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

Side by Side Diff: ui/views/examples/double_split_view_example.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « ui/views/examples/double_split_view_example.h ('k') | ui/views/examples/example_base.cc » ('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/examples/double_split_view_example.h" 5 #include "ui/views/examples/double_split_view_example.h"
6 6
7 #include "ui/views/background.h" 7 #include "ui/views/background.h"
8 #include "ui/views/controls/single_split_view.h" 8 #include "ui/views/controls/single_split_view.h"
9 #include "ui/views/layout/grid_layout.h" 9 #include "ui/views/layout/grid_layout.h"
10 10
11 namespace views { 11 namespace views {
12 namespace examples { 12 namespace examples {
13 13
14 namespace { 14 namespace {
15 15
16 // DoubleSplitViews's content, which draws gradient color on background. 16 // DoubleSplitViews's content, which draws gradient color on background.
17 class SplittedView : public View { 17 class SplittedView : public View {
18 public: 18 public:
19 SplittedView(); 19 SplittedView();
20 virtual ~SplittedView(); 20 virtual ~SplittedView();
21 21
22 void SetColor(SkColor from, SkColor to); 22 void SetColor(SkColor from, SkColor to);
23 23
24 // View: 24 // View:
25 virtual gfx::Size GetMinimumSize() const OVERRIDE; 25 virtual gfx::Size GetMinimumSize() const override;
26 26
27 private: 27 private:
28 DISALLOW_COPY_AND_ASSIGN(SplittedView); 28 DISALLOW_COPY_AND_ASSIGN(SplittedView);
29 }; 29 };
30 30
31 SplittedView::SplittedView() { 31 SplittedView::SplittedView() {
32 SetColor(SK_ColorRED, SK_ColorGREEN); 32 SetColor(SK_ColorRED, SK_ColorGREEN);
33 } 33 }
34 34
35 SplittedView::~SplittedView() { 35 SplittedView::~SplittedView() {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // Add scroll view. 73 // Add scroll view.
74 ColumnSet* column_set = layout->AddColumnSet(0); 74 ColumnSet* column_set = layout->AddColumnSet(0);
75 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 75 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
76 GridLayout::USE_PREF, 0, 0); 76 GridLayout::USE_PREF, 0, 0);
77 layout->StartRow(1, 0); 77 layout->StartRow(1, 0);
78 layout->AddView(outer_single_split_view_); 78 layout->AddView(outer_single_split_view_);
79 } 79 }
80 80
81 } // namespace examples 81 } // namespace examples
82 } // namespace views 82 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/double_split_view_example.h ('k') | ui/views/examples/example_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698