Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: ash/shell.h

Issue 11146011: fix Screen leak in ash tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698