Revert of Mandoline UI Process: Update namespaces and file names

mandoline/ui/omnibox/omnibox_application.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 "mandoline/ui/omnibox/omnibox_application.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/public/cpp/view_tree_connection.h"
 #include "components/mus/public/cpp/view_tree_delegate.h"
 #include "components/url_formatter/url_fixer.h"
 #include "mandoline/ui/aura/aura_init.h"
 #include "mandoline/ui/aura/native_widget_view_manager.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mandoline {
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl
 
-class OmniboxImpl : public mus::ViewTreeDelegate,
+class OmniboxImpl : public mojo::ViewTreeDelegate,
                     public views::LayoutManager,
                     public views::TextfieldController,
                     public Omnibox {
  public:
   OmniboxImpl(mojo::ApplicationImpl* app,
               mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<Omnibox> request);
   ~OmniboxImpl() override;
 
  private:
-  // Overridden from mus::ViewTreeDelegate:
-  void OnEmbed(mus::View* root) override;
-  void OnConnectionLost(mus::ViewTreeConnection* connection) override;
+  // Overridden from mojo::ViewTreeDelegate:
+  void OnEmbed(mojo::View* root) override;
+  void OnConnectionLost(mojo::ViewTreeConnection* connection) override;
 
   // Overridden from views::LayoutManager:
   gfx::Size GetPreferredSize(const views::View* view) const override;
   void Layout(views::View* host) override;
 
   // Overridden from views::TextfieldController:
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
 
   // Overridden from Omnibox:
   void GetViewTreeClient(
       mojo::InterfaceRequest<mojo::ViewTreeClient> request) override;
   void ShowForURL(const mojo::String& url) override;
 
   void HideWindow();
   void ShowWindow();
 
   scoped_ptr<AuraInit> aura_init_;
   mojo::ApplicationImpl* app_;
-  mus::View* root_;
+  mojo::View* root_;
   mojo::String url_;
   views::Textfield* edit_;
   mojo::Binding<Omnibox> binding_;
   ViewEmbedderPtr view_embedder_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxImpl);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxApplication, public:
@@ skipping 30 matching lines @@
                          mojo::InterfaceRequest<Omnibox> request)
     : app_(app),
       root_(nullptr),
       edit_(nullptr),
       binding_(this, request.Pass()) {
   connection->ConnectToService(&view_embedder_);
 }
 OmniboxImpl::~OmniboxImpl() {}
 
 ////////////////////////////////////////////////////////////////////////////////
-// OmniboxImpl, mus::ViewTreeDelegate implementation:
+// OmniboxImpl, mojo::ViewTreeDelegate implementation:
 
-void OmniboxImpl::OnEmbed(mus::View* root) {
+void OmniboxImpl::OnEmbed(mojo::View* root) {
   root_ = root;
 
   if (!aura_init_.get()) {
     aura_init_.reset(new AuraInit(root, app_->shell()));
     edit_ = new views::Textfield;
     edit_->set_controller(this);
     edit_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
   }
 
   const int kOpacity = 0xC0;
@@ skipping 15 matching lines @@
   params.bounds = root->bounds().To<gfx::Rect>();
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   widget->Init(params);
   widget->Show();
   widget->GetCompositor()->SetBackgroundColor(
       SkColorSetA(SK_ColorBLACK, kOpacity));
 
   ShowWindow();
 }
 
-void OmniboxImpl::OnConnectionLost(mus::ViewTreeConnection* connection) {
+void OmniboxImpl::OnConnectionLost(mojo::ViewTreeConnection* connection) {
   root_ = nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl, views::LayoutManager implementation:
 
 gfx::Size OmniboxImpl::GetPreferredSize(const views::View* view) const {
   return gfx::Size();
 }
 
@@ skipping 21 matching lines @@
     return true;
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxImpl, Omnibox implementation:
 
 void OmniboxImpl::GetViewTreeClient(
     mojo::InterfaceRequest<mojo::ViewTreeClient> request) {
-  mus::ViewTreeConnection::Create(this, request.Pass());
+  mojo::ViewTreeConnection::Create(this, request.Pass());
 }
 
 void OmniboxImpl::ShowForURL(const mojo::String& url) {
   url_ = url;
   if (root_) {
     ShowWindow();
   } else {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:omnibox");
     view_embedder_->Embed(request.Pass());
@@ skipping 12 matching lines @@
   edit_->SelectAll(false);
   edit_->RequestFocus();
 }
 
 void OmniboxImpl::HideWindow() {
   DCHECK(root_);
   root_->SetVisible(false);
 }
 
 }  // namespace mandoline