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

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_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/frame/opaque_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/themes/theme_properties.h" 8 #include "chrome/browser/themes/theme_properties.h"
9 #include "chrome/browser/themes/theme_service_factory.h" 9 #include "chrome/browser/themes/theme_service_factory.h"
10 #include "chrome/browser/ui/layout_constants.h" 10 #include "chrome/browser/ui/layout_constants.h"
11 #include "chrome/browser/ui/views/frame/browser_frame.h" 11 #include "chrome/browser/ui/views/frame/browser_frame.h"
12 #include "chrome/browser/ui/views/frame/browser_view.h" 12 #include "chrome/browser/ui/views/frame/browser_view.h"
13 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" 13 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
14 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_speci fic.h" 14 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_speci fic.h"
15 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" 15 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
16 #include "chrome/browser/ui/views/tab_icon_view.h" 16 #include "chrome/browser/ui/views/tab_icon_view.h"
17 #include "chrome/browser/ui/views/tabs/tab_strip.h" 17 #include "chrome/browser/ui/views/tabs/tab_strip.h"
18 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 18 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
19 #include "chrome/grit/generated_resources.h" 19 #include "chrome/grit/generated_resources.h"
20 #include "chrome/grit/theme_resources.h" 20 #include "chrome/grit/theme_resources.h"
21 #include "components/strings/grit/components_strings.h" 21 #include "components/strings/grit/components_strings.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "ui/accessibility/ax_view_state.h" 23 #include "ui/accessibility/ax_node_data.h"
24 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/theme_provider.h" 26 #include "ui/base/theme_provider.h"
27 #include "ui/gfx/canvas.h" 27 #include "ui/gfx/canvas.h"
28 #include "ui/gfx/font_list.h" 28 #include "ui/gfx/font_list.h"
29 #include "ui/gfx/geometry/rect_conversions.h" 29 #include "ui/gfx/geometry/rect_conversions.h"
30 #include "ui/gfx/image/image.h" 30 #include "ui/gfx/image/image.h"
31 #include "ui/gfx/image/image_skia.h" 31 #include "ui/gfx/image/image_skia.h"
32 #include "ui/gfx/path.h" 32 #include "ui/gfx/path.h"
33 #include "ui/gfx/scoped_canvas.h" 33 #include "ui/gfx/scoped_canvas.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 if (!frame()->IsFullscreen()) 262 if (!frame()->IsFullscreen())
263 window_title_->SchedulePaint(); 263 window_title_->SchedulePaint();
264 } 264 }
265 265
266 void OpaqueBrowserFrameView::SizeConstraintsChanged() { 266 void OpaqueBrowserFrameView::SizeConstraintsChanged() {
267 } 267 }
268 268
269 /////////////////////////////////////////////////////////////////////////////// 269 ///////////////////////////////////////////////////////////////////////////////
270 // OpaqueBrowserFrameView, views::View overrides: 270 // OpaqueBrowserFrameView, views::View overrides:
271 271
272 void OpaqueBrowserFrameView::GetAccessibleState( 272 void OpaqueBrowserFrameView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
273 ui::AXViewState* state) { 273 node_data->role = ui::AX_ROLE_TITLE_BAR;
274 state->role = ui::AX_ROLE_TITLE_BAR;
275 } 274 }
276 275
277 /////////////////////////////////////////////////////////////////////////////// 276 ///////////////////////////////////////////////////////////////////////////////
278 // OpaqueBrowserFrameView, views::ButtonListener implementation: 277 // OpaqueBrowserFrameView, views::ButtonListener implementation:
279 278
280 void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender, 279 void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender,
281 const ui::Event& event) { 280 const ui::Event& event) {
282 if (sender == minimize_button_) { 281 if (sender == minimize_button_) {
283 frame()->Minimize(); 282 frame()->Minimize();
284 } else if (sender == maximize_button_) { 283 } else if (sender == maximize_button_) {
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 gfx::Rect side(x, y, kClientEdgeThickness, h); 666 gfx::Rect side(x, y, kClientEdgeThickness, h);
668 canvas->FillRect(side, color); 667 canvas->FillRect(side, color);
669 if (draw_bottom) { 668 if (draw_bottom) {
670 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness), 669 canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness),
671 kClientEdgeThickness), 670 kClientEdgeThickness),
672 color); 671 color);
673 } 672 }
674 side.Offset(w + kClientEdgeThickness, 0); 673 side.Offset(w + kClientEdgeThickness, 0);
675 canvas->FillRect(side, color); 674 canvas->FillRect(side, color);
676 } 675 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.h ('k') | chrome/browser/ui/views/infobars/infobar_container_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698