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

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

Issue 10399046: Remove virtual keyboard support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final rebase Created 8 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
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 9a50210d9e017fc1d05ab1f231c42f092a6d0ffd..0f66270f7c327d0b8158338c981bf775bb614758 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -123,10 +123,6 @@
#include "webkit/fileapi/file_system_mount_point_provider.h"
#endif
-#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
-#include "chrome/browser/extensions/extension_input_ui_api.h"
-#endif
-
using base::Time;
using content::BrowserContext;
using content::BrowserThread;
@@ -519,11 +515,6 @@ void ExtensionService::InitEventRouters() {
ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);
ExtensionInputImeEventRouter::GetInstance()->Init();
#endif
-
-#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
- ExtensionInputUiEventRouter::GetInstance()->Init();
-#endif
-
#endif // defined(ENABLE_EXTENSIONS)
event_routers_initialized_ = true;
}
@@ -1045,20 +1036,6 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
ExtensionInputImeEventRouter::GetInstance()->RegisterIme(
profile_, extension->id(), *component);
}
-#if defined(USE_VIRTUAL_KEYBOARD)
- if (component->type == Extension::INPUT_COMPONENT_TYPE_VIRTUAL_KEYBOARD &&
- !component->layouts.empty()) {
- chromeos::input_method::InputMethodManager* input_method_manager =
- chromeos::input_method::InputMethodManager::GetInstance();
- const bool is_system_keyboard =
- extension->location() == Extension::COMPONENT;
- input_method_manager->RegisterVirtualKeyboard(
- extension->url(),
- component->name, // human-readable name of the keyboard extension.
- component->layouts,
- is_system_keyboard);
- }
-#endif
}
#endif
}
« no previous file with comments | « chrome/browser/extensions/extension_override_apitest.cc ('k') | chrome/browser/metrics/metrics_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698