Move shell service to toplevel shell namespace

mash/login/login.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/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "base/guid.h"
@@ skipping 18 matching lines @@
 
 namespace mash {
 namespace login {
 namespace {
 
 class Login;
 
 class UI : public views::WidgetDelegateView,
            public views::ButtonListener {
  public:
-  static void Show(mojo::Connector* connector, Login* login) {
+  static void Show(shell::Connector* connector, Login* login) {
     UI* ui = new UI(login, connector);
     ui->StartWindowManager();
 
     views::WindowManagerConnection::Create(connector);
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = ui;
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(mash::wm::mojom::Container::LOGIN_WINDOWS));
     mus::Window* window =
         views::WindowManagerConnection::Get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
         widget, connector, window, mus::mojom::SurfaceType::DEFAULT);
     widget->Init(params);
     widget->Show();
   }
 
  private:
-  UI(Login* login, mojo::Connector* connector)
+  UI(Login* login, shell::Connector* connector)
       : login_(login),
         connector_(connector),
         user_id_1_("00000000-0000-4000-8000-000000000000"),
         user_id_2_("00000000-0000-4000-8000-000000000001"),
         login_button_1_(
             new views::LabelButton(this, base::ASCIIToUTF16("Timothy"))),
         login_button_2_(
             new views::LabelButton(this, base::ASCIIToUTF16("Jimothy"))) {
     set_background(views::Background::CreateSolidBackground(SK_ColorRED));
     login_button_1_->SetStyle(views::Button::STYLE_BUTTON);
@@ skipping 38 matching lines @@
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   void StartWindowManager() {
     window_manager_connection_ = connector_->Connect("mojo:desktop_wm");
     window_manager_connection_->SetConnectionLostClosure(
         base::Bind(&UI::StartWindowManager, base::Unretained(this)));
   }
 
   Login* login_;
-  mojo::Connector* connector_;
+  shell::Connector* connector_;
   const std::string user_id_1_;
   const std::string user_id_2_;
   views::LabelButton* login_button_1_;
   views::LabelButton* login_button_2_;
-  std::unique_ptr<mojo::Connection> window_manager_connection_;
+  std::unique_ptr<shell::Connection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
-class Login : public mojo::ShellClient,
-              public mojo::InterfaceFactory<mojom::Login>,
+class Login : public shell::ShellClient,
+              public shell::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
   ~Login() override {}
 
   void LoginAs(const std::string& user_id) {
     user_access_manager_->SetActiveUser(user_id);
     mash::init::mojom::InitPtr init;
     connector_->ConnectToInterface("mojo:mash_init", &init);
     init->StartService("mojo:mash_session", user_id);
   }
 
  private:
-  // mojo::ShellClient:
-  void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
+  // shell::ShellClient:
+  void Initialize(shell::Connector* connector,
+                  const shell::Identity& identity,
                   uint32_t id) override {
     connector_ = connector;
     tracing_.Initialize(connector, identity.name());
 
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
 
     connector_->ConnectToInterface("mojo:mus", &user_access_manager_);
     user_access_manager_->SetActiveUser(identity.user_id());
   }
-  bool AcceptConnection(mojo::Connection* connection) override {
+  bool AcceptConnection(shell::Connection* connection) override {
     connection->AddInterface<mojom::Login>(this);
     return true;
   }
 
-  // mojo::InterfaceFactory<mojom::Login>:
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::Login>:
+  void Create(shell::Connection* connection,
               mojom::LoginRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::Login:
   void ShowLoginUI() override {
     UI::Show(connector_, this);
   }
   void SwitchUser() override {
     UI::Show(connector_, this);
   }
 
   void StartWindowManager();
 
-  mojo::Connector* connector_;
+  shell::Connector* connector_;
   mojo::TracingImpl tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
   mojo::BindingSet<mojom::Login> bindings_;
   mus::mojom::UserAccessManagerPtr user_access_manager_;
-  std::unique_ptr<mojo::Connection> window_manager_connection_;
+  std::unique_ptr<shell::Connection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
 
 void UI::ButtonPressed(views::Button* sender, const ui::Event& event) {
   // Login...
   if (sender == login_button_1_) {
     login_->LoginAs(user_id_1_);
   } else if (sender == login_button_2_) {
     login_->LoginAs(user_id_2_);
   } else {
     NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 }  // namespace
 
-mojo::ShellClient* CreateLogin() {
+shell::ShellClient* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main