diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 06:31:02 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 06:31:02 +0000 |
| commit | 04939794970b9fd368a0043a830892773064b45c (patch) | |
| tree | 189f33f09dbb70e83e881026fd34fc2f2837fba1 | |
| parent | b0ff83de884fa15d019a05faf9a8b987681d51c1 (diff) | |
| download | chromium_src-04939794970b9fd368a0043a830892773064b45c.zip chromium_src-04939794970b9fd368a0043a830892773064b45c.tar.gz chromium_src-04939794970b9fd368a0043a830892773064b45c.tar.bz2 | |
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
| -rw-r--r-- | ash/shell.cc | 4 | ||||
| -rw-r--r-- | ash/shell.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index dfce306f..4375e18 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -185,8 +185,8 @@ Shell::Shell(ShellDelegate* delegate) new internal::OutputConfiguratorAnimation()), #endif // defined(OS_CHROMEOS) browser_context_(NULL) { - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_); - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_); + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_.get()); ui_controls::InstallUIControlsAura(internal::CreateUIControls()); #if defined(OS_CHROMEOS) output_configurator_->AddObserver(output_configurator_animation_.get()); 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<ScreenAsh> screen_; // Active root window. Never becomes NULL during the session. aura::RootWindow* active_root_window_; |