Rename shell namespace to service_manager

mash/task_viewer/task_viewer.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 "mash/task_viewer/task_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace task_viewer {
 namespace {
 
-using shell::mojom::ServiceInfoPtr;
+using service_manager::mojom::ServiceInfoPtr;
 
-class TaskViewerContents : public views::WidgetDelegateView,
-                           public ui::TableModel,
-                           public views::ButtonListener,
-                           public shell::mojom::ServiceManagerListener {
+class TaskViewerContents
+    : public views::WidgetDelegateView,
+      public ui::TableModel,
+      public views::ButtonListener,
+      public service_manager::mojom::ServiceManagerListener {
  public:
-  TaskViewerContents(TaskViewer* task_viewer,
-                     shell::mojom::ServiceManagerListenerRequest request,
-                     catalog::mojom::CatalogPtr catalog)
+  TaskViewerContents(
+      TaskViewer* task_viewer,
+      service_manager::mojom::ServiceManagerListenerRequest request,
+      catalog::mojom::CatalogPtr catalog)
       : task_viewer_(task_viewer),
         binding_(this, std::move(request)),
         catalog_(std::move(catalog)),
         table_view_(nullptr),
         table_view_parent_(nullptr),
         kill_button_(
             views::MdTextButton::Create(this,
                                         base::ASCIIToUTF16("Kill Process"))),
         observer_(nullptr),
         weak_ptr_factory_(this) {
@@ skipping 10 matching lines @@
 
     AddChildView(kill_button_);
   }
   ~TaskViewerContents() override {
     table_view_->SetModel(nullptr);
     task_viewer_->RemoveWindow(GetWidget());
   }
 
  private:
   struct InstanceInfo {
-    InstanceInfo(const shell::Identity& identity, base::ProcessId pid)
+    InstanceInfo(const service_manager::Identity& identity, base::ProcessId pid)
         : identity(identity), pid(pid) {}
-    shell::Identity identity;
+    service_manager::Identity identity;
     uint32_t pid;
     std::string display_name;
   };
 
 
   // Overridden from views::WidgetDelegate:
   base::string16 GetWindowTitle() const override {
     // TODO(beng): use resources.
     return base::ASCIIToUTF16("Tasks");
   }
@@ skipping 50 matching lines @@
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     DCHECK_EQ(sender, kill_button_);
     DCHECK_EQ(table_view_->SelectedRowCount(), 1);
     int row = table_view_->FirstSelectedRow();
     DCHECK(row < static_cast<int>(instances_.size()));
     base::Process process = base::Process::Open(instances_[row]->pid);
     process.Terminate(9, true);
   }
 
-  // Overridden from shell::mojom::ServiceManagerListener:
+  // Overridden from service_manager::mojom::ServiceManagerListener:
   void OnInit(std::vector<ServiceInfoPtr> instances) override {
     // This callback should only be called with an empty model.
     DCHECK(instances_.empty());
     std::vector<std::string> names;
     names.reserve(instances.size());
     for (size_t i = 0; i < instances.size(); ++i) {
-      const shell::Identity& identity = instances[i]->identity;
+      const service_manager::Identity& identity = instances[i]->identity;
       InsertInstance(identity, instances[i]->pid);
       names.push_back(identity.name());
     }
     catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
   void OnServiceCreated(ServiceInfoPtr instance) override {
-    shell::Identity identity = instance->identity;
+    service_manager::Identity identity = instance->identity;
     DCHECK(!ContainsIdentity(identity));
     InsertInstance(identity, instance->pid);
     observer_->OnItemsAdded(static_cast<int>(instances_.size()), 1);
     std::vector<std::string> names;
     names.push_back(identity.name());
     catalog_->GetEntries(std::move(names),
                          base::Bind(&TaskViewerContents::OnGotCatalogEntries,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
-  void OnServiceStarted(const shell::Identity& identity,
+  void OnServiceStarted(const service_manager::Identity& identity,
                         uint32_t pid) override {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       if ((*it)->identity == identity) {
         (*it)->pid = pid;
         observer_->OnItemsChanged(
           static_cast<int>(it - instances_.begin()), 1);
         return;
       }
     }
   }
-  void OnServiceStopped(const shell::Identity& identity) override {
+  void OnServiceStopped(const service_manager::Identity& identity) override {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       if ((*it)->identity == identity) {
         observer_->OnItemsRemoved(
             static_cast<int>(it - instances_.begin()), 1);
         instances_.erase(it);
         return;
       }
     }
     NOTREACHED();
   }
 
-  bool ContainsIdentity(const shell::Identity& identity) const {
+  bool ContainsIdentity(const service_manager::Identity& identity) const {
     for (auto& it : instances_) {
       if (it->identity == identity)
         return true;
     }
     return false;
   }
 
-  void InsertInstance(const shell::Identity& identity, uint32_t pid) {
+  void InsertInstance(const service_manager::Identity& identity, uint32_t pid) {
     instances_.push_back(base::MakeUnique<InstanceInfo>(identity, pid));
   }
 
   void OnGotCatalogEntries(std::vector<catalog::mojom::EntryPtr> entries) {
     for (auto it = instances_.begin(); it != instances_.end(); ++it) {
       for (auto& entry : entries) {
         if (entry->name == (*it)->identity.name()) {
           (*it)->display_name = entry->display_name;
           observer_->OnItemsChanged(
               static_cast<int>(it - instances_.begin()), 1);
@@ skipping 29 matching lines @@
     // TODO(beng): use resources.
     pid_column.title  = base::ASCIIToUTF16("PID");
     pid_column.width = 50;
     pid_column.sortable = true;
     columns.push_back(pid_column);
 
     return columns;
   }
 
   TaskViewer* task_viewer_;
-  mojo::Binding<shell::mojom::ServiceManagerListener> binding_;
+  mojo::Binding<service_manager::mojom::ServiceManagerListener> binding_;
   catalog::mojom::CatalogPtr catalog_;
 
   views::TableView* table_view_;
   views::View* table_view_parent_;
   views::MdTextButton* kill_button_;
   ui::TableModelObserver* observer_;
 
   std::vector<std::unique_ptr<InstanceInfo>> instances_;
 
   base::WeakPtrFactory<TaskViewerContents> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskViewerContents);
 };
 
 }  // namespace
 
 TaskViewer::TaskViewer() {}
 TaskViewer::~TaskViewer() {}
 
 void TaskViewer::RemoveWindow(views::Widget* widget) {
   auto it = std::find(windows_.begin(), windows_.end(), widget);
   DCHECK(it != windows_.end());
   windows_.erase(it);
   if (windows_.empty())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
-void TaskViewer::OnStart(const shell::Identity& identity) {
+void TaskViewer::OnStart(const service_manager::Identity& identity) {
   tracing_.Initialize(connector(), identity.name());
 
   aura_init_.reset(
       new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
       views::WindowManagerConnection::Create(connector(), identity);
 }
 
-bool TaskViewer::OnConnect(const shell::Identity& remote_identity,
-                           shell::InterfaceRegistry* registry) {
+bool TaskViewer::OnConnect(const service_manager::Identity& remote_identity,
+                           service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Launchable>(this);
   return true;
 }
 
 void TaskViewer::Launch(uint32_t what, mojom::LaunchMode how) {
   bool reuse = how == mojom::LaunchMode::REUSE ||
                how == mojom::LaunchMode::DEFAULT;
   if (reuse && !windows_.empty()) {
     windows_.back()->Activate();
     return;
   }
 
-  shell::mojom::ServiceManagerPtr service_manager;
+  service_manager::mojom::ServiceManagerPtr service_manager;
   connector()->ConnectToInterface("service:shell", &service_manager);
 
-  shell::mojom::ServiceManagerListenerPtr listener;
-  shell::mojom::ServiceManagerListenerRequest request = GetProxy(&listener);
+  service_manager::mojom::ServiceManagerListenerPtr listener;
+  service_manager::mojom::ServiceManagerListenerRequest request =
+      GetProxy(&listener);
   service_manager->AddListener(std::move(listener));
 
   catalog::mojom::CatalogPtr catalog;
   connector()->ConnectToInterface("service:catalog", &catalog);
 
   TaskViewerContents* task_viewer = new TaskViewerContents(
       this, std::move(request), std::move(catalog));
   views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
       task_viewer, nullptr, gfx::Rect(10, 10, 500, 500));
   window->Show();
   windows_.push_back(window);
 }
 
-void TaskViewer::Create(const shell::Identity& remote_identity,
+void TaskViewer::Create(const service_manager::Identity& remote_identity,
                         mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace task_viewer
 }  // namespace main