summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 5263923..05dc2b8 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -325,7 +325,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
return magnification_controller_.get();
}
- const ScreenAsh* screen() { return screen_.get(); }
+ const ScreenAsh* screen() { return screen_; }
// Force the shelf to query for it's current visibility state.
void UpdateShelfVisibility();
@@ -420,7 +420,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
// when the screen is initially created.
static bool initially_hide_cursor_;
- scoped_ptr<ScreenAsh> screen_;
+ ScreenAsh* screen_;
// Active root window. Never becomes NULL during the session.
aura::RootWindow* active_root_window_;