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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_button.cc

Issue 2518183002: Moved action verbs out of Blink. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" 5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/themes/theme_service.h" 13 #include "chrome/browser/themes/theme_service.h"
14 #include "chrome/browser/themes/theme_service_factory.h" 14 #include "chrome/browser/themes/theme_service_factory.h"
15 #include "chrome/browser/ui/layout_constants.h" 15 #include "chrome/browser/ui/layout_constants.h"
16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
17 #include "ui/accessibility/ax_node_data.h" 17 #include "ui/accessibility/ax_node_data.h"
18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/models/menu_model.h" 18 #include "ui/base/models/menu_model.h"
20 #include "ui/display/display.h" 19 #include "ui/display/display.h"
21 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
22 #include "ui/strings/grit/ui_strings.h"
23 #include "ui/views/controls/button/label_button_border.h" 21 #include "ui/views/controls/button/label_button_border.h"
24 #include "ui/views/controls/menu/menu_item_view.h" 22 #include "ui/views/controls/menu/menu_item_view.h"
25 #include "ui/views/controls/menu/menu_model_adapter.h" 23 #include "ui/views/controls/menu/menu_model_adapter.h"
26 #include "ui/views/controls/menu/menu_runner.h" 24 #include "ui/views/controls/menu/menu_runner.h"
27 #include "ui/views/widget/widget.h" 25 #include "ui/views/widget/widget.h"
28 26
29 ToolbarButton::ToolbarButton(Profile* profile, 27 ToolbarButton::ToolbarButton(Profile* profile,
30 views::ButtonListener* listener, 28 views::ButtonListener* listener,
31 ui::MenuModel* model) 29 ui::MenuModel* model)
32 : views::LabelButton(listener, base::string16()), 30 : views::LabelButton(listener, base::string16()),
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 event->StopPropagation(); 130 event->StopPropagation();
133 return; 131 return;
134 } 132 }
135 133
136 LabelButton::OnGestureEvent(event); 134 LabelButton::OnGestureEvent(event);
137 } 135 }
138 136
139 void ToolbarButton::GetAccessibleNodeData(ui::AXNodeData* node_data) { 137 void ToolbarButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
140 CustomButton::GetAccessibleNodeData(node_data); 138 CustomButton::GetAccessibleNodeData(node_data);
141 node_data->role = ui::AX_ROLE_BUTTON_DROP_DOWN; 139 node_data->role = ui::AX_ROLE_BUTTON_DROP_DOWN;
142 node_data->AddStringAttribute( 140 node_data->AddIntAttribute(ui::AX_ATTR_ACTION, ui::AX_SUPPORTED_ACTION_PRESS);
143 ui::AX_ATTR_ACTION, l10n_util::GetStringUTF8(IDS_APP_ACCACTION_PRESS));
144 node_data->AddStateFlag(ui::AX_STATE_HASPOPUP); 141 node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
145 } 142 }
146 143
147 std::unique_ptr<views::LabelButtonBorder> ToolbarButton::CreateDefaultBorder() 144 std::unique_ptr<views::LabelButtonBorder> ToolbarButton::CreateDefaultBorder()
148 const { 145 const {
149 std::unique_ptr<views::LabelButtonBorder> border = 146 std::unique_ptr<views::LabelButtonBorder> border =
150 views::LabelButton::CreateDefaultBorder(); 147 views::LabelButton::CreateDefaultBorder();
151 148
152 if (ThemeServiceFactory::GetForProfile(profile_)->UsingSystemTheme()) 149 if (ThemeServiceFactory::GetForProfile(profile_)->UsingSystemTheme())
153 border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON)); 150 border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON));
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 if (state() != STATE_DISABLED) 235 if (state() != STATE_DISABLED)
239 SetState(STATE_NORMAL); 236 SetState(STATE_NORMAL);
240 237
241 menu_runner_.reset(); 238 menu_runner_.reset();
242 menu_model_adapter_.reset(); 239 menu_model_adapter_.reset();
243 } 240 }
244 241
245 const char* ToolbarButton::GetClassName() const { 242 const char* ToolbarButton::GetClassName() const {
246 return "ToolbarButton"; 243 return "ToolbarButton";
247 } 244 }
OLDNEW
« no previous file with comments | « no previous file | content/app/strings/content_strings.grd » ('j') | content/browser/accessibility/browser_accessibility_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698