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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_button.cc

Issue 2518183002: Moved action verbs out of Blink. (Closed)
Patch Set: Added missing braces. Created 4 years 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 | « no previous file | content/app/strings/content_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 57fb60de60a70a9b46e05451c3d969c7e43a7b94..c66f40eebe561ec70e9f8bab5ae07355ee34d75b 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -13,11 +13,9 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/accessibility/ax_node_data.h"
-#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/menu_model.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
-#include "ui/strings/grit/ui_strings.h"
#include "ui/views/controls/button/label_button_border.h"
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
@@ -131,9 +129,11 @@ void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) {
void ToolbarButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
CustomButton::GetAccessibleNodeData(node_data);
node_data->role = ui::AX_ROLE_BUTTON_DROP_DOWN;
- node_data->AddStringAttribute(
- ui::AX_ATTR_ACTION, l10n_util::GetStringUTF8(IDS_APP_ACCACTION_PRESS));
node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
+ if (enabled()) {
+ node_data->AddIntAttribute(ui::AX_ATTR_ACTION,
+ ui::AX_SUPPORTED_ACTION_PRESS);
+ }
}
std::unique_ptr<views::LabelButtonBorder> ToolbarButton::CreateDefaultBorder()
« no previous file with comments | « no previous file | content/app/strings/content_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698