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

Side by Side Diff: ui/views/controls/separator.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
« no previous file with comments | « ui/views/controls/separator.h ('k') | ui/views/controls/slider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/views/controls/separator.h" 5 #include "ui/views/controls/separator.h"
6 6
7 #include "ui/accessibility/ax_view_state.h" 7 #include "ui/accessibility/ax_node_data.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 9
10 namespace views { 10 namespace views {
11 11
12 // static 12 // static
13 const char Separator::kViewClassName[] = "Separator"; 13 const char Separator::kViewClassName[] = "Separator";
14 14
15 // The separator size in pixels. 15 // The separator size in pixels.
16 const int kSeparatorSize = 1; 16 const int kSeparatorSize = 1;
17 17
(...skipping 25 matching lines...) Expand all
43 // Separator, View overrides: 43 // Separator, View overrides:
44 44
45 gfx::Size Separator::GetPreferredSize() const { 45 gfx::Size Separator::GetPreferredSize() const {
46 gfx::Size size = 46 gfx::Size size =
47 orientation_ == HORIZONTAL ? gfx::Size(1, size_) : gfx::Size(size_, 1); 47 orientation_ == HORIZONTAL ? gfx::Size(1, size_) : gfx::Size(size_, 1);
48 gfx::Insets insets = GetInsets(); 48 gfx::Insets insets = GetInsets();
49 size.Enlarge(insets.width(), insets.height()); 49 size.Enlarge(insets.width(), insets.height());
50 return size; 50 return size;
51 } 51 }
52 52
53 void Separator::GetAccessibleState(ui::AXViewState* state) { 53 void Separator::GetAccessibleNodeData(ui::AXNodeData* node_data) {
54 state->role = ui::AX_ROLE_SPLITTER; 54 node_data->role = ui::AX_ROLE_SPLITTER;
55 } 55 }
56 56
57 void Separator::OnPaint(gfx::Canvas* canvas) { 57 void Separator::OnPaint(gfx::Canvas* canvas) {
58 canvas->FillRect(GetContentsBounds(), color_); 58 canvas->FillRect(GetContentsBounds(), color_);
59 } 59 }
60 60
61 const char* Separator::GetClassName() const { 61 const char* Separator::GetClassName() const {
62 return kViewClassName; 62 return kViewClassName;
63 } 63 }
64 64
65 } // namespace views 65 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/separator.h ('k') | ui/views/controls/slider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698