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

Unified Diff: ui/aura/desktop.cc

Issue 8205018: Gets component build to work with aura. As part of this I needed to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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 | « ui/aura/aura.gyp ('k') | ui/aura/desktop_delegate.h » ('j') | ui/gfx/screen.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop.cc
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
index e28fcf607742bdee71d570be9c731d248dbd8c1e..c2f6d4492bd050772a92663bec432fb14c9e8e10 100644
--- a/ui/aura/desktop.cc
+++ b/ui/aura/desktop.cc
@@ -10,6 +10,7 @@
#include "ui/aura/desktop_host.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/root_window.h"
+#include "ui/aura/screen_aura.h"
#include "ui/aura/toplevel_window_container.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
@@ -36,6 +37,7 @@ Desktop::Desktop()
compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
host_->GetSize());
}
+ gfx::Screen::SetInstance(new internal::ScreenAura);
host_->SetDesktop(this);
DCHECK(compositor_.get());
window_.reset(new internal::RootWindow);
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/desktop_delegate.h » ('j') | ui/gfx/screen.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698