summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 05:37:06 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 05:37:06 +0000
commitaf5e62c35a97eec03b64701aa31024b8c139b836 (patch)
tree85512a3a2d9431f974cd19599ecc49caca7a94b1 /ash/shell.cc
parent17a4590ac157a558caa64bce6e309da103e93133 (diff)
downloadchromium_src-af5e62c35a97eec03b64701aa31024b8c139b836.zip
chromium_src-af5e62c35a97eec03b64701aa31024b8c139b836.tar.gz
chromium_src-af5e62c35a97eec03b64701aa31024b8c139b836.tar.bz2
Remove root window from screen_ash
BUG=123160 TEST=none Review URL: https://chromiumcodereview.appspot.com/10533041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index 35f0850..51cd7bf 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -553,7 +553,7 @@ internal::WorkspaceController* Shell::TestApi::workspace_controller() {
Shell::Shell(ShellDelegate* delegate)
: root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()),
- screen_(new ScreenAsh(root_window_.get())),
+ screen_(new ScreenAsh),
env_filter_(NULL),
delegate_(delegate),
#if defined(OS_CHROMEOS)