Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1522)

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 6869024: Add IME UI related extension API. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_input_ui_api.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 603772c75803e13ab114be0321e02b1605d3de0a..e9a0d3c7181c5a46c3577aa0d58595484744227c 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -89,6 +89,10 @@
#include "webkit/fileapi/file_system_path_manager.h"
#endif
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#include "chrome/browser/extensions/extension_input_ui_api.h"
+#endif
+
using base::Time;
namespace errors = extension_manifest_errors;
@@ -544,10 +548,16 @@ void ExtensionService::InitEventRouters() {
ExtensionManagementEventRouter::GetInstance()->Init();
ExtensionProcessesEventRouter::GetInstance()->ObserveProfile(profile_);
ExtensionWebNavigationEventRouter::GetInstance()->Init();
+
#if defined(OS_CHROMEOS)
ExtensionFileBrowserEventRouter::GetInstance()->ObserveFileSystemEvents(
profile_);
#endif
+
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+ ExtensionInputUiEventRouter::GetInstance()->Init();
+#endif
+
event_routers_initialized_ = true;
}
« no previous file with comments | « chrome/browser/extensions/extension_input_ui_api.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698