diff options
Diffstat (limited to 'chrome/browser/chromeos/status/input_method_menu.h')
| -rw-r--r-- | chrome/browser/chromeos/status/input_method_menu.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h index fb87f16..a132c87 100644 --- a/chrome/browser/chromeos/status/input_method_menu.h +++ b/chrome/browser/chromeos/status/input_method_menu.h @@ -31,8 +31,11 @@ class InputMethodMenu : public views::ViewMenuDelegate, public NotificationObserver { public: InputMethodMenu(PrefService* pref_service, + // TODO(yusukes): combine the three booleans into one enum. + // http://crosbug.com/8386. bool is_browser_mode, - bool is_screen_locker); + bool is_screen_locker, + bool is_out_of_box_experience_mode); virtual ~InputMethodMenu(); // menus::MenuModel implementation. @@ -92,8 +95,8 @@ class InputMethodMenu : public views::ViewMenuDelegate, void PrepareForMenuOpen(); // Returns menu2 object for language menu. - views::Menu2& language_menu() { - return language_menu_; + views::Menu2& input_method_menu() { + return input_method_menu_; } private: @@ -141,14 +144,15 @@ class InputMethodMenu : public views::ViewMenuDelegate, scoped_ptr<menus::SimpleMenuModel> model_; // The language menu which pops up when the button in status area is clicked. - views::Menu2 language_menu_; - int minimum_language_menu_width_; + views::Menu2 input_method_menu_; + int minimum_input_method_menu_width_; PrefService* pref_service_; NotificationRegistrar registrar_; bool logged_in_; const bool is_browser_mode_; const bool is_screen_locker_mode_; + const bool is_out_of_box_experience_mode_; DISALLOW_COPY_AND_ASSIGN(InputMethodMenu); }; |