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

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

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/accessibility_menu_button.cc
diff --git a/chrome/browser/chromeos/status/accessibility_menu_button.cc b/chrome/browser/chromeos/status/accessibility_menu_button.cc
index bdda6ff19e150d57a8ad03c09d38836d1ca1ce11..0d8b95fcdf6e184af779a0a6ef8905f174cb0a6e 100644
--- a/chrome/browser/chromeos/status/accessibility_menu_button.cc
+++ b/chrome/browser/chromeos/status/accessibility_menu_button.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/status/status_area_bubble.h"
+#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
#include "chrome/browser/chromeos/view_ids.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/chrome_notification_types.h"
@@ -37,10 +38,8 @@ namespace chromeos {
// AccessibilityMenuButton
AccessibilityMenuButton::AccessibilityMenuButton(
- StatusAreaButton::Delegate* delegate,
- StatusAreaViewChromeos::ScreenMode screen_mode)
- : StatusAreaButton(delegate, this),
- screen_mode_(screen_mode) {
+ StatusAreaButton::Delegate* delegate)
+ : StatusAreaButton(delegate, this) {
set_id(VIEW_ID_STATUS_BUTTON_ACCESSIBILITY);
accessibility_enabled_.Init(prefs::kAccessibilityEnabled,
g_browser_process->local_state(), this);
@@ -95,7 +94,7 @@ void AccessibilityMenuButton::Observe(
// Show a bubble when accessibility is turned on at the login screen.
if (path == prefs::kAccessibilityEnabled) {
if (accessibility_enabled_.GetValue() &&
- screen_mode_ == StatusAreaViewChromeos::LOGIN_MODE_WEBUI) {
+ StatusAreaViewChromeos::IsLoginMode()) {
views::ImageView* icon_view = new views::ImageView;
const gfx::Image& image = ResourceBundle::GetSharedInstance().
GetImageNamed(IDR_ACCESSIBILITY_ICON);
« no previous file with comments | « chrome/browser/chromeos/status/accessibility_menu_button.h ('k') | chrome/browser/chromeos/status/input_method_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698