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

Side by Side Diff: ui/views/controls/separator.cc

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 months 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/separator.h ('k') | ui/views/controls/single_split_view.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_view_state.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 9
10 namespace views { 10 namespace views {
(...skipping 10 matching lines...) Expand all
21 Separator::Separator(Orientation orientation) : orientation_(orientation) { 21 Separator::Separator(Orientation orientation) : orientation_(orientation) {
22 SetFocusable(false); 22 SetFocusable(false);
23 } 23 }
24 24
25 Separator::~Separator() { 25 Separator::~Separator() {
26 } 26 }
27 27
28 //////////////////////////////////////////////////////////////////////////////// 28 ////////////////////////////////////////////////////////////////////////////////
29 // Separator, View overrides: 29 // Separator, View overrides:
30 30
31 gfx::Size Separator::GetPreferredSize() { 31 gfx::Size Separator::GetPreferredSize() const {
32 if (orientation_ == HORIZONTAL) 32 if (orientation_ == HORIZONTAL)
33 return gfx::Size(width(), kSeparatorHeight); 33 return gfx::Size(width(), kSeparatorHeight);
34 return gfx::Size(kSeparatorHeight, height()); 34 return gfx::Size(kSeparatorHeight, height());
35 } 35 }
36 36
37 void Separator::GetAccessibleState(ui::AXViewState* state) { 37 void Separator::GetAccessibleState(ui::AXViewState* state) {
38 state->role = ui::AX_ROLE_SPLITTER; 38 state->role = ui::AX_ROLE_SPLITTER;
39 } 39 }
40 40
41 void Separator::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { 41 void Separator::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) {
42 canvas->FillRect(bounds(), kDefaultColor); 42 canvas->FillRect(bounds(), kDefaultColor);
43 } 43 }
44 44
45 const char* Separator::GetClassName() const { 45 const char* Separator::GetClassName() const {
46 return kViewClassName; 46 return kViewClassName;
47 } 47 }
48 48
49 } // namespace views 49 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/separator.h ('k') | ui/views/controls/single_split_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698