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

Unified Diff: content/browser/browser_main_loop.cc

Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 | « chrome/common/chrome_content_client.cc ('k') | content/browser/download/download_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 5c5b3fea25fc1bf736384ee516b3c7c3fed3c902..882054f1615397bc81d045607ceb323989a588c7 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -37,7 +37,6 @@
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/media/media_internals.h"
#include "content/browser/net/browser_online_state_observer.h"
-#include "content/browser/plugin_service_impl.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/speech/speech_recognition_manager_impl.h"
#include "content/browser/startup_task_runner.h"
@@ -116,6 +115,10 @@
#include "sandbox/linux/suid/client/setuid_sandbox_client.h"
#endif
+#if defined(ENABLE_PLUGINS)
+#include "content/browser/plugin_service_impl.h"
+#endif
+
#if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
#endif
@@ -1003,8 +1006,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
ImageTransportFactory::Initialize();
#if defined(USE_AURA)
if (aura::Env::GetInstance()) {
- aura::Env::GetInstance()->set_context_factory(
- content::GetContextFactory());
+ aura::Env::GetInstance()->set_context_factory(GetContextFactory());
}
#endif
}
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698