OLD | NEW |
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 "ash/wm/toplevel_frame_view.h" | 5 #include "ash/wm/toplevel_frame_view.h" |
6 #include "base/utf_string_conversions.h" // ASCIIToUTF16 | 6 #include "base/utf_string_conversions.h" // ASCIIToUTF16 |
7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
8 #include "ui/gfx/canvas.h" | 8 #include "ui/gfx/canvas.h" |
9 #include "ui/views/controls/button/checkbox.h" | 9 #include "ui/views/controls/button/checkbox.h" |
10 #include "ui/views/controls/button/radio_button.h" | 10 #include "ui/views/controls/button/radio_button.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 | 116 |
117 views::View* WidgetsWindow::GetContentsView() { | 117 views::View* WidgetsWindow::GetContentsView() { |
118 return this; | 118 return this; |
119 } | 119 } |
120 | 120 |
121 string16 WidgetsWindow::GetWindowTitle() const { | 121 string16 WidgetsWindow::GetWindowTitle() const { |
122 return ASCIIToUTF16("Examples: Widgets"); | 122 return ASCIIToUTF16("Examples: Widgets"); |
123 } | 123 } |
124 | 124 |
125 views::NonClientFrameView* WidgetsWindow::CreateNonClientFrameView() { | 125 views::NonClientFrameView* WidgetsWindow::CreateNonClientFrameView() { |
126 return new aura_shell::internal::ToplevelFrameView; | 126 return new ash::internal::ToplevelFrameView; |
127 } | 127 } |
128 | 128 |
129 } // namespace | 129 } // namespace |
130 | 130 |
131 namespace ash { | 131 namespace ash { |
132 namespace shell { | 132 namespace shell { |
133 | 133 |
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()->SetName("WidgetsWindow"); | 138 widget->GetNativeView()->SetName("WidgetsWindow"); |
139 widget->Show(); | 139 widget->Show(); |
140 } | 140 } |
141 | 141 |
142 } // namespace shell | 142 } // namespace shell |
143 } // namespace ash | 143 } // namespace ash |
OLD | NEW |