ash/shell.cc - Issue 11360045: ash: Add RootWindowHostFactory class.

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: ash/shell.cc

Issue 11360045: ash: Add RootWindowHostFactory class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add RootWindowHostFactory class and remove DisplayManagerDelegate. Created 8 years 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: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 16512512a4c15a5d6080001864b686d32d67ec8d..ef2c8b0134b8140d206bb94f251efb7d495f323b 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

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

#include "ash/drag_drop/drag_drop_controller.h"

#include "ash/focus_cycler.h"

#include "ash/high_contrast/high_contrast_controller.h"

+#include "ash/host/root_window_host_factory.h"

#include "ash/launcher/launcher_delegate.h"

#include "ash/launcher/launcher_model.h"

#include "ash/magnifier/magnification_controller.h"

@@ -427,6 +428,7 @@ void Shell::Init() {

focus_cycler_.reset(new internal::FocusCycler());

screen_position_controller_.reset(new internal::ScreenPositionController);

+ root_window_host_factory_.reset(delegate_->CreateRootWindowHostFactory());

display_controller_.reset(new DisplayController);

display_controller_->InitPrimaryDisplay();

aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow();