Chromium Code Reviews| Index: extensions/shell/browser/shell_browser_main_parts.cc |
| diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc |
| index bc5ac7c96865315c3ffe7e3d43e21ac0ef7af51c..55d48b238714f71989af3954a370dc1b1e8483f1 100644 |
| --- a/extensions/shell/browser/shell_browser_main_parts.cc |
| +++ b/extensions/shell/browser/shell_browser_main_parts.cc |
| @@ -12,6 +12,7 @@ |
| #include "content/public/common/result_codes.h" |
| #include "content/shell/browser/shell_devtools_delegate.h" |
| #include "content/shell/browser/shell_net_log.h" |
| +#include "extensions/browser/api/system_info/system_info_api.h" |
| #include "extensions/browser/browser_context_keyed_service_factories.h" |
| #include "extensions/browser/extension_system.h" |
| #include "extensions/shell/browser/shell_browser_context.h" |
| @@ -29,6 +30,10 @@ |
| #include "ui/base/ime/input_method_initializer.h" |
| #include "ui/base/resource/resource_bundle.h" |
| +#if !defined(OS_ANDROID) && !defined(OS_IOS) |
| +#include "components/storage_monitor/storage_monitor.h" |
| +#endif |
| + |
| #if defined(OS_CHROMEOS) |
| #include "chromeos/audio/cras_audio_handler.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| @@ -129,6 +134,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { |
| // ChromeBrowserMainExtraPartsProfiles for details. |
| EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| ShellExtensionSystemFactory::GetInstance(); |
| + SystemInfoAPI::GetFactoryInstance(); |
|
James Cook
2014/09/03 22:22:58
This should probably go in extensions::EnsureBrows
tmpsantos
2014/09/04 12:51:58
Acknowledged.
|
| BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( |
| browser_context_.get()); |
| @@ -153,6 +159,10 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { |
| } else { |
| browser_main_delegate_->Start(browser_context_.get()); |
| } |
| + |
| +#if !defined(OS_ANDROID) && !defined(OS_IOS) |
| + storage_monitor::StorageMonitor::Create(); |
|
James Cook
2014/09/03 22:22:58
It kinda feels to me like this should be a little
tmpsantos
2014/09/04 12:51:58
Acknowledged.
|
| +#endif |
| } |
| bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| @@ -176,6 +186,10 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { |
| browser_context_.reset(); |
| desktop_controller_.reset(); |
| + |
| +#if !defined(OS_ANDROID) && !defined(OS_IOS) |
| + storage_monitor::StorageMonitor::Destroy(); |
|
James Cook
2014/09/03 22:22:58
Please destroy things in the opposite order of cre
tmpsantos
2014/09/04 12:51:58
I will create it on app_shell before the DesktopCo
|
| +#endif |
| } |
| void ShellBrowserMainParts::PostDestroyThreads() { |