wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 725213 - Refactor search engines in BrowserApp. r=mfinkle

Browse Source
This commit is contained in:
Brian Nicholson 2012-03-12 19:16:27 -07:00
parent 569c1017ce
commit fde5002690
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mobile/android/chrome/content/browser.js
View File

@ -238,7 +238,6 @@ var BrowserApp = {
Services.obs.addObserver(this, "PanZoom:PanZoom", false);
Services.obs.addObserver(this, "FullScreen:Exit", false);
Services.obs.addObserver(this, "Viewport:Change", false);
Services.obs.addObserver(this, "SearchEngines:Get", false);
Services.obs.addObserver(this, "Passwords:Init", false);
Services.obs.addObserver(this, "FormHistory:Init", false);
@ -281,6 +280,7 @@ var BrowserApp = {
ClipboardHelper.init();
PermissionsHelper.init();
CharacterEncoding.init();
SearchEngines.init();
// Init LoginManager
Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
@ -436,6 +436,7 @@ var BrowserApp = {
XPInstallObserver.uninit();
ConsoleAPI.uninit();
CharacterEncoding.uninit();
SearchEngines.uninit();
},
get tabs() {
@ -824,23 +825,6 @@ var BrowserApp = {
}
},
getSearchEngines: function() {
let engineData = Services.search.getVisibleEngines({});
let searchEngines = engineData.map(function (engine) {
return {
name: engine.name,
iconURI: engine.iconURI.spec
};
});
sendMessageToJava({
gecko: {
type: "SearchEngines:Data",
searchEngines: searchEngines
}
});
},
scrollToFocusedInput: function(aBrowser) {
let doc = aBrowser.contentDocument;
if (!doc)
@ -995,8 +979,6 @@ var BrowserApp = {
} else if (aTopic == "Viewport:Change") {
this.selectedTab.viewport = JSON.parse(aData);
ViewportHandler.onResize();
} else if (aTopic == "SearchEngines:Get") {
this.getSearchEngines();
} else if (aTopic == "Passwords:Init") {
var storage = Components.classes["@mozilla.org/login-manager/storage/mozStorage;1"].
getService(Components.interfaces.nsILoginManagerStorage);
@ -4371,3 +4353,32 @@ OverscrollController.prototype = {
onEvent : function onEvent(aEvent) { }
};
var SearchEngines = {
init: function init() {
Services.obs.addObserver(this, "SearchEngines:Get", false);
},
uninit: function uninit() {
Services.obs.removeObserver(this, "SearchEngines:Get", false);
},
observe: function observe(aSubject, aTopic, aData) {
if (aTopic == "SearchEngines:Get") {
let engineData = Services.search.getVisibleEngines({});
let searchEngines = engineData.map(function (engine) {
return {
name: engine.name,
iconURI: (engine.iconURI ? engine.iconURI.spec : null)
};
});
sendMessageToJava({
gecko: {
type: "SearchEngines:Data",
searchEngines: searchEngines
}
});
}
}
};