Revert of Connect X11 ConfigureNotify events to Mojo

mojo/examples/window_manager/window_manager.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "mojo/examples/keyboard/keyboard.mojom.h"
 #include "mojo/examples/window_manager/debug_panel.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
-#include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_event_dispatcher.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/views/views_init.h"
 #include "ui/events/event.h"
@@ skipping 123 matching lines @@
 
   KeyboardServicePtr keyboard_service_;
   ViewManager* view_manager_;
 
   // Node the keyboard is attached to.
   Node* node_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
 };
 
-class RootLayoutManager : public NodeObserver {
- public:
-  explicit RootLayoutManager(ViewManager* view_manager,
-                             Node* root,
-                             Id content_node_id)
-                            : root_(root),
-                              view_manager_(view_manager),
-                              content_node_id_(content_node_id) {}
-  virtual ~RootLayoutManager() {}
-
- private:
-  // Overridden from NodeObserver:
-  virtual void OnNodeBoundsChanged(Node* node,
-                                   const gfx::Rect& /*old_bounds*/,
-                                   const gfx::Rect& new_bounds) OVERRIDE {
-    DCHECK_EQ(node, root_);
-    Node* content_node = view_manager_->GetNodeById(content_node_id_);
-    content_node->SetBounds(new_bounds);
-    // Force the view's bitmap to be recreated
-    content_node->active_view()->SetColor(SK_ColorBLUE);
-    // TODO(hansmuller): Do Layout
-  }
-
-  Node* root_;
-  ViewManager* view_manager_;
-  Id content_node_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(RootLayoutManager);
-};
-
 class WindowManager : public ApplicationDelegate,
                       public DebugPanel::Delegate,
                       public ViewObserver,
                       public ViewManagerDelegate,
                       public ViewEventDispatcher {
  public:
   WindowManager()
       : launcher_ui_(NULL),
         view_manager_(NULL),
         app_(NULL) {
@@ skipping 74 matching lines @@
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
     DCHECK(!view_manager_);
     view_manager_ = view_manager;
     view_manager_->SetEventDispatcher(this);
 
     Node* node = Node::Create(view_manager);
-    root->AddChild(node);
-    node->SetBounds(gfx::Rect(root->bounds().size()));
+    view_manager->GetRoots().front()->AddChild(node);
+    node->SetBounds(gfx::Rect(800, 600));
     content_node_id_ = node->id();
 
-    root_layout_manager_.reset(
-        new RootLayoutManager(view_manager, root, content_node_id_));
-    root->AddObserver(root_layout_manager_.get());
-
     View* view = View::Create(view_manager);
     node->SetActiveView(view);
     view->SetColor(SK_ColorBLUE);
     view->AddObserver(this);
 
     CreateLauncherUI();
     CreateControlPanel(node);
   }
 
   // Overridden from ViewEventDispatcher:
@@ skipping 121 matching lines @@
 
     debug_panel_ = new DebugPanel(this, node);
   }
 
   scoped_ptr<ViewsInit> views_init_;
   DebugPanel* debug_panel_;
   launcher::LauncherPtr launcher_;
   Node* launcher_ui_;
   std::vector<Node*> windows_;
   ViewManager* view_manager_;
-  scoped_ptr<RootLayoutManager> root_layout_manager_;
 
   // Id of the node most content is added to. The keyboard is NOT added here.
   Id content_node_id_;
 
   scoped_ptr<KeyboardManager> keyboard_manager_;
   ApplicationImpl* app_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
@@ skipping 22 matching lines @@
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::WindowManager;
 }
 
 }  // namespace mojo