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

Unified Diff: ui/aura/desktop.cc

Issue 7980023: Fixes aura unit tests. There were a couple of problems: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | ui/aura/event_filter.h » ('j') | no next file with comments »
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 e4e1ea8c0a1f85da95117a320264b022fc368522..50b38029dc5fec1cbe958f1d79de9f53c8bf9df8 100644
--- a/ui/aura/desktop.cc
+++ b/ui/aura/desktop.cc
@@ -8,6 +8,7 @@
#include "base/message_loop.h"
#include "ui/aura/desktop_host.h"
#include "ui/aura/root_window.h"
+#include "ui/aura/toplevel_window_container.h"
#include "ui/aura/window.h"
#include "ui/gfx/compositor/compositor.h"
#include "ui/gfx/compositor/layer.h"
@@ -18,7 +19,7 @@ namespace aura {
Desktop* Desktop::instance_ = NULL;
Desktop::Desktop()
- : toplevel_window_container_(NULL),
+ : toplevel_window_container_(new aura::internal::ToplevelWindowContainer),
host_(aura::DesktopHost::Create(gfx::Rect(200, 200, 1280, 1024))),
ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_(this)) {
DCHECK(MessageLoopForUI::current())
@@ -38,6 +39,10 @@ Desktop::~Desktop() {
void Desktop::Init() {
window_->Init();
compositor()->set_root_layer(window_->layer());
+ toplevel_window_container_->Init();
+ toplevel_window_container_->SetBounds(gfx::Rect(0, 0, 1280, 1024), 0);
+ toplevel_window_container_->SetVisibility(aura::Window::VISIBILITY_SHOWN);
+ toplevel_window_container_->SetParent(window_.get());
#if defined(USE_X11)
// TODO(oshima): Implement configure notify and remove this.
OnHostResized(host_->GetSize());
« no previous file with comments | « no previous file | ui/aura/event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698