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

Unified Diff: ash/launcher/launcher_view.cc

Issue 9307037: Reland http://codereview.chromium.org/9121050/ with fix for aura_win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separate ash_strings into its own gyp to break circular dependencies Created 8 years, 10 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/launcher/launcher_view.h ('k') | ash/launcher/tabbed_launcher_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.cc
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index d674bb343f3ed6a78c2009631531d8012f5e78d0..ec93a280f8fa344874c68e83a5e6ca04c279c41f 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -13,10 +13,12 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "base/utf_string_conversions.h"
+#include "grit/ash_strings.h"
#include "grit/ui_resources.h"
#include "ui/aura/window.h"
#include "ui/base/animation/animation.h"
#include "ui/base/animation/throb_animation.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/compositor/layer.h"
@@ -643,5 +645,28 @@ void LauncherView::ButtonPressed(views::Button* sender,
}
}
+string16 LauncherView::GetAccessibleName(views::View* view) {
+ ShellDelegate* delegate = Shell::GetInstance()->delegate();
+ if (!delegate)
+ return string16();
+ int view_index = view_model_->GetIndexOfView(view);
+ // May be -1 while in the process of animating closed.
+ if (view_index == -1)
+ return string16();
+
+ switch (model_->items()[view_index].type) {
+ case TYPE_TABBED:
+ case TYPE_APP:
+ return delegate->GetLauncherItemTitle(model_->items()[view_index]);
+
+ case TYPE_APP_LIST:
+ return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
+
+ case TYPE_BROWSER_SHORTCUT:
+ return l10n_util::GetStringUTF16(IDS_AURA_CYCLER_TITLE);
+ }
+ return string16();
+}
+
} // namespace internal
} // namespace ash
« no previous file with comments | « ash/launcher/launcher_view.h ('k') | ash/launcher/tabbed_launcher_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698