| Index: components/html_viewer/html_frame_tree_manager.h
|
| diff --git a/components/html_viewer/html_frame_tree_manager.h b/components/html_viewer/html_frame_tree_manager.h
|
| index bbd2d6642244f0bd17862625a303f00f9231881b..61ea86ffa25662cda46c21f8c3d3e5df0501f215 100644
|
| --- a/components/html_viewer/html_frame_tree_manager.h
|
| +++ b/components/html_viewer/html_frame_tree_manager.h
|
| @@ -18,7 +18,7 @@
|
| class WebView;
|
| }
|
|
|
| -namespace mus {
|
| +namespace mojo {
|
| class View;
|
| }
|
|
|
| @@ -34,7 +34,7 @@
|
| // document. Some of the frames may be remote. HTMLFrameTreeManager updates its
|
| // state in response to changes from the FrameTreeServer, as well as changes
|
| // from the underlying frames. The frame tree has at least one local frame
|
| -// that is backed by a mus::View.
|
| +// that is backed by a mojo::View.
|
| class HTMLFrameTreeManager {
|
| public:
|
| // Returns a new HTMLFrame or null if a HTMLFrame does not need to be created.
|
| @@ -42,7 +42,7 @@
|
| // Close() when done.
|
| static HTMLFrame* CreateFrameAndAttachToTree(
|
| GlobalState* global_state,
|
| - mus::View* view,
|
| + mojo::View* view,
|
| scoped_ptr<DocumentResourceWaiter> resource_waiter,
|
| HTMLFrameDelegate* delegate);
|
|
|
| @@ -71,7 +71,7 @@
|
| ~HTMLFrameTreeManager();
|
|
|
| void Init(HTMLFrameDelegate* delegate,
|
| - mus::View* local_view,
|
| + mojo::View* local_view,
|
| const mojo::Array<web_view::FrameDataPtr>& frame_data,
|
| uint32_t change_id);
|
|
|
| @@ -80,7 +80,7 @@
|
| HTMLFrameDelegate* delegate,
|
| const mojo::Array<web_view::FrameDataPtr>& frame_data,
|
| uint32_t local_frame_id,
|
| - mus::View* local_view);
|
| + mojo::View* local_view);
|
|
|
| // Returns this HTMLFrameTreeManager from |instances_|.
|
| void RemoveFromInstances();
|
|
|