diff options
| author | rockot <rockot@chromium.org> | 2014-09-05 01:02:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-05 08:05:55 +0000 |
| commit | 1a51b92b7038b82a90c1a1944104eaf8c51a9e1c (patch) | |
| tree | 9dde79f2e12d64897300d2c389725ab4d349f01f /extensions/shell/browser/shell_extensions_browser_client.cc | |
| parent | 243eec86f415a6624d8d41b0ea0393eda0b3a808 (diff) | |
| download | chromium_src-1a51b92b7038b82a90c1a1944104eaf8c51a9e1c.zip chromium_src-1a51b92b7038b82a90c1a1944104eaf8c51a9e1c.tar.gz chromium_src-1a51b92b7038b82a90c1a1944104eaf8c51a9e1c.tar.bz2 | |
Fix HidService lifetime issues
This reverts HidService to being a singleton instance for now.
BUG=401234
TBR=rpaquay
Review URL: https://codereview.chromium.org/523743005
Cr-Commit-Position: refs/heads/master@{#293464}
Diffstat (limited to 'extensions/shell/browser/shell_extensions_browser_client.cc')
| -rw-r--r-- | extensions/shell/browser/shell_extensions_browser_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc index 84e757c..659f88f 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.cc +++ b/extensions/shell/browser/shell_extensions_browser_client.cc @@ -9,12 +9,12 @@ #include "base/prefs/testing_pref_store.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" +#include "extensions/browser/api/extensions_api_client.h" #include "extensions/browser/api/generated_api_registration.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/extension_function_registry.h" #include "extensions/browser/extension_prefs.h" #include "extensions/shell/browser/api/generated_api_registration.h" -#include "extensions/shell/browser/api/shell_extensions_api_client.h" #include "extensions/shell/browser/shell_app_sorting.h" #include "extensions/shell/browser/shell_extension_host_delegate.h" #include "extensions/shell/browser/shell_extension_system_factory.h" @@ -34,7 +34,7 @@ void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) { ShellExtensionsBrowserClient::ShellExtensionsBrowserClient( BrowserContext* context) - : browser_context_(context), api_client_(new ShellExtensionsAPIClient) { + : browser_context_(context), api_client_(new ExtensionsAPIClient) { // Set up the preferences service. base::PrefServiceFactory factory; factory.set_user_prefs(new TestingPrefStore); |