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" |
11 #include "apps/shell/web_view_window.h" | 11 #include "apps/shell/web_view_window.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
16 #include "chrome/browser/extensions/extension_system.h" | |
17 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
18 #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" |
19 #include "content/public/common/result_codes.h" | 18 #include "content/public/common/result_codes.h" |
| 19 #include "extensions/browser/extension_system.h" |
20 #include "extensions/browser/renderer_startup_helper.h" | 20 #include "extensions/browser/renderer_startup_helper.h" |
21 #include "extensions/common/extension_paths.h" | 21 #include "extensions/common/extension_paths.h" |
22 #include "ui/aura/env.h" | 22 #include "ui/aura/env.h" |
23 #include "ui/aura/root_window.h" | 23 #include "ui/aura/root_window.h" |
24 #include "ui/aura/test/test_screen.h" | 24 #include "ui/aura/test/test_screen.h" |
25 #include "ui/base/ime/input_method_initializer.h" | 25 #include "ui/base/ime/input_method_initializer.h" |
26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
27 #include "ui/gfx/screen.h" | 27 #include "ui/gfx/screen.h" |
28 #include "ui/wm/test/wm_test_helper.h" | 28 #include "ui/wm/test/wm_test_helper.h" |
29 | 29 |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 void ShellBrowserMainParts::DestroyRootWindow() { | 163 void ShellBrowserMainParts::DestroyRootWindow() { |
164 wm_test_helper_->root_window()->RemoveRootWindowObserver(this); | 164 wm_test_helper_->root_window()->RemoveRootWindowObserver(this); |
165 wm_test_helper_->root_window()->PrepareForShutdown(); | 165 wm_test_helper_->root_window()->PrepareForShutdown(); |
166 wm_test_helper_.reset(); | 166 wm_test_helper_.reset(); |
167 ui::ShutdownInputMethodForTesting(); | 167 ui::ShutdownInputMethodForTesting(); |
168 } | 168 } |
169 | 169 |
170 void ShellBrowserMainParts::CreateExtensionSystem() { | 170 void ShellBrowserMainParts::CreateExtensionSystem() { |
171 DCHECK(browser_context_); | 171 DCHECK(browser_context_); |
172 extension_system_ = static_cast<ShellExtensionSystem*>( | 172 extension_system_ = static_cast<ShellExtensionSystem*>( |
173 ExtensionSystem::GetForBrowserContext(browser_context_.get())); | 173 ExtensionSystem::Get(browser_context_.get())); |
174 extension_system_->InitForRegularProfile(true); | 174 extension_system_->InitForRegularProfile(true); |
175 } | 175 } |
176 | 176 |
177 } // namespace apps | 177 } // namespace apps |
OLD | NEW |