Revert of Connect X11 ConfigureNotify events to Mojo

mojo/services/view_manager/window_tree_host_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/window_tree_host_impl.h"
+
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/view_manager/context_factory_impl.h"
 #include "ui/aura/env.h"
-#include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 // TODO(sky): nuke this. It shouldn't be static.
 // static
 ContextFactoryImpl* WindowTreeHostImpl::context_factory_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
-// RootLayoutManager, layout management for the root window's (one) child
-
-class RootLayoutManager : public aura::LayoutManager {
- public:
-  RootLayoutManager() : child_(NULL) { }
-
-  // Overridden from aura::LayoutManager
-  virtual void OnWindowResized() OVERRIDE;
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE;
-  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
-  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {}
-  virtual void OnChildWindowVisibilityChanged(aura::Window* child,
-                                              bool visible) OVERRIDE {}
-  virtual void SetChildBounds(aura::Window* child,
-                              const gfx::Rect& requested_bounds) OVERRIDE;
- private:
-  aura::Window* child_;
-
-  DISALLOW_COPY_AND_ASSIGN(RootLayoutManager);
-};
-
-void RootLayoutManager::OnWindowResized() {
-  if (child_) {
-    gfx::Rect bounds = child_->parent()->bounds();
-    child_->SetBounds(gfx::Rect(0, 0, bounds.width(), bounds.height()));
-  }
-}
-
-void RootLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
-  DCHECK(!child_);
-  child_ = child;
-}
-
-void RootLayoutManager::SetChildBounds(aura::Window* child,
-                                       const gfx::Rect& requested_bounds) {
-  SetChildBoundsDirect(child, gfx::Rect(
-      requested_bounds.width(),
-      requested_bounds.height()));
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, public:
 
 WindowTreeHostImpl::WindowTreeHostImpl(
     NativeViewportPtr viewport,
     const gfx::Rect& bounds,
     const base::Callback<void()>& compositor_created_callback)
     : native_viewport_(viewport.Pass()),
       compositor_created_callback_(compositor_created_callback),
       bounds_(bounds) {
   native_viewport_.set_client(this);
   native_viewport_->Create(Rect::From(bounds));
 
   MessagePipe pipe;
   native_viewport_->CreateGLES2Context(
       MakeRequest<CommandBuffer>(pipe.handle0.Pass()));
 
   // The ContextFactory must exist before any Compositors are created.
   if (context_factory_) {
     delete context_factory_;
     context_factory_ = NULL;
   }
   context_factory_ = new ContextFactoryImpl(pipe.handle1.Pass());
   aura::Env::GetInstance()->set_context_factory(context_factory_);
-
-  window()->SetLayoutManager(new RootLayoutManager());
 }
 
 WindowTreeHostImpl::~WindowTreeHostImpl() {
   DestroyCompositor();
   DestroyDispatcher();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostImpl, aura::WindowTreeHost implementation:
 
@@ skipping 114 matching lines @@
       break;
     }
     // TODO(beng): touch, etc.
   }
   callback.Run();
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo