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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2803523002: Always create ClientNativePixmapFactory in chrome --mash (Closed)
Patch Set: rebased Created 3 years, 8 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 | ui/aura/env.h » ('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 8ca5ddd32b3c8e9a1cd8a0628ab95f78b7160436..0dc52fcaf88e98e2dcf3b4a4858b357f8210f0ad 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -145,10 +145,6 @@
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
#endif
-#if defined(USE_OZONE)
-#include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
-#endif
-
#if defined(OS_WIN)
#include <windows.h>
#include <commctrl.h>
@@ -771,12 +767,6 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
}
#endif
-#if defined(USE_OZONE)
- client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
- gfx::ClientNativePixmapFactory::SetInstance(
- client_native_pixmap_factory_.get());
-#endif
-
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
memory_observer_.reset(new MemoryObserver());
« no previous file with comments | « no previous file | ui/aura/env.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698