| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 Widget::InitParams params; | 218 Widget::InitParams params; |
| 219 params.delegate = delegate; | 219 params.delegate = delegate; |
| 220 params.parent = parent; | 220 params.parent = parent; |
| 221 params.bounds = bounds; | 221 params.bounds = bounds; |
| 222 widget->Init(params); | 222 widget->Init(params); |
| 223 return widget; | 223 return widget; |
| 224 } | 224 } |
| 225 | 225 |
| 226 // static | 226 // static |
| 227 Widget* Widget::CreateWindowWithContext(WidgetDelegate* delegate, | 227 Widget* Widget::CreateWindowWithContext(WidgetDelegate* delegate, |
| 228 gfx::NativeView context) { | 228 gfx::NativeWindow context) { |
| 229 return CreateWindowWithContextAndBounds(delegate, context, gfx::Rect()); | 229 return CreateWindowWithContextAndBounds(delegate, context, gfx::Rect()); |
| 230 } | 230 } |
| 231 | 231 |
| 232 // static | 232 // static |
| 233 Widget* Widget::CreateWindowWithContextAndBounds(WidgetDelegate* delegate, | 233 Widget* Widget::CreateWindowWithContextAndBounds(WidgetDelegate* delegate, |
| 234 gfx::NativeView context, | 234 gfx::NativeWindow context, |
| 235 const gfx::Rect& bounds) { | 235 const gfx::Rect& bounds) { |
| 236 Widget* widget = new Widget; | 236 Widget* widget = new Widget; |
| 237 Widget::InitParams params; | 237 Widget::InitParams params; |
| 238 params.delegate = delegate; | 238 params.delegate = delegate; |
| 239 params.context = context; | 239 params.context = context; |
| 240 params.bounds = bounds; | 240 params.bounds = bounds; |
| 241 widget->Init(params); | 241 widget->Init(params); |
| 242 return widget; | 242 return widget; |
| 243 } | 243 } |
| 244 | 244 |
| (...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1506 | 1506 |
| 1507 //////////////////////////////////////////////////////////////////////////////// | 1507 //////////////////////////////////////////////////////////////////////////////// |
| 1508 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1508 // internal::NativeWidgetPrivate, NativeWidget implementation: |
| 1509 | 1509 |
| 1510 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1510 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
| 1511 return this; | 1511 return this; |
| 1512 } | 1512 } |
| 1513 | 1513 |
| 1514 } // namespace internal | 1514 } // namespace internal |
| 1515 } // namespace views | 1515 } // namespace views |
| OLD | NEW |