chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.

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/chrome_shell_delegate.cc

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 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

« ash/host/ash_window_tree_host_x11.h ('K') | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | mojo/examples/aura_demo/window_tree_host_mojo.h » ('j') | ui/aura/window_tree_host_x11.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e8b6b8e533fe1e8ad3990286ab705d2515821298..5238dbedcfad55d26f913ef1419d950d9618b7e3 100644

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

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

@@ -7,7 +7,6 @@

#include "apps/app_window.h"

#include "apps/app_window_registry.h"

#include "ash/content_support/gpu_support_impl.h"

-#include "ash/host/window_tree_host_factory.h"

#include "ash/magnifier/magnifier_constants.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_util.h"

@@ -136,10 +135,6 @@ ui::MenuModel* ChromeShellDelegate::CreateContextMenu(

return new LauncherContextMenu(shelf_delegate_, root);

}

-ash::WindowTreeHostFactory* ChromeShellDelegate::CreateWindowTreeHostFactory() {

- return ash::WindowTreeHostFactory::Create();

ash::GPUSupport* ChromeShellDelegate::CreateGPUSupport() {

// Chrome uses real GPU support.

return new ash::GPUSupportImpl;