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

Side by Side Diff: apps/shell/shell_extensions_browser_client.h

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 #ifndef APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ 5 #ifndef APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
6 #define APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ 6 #define APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "extensions/browser/extensions_browser_client.h" 9 #include "extensions/browser/extensions_browser_client.h"
10 10
(...skipping 27 matching lines...) Expand all
38 content::BrowserContext* context) OVERRIDE; 38 content::BrowserContext* context) OVERRIDE;
39 virtual bool DeferLoadingBackgroundHosts(content::BrowserContext* context) 39 virtual bool DeferLoadingBackgroundHosts(content::BrowserContext* context)
40 const OVERRIDE; 40 const OVERRIDE;
41 virtual bool IsBackgroundPageAllowed(content::BrowserContext* context) 41 virtual bool IsBackgroundPageAllowed(content::BrowserContext* context)
42 const OVERRIDE; 42 const OVERRIDE;
43 virtual bool DidVersionUpdate(content::BrowserContext* context) OVERRIDE; 43 virtual bool DidVersionUpdate(content::BrowserContext* context) OVERRIDE;
44 virtual scoped_ptr<extensions::AppSorting> CreateAppSorting() OVERRIDE; 44 virtual scoped_ptr<extensions::AppSorting> CreateAppSorting() OVERRIDE;
45 virtual bool IsRunningInForcedAppMode() OVERRIDE; 45 virtual bool IsRunningInForcedAppMode() OVERRIDE;
46 virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager() 46 virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
47 OVERRIDE; 47 OVERRIDE;
48 virtual std::vector<BrowserContextKeyedServiceFactory*>
49 GetExtensionSystemDependencies() OVERRIDE;
50 virtual extensions::ExtensionSystem* CreateExtensionSystem(
51 content::BrowserContext* context) OVERRIDE;
48 52
49 private: 53 private:
50 // The single BrowserContext for app_shell. Not owned. 54 // The single BrowserContext for app_shell. Not owned.
51 content::BrowserContext* browser_context_; 55 content::BrowserContext* browser_context_;
52 56
53 // The PrefService for |browser_context_|. 57 // The PrefService for |browser_context_|.
54 scoped_ptr<PrefService> prefs_; 58 scoped_ptr<PrefService> prefs_;
55 59
56 DISALLOW_COPY_AND_ASSIGN(ShellExtensionsBrowserClient); 60 DISALLOW_COPY_AND_ASSIGN(ShellExtensionsBrowserClient);
57 }; 61 };
58 62
59 } // namespace apps 63 } // namespace apps
60 64
61 #endif // APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ 65 #endif // APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698