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

Unified Diff: content/browser/browser_main_loop.cc

Issue 291473002: ozone: Initialize a subsystem only if necessary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r270817 Created 6 years, 7 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 | « no previous file | content/browser/compositor/software_output_device_ozone_unittest.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 ad00ac03f52034e56470d9ecedce767d17f6fad5..a30a62eff7e81dfd7c6c34f6ace51bb64cd01c01 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -122,10 +122,6 @@
#include "ui/gfx/x/x11_types.h"
#endif
-#if defined(USE_OZONE)
-#include "ui/ozone/ozone_platform.h"
-#endif
-
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
@@ -958,10 +954,6 @@ int BrowserMainLoop::BrowserThreadsStarted() {
device_monitor_mac_.reset(new DeviceMonitorMac());
#endif
-#if defined(USE_OZONE)
- ui::OzonePlatform::Initialize();
-#endif
-
// RDH needs the IO thread to be created
{
TRACE_EVENT0("startup",
« no previous file with comments | « no previous file | content/browser/compositor/software_output_device_ozone_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698