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

Unified Diff: components/web_view/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/web_view/frame.h ('k') | components/web_view/frame_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/frame.cc
diff --git a/components/web_view/frame.cc b/components/web_view/frame.cc
index 109738848fba91335af434dbba38f7ba633245e1..5f306406f8cffe5d66c46151ff594882e07466b2 100644
--- a/components/web_view/frame.cc
+++ b/components/web_view/frame.cc
@@ -18,7 +18,7 @@
#include "components/web_view/frame_utils.h"
#include "mojo/application/public/interfaces/shell.mojom.h"
-using mus::View;
+using mojo::View;
DECLARE_VIEW_PROPERTY_TYPE(web_view::Frame*);
@@ -30,7 +30,7 @@
namespace {
const uint32_t kNoParentId = 0u;
-const mus::ConnectionSpecificId kInvalidConnectionId = 0u;
+const mojo::ConnectionSpecificId kInvalidConnectionId = 0u;
FrameDataPtr FrameToFrameData(const Frame* frame) {
FrameDataPtr frame_data(FrameData::New());
@@ -219,12 +219,12 @@
view_tree_client.Pass());
}
-void Frame::OnEmbedAck(bool success, mus::ConnectionSpecificId connection_id) {
+void Frame::OnEmbedAck(bool success, mojo::ConnectionSpecificId connection_id) {
if (success)
embedded_connection_id_ = connection_id;
}
-void Frame::SetView(mus::View* view) {
+void Frame::SetView(mojo::View* view) {
DCHECK(!view_);
DCHECK_EQ(id_, view->id());
view_ = view;
@@ -407,7 +407,7 @@
}
}
-void Frame::OnViewDestroying(mus::View* view) {
+void Frame::OnViewDestroying(mojo::View* view) {
if (parent_)
parent_->Remove(this);
@@ -424,7 +424,7 @@
delete this;
}
-void Frame::OnViewEmbeddedAppDisconnected(mus::View* view) {
+void Frame::OnViewEmbeddedAppDisconnected(mojo::View* view) {
// See FrameTreeDelegate::OnViewEmbeddedAppDisconnected() for details of when
// this happens.
//
« no previous file with comments | « components/web_view/frame.h ('k') | components/web_view/frame_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698