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

Side by Side Diff: apps/shell/shell_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: delegate out ExtensionSystem creation (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 "apps/shell/shell_extensions_browser_client.h" 5 #include "apps/shell/shell_extensions_browser_client.h"
6 6
7 #include "apps/shell/shell_app_sorting.h" 7 #include "apps/shell/shell_app_sorting.h"
8 #include "apps/shell/shell_extension_system.h"
8 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
9 #include "base/prefs/pref_service_factory.h" 10 #include "base/prefs/pref_service_factory.h"
10 #include "base/prefs/testing_pref_store.h" 11 #include "base/prefs/testing_pref_store.h"
11 #include "chrome/browser/extensions/extension_prefs.h" 12 #include "chrome/browser/extensions/extension_prefs.h"
12 #include "components/user_prefs/pref_registry_syncable.h" 13 #include "components/user_prefs/pref_registry_syncable.h"
13 #include "components/user_prefs/user_prefs.h" 14 #include "components/user_prefs/user_prefs.h"
14 #include "extensions/browser/app_sorting.h" 15 #include "extensions/browser/app_sorting.h"
15 16
16 using content::BrowserContext; 17 using content::BrowserContext;
17 18
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 112 }
112 113
113 content::JavaScriptDialogManager* 114 content::JavaScriptDialogManager*
114 ShellExtensionsBrowserClient::GetJavaScriptDialogManager() { 115 ShellExtensionsBrowserClient::GetJavaScriptDialogManager() {
115 // TODO(jamescook): Create a JavaScriptDialogManager or reuse the one from 116 // TODO(jamescook): Create a JavaScriptDialogManager or reuse the one from
116 // content_shell. 117 // content_shell.
117 NOTREACHED(); 118 NOTREACHED();
118 return NULL; 119 return NULL;
119 } 120 }
120 121
122 std::vector<BrowserContextKeyedServiceFactory*>
123 ShellExtensionsBrowserClient::GetExtensionSystemDependencies() {
124 // No dependencies.
125 return std::vector<BrowserContextKeyedServiceFactory*>();
126 }
127
128 extensions::ExtensionSystem*
129 ShellExtensionsBrowserClient::CreateExtensionSystem(BrowserContext* context) {
130 return new extensions::ShellExtensionSystem(context);
131 }
132
121 } // namespace apps 133 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698