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

Unified Diff: apps/shell/shell_browser_main_parts.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/shell_browser_context.cc ('k') | apps/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/shell_browser_main_parts.h
diff --git a/apps/shell/shell_browser_main_parts.h b/apps/shell/shell_browser_main_parts.h
index a1fdba365d69900a551194b1cedc8ea7133a64b3..77fbc499b51e785359dc4b69fcaab968970f8797 100644
--- a/apps/shell/shell_browser_main_parts.h
+++ b/apps/shell/shell_browser_main_parts.h
@@ -21,6 +21,7 @@ struct MainFunctionParams;
}
namespace extensions {
+class ShellExtensionsBrowserClient;
class ShellExtensionSystem;
}
@@ -31,7 +32,6 @@ class WMTestHelper;
namespace apps {
class ShellBrowserContext;
-class ShellExtensionsBrowserClient;
class ShellExtensionsClient;
// Handles initialization of AppShell.
@@ -71,7 +71,8 @@ class ShellBrowserMainParts : public content::BrowserMainParts,
scoped_ptr<ShellBrowserContext> browser_context_;
scoped_ptr<ShellExtensionsClient> extensions_client_;
- scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_;
+ scoped_ptr<extensions::ShellExtensionsBrowserClient>
+ extensions_browser_client_;
// Enable a minimal set of views::corewm to be initialized.
scoped_ptr<wm::WMTestHelper> wm_test_helper_;
« no previous file with comments | « apps/shell/shell_browser_context.cc ('k') | apps/shell/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698