| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/shell/shell_browser_main_parts.h" | 5 #include "apps/shell/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "apps/shell/shell_browser_context.h" | 7 #include "apps/shell/shell_browser_context.h" |
| 8 #include "apps/shell/shell_extension_system.h" | 8 #include "apps/shell/shell_extension_system.h" |
| 9 #include "apps/shell/shell_extensions_browser_client.h" | 9 #include "apps/shell/shell_extensions_browser_client.h" |
| 10 #include "apps/shell/shell_extensions_client.h" | 10 #include "apps/shell/shell_extensions_client.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 extensions::ExtensionsBrowserClient::Set(NULL); | 117 extensions::ExtensionsBrowserClient::Set(NULL); |
| 118 extensions_browser_client_.reset(); | 118 extensions_browser_client_.reset(); |
| 119 browser_context_.reset(); | 119 browser_context_.reset(); |
| 120 aura::Env::DeleteInstance(); | 120 aura::Env::DeleteInstance(); |
| 121 | 121 |
| 122 LOG(WARNING) << "-----------------------------------"; | 122 LOG(WARNING) << "-----------------------------------"; |
| 123 LOG(WARNING) << "app_shell is expected to crash now."; | 123 LOG(WARNING) << "app_shell is expected to crash now."; |
| 124 LOG(WARNING) << "-----------------------------------"; | 124 LOG(WARNING) << "-----------------------------------"; |
| 125 } | 125 } |
| 126 | 126 |
| 127 void ShellBrowserMainParts::OnRootWindowHostCloseRequested( | 127 void ShellBrowserMainParts::OnWindowTreeHostCloseRequested( |
| 128 const aura::RootWindow* root) { | 128 const aura::RootWindow* root) { |
| 129 base::MessageLoop::current()->PostTask(FROM_HERE, | 129 base::MessageLoop::current()->PostTask(FROM_HERE, |
| 130 base::MessageLoop::QuitClosure()); | 130 base::MessageLoop::QuitClosure()); |
| 131 } | 131 } |
| 132 | 132 |
| 133 void ShellBrowserMainParts::CreateRootWindow() { | 133 void ShellBrowserMainParts::CreateRootWindow() { |
| 134 // TODO(jamescook): Replace this with a real Screen implementation. | 134 // TODO(jamescook): Replace this with a real Screen implementation. |
| 135 gfx::Screen::SetScreenInstance( | 135 gfx::Screen::SetScreenInstance( |
| 136 gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create()); | 136 gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create()); |
| 137 // Set up basic pieces of views::corewm. | 137 // Set up basic pieces of views::corewm. |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 return false; | 173 return false; |
| 174 } | 174 } |
| 175 | 175 |
| 176 // TODO(jamescook): Add to ExtensionRegistry. | 176 // TODO(jamescook): Add to ExtensionRegistry. |
| 177 // TODO(jamescook): Set ExtensionSystem ready. | 177 // TODO(jamescook): Set ExtensionSystem ready. |
| 178 // TODO(jamescook): Send NOTIFICATION_EXTENSION_LOADED. | 178 // TODO(jamescook): Send NOTIFICATION_EXTENSION_LOADED. |
| 179 return true; | 179 return true; |
| 180 } | 180 } |
| 181 | 181 |
| 182 } // namespace apps | 182 } // namespace apps |
| OLD | NEW |