chrome/browser/extensions/extension_service.cc - Issue 10735074: Moving input_ime to api/ .

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10735074: Moving input_ime to api/ . (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebased Created 8 years, 5 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

« chrome/browser/extensions/api/input_ime/input_ime_api.h ('K') | « chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 9a13fddc15158e7b23019347f2aeef15e3074a59..40cce004ccca926ca06e8dfb114006be64e477b1 100644

--- a/chrome/browser/extensions/extension_service.cc

+++ b/chrome/browser/extensions/extension_service.cc

@@ -46,7 +46,6 @@

#include "chrome/browser/extensions/extension_font_settings_api.h"

#include "chrome/browser/extensions/extension_global_error.h"

#include "chrome/browser/extensions/extension_host.h"

-#include "chrome/browser/extensions/extension_input_ime_api.h"

#include "chrome/browser/extensions/extension_managed_mode_api.h"

#include "chrome/browser/extensions/extension_management_api.h"

#include "chrome/browser/extensions/extension_preference_api.h"

@@ -120,7 +119,7 @@

#include "chrome/browser/chromeos/extensions/input_method_event_router.h"

#include "chrome/browser/chromeos/extensions/media_player_event_router.h"

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

-#include "chrome/browser/extensions/extension_input_ime_api.h"

+#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"

#include "webkit/fileapi/file_system_context.h"

#include "webkit/fileapi/file_system_mount_point_provider.h"

#endif

@@ -509,7 +508,7 @@ void ExtensionService::InitEventRouters() {

new chromeos::ExtensionInputMethodEventRouter);

ExtensionMediaPlayerEventRouter::GetInstance()->Init(profile_);

- ExtensionInputImeEventRouter::GetInstance()->Init();

+ extensions::ExtensionInputImeEventRouter::GetInstance()->Init();

#endif

#endif // defined(ENABLE_EXTENSIONS)

event_routers_initialized_ = true;

@@ -1036,7 +1035,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {

component != extension->input_components().end();

++component) {

if (component->type == Extension::INPUT_COMPONENT_TYPE_IME) {

- ExtensionInputImeEventRouter::GetInstance()->RegisterIme(

+ extensions::ExtensionInputImeEventRouter::GetInstance()->RegisterIme(

profile_, extension->id(), *component);

}

@@ -1078,7 +1077,7 @@ void ExtensionService::NotifyExtensionUnloaded(

}

if (extension->input_components().size() > 0) {

- ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes(

+ extensions::ExtensionInputImeEventRouter::GetInstance()->UnregisterAllImes(

profile_, extension->id());

}

#endif