Bug 1130886 Warning: Trying to re-register CID '{22117140-9c6e-11d3-aaf1-00805f8a4905}' r=Mossop

--HG--
extra : rebase_source : d7df180a294e406e1ba621a586c1974870a2007e
This commit is contained in:
Philip Chee 2015-02-14 02:50:38 +08:00
parent 5b641e3fb5
commit b7e54e1f45
2 changed files with 9 additions and 2 deletions

View File

@ -8,16 +8,21 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
EXTRA_COMPONENTS += [
'nsSearchSuggestions.js',
'nsSidebar.js',
'toolkitsearch.manifest',
]
if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
DEFINES['HAVE_SIDEBAR'] = True
EXTRA_COMPONENTS += [
'nsSidebar.js',
]
EXTRA_JS_MODULES += [
'SearchSuggestionController.jsm',
]
EXTRA_PP_COMPONENTS += [
'nsSearchService.js',
'toolkitsearch.manifest',
]
EXTRA_JS_MODULES += [

View File

@ -4,5 +4,7 @@ contract @mozilla.org/browser/search-service;1 {7319788a-fe93-4db3-9f39-818cf08f
category update-timer nsSearchService @mozilla.org/browser/search-service;1,getService,search-engine-update-timer,browser.search.update.interval,21600
component {aa892eb4-ffbf-477d-9f9a-06c995ae9f27} nsSearchSuggestions.js
contract @mozilla.org/autocomplete/search;1?name=search-autocomplete {aa892eb4-ffbf-477d-9f9a-06c995ae9f27}
#ifdef HAVE_SIDEBAR
component {22117140-9c6e-11d3-aaf1-00805f8a4905} nsSidebar.js
contract @mozilla.org/sidebar;1 {22117140-9c6e-11d3-aaf1-00805f8a4905}
#endif