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

Unified Diff: chrome/browser/chromeos/status/input_method_menu_button.cc

Issue 6378008: Add GetScreenMode() to status_area_host.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 9 years, 11 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
Index: chrome/browser/chromeos/status/input_method_menu_button.cc
diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc
index 9ad5f4e88306e28d236cc02e1e4ef4ab2611f5eb..ff4db965406f2640994a6c7e84752b160830f935 100644
--- a/chrome/browser/chromeos/status/input_method_menu_button.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_button.cc
@@ -42,9 +42,8 @@ namespace chromeos {
InputMethodMenuButton::InputMethodMenuButton(StatusAreaHost* host)
: StatusAreaButton(this),
InputMethodMenu(GetPrefService(host),
- host->IsBrowserMode(),
- host->IsScreenLockerMode(),
- false /* is_out_of_box_experience_mode */),
+ host->GetScreenMode(),
+ false /* for_out_of_box_experience_dialog */),
host_(host) {
set_border(NULL);
set_use_menu_button_paint(true);
@@ -112,7 +111,7 @@ void InputMethodMenuButton::UpdateUI(const std::string& input_method_id,
// like Hiragana and Katakana modes in Japanese input methods.
if (num_active_input_methods == 1 &&
input_method::IsKeyboardLayout(input_method_id) &&
- host_->IsBrowserMode()) {
+ host_->GetScreenMode() == StatusAreaHost::kBrowserMode) {
// As the disabled color is set to invisible, disabling makes the
// button disappear.
SetEnabled(false);
« no previous file with comments | « chrome/browser/chromeos/status/input_method_menu.cc ('k') | chrome/browser/chromeos/status/network_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698