chrome/browser/extensions/component_loader.cc - Issue 419293002: IME refactoring: ChromeOS introduce input methods State.

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/component_loader.cc

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup. Created 6 years, 4 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/chromeos/preferences.cc ('K') | « chrome/browser/extensions/api/input_ime/input_ime_api.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index db9e40d6bba6868346242bdb0f704326813c01cc..819e3076b9991107010fe0812acfb89d654b167f 100644

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

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

@@ -429,7 +429,8 @@ void ComponentLoader::AddDefaultComponentExtensions(

chromeos::input_method::InputMethodManager* input_method_manager =

chromeos::input_method::InputMethodManager::Get();

if (input_method_manager)

- input_method_manager->InitializeComponentExtension();

+ input_method_manager->InitializeComponentExtension(

+ Profile::FromBrowserContext(browser_context_));

Add(IDR_MOBILE_MANIFEST,

base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));

@@ -476,7 +477,8 @@ void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(

chromeos::input_method::InputMethodManager* input_method_manager =

chromeos::input_method::InputMethodManager::Get();

if (input_method_manager)

- input_method_manager->InitializeComponentExtension();

+ input_method_manager->InitializeComponentExtension(

+ Profile::FromBrowserContext(browser_context_));

#endif

// No component extension for kiosk app launch splash screen.

if (skip_session_components)