Skip to content

Commit

Permalink
Bug 1222490 - part 6: remove miscellaneous other bits and bobs referr…
Browse files Browse the repository at this point in the history
…ing to panorama/tabview/tab groups, r=ttaubert

--HG--
extra : commitid : ImgP4ZmiXCw
extra : rebase_source : 46228ed4cda02d01848f9e66f5a38ac00a43142d
  • Loading branch information
gijsk committed Dec 1, 2015
1 parent 3138381 commit 2775b14
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 38 deletions.
1 change: 0 additions & 1 deletion addon-sdk/source/python-lib/cuddlefish/prefs.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@
'security.default_personal_cert': 'Select Automatically',
'network.http.prompt-temp-redirect': False,
'security.warn_viewing_mixed': False,
'browser.panorama.experienced_first_run': True,
# Set a future policy version to avoid the telemetry prompt.
'toolkit.telemetry.prompted': 999,
'toolkit.telemetry.notifiedOptOut': 999,
Expand Down
1 change: 0 additions & 1 deletion addon-sdk/source/test/preferences/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"security.default_personal_cert": "Select Automatically",
"network.http.prompt-temp-redirect": false,
"security.warn_viewing_mixed": false,
"browser.panorama.experienced_first_run": true,
"toolkit.telemetry.prompted": 999,
"toolkit.telemetry.notifiedOptOut": 999,
"extensions.defaultProviders.enabled": true,
Expand Down
1 change: 0 additions & 1 deletion testing/profiles/prefs_general.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ user_pref("app.update.staging.enabled", false);
user_pref("app.update.url.android", "");
// Make sure GMPInstallManager won't hit the network.
user_pref("media.gmp-manager.url.override", "http://%(server)s/dummy-gmp-manager.xml");
user_pref("browser.panorama.experienced_first_run", true); // Assume experienced
user_pref("dom.w3c_touch_events.enabled", 1);
user_pref("dom.undo_manager.enabled", true);
user_pref("dom.webcomponents.enabled", true);
Expand Down
32 changes: 0 additions & 32 deletions toolkit/components/telemetry/Histograms.json
Original file line number Diff line number Diff line change
Expand Up @@ -5147,38 +5147,6 @@
"n_values": 10,
"description": "Track click count on about:newtab tiles per index (0-8). For non-default row or column configurations all clicks into the '9' bucket. *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"PANORAMA_INITIALIZATION_TIME_MS": {
"expires_in_version": "40",
"kind": "exponential",
"high": "10000",
"n_buckets": 15,
"extended_statistics_ok": true,
"description": "Time it takes to initialize Panorama (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"PANORAMA_GROUPS_COUNT": {
"expires_in_version": "40",
"kind": "exponential",
"high": "25",
"n_buckets": 15,
"extended_statistics_ok": true,
"description": "Number of groups in Panorama *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"PANORAMA_STACKED_GROUPS_COUNT": {
"expires_in_version": "40",
"kind": "exponential",
"high": "25",
"n_buckets": 15,
"extended_statistics_ok": true,
"description": "Number of stacked groups in Panorama *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
},
"PANORAMA_MEDIAN_TABS_IN_GROUPS_COUNT": {
"expires_in_version": "40",
"kind": "exponential",
"high": "100",
"n_buckets": 15,
"extended_statistics_ok": true,
"description": "Median of tabs in groups in Panorama"
},
"BROWSERPROVIDER_XUL_IMPORT_TIME": {
"expires_in_version": "40",
"kind": "exponential",
Expand Down
4 changes: 1 addition & 3 deletions toolkit/content/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -3542,9 +3542,7 @@ <h1><a id="jemalloc"></a>jemalloc License</h1>

<h1><a id="jquery"></a>jQuery License</h1>

<p>This license applies to all copies of jQuery in the code.
Furthermore, the file <span class="path">browser/components/tabview/iq.js</span>
incorporates work from jQuery.</p>
<p>This license applies to all copies of jQuery in the code.</p>

<pre>
Copyright (c) 2010 John Resig, http://jquery.com/
Expand Down

0 comments on commit 2775b14

Please sign in to comment.