Rename frame classes

components/web_view/frame_tree.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 "components/web_view/frame_tree.h"
 
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/frame_user_data.h"
 
 namespace web_view {
 
 FrameTree::FrameTree(uint32_t root_app_id,
                      mus::View* view,
                      mojo::ViewTreeClientPtr view_tree_client,
                      FrameTreeDelegate* delegate,
-                     FrameTreeClient* root_client,
+                     mojom::FrameClient* root_client,
                      scoped_ptr<FrameUserData> user_data,
                      const Frame::ClientPropertyMap& client_properties)
     : view_(view),
       delegate_(delegate),
       root_(new Frame(this,
                       view,
                       view->id(),
                       root_app_id,
                       ViewOwnership::DOESNT_OWN_VIEW,
                       root_client,
                       user_data.Pass(),
                       client_properties)),
       progress_(0.f),
       change_id_(1u) {
   root_->Init(nullptr, view_tree_client.Pass(), nullptr);
 }
 
 FrameTree::~FrameTree() {
   // Destroy the root explicitly in case it calls back to us for state (such
   // as to see if it is the root).
   delete root_;
   root_ = nullptr;
 }
 
 Frame* FrameTree::CreateChildFrame(
     Frame* parent,
-    mojo::InterfaceRequest<FrameTreeServer> server_request,
-    FrameTreeClientPtr client,
+    mojo::InterfaceRequest<mojom::Frame> frame_request,
+    mojom::FrameClientPtr client,
     uint32_t frame_id,
     uint32_t app_id,
     const Frame::ClientPropertyMap& client_properties) {
-  FrameTreeClient* raw_client = client.get();
+  mojom::FrameClient* raw_client = client.get();
   scoped_ptr<FrameUserData> user_data =
       delegate_->CreateUserDataForNewFrame(client.Pass());
   mus::View* frame_view = root_->view()->GetChildById(frame_id);
   // |frame_view| may be null if the View hasn't been created yet. If this is
   // the case the View will be connected to the Frame in Frame::OnTreeChanged.
   Frame* frame =
       new Frame(this, frame_view, frame_id, app_id, ViewOwnership::OWNS_VIEW,
                 raw_client, user_data.Pass(), client_properties);
-  frame->Init(parent, nullptr, server_request.Pass());
+  frame->Init(parent, nullptr, frame_request.Pass());
   return frame;
 }
 
 uint32_t FrameTree::AdvanceChangeID() {
   return ++change_id_;
 }
 
 void FrameTree::LoadingStateChanged() {
   const bool loading = root_->IsLoading();
   if (loading) {
@@ skipping 14 matching lines @@
   delegate_->DidCommitProvisionalLoad(source);
 }
 
 void FrameTree::ClientPropertyChanged(const Frame* source,
                                       const mojo::String& name,
                                       const mojo::Array<uint8_t>& value) {
   root_->NotifyClientPropertyChanged(source, name, value);
 }
 
 }  // namespace web_view