OLD | NEW |
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 "base/utf_string_conversions.h" // ASCIIToUTF16 | 6 #include "base/utf_string_conversions.h" // ASCIIToUTF16 |
| 7 #include "ui/aura/root_window.h" |
6 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
7 #include "ui/gfx/canvas.h" | 9 #include "ui/gfx/canvas.h" |
8 #include "ui/views/controls/button/checkbox.h" | 10 #include "ui/views/controls/button/checkbox.h" |
9 #include "ui/views/controls/button/radio_button.h" | 11 #include "ui/views/controls/button/radio_button.h" |
10 #include "ui/views/controls/button/text_button.h" | 12 #include "ui/views/controls/button/text_button.h" |
11 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
12 #include "ui/views/widget/widget_delegate.h" | 14 #include "ui/views/widget/widget_delegate.h" |
13 | 15 |
14 namespace { | 16 namespace { |
15 | 17 |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 } | 126 } |
125 | 127 |
126 } // namespace | 128 } // namespace |
127 | 129 |
128 namespace ash { | 130 namespace ash { |
129 namespace shell { | 131 namespace shell { |
130 | 132 |
131 void CreateWidgetsWindow() { | 133 void CreateWidgetsWindow() { |
132 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight); | 134 gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight); |
133 views::Widget* widget = | 135 views::Widget* widget = |
134 views::Widget::CreateWindowWithBounds(new WidgetsWindow, bounds); | 136 views::Widget::CreateWindowWithContextAndBounds( |
| 137 new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds); |
135 widget->GetNativeView()->SetName("WidgetsWindow"); | 138 widget->GetNativeView()->SetName("WidgetsWindow"); |
136 widget->Show(); | 139 widget->Show(); |
137 } | 140 } |
138 | 141 |
139 } // namespace shell | 142 } // namespace shell |
140 } // namespace ash | 143 } // namespace ash |
OLD | NEW |