Move shell service to toplevel shell namespace

ash/mus/sysui_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 "ash/mus/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 175 matching lines @@
 class AshInit {
  public:
   AshInit() : worker_pool_(new base::SequencedWorkerPool(2, "AshWorkerPool")) {
     ui::RegisterPathProvider();
   }
 
   ~AshInit() { worker_pool_->Shutdown(); }
 
   aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
 
-  void Initialize(mojo::Connector* connector) {
+  void Initialize(::shell::Connector* connector) {
     InitializeResourceBundle(connector);
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
     views::WindowManagerConnection::Create(connector);
 
     gfx::Screen* screen = gfx::Screen::GetScreen();
     DCHECK(screen);
     gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
 
     // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
     // installs and uses the ScreenAsh. This can be removed once ash learns to
@@ skipping 18 matching lines @@
         base::Bind(&KeyboardUIMus::Create, connector);
     ash::Shell::CreateInstance(init_params);
     ash::Shell::GetInstance()->CreateShelf();
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         ash::user::LOGGED_IN_USER);
 
     ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
     SetupWallpaper(SkColorSetARGB(255, 0, 255, 0));
   }
 
-  void InitializeResourceBundle(mojo::Connector* connector) {
+  void InitializeResourceBundle(::shell::Connector* connector) {
     if (ui::ResourceBundle::HasSharedInstance())
       return;
 
     std::set<std::string> resource_paths;
     resource_paths.insert(kResourceFileStrings);
     resource_paths.insert(kResourceFile100);
     resource_paths.insert(kResourceFile200);
 
     resource_provider::ResourceLoader loader(connector, resource_paths);
     if (!loader.BlockUntilLoaded())
@@ skipping 49 matching lines @@
   ShellDelegateMus* ash_delegate_ = nullptr;
   std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AshInit);
 };
 
 SysUIApplication::SysUIApplication() {}
 
 SysUIApplication::~SysUIApplication() {}
 
-void SysUIApplication::Initialize(mojo::Connector* connector,
-                                  const mojo::Identity& identity,
+void SysUIApplication::Initialize(::shell::Connector* connector,
+                                  const ::shell::Identity& identity,
                                   uint32_t id) {
   ash_init_.reset(new AshInit());
   ash_init_->Initialize(connector);
 }
 
-bool SysUIApplication::AcceptConnection(mojo::Connection* connection) {
+bool SysUIApplication::AcceptConnection(::shell::Connection* connection) {
   connection->AddInterface<mash::shelf::mojom::ShelfController>(this);
   return true;
 }
 
 void SysUIApplication::Create(
-    mojo::Connection* connection,
+    ::shell::Connection* connection,
     mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash