Index: apps/shell/browser/shell_browser_main_parts.cc |
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc |
index b409f1775c301e8401a440f69483a8c107c9a79f..3dbfb7c06f8404489ece945195571b66a5913791 100644 |
--- a/apps/shell/browser/shell_browser_main_parts.cc |
+++ b/apps/shell/browser/shell_browser_main_parts.cc |
@@ -81,8 +81,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { |
// Initialize our "profile" equivalent. |
browser_context_.reset(new ShellBrowserContext); |
- desktop_controller_.reset(new ShellDesktopController); |
- desktop_controller_->GetWindowTreeHost()->AddObserver(this); |
+ desktop_controller_.reset(browser_main_delegate_->CreateDesktopController()); |
+ desktop_controller_->CreateRootWindow(); |
// NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc |
// TODO(jamescook): Initialize chromeos::UserManager. |
@@ -136,7 +136,6 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { |
extensions_browser_client_.reset(); |
browser_context_.reset(); |
- desktop_controller_->GetWindowTreeHost()->RemoveObserver(this); |
desktop_controller_.reset(); |
} |
@@ -147,13 +146,6 @@ void ShellBrowserMainParts::PostDestroyThreads() { |
#endif |
} |
-void ShellBrowserMainParts::OnHostCloseRequested( |
- const aura::WindowTreeHost* host) { |
- desktop_controller_->CloseAppWindow(); |
- base::MessageLoop::current()->PostTask(FROM_HERE, |
- base::MessageLoop::QuitClosure()); |
-} |
- |
void ShellBrowserMainParts::CreateExtensionSystem() { |
DCHECK(browser_context_); |
extension_system_ = static_cast<ShellExtensionSystem*>( |