chrome/browser/ui/ash/ash_init.cc - Issue 132173006: Provide real GPUSupport to ash for Chrome

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 132173006: Provide real GPUSupport to ash for Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win (gpu_support) 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:

Index: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 7d980afb6d0d748b90fc09a48facd8cab7464c43..f6a482ffec7d7a8f17370116093a0af2172cf2c6 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -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 @@ void OpenAsh() {

// 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 | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »