Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Unified Diff: components/html_viewer/html_document.h

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/html_viewer/global_state.h ('k') | components/html_viewer/html_document.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_document.h
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 6b6f96168822c675df8e8cca6e66ecbd29e547cf..6caf05435cb0c638f9ffe1e8952f26e36bf58ad4 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -27,7 +27,7 @@
class SingleThreadTaskRunner;
}
-namespace mus {
+namespace mojo {
class View;
class ViewTreeConnection;
}
@@ -49,7 +49,7 @@
// . When the View the HTMLDocument is embedded in is destroyed.
// . Explicitly by way of Destroy().
class HTMLDocument
- : public mus::ViewTreeDelegate,
+ : public mojo::ViewTreeDelegate,
public HTMLFrameDelegate,
public mojo::InterfaceFactory<mojo::AxProvider>,
public mojo::InterfaceFactory<web_view::FrameTreeClient>,
@@ -96,7 +96,7 @@
void Move(TransferableState* other);
bool owns_view_tree_connection;
- mus::View* root;
+ mojo::View* root;
scoped_ptr<ViewTreeDelegateImpl> view_tree_delegate_impl;
};
@@ -107,8 +107,8 @@
BeforeLoadCache* GetBeforeLoadCache();
// ViewTreeDelegate:
- void OnEmbed(mus::View* root) override;
- void OnConnectionLost(mus::ViewTreeConnection* connection) override;
+ void OnEmbed(mojo::View* root) override;
+ void OnConnectionLost(mojo::ViewTreeConnection* connection) override;
// HTMLFrameDelegate:
mojo::ApplicationImpl* GetApp() override;
@@ -136,7 +136,7 @@
mojo::ApplicationConnection* connection,
mojo::InterfaceRequest<devtools_service::DevToolsAgent> request) override;
- // mojo::InterfaceFactory<mus::ViewTreeClient>:
+ // mojo::InterfaceFactory<mojo::ViewTreeClient>:
void Create(mojo::ApplicationConnection* connection,
mojo::InterfaceRequest<mojo::ViewTreeClient> request) override;
« no previous file with comments | « components/html_viewer/global_state.h ('k') | components/html_viewer/html_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698