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

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: Fix build errors Created 9 years, 8 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
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 05c34f0243fb72863fae3591782a811292b3d75f..a64071676eb8b1c8146adc4af79bbbba90733bf5 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;
@@ -540,10 +544,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;
}

Powered by Google App Engine
This is Rietveld 408576698