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

Unified Diff: ash/system/tray_accessibility.cc

Issue 10843045: Move "Accessibility features are enabled." string resource from chrome/ to ash/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split ash_string.grd change to another CL Created 8 years, 5 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
« no previous file with comments | « ash/system/tray_accessibility.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_accessibility.cc
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 3da2e01899878b98029fd915ba1208399e92bd21..39fdc1b7947f6ba8d217e4f3151fdc5301a3b47a 100644
--- a/ash/system/tray_accessibility.cc
+++ b/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();
}
}
« no previous file with comments | « ash/system/tray_accessibility.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698