| 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/browser/shell_browser_main_parts.h" | 5 #include "apps/shell/browser/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "apps/shell/browser/shell_apps_client.h" |
| 7 #include "apps/shell/browser/shell_browser_context.h" | 8 #include "apps/shell/browser/shell_browser_context.h" |
| 8 #include "apps/shell/browser/shell_extension_system.h" | 9 #include "apps/shell/browser/shell_extension_system.h" |
| 9 #include "apps/shell/browser/shell_extensions_browser_client.h" | 10 #include "apps/shell/browser/shell_extensions_browser_client.h" |
| 10 #include "apps/shell/browser/web_view_window.h" | 11 #include "apps/shell/browser/web_view_window.h" |
| 11 #include "apps/shell/common/shell_extensions_client.h" | 12 #include "apps/shell/common/shell_extensions_client.h" |
| 12 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 13 #include "base/file_util.h" | 14 #include "base/file_util.h" |
| 14 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
| 15 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
| 16 #include "components/browser_context_keyed_service/browser_context_dependency_ma
nager.h" | 17 #include "components/browser_context_keyed_service/browser_context_dependency_ma
nager.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 // Initialize our "profile" equivalent. | 102 // Initialize our "profile" equivalent. |
| 102 browser_context_.reset(new ShellBrowserContext); | 103 browser_context_.reset(new ShellBrowserContext); |
| 103 | 104 |
| 104 extensions_client_.reset(new ShellExtensionsClient()); | 105 extensions_client_.reset(new ShellExtensionsClient()); |
| 105 extensions::ExtensionsClient::Set(extensions_client_.get()); | 106 extensions::ExtensionsClient::Set(extensions_client_.get()); |
| 106 | 107 |
| 107 extensions_browser_client_.reset( | 108 extensions_browser_client_.reset( |
| 108 new extensions::ShellExtensionsBrowserClient(browser_context_.get())); | 109 new extensions::ShellExtensionsBrowserClient(browser_context_.get())); |
| 109 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); | 110 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); |
| 110 | 111 |
| 112 apps_client_.reset(new ShellAppsClient(browser_context_.get())); |
| 113 AppsClient::Set(apps_client_.get()); |
| 114 |
| 111 // Create our custom ExtensionSystem first because other | 115 // Create our custom ExtensionSystem first because other |
| 112 // BrowserContextKeyedServices depend on it. | 116 // BrowserContextKeyedServices depend on it. |
| 113 CreateExtensionSystem(); | 117 CreateExtensionSystem(); |
| 114 | 118 |
| 115 EnsureBrowserContextKeyedServiceFactoriesBuilt(); | 119 EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| 116 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( | 120 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( |
| 117 browser_context_.get()); | 121 browser_context_.get()); |
| 118 | 122 |
| 119 CreateRootWindow(); | 123 CreateRootWindow(); |
| 120 CreateViewsDelegate(); | 124 CreateViewsDelegate(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 148 browser_context_.get()); | 152 browser_context_.get()); |
| 149 extension_system_ = NULL; | 153 extension_system_ = NULL; |
| 150 extensions::ExtensionsBrowserClient::Set(NULL); | 154 extensions::ExtensionsBrowserClient::Set(NULL); |
| 151 extensions_browser_client_.reset(); | 155 extensions_browser_client_.reset(); |
| 152 browser_context_.reset(); | 156 browser_context_.reset(); |
| 153 aura::Env::DeleteInstance(); | 157 aura::Env::DeleteInstance(); |
| 154 } | 158 } |
| 155 | 159 |
| 156 void ShellBrowserMainParts::OnWindowTreeHostCloseRequested( | 160 void ShellBrowserMainParts::OnWindowTreeHostCloseRequested( |
| 157 const aura::RootWindow* root) { | 161 const aura::RootWindow* root) { |
| 162 extension_system_->CloseApp(); |
| 158 base::MessageLoop::current()->PostTask(FROM_HERE, | 163 base::MessageLoop::current()->PostTask(FROM_HERE, |
| 159 base::MessageLoop::QuitClosure()); | 164 base::MessageLoop::QuitClosure()); |
| 160 } | 165 } |
| 161 | 166 |
| 162 void ShellBrowserMainParts::CreateRootWindow() { | 167 void ShellBrowserMainParts::CreateRootWindow() { |
| 163 test_screen_.reset(aura::TestScreen::Create()); | 168 test_screen_.reset(aura::TestScreen::Create()); |
| 164 // TODO(jamescook): Replace this with a real Screen implementation. | 169 // TODO(jamescook): Replace this with a real Screen implementation. |
| 165 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); | 170 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); |
| 166 // TODO(jamescook): Initialize a real input method. | 171 // TODO(jamescook): Initialize a real input method. |
| 167 ui::InitializeInputMethodForTesting(); | 172 ui::InitializeInputMethodForTesting(); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 194 } | 199 } |
| 195 | 200 |
| 196 void ShellBrowserMainParts::CreateExtensionSystem() { | 201 void ShellBrowserMainParts::CreateExtensionSystem() { |
| 197 DCHECK(browser_context_); | 202 DCHECK(browser_context_); |
| 198 extension_system_ = static_cast<ShellExtensionSystem*>( | 203 extension_system_ = static_cast<ShellExtensionSystem*>( |
| 199 ExtensionSystem::Get(browser_context_.get())); | 204 ExtensionSystem::Get(browser_context_.get())); |
| 200 extension_system_->InitForRegularProfile(true); | 205 extension_system_->InitForRegularProfile(true); |
| 201 } | 206 } |
| 202 | 207 |
| 203 } // namespace apps | 208 } // namespace apps |
| OLD | NEW |