Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

mandoline/tab/frame.cc

 // Copyright 2015 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 "mandoline/tab/frame.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 137 matching lines @@
   frame_tree_server_binding_.Bind(GetProxy(&frame_tree_server_ptr).Pass());
   if (frame_tree_client_) {
     frame_tree_client_->OnConnect(frame_tree_server_ptr.Pass(),
                                   tree_->change_id(), array.Pass());
     tree_->delegate_->DidStartNavigation(this);
   }
 }
 
 void Frame::OnWillNavigateAck(FrameTreeClient* frame_tree_client,
                               scoped_ptr<FrameUserData> user_data,
-                              mojo::ViewManagerClientPtr view_manager_client) {
+                              mojo::ViewTreeClientPtr view_tree_client) {
   while (!children_.empty())
     delete children_[0];
 
   user_data_ = user_data.Pass();
   frame_tree_client_ = frame_tree_client;
   frame_tree_server_binding_.Close();
   loading_ = false;
   progress_ = 0.f;
 
-  view_->Embed(view_manager_client.Pass());
+  view_->Embed(view_tree_client.Pass());
   InitClient();
 }
 
 void Frame::SetView(mojo::View* view) {
   DCHECK(!view_);
   DCHECK_EQ(id_, view->id());
   view_ = view;
   view_->SetLocalProperty(kFrame, this);
   view_->AddObserver(this);
   if (pending_navigate_.get())
@@ skipping 38 matching lines @@
   // We need a View to navigate. When we get the View we'll complete the
   // navigation.
   // TODO(sky): consider state and what is not legal while waiting.
   if (!view_) {
     pending_navigate_ = request.Pass();
     return;
   }
 
   FrameTreeClient* frame_tree_client = nullptr;
   scoped_ptr<FrameUserData> user_data;
-  mojo::ViewManagerClientPtr view_manager_client;
+  mojo::ViewTreeClientPtr view_tree_client;
   if (!tree_->delegate_->CanNavigateFrame(this, request.Pass(),
                                           &frame_tree_client, &user_data,
-                                          &view_manager_client)) {
+                                          &view_tree_client)) {
     return;
   }
 
   // TODO(sky): consider what state this should correspond to. Should we
   // disallow certain operations until we get the ack?
   Frame* ancestor_with_frame_tree_client = GetAncestorWithFrameTreeClient();
   DCHECK(ancestor_with_frame_tree_client);
   ancestor_with_frame_tree_client->frame_tree_client_->OnWillNavigate(
       id_, base::Bind(&Frame::OnWillNavigateAck, weak_factory_.GetWeakPtr(),
                       frame_tree_client, base::Passed(&user_data),
-                      base::Passed(&view_manager_client)));
+                      base::Passed(&view_tree_client)));
 }
 
 void Frame::LoadingStartedImpl() {
   DCHECK(!loading_);
   loading_ = true;
   progress_ = 0.f;
   tree_->LoadingStateChanged();
 }
 
 void Frame::LoadingStoppedImpl() {
@@ skipping 187 matching lines @@
     // Else case if |target_frame| == root. Treat at top level request.
   }
   tree_->delegate_->NavigateTopLevel(this, request.Pass());
 }
 
 void Frame::DidNavigateLocally(uint32_t frame_id, const mojo::String& url) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace mandoline