Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chrome/browser/chromeos/status/input_method_menu.h

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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
Index: chrome/browser/chromeos/status/input_method_menu.h
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h
index 29657e2cd5827ee5de4131ed0b03896fdcc8c904..a40ea71cacef2ea4d8ffb8fe6f8eb0f568f83750 100644
--- a/chrome/browser/chromeos/status/input_method_menu.h
+++ b/chrome/browser/chromeos/status/input_method_menu.h
@@ -9,7 +9,6 @@
#include <string>
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
#include "chrome/browser/prefs/pref_member.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -45,7 +44,6 @@ class InputMethodMenu
public content::NotificationObserver {
public:
InputMethodMenu(PrefService* pref_service,
- StatusAreaViewChromeos::ScreenMode screen_mode,
bool for_out_of_box_experience_dialog);
virtual ~InputMethodMenu();
@@ -168,6 +166,9 @@ class InputMethodMenu
// Stops observing InputMethodManager.
void RemoveObservers();
+ // Initializes objects for reading/writing Chrome prefs.
+ void InitializePrefMembers();
+
// The current input method list.
scoped_ptr<input_method::InputMethodDescriptors> input_method_descriptors_;
@@ -192,8 +193,6 @@ class InputMethodMenu
PrefService* pref_service_;
content::NotificationRegistrar registrar_;
- // The mode of the host screen (e.g. browser, screen locker, login screen.)
- const StatusAreaViewChromeos::ScreenMode screen_mode_;
// 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_;

Powered by Google App Engine
This is Rietveld 408576698