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

Side by Side Diff: ui/aura_shell/examples/widgets.cc

Issue 8405002: ui/gfx: Convert Canvas::FillRectInt() to use gfx::Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: save some vertical space, interactive_ui_tests are fixed by Peter's fix Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/utf_string_conversions.h" // ASCIIToUTF16 5 #include "base/utf_string_conversions.h" // ASCIIToUTF16
6 #include "ui/aura/window.h" 6 #include "ui/aura/window.h"
7 #include "ui/aura_shell/toplevel_frame_view.h" 7 #include "ui/aura_shell/toplevel_frame_view.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 #include "views/controls/button/checkbox.h" 9 #include "views/controls/button/checkbox.h"
10 #include "views/controls/button/radio_button.h" 10 #include "views/controls/button/radio_button.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 AddChildView(radio_button_selected_); 86 AddChildView(radio_button_selected_);
87 radio_button_selected_disabled_->SetChecked(true); 87 radio_button_selected_disabled_->SetChecked(true);
88 radio_button_selected_disabled_->SetEnabled(false); 88 radio_button_selected_disabled_->SetEnabled(false);
89 AddChildView(radio_button_selected_disabled_); 89 AddChildView(radio_button_selected_disabled_);
90 } 90 }
91 91
92 WidgetsWindow::~WidgetsWindow() { 92 WidgetsWindow::~WidgetsWindow() {
93 } 93 }
94 94
95 void WidgetsWindow::OnPaint(gfx::Canvas* canvas) { 95 void WidgetsWindow::OnPaint(gfx::Canvas* canvas) {
96 canvas->FillRectInt(SK_ColorWHITE, 0, 0, width(), height()); 96 canvas->FillRect(SK_ColorWHITE, GetLocalBounds());
97 } 97 }
98 98
99 void WidgetsWindow::Layout() { 99 void WidgetsWindow::Layout() {
100 const int kVerticalPad = 5; 100 const int kVerticalPad = 5;
101 int left = 5; 101 int left = 5;
102 int top = kVerticalPad; 102 int top = kVerticalPad;
103 for (Views::const_iterator it = children_begin(); 103 for (Views::const_iterator it = children_begin();
104 it != children_end(); 104 it != children_end();
105 ++it) { 105 ++it) {
106 views::View* view = *it; 106 views::View* view = *it;
(...skipping 27 matching lines...) Expand all
134 void CreateWidgetsWindow() { 134 void CreateWidgetsWindow() {
135 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight); 135 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight);
136 views::Widget* widget = 136 views::Widget* widget =
137 views::Widget::CreateWindowWithBounds(new WidgetsWindow, bounds); 137 views::Widget::CreateWindowWithBounds(new WidgetsWindow, bounds);
138 widget->GetNativeView()->set_name("WidgetsWindow"); 138 widget->GetNativeView()->set_name("WidgetsWindow");
139 widget->Show(); 139 widget->Show();
140 } 140 }
141 141
142 } // namespace examples 142 } // namespace examples
143 } // namespace aura_shell 143 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/examples/toplevel_window.cc ('k') | ui/aura_shell/examples/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698