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

Unified Diff: apps/shell/browser/shell_browser_main_parts.cc

Issue 389633002: Move system.* family of APIs to extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed gn build Created 6 years, 5 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
Index: apps/shell/browser/shell_browser_main_parts.cc
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index bafbf8e8950a0ea60dcd32159582eb00575bb041..41be9231896128fb356170be0cc63072a04108c2 100644
--- a/apps/shell/browser/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -20,12 +20,17 @@
#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 "ui/aura/window_tree_host.h"
#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 "apps/shell/browser/shell_network_controller_chromeos.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -43,6 +48,7 @@ namespace {
void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
extensions::ShellExtensionSystemFactory::GetInstance();
+ extensions::SystemInfoAPI::GetFactoryInstance();
}
} // namespace
@@ -129,6 +135,10 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
} else {
browser_main_delegate_->Start(browser_context_.get());
}
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+ storage_monitor::StorageMonitor::Create();
+#endif
}
bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
@@ -152,6 +162,10 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
browser_context_.reset();
desktop_controller_.reset();
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+ storage_monitor::StorageMonitor::Destroy();
+#endif
}
void ShellBrowserMainParts::PostDestroyThreads() {

Powered by Google App Engine
This is Rietveld 408576698