| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| index 74ef63428d87c2d263f978c1408c178fdfe524f3..8f74d3780bac9047408a4d9382d4b9f691a30d01 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
|
| #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
|
|
|
| +#include "base/lazy_instance.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "ui/aura/client/activation_change_observer.h"
|
| #include "ui/aura/client/activation_delegate.h"
|
| @@ -295,7 +296,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
|
| bool restore_focus_on_activate_;
|
|
|
| gfx::NativeCursor cursor_;
|
| - static views::corewm::CursorManager* cursor_manager_;
|
| + static base::LazyInstance<scoped_ptr<views::corewm::CursorManager> >
|
| + cursor_manager_;
|
| static views::DesktopNativeCursorManager* native_cursor_manager_;
|
|
|
| scoped_ptr<corewm::ShadowController> shadow_controller_;
|
|
|