ash/shell.cc - Issue 9390038: Move automation/ui_controls to ui/ui_controls

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 9390038: Move automation/ui_controls to ui/ui_controls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: win_aura fix, sync Created 8 years, 9 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: ash/shell.cc

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

index e3f3ebdcbd8b7c1458b73bf5b48441f698ab5e4c..4f049856ae87d6ee7df32d8960b6eccbbe3d4429 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -65,10 +65,12 @@

#include "ui/aura/monitor.h"

#include "ui/aura/monitor_manager.h"

#include "ui/aura/root_window.h"

+#include "ui/aura/ui_controls_aura.h"

#include "ui/aura/window.h"

#include "ui/gfx/compositor/layer.h"

#include "ui/gfx/compositor/layer_animator.h"

#include "ui/gfx/size.h"

+#include "ui/ui_controls/ui_controls.h"

#include "ui/views/widget/native_widget_aura.h"

#include "ui/views/widget/widget.h"

@@ -349,6 +351,7 @@ Shell::Shell(ShellDelegate* delegate)

aura::Env::GetInstance()->SetMonitorManager(

aura::CreateSingleMonitorManager(root_window_.get()));

gfx::Screen::SetInstance(screen_);

+ ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));

}

Shell::~Shell() {

« no previous file with comments | « no previous file | chrome/browser/accessibility/accessibility_win_browsertest.cc » ('j') | no next file with comments »