projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
extensions
/
api
/
omnibox
/
omnibox_api.cc
diff --git
a/src/chrome/browser/extensions/api/omnibox/omnibox_api.cc
b/src/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index
5435461
..
961637a
100644
(file)
--- a/
src/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/
src/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@
-12,7
+12,6
@@
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h"
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
@@
-24,6
+23,9
@@
#include "content/public/browser/notification_service.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_prefs.h"
#include "content/public/browser/notification_service.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_system_provider.h"
+#include "extensions/browser/extensions_browser_client.h"
#include "extensions/common/extension.h"
#include "ui/gfx/image/image.h"
#include "extensions/common/extension.h"
#include "ui/gfx/image/image.h"
@@
-278,7
+280,7
@@
void OmniboxAPI::OnTemplateURLsLoaded() {
template <>
void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() {
template <>
void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() {
- DependsOn(Extension
SystemFactory::GetInstance
());
+ DependsOn(Extension
sBrowserClient::Get()->GetExtensionSystemFactory
());
DependsOn(TemplateURLServiceFactory::GetInstance());
}
DependsOn(TemplateURLServiceFactory::GetInstance());
}