| Index: ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
| index bee915a83a7ab9beb98d9df557e89eec1ee6237c..415bfa07534c37186c9325c4ad58af9115a90744 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
| @@ -6,12 +6,13 @@
|
| #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "ui/aura/window_tree_host.h"
|
| +#include "ui/events/event.h"
|
| #include "ui/views/views_export.h"
|
| #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
|
| #include "ui/views/win/hwnd_message_handler_delegate.h"
|
| #include "ui/wm/public/animation_host.h"
|
| -
|
| namespace aura {
|
| namespace client {
|
| class DragDropClient;
|
| @@ -203,6 +204,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
|
| // Returns true if a modal window is active in the current root window chain.
|
| bool IsModalWindowActive() const;
|
|
|
| + // Posts an event to the event processor. Invoked as a task.
|
| + void PostEventToProcessor(const ui::Event& event);
|
| +
|
| scoped_ptr<HWNDMessageHandler> message_handler_;
|
| scoped_ptr<aura::client::FocusClient> focus_client_;
|
|
|
| @@ -255,6 +259,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
|
|
|
| scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
|
|
|
| + // The WeakPtrFactories below must occur last in the class definition so they
|
| + // get destroyed last.
|
| + base::WeakPtrFactory<DesktopWindowTreeHostWin> weak_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostWin);
|
| };
|
|
|
|
|