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

Side by Side Diff: apps/shell/shell_browser_main_parts.cc

Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
OLDNEW
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/common/extension_paths.h" 20 #include "extensions/common/extension_paths.h"
21 #include "ui/aura/env.h" 21 #include "ui/aura/env.h"
22 #include "ui/aura/root_window.h" 22 #include "ui/aura/root_window.h"
23 #include "ui/aura/test/test_screen.h" 23 #include "ui/aura/test/test_screen.h"
24 #include "ui/base/ime/input_method_initializer.h" 24 #include "ui/base/ime/input_method_initializer.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/screen.h" 26 #include "ui/gfx/screen.h"
27 #include "ui/wm/test/wm_test_helper.h" 27 #include "ui/wm/test/wm_test_helper.h"
28 28
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 void ShellBrowserMainParts::DestroyRootWindow() { 161 void ShellBrowserMainParts::DestroyRootWindow() {
162 wm_test_helper_->root_window()->RemoveRootWindowObserver(this); 162 wm_test_helper_->root_window()->RemoveRootWindowObserver(this);
163 wm_test_helper_->root_window()->PrepareForShutdown(); 163 wm_test_helper_->root_window()->PrepareForShutdown();
164 wm_test_helper_.reset(); 164 wm_test_helper_.reset();
165 ui::ShutdownInputMethodForTesting(); 165 ui::ShutdownInputMethodForTesting();
166 } 166 }
167 167
168 void ShellBrowserMainParts::CreateExtensionSystem() { 168 void ShellBrowserMainParts::CreateExtensionSystem() {
169 DCHECK(browser_context_); 169 DCHECK(browser_context_);
170 extension_system_ = static_cast<ShellExtensionSystem*>( 170 extension_system_ = static_cast<ShellExtensionSystem*>(
171 ExtensionSystem::GetForBrowserContext(browser_context_.get())); 171 ExtensionSystem::Get(browser_context_.get()));
172 extension_system_->InitForRegularProfile(true); 172 extension_system_->InitForRegularProfile(true);
173 } 173 }
174 174
175 } // namespace apps 175 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698