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

Side by Side Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 118043003: Fix app_shell shutdown crash due to BrowserContextKeyedServices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ScopedFactoryForTest (shutdown_crash) Created 6 years, 11 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 "chrome/browser/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/version.h" 8 #include "base/version.h"
9 #include "chrome/browser/app_mode/app_mode_utils.h" 9 #include "chrome/browser/app_mode/app_mode_utils.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/extensions/chrome_app_sorting.h" 11 #include "chrome/browser/extensions/chrome_app_sorting.h"
12 #include "chrome/browser/extensions/extension_prefs.h" 12 #include "chrome/browser/extensions/extension_prefs.h"
13 #include "chrome/browser/extensions/extension_system.h"
14 #include "chrome/browser/extensions/extension_system_factory.h"
13 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 17 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
16 #include "chrome/browser/ui/browser_finder.h" 18 #include "chrome/browser/ui/browser_finder.h"
17 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/chrome_version_info.h" 20 #include "chrome/common/chrome_version_info.h"
19 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
20 22
21 #if defined(OS_CHROMEOS) 23 #if defined(OS_CHROMEOS)
22 #include "chromeos/chromeos_switches.h" 24 #include "chromeos/chromeos_switches.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 149
148 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() { 150 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() {
149 return chrome::IsRunningInForcedAppMode(); 151 return chrome::IsRunningInForcedAppMode();
150 } 152 }
151 153
152 content::JavaScriptDialogManager* 154 content::JavaScriptDialogManager*
153 ChromeExtensionsBrowserClient::GetJavaScriptDialogManager() { 155 ChromeExtensionsBrowserClient::GetJavaScriptDialogManager() {
154 return GetJavaScriptDialogManagerInstance(); 156 return GetJavaScriptDialogManagerInstance();
155 } 157 }
156 158
159 std::vector<BrowserContextKeyedServiceFactory*>
160 ChromeExtensionsBrowserClient::GetExtensionSystemDependencies() {
161 std::vector<BrowserContextKeyedServiceFactory*> dependencies;
162 dependencies.push_back(ExtensionSystemSharedFactory::GetInstance());
163 return dependencies;
164 }
165
166 ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem(
167 content::BrowserContext* context) {
168 return new ExtensionSystemImpl(static_cast<Profile*>(context));
169 }
170
157 } // namespace extensions 171 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | chrome/browser/extensions/extension_system_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698