Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

mandoline/tab/web_view_impl.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/web_view_impl.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/view_manager/public/cpp/view.h"
@@ skipping 40 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, WebView implementation:
 
 void WebViewImpl::LoadRequest(mojo::URLRequestPtr request) {
   if (!content_) {
     // We haven't been embedded yet, store the request for when we are.
     pending_request_ = request.Pass();
     return;
   }
   scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
-  mojo::ViewManagerClientPtr view_manager_client;
-  frame_connection->Init(app_, request.Pass(), &view_manager_client);
+  mojo::ViewTreeClientPtr view_tree_client;
+  frame_connection->Init(app_, request.Pass(), &view_tree_client);
 
   Frame::ClientPropertyMap client_properties;
   if (devtools_agent_) {
     devtools_service::DevToolsAgentPtr forward_agent;
     frame_connection->application_connection()->ConnectToService(
         &forward_agent);
     devtools_agent_->AttachFrame(forward_agent.Pass(), &client_properties);
   }
 
   FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
   frame_tree_.reset(new FrameTree(content_, this, frame_tree_client,
                                   frame_connection.Pass(), client_properties));
-  content_->Embed(view_manager_client.Pass());
+  content_->Embed(view_tree_client.Pass());
 }
 
-void WebViewImpl::GetViewManagerClient(
-    mojo::InterfaceRequest<mojo::ViewManagerClient> view_manager_client) {
-  mojo::ViewManager::Create(nullptr, view_manager_client.Pass());
+void WebViewImpl::GetViewTreeClient(
+    mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) {
+  mojo::ViewManager::Create(nullptr, view_tree_client.Pass());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, mojo::ViewManagerDelegate implementation:
 
 void WebViewImpl::OnEmbed(mojo::View* root) {
   root->view_manager()->SetEmbedRoot();
   root->AddObserver(this);
   content_ = root->view_manager()->CreateView();
   content_->SetBounds(*mojo::Rect::From(gfx::Rect(0, 0, root->bounds().width,
@@ skipping 48 matching lines @@
 
 void WebViewImpl::NavigateTopLevel(Frame* source, mojo::URLRequestPtr request) {
   client_->TopLevelNavigate(request.Pass());
 }
 
 bool WebViewImpl::CanNavigateFrame(
     Frame* target,
     mojo::URLRequestPtr request,
     FrameTreeClient** frame_tree_client,
     scoped_ptr<FrameUserData>* frame_user_data,
-    mojo::ViewManagerClientPtr* view_manager_client) {
+    mojo::ViewTreeClientPtr* view_tree_client) {
   scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
-  frame_connection->Init(app_, request.Pass(), view_manager_client);
+  frame_connection->Init(app_, request.Pass(), view_tree_client);
   *frame_tree_client = frame_connection->frame_tree_client();
   *frame_user_data = frame_connection.Pass();
   return true;
 }
 
 void WebViewImpl::DidStartNavigation(Frame* frame) {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, FrameDevToolsAgentDelegate implementation:
 
 void WebViewImpl::HandlePageNavigateRequest(const GURL& url) {
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = url.spec();
   client_->TopLevelNavigate(request.Pass());
 }
 
 }  // namespace web_view