Move "Accessibility features are enabled." string resource from chrome/ to ash/

BUG=140060
TEST=Press Ctrl+Alt+Z to enable spoken feedback, see a bubble "Accessibility features are enabled…" is shown.

TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10843045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149800 0039d316-1c4b-4281-b951-d872f2087c98

ash/system/tray_accessibility.cc

@@ -60,8 +60,7 @@ class DefaultAccessibilityView : public ActionableView {
 TrayAccessibility::TrayAccessibility()
     : TrayImageItem(IDR_AURA_UBER_TRAY_ACCESSIBILITY),
       default_(NULL),
-      detailed_(NULL),
-      string_id_(0) {
+      detailed_(NULL) {
 }
 
 TrayAccessibility::~TrayAccessibility() {}
@@ -82,7 +81,6 @@ views::View* TrayAccessibility::CreateDefaultView(user::LoginStatus status) {
 }
 
 views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
-  DCHECK(string_id_);
   CHECK(detailed_ == NULL);
   detailed_ = new views::View;
 
@@ -96,8 +94,8 @@ views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
       ToImageSkia());
 
   detailed_->AddChildView(image);
-  detailed_->AddChildView(new views::Label(
-        bundle.GetLocalizedString(string_id_)));
+  detailed_->AddChildView(new views::Label(bundle.GetLocalizedString(
+      IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TURNED_ON_BUBBLE)));
 
   return detailed_;
 }
@@ -110,16 +108,13 @@ void TrayAccessibility::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
-void TrayAccessibility::OnAccessibilityModeChanged(bool enabled,
-                                                   int string_id) {
+void TrayAccessibility::OnAccessibilityModeChanged(bool enabled) {
   if (tray_view())
     tray_view()->SetVisible(enabled);
 
   if (enabled) {
-    string_id_ = string_id;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   } else if (detailed_) {
-    string_id_ = 0;
     detailed_->GetWidget()->Close();
   }
 }

ash/system/tray_accessibility.h

@@ -18,10 +18,8 @@ class ASH_EXPORT AccessibilityObserver {
  public:
   virtual ~AccessibilityObserver() {}
 
-  // Notifies when accessibilty mode changes. Also sends a string-id to display
-  // to the user.
-  virtual void OnAccessibilityModeChanged(bool enabled,
-                                          int string_id) = 0;
+  // Notifies when accessibilty mode changes.
+  virtual void OnAccessibilityModeChanged(bool enabled) = 0;
 };
 
 namespace internal {
@@ -41,12 +39,10 @@ class TrayAccessibility : public TrayImageItem,
   virtual void DestroyDetailedView() OVERRIDE;
 
   // Overridden from AccessibilityObserver.
-  virtual void OnAccessibilityModeChanged(bool enabled,
-                                          int string_id) OVERRIDE;
+  virtual void OnAccessibilityModeChanged(bool enabled) OVERRIDE;
 
   views::View* default_;
   views::View* detailed_;
-  int string_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
 };

chrome/app/generated_resources.grd

@@ -15002,10 +15002,6 @@ Press any key to continue exploring.
       <message name="IDS_STATUSBAR_ACCESSIBILITY_ENABLED" desc="The tooltip for the status bar button to indicate that accessibility is enabled.">
         Accessibility features are enabled.
       </message>
-      <message name="IDS_STATUSBAR_ACCESSIBILITY_TURNED_ON_BUBBLE" desc="The message shown on a bubble when accessibility is turned on">
-Accessibility features are enabled.
-Press Ctrl+Alt+Z to cancel.
-      </message>
       <message name="IDS_STATUSBAR_DISABLE_SPOKEN_FEEDBACK" desc="The menu option to disable spoken feedback accessibility feature.">
         Disable Spoken Feedback
       </message>

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -1057,8 +1057,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
               tray_->accessibility_observer();
           if (observer) {
             observer->OnAccessibilityModeChanged(
-                service->GetBoolean(prefs::kSpokenFeedbackEnabled),
-                IDS_STATUSBAR_ACCESSIBILITY_TURNED_ON_BUBBLE);
+                service->GetBoolean(prefs::kSpokenFeedbackEnabled));
           }
         } else {
           NOTREACHED();