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

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

Issue 8438064: Separate StatusAreaView from StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 1e94967dcf2548770328eb862bfa58739beae8eb..f8f59d7a5f8062a1074b43e1936b360bf835d6dd 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_util.h"
#include "chrome/browser/chromeos/status/status_area_bubble.h"
+#include "chrome/browser/chromeos/view_ids.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
@@ -35,8 +36,12 @@ namespace chromeos {
////////////////////////////////////////////////////////////////////////////////
// AccessibilityMenuButton
-AccessibilityMenuButton::AccessibilityMenuButton(StatusAreaHost* host)
- : StatusAreaButton(host, this) {
+AccessibilityMenuButton::AccessibilityMenuButton(
+ StatusAreaButton::Delegate* delegate,
+ StatusAreaViewChromeos::ScreenMode screen_mode)
+ : StatusAreaButton(delegate, this),
+ screen_mode_(screen_mode) {
+ set_id(VIEW_ID_STATUS_BUTTON_ACCESSIBILITY);
accessibility_enabled_.Init(prefs::kAccessibilityEnabled,
g_browser_process->local_state(), this);
SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
@@ -90,7 +95,7 @@ void AccessibilityMenuButton::Observe(
// Show a bubble when accessibility is turned on at the login screen.
if (path == prefs::kAccessibilityEnabled) {
if (accessibility_enabled_.GetValue() &&
- host_->GetScreenMode() == StatusAreaHost::kWebUILoginMode) {
+ screen_mode_ == StatusAreaViewChromeos::LOGIN_MODE_WEBUI) {
views::ImageView* icon_view = new views::ImageView;
const gfx::Image& image = ResourceBundle::GetSharedInstance().
GetImageNamed(IDR_ACCESSIBILITY_ICON);

Powered by Google App Engine
This is Rietveld 408576698