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

Unified Diff: components/html_viewer/html_frame.cc

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/html_frame.h ('k') | components/html_viewer/html_frame_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_frame.cc
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index 1d2405965a63ed533649ae7858c0e9c8869e94fd..9d7fe387f224da4d9e68b69c67dbc2dfff6e42a8 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -71,7 +71,7 @@
using mojo::Rect;
using mojo::ServiceProviderPtr;
using mojo::URLResponsePtr;
-using mus::View;
+using mojo::View;
using web_view::HTMLMessageEvent;
using web_view::HTMLMessageEventPtr;
@@ -275,7 +275,7 @@
if (view_) {
view_->RemoveObserver(this);
- mus::ScopedViewPtr::DeleteViewOrViewManager(view_);
+ mojo::ScopedViewPtr::DeleteViewOrViewManager(view_);
}
}
@@ -300,7 +300,7 @@
DCHECK(view_); // If we're local we have to have a view.
// Create the view that will house the frame now. We embed once we know the
// url (see decidePolicyForNavigation()).
- mus::View* child_view = view_->connection()->CreateView();
+ mojo::View* child_view = view_->connection()->CreateView();
ReplicatedFrameState child_state;
child_state.name = frame_name;
child_state.tree_scope = scope;
@@ -320,7 +320,7 @@
params.allow_local_shared_frame = true;
HTMLFrame* child_frame =
GetLocalRoot()->delegate_->GetHTMLFactory()->CreateHTMLFrame(&params);
- child_frame->owned_view_.reset(new mus::ScopedViewPtr(child_view));
+ child_frame->owned_view_.reset(new mojo::ScopedViewPtr(child_view));
return child_frame->web_frame_;
}
@@ -494,7 +494,7 @@
return frame_tree_manager_->local_root_->server_.get();
}
-void HTMLFrame::SetView(mus::View* view) {
+void HTMLFrame::SetView(mojo::View* view) {
if (view_)
view_->RemoveObserver(this);
view_ = view;
@@ -561,7 +561,7 @@
void HTMLFrame::SwapToLocal(
HTMLFrameDelegate* delegate,
- mus::View* view,
+ mojo::View* view,
const mojo::Map<mojo::String, mojo::Array<uint8_t>>& properties) {
CHECK(!IsLocal());
// It doesn't make sense for the root to swap to local.
@@ -660,8 +660,8 @@
web_widget->handleInputEvent(*web_event);
}
-void HTMLFrame::OnViewFocusChanged(mus::View* gained_focus,
- mus::View* lost_focus) {
+void HTMLFrame::OnViewFocusChanged(mojo::View* gained_focus,
+ mojo::View* lost_focus) {
UpdateFocus();
}
« no previous file with comments | « components/html_viewer/html_frame.h ('k') | components/html_viewer/html_frame_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698