Revert 98850 - Proper MouseEvent targeting. Adds a Window method that locates a Window for a give...

aura/desktop.cc

Index: aura/desktop.cc
===================================================================
--- aura/desktop.cc	(revision 98850)
+++ aura/desktop.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "aura/desktop.h"
 
 #include "aura/desktop_host.h"
-#include "aura/root_window.h"
 #include "aura/window.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -22,34 +21,27 @@
                                        host_->GetSize());
   host_->SetDesktop(this);
   DCHECK(compositor_.get());
-  window_.reset(new internal::RootWindow);
+  window_.reset(new Window(NULL));
 }
 
 Desktop::~Desktop() {
 }
 
-void Desktop::Show() {
-  host_->Show();
-}
-
-void Desktop::SetSize(const gfx::Size& size) {
-  host_->SetSize(size);
-}
-
 void Desktop::Run() {
-  Show();
+  host_->Show();
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
   MessageLoopForUI::current()->Run(host_);
 }
 
 void Desktop::Draw() {
+  // Second pass renders the layers.
   compositor_->NotifyStart();
   window_->DrawTree();
   compositor_->NotifyEnd();
 }
 
 bool Desktop::OnMouseEvent(const MouseEvent& event) {
-  return window_->HandleMouseEvent(event);
+  return window_->OnMouseEvent(event);
 }
 
 // static