diff options
author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 04:58:17 +0000 |
---|---|---|
committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 04:58:17 +0000 |
commit | 6cee8c45e34d13c1cd54defe95e0507c9f0360b3 (patch) | |
tree | c486d38dd8735473fecad26a627ad792cb3b412f /chrome/browser/chromeos/status/input_method_menu.h | |
parent | 890e7a6edad8b6d1a1ec3960e6969b6d177a0454 (diff) | |
download | chromium_src-6cee8c45e34d13c1cd54defe95e0507c9f0360b3.zip chromium_src-6cee8c45e34d13c1cd54defe95e0507c9f0360b3.tar.gz chromium_src-6cee8c45e34d13c1cd54defe95e0507c9f0360b3.tar.bz2 |
Get the ProfileService object after NOTIFICATION_SESSION_STARTED is sent to Chrome.
Currently InputMethodMenu continues to read/write the /home/chronos/Default/Preferences file, rather than /home/chronos/user/Preferences, even after sign in because InputMethodMenu gets a pointer to Profile by calling ProfileManager::GetDefaultProfile() *before* sign in. We have to do it after sign in since the GetDefaultProfile() function returns a different instance depending on the user is signed in or not.
This is the same fix as http://crrev.com/125787 .
BUG=118142
TEST=see the bug
Review URL: https://chromiumcodereview.appspot.com/9651023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/input_method_menu.h')
-rw-r--r-- | chrome/browser/chromeos/status/input_method_menu.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index 92a2227..653d887 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.h @@ -44,8 +44,7 @@ class InputMethodMenu public input_method::InputMethodManager::PreferenceObserver, public content::NotificationObserver { public: - InputMethodMenu(PrefService* pref_service, - bool for_out_of_box_experience_dialog); + InputMethodMenu(); virtual ~InputMethodMenu(); // ui::MenuModel implementation. @@ -197,13 +196,8 @@ class InputMethodMenu // Menu alignment (default TOPRIGHT). views::MenuItemView::AnchorPosition menu_alignment_; - PrefService* pref_service_; content::NotificationRegistrar registrar_; - // true if the menu is for a dialog in OOBE screen. In the dialog, we don't - // use radio buttons. - const bool for_out_of_box_experience_dialog_; - DISALLOW_COPY_AND_ASSIGN(InputMethodMenu); }; |