Move shell service to toplevel shell namespace

mash/quick_launch/quick_launch_application.cc

 // Copyright 2016 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 "mash/quick_launch/quick_launch_application.h"
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 14 matching lines @@
 namespace views {
 class AuraInit;
 }
 
 namespace mash {
 namespace quick_launch {
 
 class QuickLaunchUI : public views::WidgetDelegateView,
                       public views::TextfieldController {
  public:
-  QuickLaunchUI(mojo::Connector* connector, catalog::mojom::CatalogPtr catalog)
+  QuickLaunchUI(shell::Connector* connector, catalog::mojom::CatalogPtr catalog)
       : connector_(connector),
         prompt_(new views::Textfield),
         catalog_(std::move(catalog)) {
     set_background(views::Background::CreateStandardPanelBackground());
     prompt_->set_controller(this);
     AddChildView(prompt_);
 
     UpdateEntries();
   }
   ~QuickLaunchUI() override {}
@@ skipping 75 matching lines @@
                          base::Bind(&QuickLaunchUI::OnGotCatalogEntries,
                                     base::Unretained(this)));
   }
 
   void OnGotCatalogEntries(
       mojo::Map<mojo::String, catalog::mojom::CatalogEntryPtr> entries) {
     for (const auto& entry : entries)
       app_names_.insert(base::UTF8ToUTF16(entry.first.get()));
   }
 
-  mojo::Connector* connector_;
+  shell::Connector* connector_;
   views::Textfield* prompt_;
-  std::vector<std::unique_ptr<mojo::Connection>> connections_;
+  std::vector<std::unique_ptr<shell::Connection>> connections_;
   catalog::mojom::CatalogPtr catalog_;
   std::set<base::string16> app_names_;
   bool suggestion_rejected_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI);
 };
 
 QuickLaunchApplication::QuickLaunchApplication() {}
 QuickLaunchApplication::~QuickLaunchApplication() {}
 
-void QuickLaunchApplication::Initialize(mojo::Connector* connector,
-                                        const mojo::Identity& identity,
+void QuickLaunchApplication::Initialize(shell::Connector* connector,
+                                        const shell::Identity& identity,
                                         uint32_t id) {
   tracing_.Initialize(connector, identity.name());
 
   aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
   views::WindowManagerConnection::Create(connector);
 
   catalog::mojom::CatalogPtr catalog;
   connector->ConnectToInterface("mojo:catalog", &catalog);
 
   views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
       new QuickLaunchUI(connector, std::move(catalog)), nullptr,
       gfx::Rect(10, 640, 0, 0));
   window->Show();
 }
 
-bool QuickLaunchApplication::AcceptConnection(mojo::Connection* connection) {
+bool QuickLaunchApplication::AcceptConnection(shell::Connection* connection) {
   return true;
 }
 
 }  // namespace quick_launch
 }  // namespace mash