Revert of Mandoline UI Process: Update namespaces and file names

mandoline/ui/desktop_ui/browser_window.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/desktop_ui/browser_window.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 62 matching lines @@
       host_client_binding_(this),
       manager_(manager),
       toolbar_view_(nullptr),
       progress_bar_(nullptr),
       root_(nullptr),
       content_(nullptr),
       omnibox_view_(nullptr),
       web_view_(this) {
   mojo::ViewTreeHostClientPtr host_client;
   host_client_binding_.Bind(GetProxy(&host_client));
-  mus::CreateViewTreeHost(host_factory, host_client.Pass(), this, &host_);
+  mojo::CreateViewTreeHost(host_factory, host_client.Pass(), this, &host_);
 }
 
 void BrowserWindow::LoadURL(const GURL& url) {
   // Haven't been embedded yet, can't embed.
   // TODO(beng): remove this.
   if (!root_) {
     default_url_ = url;
     return;
   }
 
   if (!url.is_valid()) {
     ShowOmnibox();
     return;
   }
 
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = url.spec();
   Embed(request.Pass());
 }
 
 void BrowserWindow::Close() {
   if (root_)
-    mus::ScopedViewPtr::DeleteViewOrViewManager(root_);
+    mojo::ScopedViewPtr::DeleteViewOrViewManager(root_);
   else
     delete this;
 }
 
 void BrowserWindow::ShowOmnibox() {
   if (!omnibox_.get()) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:omnibox");
     omnibox_connection_ = app_->ConnectToApplication(request.Pass());
     omnibox_connection_->AddService<ViewEmbedder>(this);
@@ skipping 19 matching lines @@
 BrowserWindow::~BrowserWindow() {
   DCHECK(!root_);
   manager_->BrowserWindowClosed(this);
 }
 
 float BrowserWindow::DIPSToPixels(float value) const {
   return value * root_->viewport_metrics().device_pixel_ratio;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// BrowserWindow, mus::ViewTreeDelegate implementation:
+// BrowserWindow, mojo::ViewTreeDelegate implementation:
 
-void BrowserWindow::OnEmbed(mus::View* root) {
+void BrowserWindow::OnEmbed(mojo::View* root) {
   // BrowserWindow does not support being embedded more than once.
   CHECK(!root_);
 
   // Record when the browser window was displayed, used for performance testing.
   const base::Time display_time = base::Time::Now();
 
   root_ = root;
 
   host_->SetTitle("Mandoline");
 
@@ skipping 34 matching lines @@
     tracing::StartupPerformanceDataCollectorPtr collector;
     app_->ConnectToService(request.Pass(), &collector);
     collector->SetBrowserWindowDisplayTime(display_time.ToInternalValue());
     collector->SetBrowserOpenTabsTimeDelta(open_tabs_delta.ToInternalValue());
     collector->SetBrowserMessageLoopStartTime(
         manager_->startup_time().ToInternalValue());
     recorded_browser_startup_metrics = true;
   }
 }
 
-void BrowserWindow::OnConnectionLost(mus::ViewTreeConnection* connection) {
+void BrowserWindow::OnConnectionLost(mojo::ViewTreeConnection* connection) {
   root_ = nullptr;
   delete this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// BrowserWindow, mus::ViewTreeHostClient implementation:
+// BrowserWindow, mojo::ViewTreeHostClient implementation:
 
 void BrowserWindow::OnAccelerator(uint32_t id, mojo::EventPtr event) {
   switch (static_cast<BrowserCommand>(id)) {
     case BrowserCommand::CLOSE:
       Close();
       break;
     case BrowserCommand::NEW_WINDOW:
       manager_->CreateBrowser(GURL());
       break;
     case BrowserCommand::FOCUS_OMNIBOX:
@@ skipping 101 matching lines @@
 
   // The omnibox view bounds are in physical pixels.
   omnibox_view_->SetBounds(
       mojo::TypeConverter<mojo::Rect, gfx::Rect>::Convert(
           bounds_in_physical_pixels));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, private:
 
-void BrowserWindow::Init(mus::View* root) {
+void BrowserWindow::Init(mojo::View* root) {
   DCHECK_GT(root->viewport_metrics().device_pixel_ratio, 0);
   if (!aura_init_)
     aura_init_.reset(new AuraInit(root, app_->shell()));
 
   root_ = root;
   omnibox_view_ = root_->connection()->CreateView();
   root_->AddChild(omnibox_view_);
 
   views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
   widget_delegate->GetContentsView()->set_background(
@@ skipping 22 matching lines @@
   omnibox_view_->Embed(view_tree_client.Pass());
 
   // TODO(beng): This should be handled sufficiently by
   //             OmniboxImpl::ShowWindow() but unfortunately view manager policy
   //             currently prevents the embedded app from changing window z for
   //             its own window.
   omnibox_view_->MoveToFront();
 }
 
 }  // namespace mandoline