diff options
Diffstat (limited to 'components/web_view/frame.cc')
| -rw-r--r-- | components/web_view/frame.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/web_view/frame.cc b/components/web_view/frame.cc index 1097388..5f30640 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 @@ DEFINE_LOCAL_VIEW_PROPERTY_KEY(Frame*, kFrame, nullptr); 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 @@ void Frame::ChangeClient(FrameTreeClient* frame_tree_client, 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::OnTreeChanged(const TreeChangeParams& params) { } } -void Frame::OnViewDestroying(mus::View* view) { +void Frame::OnViewDestroying(mojo::View* view) { if (parent_) parent_->Remove(this); @@ -424,7 +424,7 @@ void Frame::OnViewDestroying(mus::View* view) { delete this; } -void Frame::OnViewEmbeddedAppDisconnected(mus::View* view) { +void Frame::OnViewEmbeddedAppDisconnected(mojo::View* view) { // See FrameTreeDelegate::OnViewEmbeddedAppDisconnected() for details of when // this happens. // |