chrome/browser/chromeos/extensions/input_method_event_router.cc - Issue 1055863002: ChromeOS: switch UI language before apps are loaded.

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/chromeos/extensions/input_method_event_router.cc

Issue 1055863002: ChromeOS: switch UI language before apps are loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Replaced CHECK with DCHECK. Created 5 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

« chrome/browser/chromeos/base/locale_util.cc ('K') | « chrome/browser/chromeos/extensions/input_method_event_router.h ('k') | chrome/browser/chromeos/input_method/accessibility.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/input_method_event_router.cc

diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc

index 79e4f7303b65926b0b969dcc0cedaee39c39befb..86c32d1259f028c3dd5e687157562052a087db51 100644

--- a/chrome/browser/chromeos/extensions/input_method_event_router.cc

+++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc

@@ -9,6 +9,7 @@

#include "base/json/json_writer.h"

#include "base/values.h"

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

+#include "chrome/browser/profiles/profile.h"

#include "content/public/browser/browser_context.h"

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_system.h"

@@ -26,8 +27,12 @@ ExtensionInputMethodEventRouter::~ExtensionInputMethodEventRouter() {

}

void ExtensionInputMethodEventRouter::InputMethodChanged(

- input_method::InputMethodManager *manager,

+ input_method::InputMethodManager* manager,

+ Profile* profile,

bool show_message) {

+ // This should probably be CHECK, as delivering event to a wrong

+ // profile means delivering it to a wrong extension instance.

+ DCHECK(profile->IsSameProfile(Profile::FromBrowserContext(context_)));

extensions::EventRouter* router = extensions::EventRouter::Get(context_);

if (!router->HasEventListener(