Renames html_viewer frame classes

components/html_viewer/html_document_oopif.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 "components/html_viewer/html_document_oopif.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/html_viewer/blink_url_request_type_converters.h"
 #include "components/html_viewer/devtools_agent_impl.h"
 #include "components/html_viewer/document_resource_waiter.h"
-#include "components/html_viewer/frame.h"
-#include "components/html_viewer/frame_tree_manager.h"
 #include "components/html_viewer/global_state.h"
+#include "components/html_viewer/html_frame.h"
+#include "components/html_viewer/html_frame_tree_manager.h"
 #include "components/html_viewer/test_html_viewer_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "components/view_manager/ids.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ skipping 102 matching lines @@
   mandoline::FrameTreeServerPtr frame_tree_server;
   mojo::Array<mandoline::FrameDataPtr> frame_data;
   mojo::URLResponsePtr response;
   resource_waiter_->Release(&frame_tree_client_request, &frame_tree_server,
                             &frame_data, &response);
   resource_waiter_.reset();
 
   view->RemoveObserver(this);
 
   frame_tree_manager_.reset(
-      new FrameTreeManager(global_state_, html_document_app_, connection_,
-                           view->id(), frame_tree_server.Pass()));
+      new HTMLFrameTreeManager(global_state_, html_document_app_, connection_,
+                               view->id(), frame_tree_server.Pass()));
   frame_tree_manager_->set_delegate(this);
   frame_tree_manager_binding_.reset(
       new mojo::Binding<mandoline::FrameTreeClient>(
           frame_tree_manager_.get(), frame_tree_client_request.Pass()));
   frame_tree_manager_->Init(view, frame_data.Pass());
 
   // TODO(yzshen): http://crbug.com/498986 Creating DevToolsAgentImpl instances
   // causes html_viewer_apptests flakiness currently. Before we fix that we
   // cannot enable remote debugging (which is required by Telemetry tests) on
   // the bots.
   if (EnableRemoteDebugging()) {
-    Frame* frame = frame_tree_manager_->GetLocalFrame();
+    HTMLFrame* frame = frame_tree_manager_->GetLocalFrame();
     if (!frame->parent()) {
       devtools_agent_.reset(new DevToolsAgentImpl(
           frame->web_frame()->toWebLocalFrame(), html_document_app_->shell()));
     }
   }
 
   WebURLRequestExtraData* extra_data = new WebURLRequestExtraData;
   extra_data->synthetic_response = response.Pass();
 
   const GURL url(extra_data->synthetic_response->url);
@@ skipping 35 matching lines @@
 
 void HTMLDocumentOOPIF::OnViewDestroyed(View* view) {
   resource_waiter_->root()->RemoveObserver(this);
   resource_waiter_->set_root(nullptr);
 }
 
 bool HTMLDocumentOOPIF::ShouldNavigateLocallyInMainFrame() {
   return devtools_agent_ && devtools_agent_->handling_page_navigate_request();
 }
 
-void HTMLDocumentOOPIF::OnFrameDidFinishLoad(Frame* frame) {
+void HTMLDocumentOOPIF::OnFrameDidFinishLoad(HTMLFrame* frame) {
   // TODO(msw): Notify AxProvider clients of updates on child frame loads.
   if (frame_tree_manager_ &&
       frame != frame_tree_manager_->GetLocalFrame()) {
     return;
   }
 
   did_finish_local_frame_load_ = true;
   scoped_ptr<BeforeLoadCache> before_load_cache = before_load_cache_.Pass();
   if (!before_load_cache)
     return;
@@ skipping 40 matching lines @@
     mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mandoline::FrameTreeClient> request) {
   if (frame_tree_manager_.get() || frame_tree_manager_binding_.get()) {
     DVLOG(1) << "Request for FrameTreeClient after one already vended.";
     return;
   }
   resource_waiter_->Bind(request.Pass());
 }
 
 }  // namespace html_viewer