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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/accessibility/accessibility_win_browsertest.cc » ('j') | ui/ui_controls/ui_controls_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 808771db5f83c614d51e4a0245c3043c2e5009be..bf57f5657fbd8394c4c2fdc0bb472c85c999478b 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -62,10 +62,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"
@@ -353,6 +355,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') | ui/ui_controls/ui_controls_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698