Index: ash/shell.h |
diff --git a/ash/shell.h b/ash/shell.h |
index 2cf4b932ae3d419aa563738a7df3f6a1b54f4877..2f08927ccab2034a515ff1cb8a4bf41642431dee 100644 |
--- a/ash/shell.h |
+++ b/ash/shell.h |
@@ -314,7 +314,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{ |
// TODO(oshima): Remove methods that are moved to RootWindowController. |
Launcher* launcher(); |
- const ScreenAsh* screen() { return screen_; } |
+ const ScreenAsh* screen() { return screen_.get(); } |
// Force the shelf to query for it's current visibility state. |
void UpdateShelfVisibility(); |
@@ -411,7 +411,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{ |
// when the screen is initially created. |
static bool initially_hide_cursor_; |
- ScreenAsh* screen_; |
+ scoped_ptr<ScreenAsh> screen_; |
// Active root window. Never becomes NULL during the session. |
aura::RootWindow* active_root_window_; |