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

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 afcc6b1855d8ef1e6d19ef5b5c1816d9b409d976..887a820c0e7fe80910dcf2ddd0801117d44ab8d8 100644
--- a/chrome/browser/chromeos/status/input_method_menu.h
+++ b/chrome/browser/chromeos/status/input_method_menu.h
@@ -10,7 +10,6 @@
#include "base/compiler_specific.h"
#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"
@@ -46,7 +45,6 @@ class InputMethodMenu
public content::NotificationObserver {
public:
InputMethodMenu(PrefService* pref_service,
- StatusAreaViewChromeos::ScreenMode screen_mode,
bool for_out_of_box_experience_dialog);
virtual ~InputMethodMenu();
@@ -171,6 +169,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_;
@@ -195,8 +196,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_;
« no previous file with comments | « chrome/browser/chromeos/status/accessibility_menu_button.cc ('k') | chrome/browser/chromeos/status/input_method_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698