mobile/android/chrome/content/browser.js - Issue 4920541991403520: Create a minimal settings UI

Delta Between Two Patch Sets: mobile/android/chrome/content/browser.js

Issue 4920541991403520: Create a minimal settings UI (Closed)

Left Patch Set: Cleanup of AddOnBridge Created March 22, 2015, 12:13 p.m.

Right Patch Set: Removed default case Created March 22, 2015, 9:23 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

« no previous file with change/comment | « mobile/android/base/strings.xml.in ('k') | mobile/android/thirdparty/org/adblockplus/browser/AbpCheckBoxPreference.java » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

LEFT	RIGHT
1 #filter substitution	1 #filter substitution

2 // -- Mode: js2; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2- skip-preprocessor-directives: t; --	2 // -- Mode: js2; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2- skip-preprocessor-directives: t; --

3 /* This Source Code Form is subject to the terms of the Mozilla Public	3 /* This Source Code Form is subject to the terms of the Mozilla Public

4 * License, v. 2.0. If a copy of the MPL was not distributed with this	4 * License, v. 2.0. If a copy of the MPL was not distributed with this

5 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */	5 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

6 "use strict";	6 "use strict";

7	7

8 let Cc = Components.classes;	8 let Cc = Components.classes;

9 let Ci = Components.interfaces;	9 let Ci = Components.interfaces;

10 let Cu = Components.utils;	10 let Cu = Components.utils;

11 let Cr = Components.results;	11 let Cr = Components.results;

12	12

13 Cu.import("resource://gre/modules/XPCOMUtils.jsm");	13 Cu.import("resource://gre/modules/XPCOMUtils.jsm");

14 Cu.import("resource://gre/modules/Services.jsm");	14 Cu.import("resource://gre/modules/Services.jsm");

15 Cu.import("resource://gre/modules/AddonManager.jsm");	15 Cu.import("resource://gre/modules/AddonManager.jsm");

16 Cu.import("resource://gre/modules/FileUtils.jsm");	16 Cu.import("resource://gre/modules/FileUtils.jsm");

17 Cu.import("resource://gre/modules/JNI.jsm");	17 Cu.import("resource://gre/modules/JNI.jsm");

18 Cu.import('resource://gre/modules/Payment.jsm');	18 Cu.import('resource://gre/modules/Payment.jsm');

19 Cu.import("resource://gre/modules/NotificationDB.jsm");	19 Cu.import("resource://gre/modules/NotificationDB.jsm");

20 Cu.import("resource://gre/modules/SpatialNavigation.jsm");	20 Cu.import("resource://gre/modules/SpatialNavigation.jsm");

21 Cu.import("resource://gre/modules/UITelemetry.jsm");	21 Cu.import("resource://gre/modules/UITelemetry.jsm");

22 Cu.import("chrome://adblockplus/content/Api.jsm");
Felix Dahlke 2015/03/22 13:52:34 See my comment in Api.jsm, I believe it'd be more See my comment in Api.jsm, I believe it'd be more obvious if we had an explicit call that sets up the communication. Either way, we should move this to the bottom of browser.js. René Jeschke 2015/03/22 15:32:59 Done. Show quoted text On 2015/03/22 13:52:34, Felix H. Dahlke wrote: > See my comment in Api.jsm, I believe it'd be more obvious if we had an explicit > call that sets up the communication. > > Either way, we should move this to the bottom of browser.js. Done.
23	22

24 #ifdef ACCESSIBILITY	23 #ifdef ACCESSIBILITY

25 Cu.import("resource://gre/modules/accessibility/AccessFu.jsm");	24 Cu.import("resource://gre/modules/accessibility/AccessFu.jsm");

26 #endif	25 #endif

27	26

28 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",	27 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",

29 "resource://gre/modules/PluralForm.jsm");	28 "resource://gre/modules/PluralForm.jsm");

30	29

31 XPCOMUtils.defineLazyModuleGetter(this, "sendMessageToJava",	30 XPCOMUtils.defineLazyModuleGetter(this, "sendMessageToJava",

32 "resource://gre/modules/Messaging.jsm");	31 "resource://gre/modules/Messaging.jsm");

(...skipping 8409 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
8442 return {	8441 return {

8443 id: this.id,	8442 id: this.id,

8444 icon: elt.icon,	8443 icon: elt.icon,

8445 label: elt.label,	8444 label: elt.label,

8446 disabled: elt.disabled,	8445 disabled: elt.disabled,

8447 menu: elt instanceof Ci.nsIDOMHTMLMenuElement	8446 menu: elt instanceof Ci.nsIDOMHTMLMenuElement

8448 };	8447 };

8449 }	8448 }

8450 },	8449 },

8451 });	8450 });

	8451

	8452 let {AdblockPlusApi} = Cu.import("chrome://adblockplus/content/Api.jsm");

	8453 AdblockPlusApi.initCommunication();

	8454

LEFT	RIGHT