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

Unified Diff: components/html_viewer/document_resource_waiter.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/ax_provider_apptest.cc ('k') | components/html_viewer/document_resource_waiter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/document_resource_waiter.h
diff --git a/components/html_viewer/document_resource_waiter.h b/components/html_viewer/document_resource_waiter.h
index 380d615679818978624e3d032edbfa31c0e5c15d..f425c0cf681c15c3dcccf16b4da1a48f7e22909a 100644
--- a/components/html_viewer/document_resource_waiter.h
+++ b/components/html_viewer/document_resource_waiter.h
@@ -27,7 +27,7 @@
// assumed HTMLDocument will call back for the FrameTreeClient and FrameData.
class DocumentResourceWaiter : public web_view::FrameTreeClient,
public HTMLFrameTreeManagerObserver,
- public mus::ViewObserver {
+ public mojo::ViewObserver {
public:
DocumentResourceWaiter(GlobalState* global_state,
mojo::URLResponsePtr response,
@@ -51,8 +51,8 @@
// See class description.
bool is_ready() const { return is_ready_; }
- void SetRoot(mus::View* root);
- mus::View* root() { return root_; }
+ void SetRoot(mojo::View* root);
+ mojo::View* root() { return root_; }
void Bind(mojo::InterfaceRequest<web_view::FrameTreeClient> request);
@@ -80,10 +80,10 @@
// ViewObserver:
void OnViewViewportMetricsChanged(
- mus::View* view,
+ mojo::View* view,
const mojo::ViewportMetrics& old_metrics,
const mojo::ViewportMetrics& new_metrics) override;
- void OnViewDestroyed(mus::View* view) override;
+ void OnViewDestroyed(mojo::View* view) override;
// HTMLFrameTreeManagerObserver:
void OnHTMLFrameTreeManagerChangeIdAdvanced() override;
@@ -92,7 +92,7 @@
GlobalState* global_state_;
HTMLDocument* document_;
mojo::URLResponsePtr response_;
- mus::View* root_;
+ mojo::View* root_;
web_view::FrameTreeServerPtr server_;
mojo::Array<web_view::FrameDataPtr> frame_data_;
uint32_t change_id_;
« no previous file with comments | « components/html_viewer/ax_provider_apptest.cc ('k') | components/html_viewer/document_resource_waiter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698