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

mojo/services/window_manager/window_manager_api_unittest.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/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
+#include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
@@ skipping 92 matching lines @@
   TwoNodeCallback focus_changed_callback_;
   TwoNodeCallback active_window_changed_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowManagerClient);
 };
 
 class TestApplicationLoader : public ApplicationLoader,
                               public ApplicationDelegate,
                               public ViewManagerDelegate {
  public:
-  typedef base::Callback<void(Node*)> RootAddedCallback;
+  typedef base::Callback<void(View*)> RootAddedCallback;
 
   explicit TestApplicationLoader(const RootAddedCallback& root_added_callback)
       : root_added_callback_(root_added_callback),
         view_manager_client_factory_(this) {}
   virtual ~TestApplicationLoader() {}
 
  private:
   // Overridden from ApplicationLoader:
   virtual void Load(ApplicationManager* application_manager,
                     const GURL& url,
@@ skipping 11 matching lines @@
   // Overridden from ApplicationDelegate:
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) MOJO_OVERRIDE {
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(
       ViewManager* view_manager,
-      Node* root,
+      View* root,
       ServiceProviderImpl* exported_services,
       scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE {
     root_added_callback_.Run(root);
   }
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) MOJO_OVERRIDE {
   }
 
   RootAddedCallback root_added_callback_;
 
@@ skipping 66 matching lines @@
 
   void ConnectToWindowManager() {
     test_helper_.application_manager()->ConnectToService(
         GURL("mojo:mojo_core_window_manager"), &window_manager_);
     base::RunLoop connect_loop;
     window_manager_client_.reset(new TestWindowManagerClient(&connect_loop));
     window_manager_.set_client(window_manager_client());
     connect_loop.Run();
   }
 
-  void OnRootAdded(Node* root) {
+  void OnRootAdded(View* root) {
     if (!root_added_callback_.is_null())
       root_added_callback_.Run(root);
   }
 
   void OnEmbed(Id* root_id,
                base::RunLoop* loop,
-               Node* root) {
+               View* root) {
     *root_id = root->id();
     loop->Quit();
   }
 
   void OnFocusChanged(TwoIds* old_and_new,
                       base::RunLoop* run_loop,
                       Id old_focused_node_id,
                       Id new_focused_node_id) {
     DCHECK(old_and_new);
     old_and_new->first = old_focused_node_id;
@@ skipping 37 matching lines @@
 
   Id second_window = OpenWindow(window_manager_.get());
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo