Rename frame classes

components/html_viewer/html_document.h

 // 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h"
 #include "components/html_viewer/ax_provider_impl.h"
 #include "components/html_viewer/html_frame_delegate.h"
 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"
 #include "components/mus/public/cpp/view_tree_delegate.h"
-#include "components/web_view/public/interfaces/frame_tree.mojom.h"
+#include "components/web_view/public/interfaces/frame.mojom.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
@@ skipping 15 matching lines @@
 
 // A view for a single HTML document.
 //
 // HTMLDocument is deleted in one of two ways:
 // . When the View the HTMLDocument is embedded in is destroyed.
 // . Explicitly by way of Destroy().
 class HTMLDocument
     : public mus::ViewTreeDelegate,
       public HTMLFrameDelegate,
       public mojo::InterfaceFactory<mojo::AxProvider>,
-      public mojo::InterfaceFactory<web_view::FrameTreeClient>,
+      public mojo::InterfaceFactory<web_view::mojom::FrameClient>,
       public mojo::InterfaceFactory<TestHTMLViewer>,
       public mojo::InterfaceFactory<devtools_service::DevToolsAgent>,
       public mojo::InterfaceFactory<mojo::ViewTreeClient> {
  public:
   using DeleteCallback = base::Callback<void(HTMLDocument*)>;
 
   // Load a new HTMLDocument with |response|.
   // |html_document_app| is the application this app was created in, and
   // |connection| the specific connection triggering this new instance.
   // |setup| is used to obtain init type state (such as resources).
@@ skipping 49 matching lines @@
   HTMLFactory* GetHTMLFactory() override;
   void OnFrameDidFinishLoad() override;
   void OnFrameSwappedToRemote() override;
   void OnSwap(HTMLFrame* frame, HTMLFrameDelegate* old_delegate) override;
   void OnFrameDestroyed() override;
 
   // mojo::InterfaceFactory<mojo::AxProvider>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::AxProvider> request) override;
 
-  // mojo::InterfaceFactory<web_view::FrameTreeClient>:
+  // mojo::InterfaceFactory<web_view::mojom::FrameClient>:
   void Create(
       mojo::ApplicationConnection* connection,
-      mojo::InterfaceRequest<web_view::FrameTreeClient> request) override;
+      mojo::InterfaceRequest<web_view::mojom::FrameClient> request) override;
 
   // mojo::InterfaceFactory<TestHTMLViewer>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<TestHTMLViewer> request) override;
 
   // mojo::InterfaceFactory<devtools_service::DevToolsAgent>:
   void Create(
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) override;
 
@@ skipping 31 matching lines @@
   // initialized.
   mojo::InterfaceRequest<devtools_service::DevToolsAgent>
       devtools_agent_request_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_