Rename frame classes

components/html_viewer/html_frame_tree_manager.h

 // 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_TREE_MANAGER_H_
 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_TREE_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "components/web_view/public/interfaces/frame_tree.mojom.h"
+#include "components/web_view/public/interfaces/frame.mojom.h"
 
 namespace blink {
 class WebView;
 }
 
 namespace mus {
 class View;
 }
 
 namespace html_viewer {
 
 class DocumentResourceWaiter;
 class GlobalState;
 class HTMLFrame;
 class HTMLFrameDelegate;
 class HTMLFrameTreeManagerObserver;
 
 // HTMLFrameTreeManager is responsible for managing the frames that comprise a
 // document. Some of the frames may be remote. HTMLFrameTreeManager updates its
-// state in response to changes from the FrameTreeServer, as well as changes
+// state in response to changes from the server Frame, as well as changes
 // from the underlying frames. The frame tree has at least one local frame
 // that is backed by a mus::View.
 class HTMLFrameTreeManager {
  public:
   // Returns a new HTMLFrame or null if a HTMLFrame does not need to be created.
   // If this returns non-null the caller owns the return value and must call
   // Close() when done.
   static HTMLFrame* CreateFrameAndAttachToTree(
       GlobalState* global_state,
       mus::View* view,
@@ skipping 19 matching lines @@
   friend class HTMLFrame;
   class ChangeIdAdvancedNotifier;
   using TreeMap = std::map<uint32_t, HTMLFrameTreeManager*>;
   using ChangeIDSet = std::set<uint32_t>;
 
   explicit HTMLFrameTreeManager(GlobalState* global_state);
   ~HTMLFrameTreeManager();
 
   void Init(HTMLFrameDelegate* delegate,
             mus::View* local_view,
-            const mojo::Array<web_view::FrameDataPtr>& frame_data,
+            const mojo::Array<web_view::mojom::FrameDataPtr>& frame_data,
             uint32_t change_id);
 
   // Creates a Frame per FrameData element in |frame_data|. Returns the root.
   HTMLFrame* BuildFrameTree(
       HTMLFrameDelegate* delegate,
-      const mojo::Array<web_view::FrameDataPtr>& frame_data,
+      const mojo::Array<web_view::mojom::FrameDataPtr>& frame_data,
       uint32_t local_frame_id,
       mus::View* local_view);
 
   // Returns this HTMLFrameTreeManager from |instances_|.
   void RemoveFromInstances();
 
   // Invoked when a Frame is destroyed.
   void OnFrameDestroyed(HTMLFrame* frame);
 
   // Call before applying a structure change from the server. |source| is the
   // the source of the change, and |change_id| the id from the server. Returns
   // true if the change should be applied, false otherwise.
   bool PrepareForStructureChange(HTMLFrame* source, uint32_t change_id);
 
-  // Each HTMLFrame delegates FrameTreeClient methods to the
-  // HTMLFrameTreeManager the frame is in. HTMLFrameTreeManager only responds
-  // to changes from the |local_root_| (this is because each FrameTreeClient
-  // sees the same change, and a change only need be processed once).
+  // Each HTMLFrame delegates FrameClient methods to the HTMLFrameTreeManager
+  // the frame is in. HTMLFrameTreeManager only responds to changes from the
+  // |local_root_| (this is because each FrameClient sees the same change, and
+  // a change only need be processed once).
   void ProcessOnFrameAdded(HTMLFrame* source,
                            uint32_t change_id,
-                           web_view::FrameDataPtr frame_data);
+                           web_view::mojom::FrameDataPtr frame_data);
   void ProcessOnFrameRemoved(HTMLFrame* source,
                              uint32_t change_id,
                              uint32_t frame_id);
   void ProcessOnFrameClientPropertyChanged(HTMLFrame* source,
                                            uint32_t frame_id,
                                            const mojo::String& name,
                                            mojo::Array<uint8_t> new_data);
 
   static TreeMap* instances_;
 
@@ skipping 19 matching lines @@
   base::ObserverList<HTMLFrameTreeManagerObserver> observers_;
 
   base::WeakPtrFactory<HTMLFrameTreeManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLFrameTreeManager);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_HTML_FRAME_TREE_MANAGER_H_