chrome/browser/chromeos/login/session/user_session_manager.h - 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/login/session/user_session_manager.h

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

Patch Set: Update after review. 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/input_method/input_method_manager_impl.cc ('K') | « chrome/browser/chromeos/input_method/mock_input_method_manager.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | chromeos/ime/component_extension_ime_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.h

diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h

index 7a5448b8a9b1d34c1be75ca39fefb18e6a20f9e0..90ad1dc9cb255064a136a8a30e8f21be4649d49e 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.h

+++ b/chrome/browser/chromeos/login/session/user_session_manager.h

@@ -14,6 +14,7 @@

#include "chrome/browser/chromeos/base/locale_util.h"

#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

#include "chromeos/dbus/session_manager_client.h"

+#include "chromeos/ime/input_method_manager.h"

#include "chromeos/login/auth/authenticator.h"

#include "chromeos/login/auth/user_context.h"

#include "components/user_manager/user.h"

@@ -130,8 +131,8 @@ class UserSessionManager

const user_manager::User* user,

scoped_ptr<locale_util::SwitchLanguageCallback> callback) const;

- void AddSessionStateObserver(UserSessionStateObserver* observer);

- void RemoveSessionStateObserver(UserSessionStateObserver* observer);

+ void AddSessionStateObserver(chromeos::UserSessionStateObserver* observer);

+ void RemoveSessionStateObserver(chromeos::UserSessionStateObserver* observer);

private:

friend struct DefaultSingletonTraits<UserSessionManager>;

@@ -240,7 +241,7 @@ class UserSessionManager

// [user_id] > [user_id_hash]

SessionManagerClient::ActiveSessionsMap pending_user_sessions_;

- ObserverList<UserSessionStateObserver> session_state_observer_list_;

+ ObserverList<chromeos::UserSessionStateObserver> session_state_observer_list_;

// OAuth2 session related members.