From 04939794970b9fd368a0043a830892773064b45c Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Mon, 15 Oct 2012 06:31:02 +0000 Subject: fix Screen leak in ash tests valgrind memory fyi here: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%284%29/builds/14345/steps/memory%20test%3A%20unit/logs/stdio TBR=ben@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/11146011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161829 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/shell.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ash/shell.h') diff --git a/ash/shell.h b/ash/shell.h index 2cf4b93..2f08927 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 screen_; // Active root window. Never becomes NULL during the session. aura::RootWindow* active_root_window_; -- cgit v1.1