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

Side by Side Diff: chrome/browser/ui/views/location_bar/page_action_image_view.cc

Issue 2477463003: Replace ui::AXViewState with AXNodeData and AXActionData (Closed)
Patch Set: Fix test Created 4 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/location_bar/page_action_image_view.h" 5 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_action.h" 8 #include "chrome/browser/extensions/extension_action.h"
9 #include "chrome/browser/platform_util.h" 9 #include "chrome/browser/platform_util.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/sessions/session_tab_helper.h" 11 #include "chrome/browser/sessions/session_tab_helper.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 13 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
14 #include "extensions/browser/extension_registry.h" 14 #include "extensions/browser/extension_registry.h"
15 #include "extensions/common/constants.h" 15 #include "extensions/common/constants.h"
16 #include "ui/accessibility/ax_view_state.h" 16 #include "ui/accessibility/ax_node_data.h"
17 #include "ui/compositor/paint_recorder.h" 17 #include "ui/compositor/paint_recorder.h"
18 #include "ui/events/event.h" 18 #include "ui/events/event.h"
19 #include "ui/gfx/canvas.h" 19 #include "ui/gfx/canvas.h"
20 #include "ui/gfx/image/image.h" 20 #include "ui/gfx/image/image.h"
21 #include "ui/views/controls/menu/menu_runner.h" 21 #include "ui/views/controls/menu/menu_runner.h"
22 22
23 // static 23 // static
24 const char PageActionImageView::kViewClassName[] = "PageActionImageView"; 24 const char PageActionImageView::kViewClassName[] = "PageActionImageView";
25 25
26 PageActionImageView::PageActionImageView(LocationBarView* owner, 26 PageActionImageView::PageActionImageView(LocationBarView* owner,
(...skipping 16 matching lines...) Expand all
43 set_context_menu_controller(this); 43 set_context_menu_controller(this);
44 } 44 }
45 45
46 PageActionImageView::~PageActionImageView() { 46 PageActionImageView::~PageActionImageView() {
47 } 47 }
48 48
49 const char* PageActionImageView::GetClassName() const { 49 const char* PageActionImageView::GetClassName() const {
50 return kViewClassName; 50 return kViewClassName;
51 } 51 }
52 52
53 void PageActionImageView::GetAccessibleState(ui::AXViewState* state) { 53 void PageActionImageView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
54 state->role = ui::AX_ROLE_BUTTON; 54 node_data->role = ui::AX_ROLE_BUTTON;
55 state->name = base::UTF8ToUTF16(tooltip_); 55 node_data->SetName(tooltip_);
56 } 56 }
57 57
58 bool PageActionImageView::OnMousePressed(const ui::MouseEvent& event) { 58 bool PageActionImageView::OnMousePressed(const ui::MouseEvent& event) {
59 // We want to show the bubble on mouse release; that is the standard behavior 59 // We want to show the bubble on mouse release; that is the standard behavior
60 // for buttons. (Also, triggering on mouse press causes bugs like 60 // for buttons. (Also, triggering on mouse press causes bugs like
61 // http://crbug.com/33155.) 61 // http://crbug.com/33155.)
62 return true; 62 return true;
63 } 63 }
64 64
65 void PageActionImageView::OnMouseReleased(const ui::MouseEvent& event) { 65 void PageActionImageView::OnMouseReleased(const ui::MouseEvent& event) {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 nullptr, // No menu button for page action views. 157 nullptr, // No menu button for page action views.
158 gfx::Rect(screen_loc, size()), 158 gfx::Rect(screen_loc, size()),
159 views::MENU_ANCHOR_TOPLEFT, 159 views::MENU_ANCHOR_TOPLEFT,
160 source_type) == views::MenuRunner::MENU_DELETED) { 160 source_type) == views::MenuRunner::MENU_DELETED) {
161 return; 161 return;
162 } 162 }
163 163
164 menu_runner_.reset(); 164 menu_runner_.reset();
165 view_controller_->OnContextMenuClosed(); 165 view_controller_->OnContextMenuClosed();
166 } 166 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698