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

Unified Diff: trunk/src/chrome/browser/ui/ash/ash_init.cc

Issue 137893010: Revert 245010 "Inject GPUDataManager support into ash to abstrac..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 | « trunk/src/ash/system/monitor/tray_monitor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/ash/ash_init.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/ash_init.cc (revision 245015)
+++ trunk/src/chrome/browser/ui/ash/ash_init.cc (working copy)
@@ -6,7 +6,6 @@
#include "ash/accelerators/accelerator_controller.h"
#include "ash/ash_switches.h"
-#include "ash/content_support/inject.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
@@ -59,7 +58,6 @@
// Shell takes ownership of ChromeShellDelegate.
ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
- ash::InitContentSupport();
shell->event_rewriter_filter()->SetEventRewriterDelegate(
scoped_ptr<ash::EventRewriterDelegate>(new EventRewriter).Pass());
shell->accelerator_controller()->SetScreenshotDelegate(
« no previous file with comments | « trunk/src/ash/system/monitor/tray_monitor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698