chrome/browser/chromeos/input_method/browser_state_monitor.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/chromeos/input_method/browser_state_monitor.cc

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

Patch Set: Created 6 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

« no previous file with comments | « chrome/browser/chromeos/input_method/browser_state_monitor.h ('k') | chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc » ('j') | chrome/browser/chromeos/input_method/input_method_manager_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/browser_state_monitor.cc

diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.cc b/chrome/browser/chromeos/input_method/browser_state_monitor.cc

index 22b480b4e1b3f0125b176147e1b6edd8322727e0..3ec6f87251c0ec7a66a864638f2b8eccd712a049 100644

--- a/chrome/browser/chromeos/input_method/browser_state_monitor.cc

+++ b/chrome/browser/chromeos/input_method/browser_state_monitor.cc

@@ -14,9 +14,8 @@ namespace chromeos {

namespace input_method {

BrowserStateMonitor::BrowserStateMonitor(

- const base::Callback<void(InputMethodManager::State)>& observer)

- : observer_(observer),

- state_(InputMethodManager::STATE_LOGIN_SCREEN) {

+ const base::Callback<void(InputMethodManager::UIState)>& observer)

+ : observer_(observer), state_(InputMethodManager::STATE_LOGIN_SCREEN) {

notification_registrar_.Add(this,

chrome::NOTIFICATION_LOGIN_USER_CHANGED,

content::NotificationService::AllSources());

@@ -43,7 +42,7 @@ void BrowserStateMonitor::Observe(

int type,

const content::NotificationSource& source,

const content::NotificationDetails& details) {

- const InputMethodManager::State old_state = state_;

+ const InputMethodManager::UIState old_state = state_;

switch (type) {

case chrome::NOTIFICATION_APP_TERMINATING: {

state_ = InputMethodManager::STATE_TERMINATING;