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

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

Issue 672403002: Cleanup: Remove most enable_extensions logic in extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 6 years, 2 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 | « extensions/shell/BUILD.gn ('k') | extensions/strings/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e9708f1772d401fb09e7a5ee80850a33eee8ebd1..3387311031f338c879060ab4e0763d4e0279cee3 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -8,6 +8,7 @@
#include "base/run_loop.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/omaha_query_params/omaha_query_params.h"
+#include "components/storage_monitor/storage_monitor.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/context_factory.h"
#include "content/public/common/result_codes.h"
@@ -34,10 +35,6 @@
#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"
@@ -120,9 +117,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
storage_monitor::StorageMonitor::Create();
-#endif
desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
@@ -215,9 +210,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
desktop_controller_.reset();
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
storage_monitor::StorageMonitor::Destroy();
-#endif
}
void ShellBrowserMainParts::PostDestroyThreads() {
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | extensions/strings/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698