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 "ui/views/widget/widget.h" | 5 #include "ui/views/widget/widget.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 Widget::InitParams params; | 209 Widget::InitParams params; |
210 params.bounds = bounds; | 210 params.bounds = bounds; |
211 params.delegate = delegate; | 211 params.delegate = delegate; |
212 params.top_level = true; | 212 params.top_level = true; |
213 widget->Init(params); | 213 widget->Init(params); |
214 return widget; | 214 return widget; |
215 } | 215 } |
216 | 216 |
217 // static | 217 // static |
218 Widget* Widget::CreateWindowWithParent(WidgetDelegate* delegate, | 218 Widget* Widget::CreateWindowWithParent(WidgetDelegate* delegate, |
219 gfx::NativeWindow parent) { | 219 gfx::NativeView parent) { |
220 return CreateWindowWithParentAndBounds(delegate, parent, gfx::Rect()); | 220 return CreateWindowWithParentAndBounds(delegate, parent, gfx::Rect()); |
221 } | 221 } |
222 | 222 |
223 // static | 223 // static |
224 Widget* Widget::CreateWindowWithParentAndBounds(WidgetDelegate* delegate, | 224 Widget* Widget::CreateWindowWithParentAndBounds(WidgetDelegate* delegate, |
225 gfx::NativeWindow parent, | 225 gfx::NativeView parent, |
226 const gfx::Rect& bounds) { | 226 const gfx::Rect& bounds) { |
227 Widget* widget = new Widget; | 227 Widget* widget = new Widget; |
228 Widget::InitParams params; | 228 Widget::InitParams params; |
229 params.delegate = delegate; | 229 params.delegate = delegate; |
230 params.parent = parent; | 230 params.parent = parent; |
231 params.bounds = bounds; | 231 params.bounds = bounds; |
232 widget->Init(params); | 232 widget->Init(params); |
233 return widget; | 233 return widget; |
234 } | 234 } |
235 | 235 |
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1463 | 1463 |
1464 //////////////////////////////////////////////////////////////////////////////// | 1464 //////////////////////////////////////////////////////////////////////////////// |
1465 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1465 // internal::NativeWidgetPrivate, NativeWidget implementation: |
1466 | 1466 |
1467 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1467 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
1468 return this; | 1468 return this; |
1469 } | 1469 } |
1470 | 1470 |
1471 } // namespace internal | 1471 } // namespace internal |
1472 } // namespace views | 1472 } // namespace views |
OLD | NEW |