| Index: ui/views/widget/desktop_native_widget_helper_aura.cc
|
| ===================================================================
|
| --- ui/views/widget/desktop_native_widget_helper_aura.cc (revision 134532)
|
| +++ ui/views/widget/desktop_native_widget_helper_aura.cc (working copy)
|
| @@ -4,12 +4,14 @@
|
|
|
| #include "ui/views/widget/desktop_native_widget_helper_aura.h"
|
|
|
| -#include "ui/views/widget/native_widget_aura.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/desktop/desktop_activation_client.h"
|
| #include "ui/aura/desktop/desktop_dispatcher_client.h"
|
| #include "ui/aura/desktop/desktop_root_window_event_filter.h"
|
| #include "ui/aura/client/dispatcher_client.h"
|
| +#include "ui/base/win/hwnd_subclass.h"
|
| +#include "ui/views/widget/native_widget_aura.h"
|
| +#include "ui/views/widget/widget_message_filter.h"
|
|
|
| namespace views {
|
|
|
| @@ -29,6 +31,7 @@
|
| bounds.set_size(gfx::Size(100, 100));
|
| }
|
| root_window_.reset(new aura::RootWindow(bounds));
|
| + root_window_->Init();
|
| root_window_->SetEventFilter(
|
| new aura::DesktopRootWindowEventFilter(root_window_.get()));
|
| root_window_->AddRootWindowObserver(this);
|
| @@ -40,6 +43,12 @@
|
| new aura::DesktopDispatcherClient);
|
| }
|
|
|
| +void DesktopNativeWidgetHelperAura::PostInitialize() {
|
| + subclass_.reset(new ui::HWNDSubclass(root_window_->GetAcceleratedWidget()));
|
| + subclass_->SetFilter(new WidgetMessageFilter(root_window_.get(),
|
| + widget_->GetWidget()));
|
| +}
|
| +
|
| void DesktopNativeWidgetHelperAura::ShowRootWindow() {
|
| if (root_window_.get())
|
| root_window_->ShowRootWindow();
|
|
|