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

Unified Diff: ash/shell.cc

Issue 10545058: Add UIControlsAsh that works with multiple root windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 8 years, 6 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 | « ash/ash.gyp ('k') | ash/shell_factory.h » ('j') | no next file with comments »
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 f1f72fd88b56c8bcf806d83d79f5074a7f576e97..593cac4f11a71e8ab832e20f223bc37358c621ac 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -564,7 +564,7 @@ Shell::Shell(ShellDelegate* delegate)
status_area_widget_(NULL),
browser_context_(NULL) {
gfx::Screen::SetInstance(screen_);
- ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
+ ui_controls::InstallUIControlsAura(internal::CreateUIControls());
#if defined(OS_CHROMEOS)
// OutputConfigurator needs to get events regarding added/removed outputs.
static_cast<aura::DispatcherLinux*>(
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698