Rename Node to View in the View Manager mojom & client lib. Service TBD.

mojo/views/native_widget_view_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 "mojo/views/native_widget_view_manager.h"
 
 #include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 68 matching lines @@
 
   aura::Window* root_;
   scoped_ptr<ui::InputMethod> input_method_;
 
   DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter);
 };
 
 }  // namespace
 
 NativeWidgetViewManager::NativeWidgetViewManager(
-    views::internal::NativeWidgetDelegate* delegate, Node* node)
+    views::internal::NativeWidgetDelegate* delegate, View* view)
     : NativeWidgetAura(delegate),
-      node_(node) {
-  node_->AddObserver(this);
-  window_tree_host_.reset(new WindowTreeHostMojo(node_, this));
+      view_(view) {
+  view_->AddObserver(this);
+  window_tree_host_.reset(new WindowTreeHostMojo(view_, this));
   window_tree_host_->InitHost();
 
   ime_filter_.reset(
       new MinimalInputEventFilter(window_tree_host_->window()));
 
   focus_client_.reset(new wm::FocusController(new FocusRulesImpl));
 
   aura::client::SetFocusClient(window_tree_host_->window(),
                                focus_client_.get());
   aura::client::SetActivationClient(window_tree_host_->window(),
                                     focus_client_.get());
   window_tree_host_->window()->AddPreTargetHandler(focus_client_.get());
 
   aura::client::SetCaptureClient(
       window_tree_host_->window(),
       new aura::client::DefaultCaptureClient(window_tree_host_->window()));
 }
 
 NativeWidgetViewManager::~NativeWidgetViewManager() {
-  if (node_)
-    node_->RemoveObserver(this);
+  if (view_)
+    view_->RemoveObserver(this);
 }
 
 void NativeWidgetViewManager::InitNativeWidget(
     const views::Widget::InitParams& in_params) {
   views::Widget::InitParams params(in_params);
   params.parent = window_tree_host_->window();
   NativeWidgetAura::InitNativeWidget(params);
   capture_client_.reset(
       new wm::ScopedCaptureClient(window_tree_host_->window()));
 }
 
 void NativeWidgetViewManager::CompositorContentsChanged(
     const SkBitmap& bitmap) {
-  if (node_)
-    node_->SetContents(bitmap);
+  if (view_)
+    view_->SetContents(bitmap);
 }
 
-void NativeWidgetViewManager::OnNodeDestroyed(Node* node) {
-  DCHECK_EQ(node, node_);
-  node->RemoveObserver(this);
-  node_ = NULL;
+void NativeWidgetViewManager::OnViewDestroyed(View* view) {
+  DCHECK_EQ(view, view_);
+  view->RemoveObserver(this);
+  view_ = NULL;
   window_tree_host_.reset();
 }
 
-void NativeWidgetViewManager::OnNodeBoundsChanged(Node* node,
+void NativeWidgetViewManager::OnViewBoundsChanged(View* view,
                                                   const gfx::Rect& old_bounds,
                                                   const gfx::Rect& new_bounds) {
-  GetWidget()->SetBounds(gfx::Rect(node->bounds().size()));
+  GetWidget()->SetBounds(gfx::Rect(view->bounds().size()));
 }
 
-void NativeWidgetViewManager::OnNodeInputEvent(Node* node,
+void NativeWidgetViewManager::OnViewInputEvent(View* view,
                                                const EventPtr& event) {
   scoped_ptr<ui::Event> ui_event(event.To<scoped_ptr<ui::Event> >());
   if (ui_event)
     window_tree_host_->SendEventToProcessor(ui_event.get());
 }
 
 }  // namespace mojo