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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shell/content_client/shell_browser_main_parts.h" 5 #include "ash/shell/content_client/shell_browser_main_parts.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell/shell_delegate_impl.h" 10 #include "ash/shell/shell_delegate_impl.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 window_watcher_.reset(new ash::shell::WindowWatcher); 130 window_watcher_.reset(new ash::shell::WindowWatcher);
131 gfx::Screen* screen = Shell::GetInstance()->GetScreen(); 131 gfx::Screen* screen = Shell::GetInstance()->GetScreen();
132 screen->AddObserver(window_watcher_.get()); 132 screen->AddObserver(window_watcher_.get());
133 delegate_->SetWatcher(window_watcher_.get()); 133 delegate_->SetWatcher(window_watcher_.get());
134 134
135 ash::shell::InitWindowTypeLauncher(); 135 ash::shell::InitWindowTypeLauncher();
136 136
137 Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper( 137 Shell::GetInstance()->desktop_background_controller()->SetDefaultWallpaper(
138 false /* is_guest */); 138 false /* is_guest */);
139 139
140 ash::Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->Show(); 140 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
141 } 141 }
142 142
143 void ShellBrowserMainParts::PostMainMessageLoopRun() { 143 void ShellBrowserMainParts::PostMainMessageLoopRun() {
144 gfx::Screen* screen = Shell::GetInstance()->GetScreen(); 144 gfx::Screen* screen = Shell::GetInstance()->GetScreen();
145 screen->RemoveObserver(window_watcher_.get()); 145 screen->RemoveObserver(window_watcher_.get());
146 146
147 window_watcher_.reset(); 147 window_watcher_.reset();
148 delegate_->SetWatcher(NULL); 148 delegate_->SetWatcher(NULL);
149 delegate_ = NULL; 149 delegate_ = NULL;
150 ash::Shell::DeleteInstance(); 150 ash::Shell::DeleteInstance();
(...skipping 14 matching lines...) Expand all
165 browser_context_.reset(); 165 browser_context_.reset();
166 } 166 }
167 167
168 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 168 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
169 base::MessageLoopForUI::current()->Run(); 169 base::MessageLoopForUI::current()->Run();
170 return true; 170 return true;
171 } 171 }
172 172
173 } // namespace shell 173 } // namespace shell
174 } // namespace ash 174 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698