| 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" |
| 11 #include "ui/base/cursor/cursor.h" |
| 11 #include "ui/base/default_theme_provider.h" | 12 #include "ui/base/default_theme_provider.h" |
| 12 #include "ui/base/hit_test.h" | 13 #include "ui/base/hit_test.h" |
| 13 #include "ui/base/l10n/l10n_font_util.h" | 14 #include "ui/base/l10n/l10n_font_util.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 15 #include "ui/compositor/compositor.h" | 16 #include "ui/compositor/compositor.h" |
| 16 #include "ui/compositor/layer.h" | 17 #include "ui/compositor/layer.h" |
| 17 #include "ui/events/event.h" | 18 #include "ui/events/event.h" |
| 18 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
| 19 #include "ui/views/controls/menu/menu_controller.h" | 20 #include "ui/views/controls/menu/menu_controller.h" |
| 20 #include "ui/views/focus/focus_manager.h" | 21 #include "ui/views/focus/focus_manager.h" |
| 21 #include "ui/views/focus/focus_manager_factory.h" | 22 #include "ui/views/focus/focus_manager_factory.h" |
| 22 #include "ui/views/focus/view_storage.h" | 23 #include "ui/views/focus/view_storage.h" |
| 23 #include "ui/views/focus/widget_focus_manager.h" | 24 #include "ui/views/focus/widget_focus_manager.h" |
| 24 #include "ui/views/ime/input_method.h" | 25 #include "ui/views/ime/input_method.h" |
| 25 #include "ui/views/views_delegate.h" | 26 #include "ui/views/views_delegate.h" |
| 26 #include "ui/views/widget/native_widget_private.h" | 27 #include "ui/views/widget/native_widget_private.h" |
| 27 #include "ui/views/widget/root_view.h" | 28 #include "ui/views/widget/root_view.h" |
| 28 #include "ui/views/widget/tooltip_manager.h" | 29 #include "ui/views/widget/tooltip_manager.h" |
| 29 #include "ui/views/widget/widget_delegate.h" | 30 #include "ui/views/widget/widget_delegate.h" |
| 30 #include "ui/views/widget/widget_deletion_observer.h" | 31 #include "ui/views/widget/widget_deletion_observer.h" |
| 31 #include "ui/views/widget/widget_observer.h" | 32 #include "ui/views/widget/widget_observer.h" |
| 32 #include "ui/views/window/custom_frame_view.h" | 33 #include "ui/views/window/custom_frame_view.h" |
| 33 #include "ui/views/window/dialog_delegate.h" | 34 #include "ui/views/window/dialog_delegate.h" |
| 34 | 35 |
| 35 #if defined(USE_AURA) | |
| 36 #include "ui/base/cursor/cursor.h" | |
| 37 #endif | |
| 38 | |
| 39 namespace views { | 36 namespace views { |
| 40 | 37 |
| 41 namespace { | 38 namespace { |
| 42 | 39 |
| 43 // If |view| has a layer the layer is added to |layers|. Else this recurses | 40 // If |view| has a layer the layer is added to |layers|. Else this recurses |
| 44 // through the children. This is used to build a list of the layers created by | 41 // through the children. This is used to build a list of the layers created by |
| 45 // views that are direct children of the Widgets layer. | 42 // views that are direct children of the Widgets layer. |
| 46 void BuildRootLayers(View* view, std::vector<ui::Layer*>* layers) { | 43 void BuildRootLayers(View* view, std::vector<ui::Layer*>* layers) { |
| 47 if (view->layer()) { | 44 if (view->layer()) { |
| 48 layers->push_back(view->layer()); | 45 layers->push_back(view->layer()); |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 // static | 254 // static |
| 258 Widget* Widget::CreateWindowAsFramelessChild(WidgetDelegate* widget_delegate, | 255 Widget* Widget::CreateWindowAsFramelessChild(WidgetDelegate* widget_delegate, |
| 259 gfx::NativeView parent) { | 256 gfx::NativeView parent) { |
| 260 views::Widget* widget = new views::Widget; | 257 views::Widget* widget = new views::Widget; |
| 261 | 258 |
| 262 views::Widget::InitParams params; | 259 views::Widget::InitParams params; |
| 263 params.delegate = widget_delegate; | 260 params.delegate = widget_delegate; |
| 264 params.child = true; | 261 params.child = true; |
| 265 params.parent = parent; | 262 params.parent = parent; |
| 266 params.remove_standard_frame = true; | 263 params.remove_standard_frame = true; |
| 267 #if defined(USE_AURA) | |
| 268 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 264 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 269 #endif | |
| 270 | 265 |
| 271 widget->Init(params); | 266 widget->Init(params); |
| 272 return widget; | 267 return widget; |
| 273 } | 268 } |
| 274 | 269 |
| 275 // static | 270 // static |
| 276 Widget* Widget::GetWidgetForNativeView(gfx::NativeView native_view) { | 271 Widget* Widget::GetWidgetForNativeView(gfx::NativeView native_view) { |
| 277 internal::NativeWidgetPrivate* native_widget = | 272 internal::NativeWidgetPrivate* native_widget = |
| 278 internal::NativeWidgetPrivate::GetNativeWidgetForNativeView(native_view); | 273 internal::NativeWidgetPrivate::GetNativeWidgetForNativeView(native_view); |
| 279 return native_widget ? native_widget->GetWidget() : NULL; | 274 return native_widget ? native_widget->GetWidget() : NULL; |
| (...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1443 | 1438 |
| 1444 //////////////////////////////////////////////////////////////////////////////// | 1439 //////////////////////////////////////////////////////////////////////////////// |
| 1445 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1440 // internal::NativeWidgetPrivate, NativeWidget implementation: |
| 1446 | 1441 |
| 1447 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1442 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
| 1448 return this; | 1443 return this; |
| 1449 } | 1444 } |
| 1450 | 1445 |
| 1451 } // namespace internal | 1446 } // namespace internal |
| 1452 } // namespace views | 1447 } // namespace views |
| OLD | NEW |