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

Side by Side Diff: ash/shell/widgets.cc

Issue 2390953004: WidgetDelegateView is its own contents view. (Closed)
Patch Set: another minor fix Created 4 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
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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "ui/aura/window_event_dispatcher.h" 8 #include "ui/aura/window_event_dispatcher.h"
9 #include "ui/gfx/canvas.h" 9 #include "ui/gfx/canvas.h"
10 #include "ui/views/controls/button/checkbox.h" 10 #include "ui/views/controls/button/checkbox.h"
(...skipping 17 matching lines...) Expand all
28 public: 28 public:
29 WidgetsWindow(); 29 WidgetsWindow();
30 ~WidgetsWindow() override; 30 ~WidgetsWindow() override;
31 31
32 // Overridden from views::View: 32 // Overridden from views::View:
33 void OnPaint(gfx::Canvas* canvas) override; 33 void OnPaint(gfx::Canvas* canvas) override;
34 void Layout() override; 34 void Layout() override;
35 gfx::Size GetPreferredSize() const override; 35 gfx::Size GetPreferredSize() const override;
36 36
37 // Overridden from views::WidgetDelegate: 37 // Overridden from views::WidgetDelegate:
38 views::View* GetContentsView() override;
39 base::string16 GetWindowTitle() const override; 38 base::string16 GetWindowTitle() const override;
40 bool CanResize() const override; 39 bool CanResize() const override;
41 40
42 private: 41 private:
43 views::LabelButton* button_; 42 views::LabelButton* button_;
44 views::LabelButton* disabled_button_; 43 views::LabelButton* disabled_button_;
45 views::Checkbox* checkbox_; 44 views::Checkbox* checkbox_;
46 views::Checkbox* checkbox_disabled_; 45 views::Checkbox* checkbox_disabled_;
47 views::Checkbox* checkbox_checked_; 46 views::Checkbox* checkbox_checked_;
48 views::Checkbox* checkbox_checked_disabled_; 47 views::Checkbox* checkbox_checked_disabled_;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 gfx::Size preferred = view->GetPreferredSize(); 111 gfx::Size preferred = view->GetPreferredSize();
113 view->SetBounds(left, top, preferred.width(), preferred.height()); 112 view->SetBounds(left, top, preferred.width(), preferred.height());
114 top += preferred.height() + kVerticalPad; 113 top += preferred.height() + kVerticalPad;
115 } 114 }
116 } 115 }
117 116
118 gfx::Size WidgetsWindow::GetPreferredSize() const { 117 gfx::Size WidgetsWindow::GetPreferredSize() const {
119 return gfx::Size(kWindowWidth, kWindowHeight); 118 return gfx::Size(kWindowWidth, kWindowHeight);
120 } 119 }
121 120
122 views::View* WidgetsWindow::GetContentsView() {
123 return this;
124 }
125
126 base::string16 WidgetsWindow::GetWindowTitle() const { 121 base::string16 WidgetsWindow::GetWindowTitle() const {
127 return base::ASCIIToUTF16("Examples: Widgets"); 122 return base::ASCIIToUTF16("Examples: Widgets");
128 } 123 }
129 124
130 bool WidgetsWindow::CanResize() const { 125 bool WidgetsWindow::CanResize() const {
131 return true; 126 return true;
132 } 127 }
133 128
134 } // namespace 129 } // namespace
135 130
136 namespace ash { 131 namespace ash {
137 namespace shell { 132 namespace shell {
138 133
139 void CreateWidgetsWindow() { 134 void CreateWidgetsWindow() {
140 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight); 135 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight);
141 views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( 136 views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
142 new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds); 137 new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds);
143 widget->GetNativeView()->SetName("WidgetsWindow"); 138 widget->GetNativeView()->SetName("WidgetsWindow");
144 widget->Show(); 139 widget->Show();
145 } 140 }
146 141
147 } // namespace shell 142 } // namespace shell
148 } // namespace ash 143 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698