Revert of Mandoline UI Process: Update namespaces and file names

components/web_view/frame.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/web_view/frame.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "components/mus/public/cpp/view.h"
 #include "components/mus/public/cpp/view_property.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/frame_user_data.h"
 #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*);
 
 namespace web_view {
 
 // Used to find the Frame associated with a View.
 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());
   frame_data->frame_id = frame->id();
   frame_data->parent_id = frame->parent() ? frame->parent()->id() : kNoParentId;
   frame_data->client_properties =
       mojo::Map<mojo::String, mojo::Array<uint8_t>>::From(
           frame->client_properties());
   return frame_data.Pass();
 }
@@ skipping 168 matching lines @@
   frame_tree_client_ = frame_tree_client;
   frame_tree_server_binding_.reset();
   loading_ = false;
   progress_ = 0.f;
   app_id_ = app_id;
 
   InitClient(client_type, frame_tree_server_binding.Pass(),
              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;
   view_->SetLocalProperty(kFrame, this);
   view_->AddObserver(this);
   if (pending_navigate_.get())
     StartNavigate(pending_navigate_.Pass());
 }
 
 Frame* Frame::GetAncestorWithFrameTreeClient() {
@@ skipping 162 matching lines @@
 }
 
 void Frame::OnTreeChanged(const TreeChangeParams& params) {
   if (params.new_parent && this == tree_->root()) {
     Frame* child_frame = FindFrame(params.target->id());
     if (child_frame && !child_frame->view_)
       child_frame->SetView(params.target);
   }
 }
 
-void Frame::OnViewDestroying(mus::View* view) {
+void Frame::OnViewDestroying(mojo::View* view) {
   if (parent_)
     parent_->Remove(this);
 
   // Reset |view_ownership_| so we don't attempt to delete |view_| in the
   // destructor.
   view_ownership_ = ViewOwnership::DOESNT_OWN_VIEW;
 
   if (tree_->root() == this) {
     view_->RemoveObserver(this);
     view_ = nullptr;
     return;
   }
 
   delete this;
 }
 
-void Frame::OnViewEmbeddedAppDisconnected(mus::View* view) {
+void Frame::OnViewEmbeddedAppDisconnected(mojo::View* view) {
   // See FrameTreeDelegate::OnViewEmbeddedAppDisconnected() for details of when
   // this happens.
   //
   // Currently we have no way to distinguish between the cases that lead to this
   // being called, so we assume we can continue on. Continuing on is important
   // for html as it's entirely possible for a page to create a frame, navigate
   // to a bogus url and expect the frame to still exist.
   //
   // TODO(sky): notify the delegate on this? At a minimum the delegate cares
   // if the root is unembedded as this would correspond to a sab tab.
@@ skipping 99 matching lines @@
     // Else case if |target_frame| == root. Treat at top level request.
   }
   tree_->delegate_->NavigateTopLevel(this, request.Pass());
 }
 
 void Frame::DidNavigateLocally(uint32_t frame_id, const mojo::String& url) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace web_view