Renames WmShell to ShellPort

ash/shelf/shelf_window_watcher.cc

 // Copyright 2013 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/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 namespace {
 
 // Returns the shelf item type, with special temporary behavior for Mash:
 // Mash provides a default shelf item type (TYPE_APP) for non-ignored windows.
 ShelfItemType GetShelfItemType(aura::Window* window) {
-  if (!WmShell::Get()->IsRunningInMash() ||
+  if (!ShellPort::Get()->IsRunningInMash() ||
       window->GetProperty(kShelfItemTypeKey) != TYPE_UNDEFINED) {
     return static_cast<ShelfItemType>(window->GetProperty(kShelfItemTypeKey));
   }
   return wm::GetWindowState(window)->ignored_by_shelf() ? TYPE_UNDEFINED
                                                         : TYPE_APP;
 }
 
 // Update the ShelfItem from relevant window properties.
 void UpdateShelfItemForWindow(ShelfItem* item, aura::Window* window) {
   item->type = GetShelfItemType(window);
@@ skipping 184 matching lines @@
 void ShelfWindowWatcher::OnWindowActivated(ActivationReason reason,
                                            aura::Window* gained_active,
                                            aura::Window* lost_active) {
   if (gained_active && user_windows_with_items_.count(gained_active) > 0)
     OnUserWindowPropertyChanged(gained_active);
   if (lost_active && user_windows_with_items_.count(lost_active) > 0)
     OnUserWindowPropertyChanged(lost_active);
 }
 
 void ShelfWindowWatcher::OnDisplayAdded(const display::Display& new_display) {
-  WmWindow* root = WmShell::Get()->GetRootWindowForDisplayId(new_display.id());
+  WmWindow* root =
+      ShellPort::Get()->GetRootWindowForDisplayId(new_display.id());
   aura::Window* aura_root = WmWindow::GetAuraWindow(root);
 
   // When the primary root window's display is removed, the existing root window
   // is taken over by the new display, and the observer is already set.
   aura::Window* default_container =
       aura_root->GetChildById(kShellWindowId_DefaultContainer);
   if (!observed_container_windows_.IsObserving(default_container)) {
     for (aura::Window* window : default_container->children())
       OnUserWindowAdded(window);
     observed_container_windows_.Add(default_container);
   }
   aura::Window* panel_container =
       aura_root->GetChildById(kShellWindowId_PanelContainer);
   if (!observed_container_windows_.IsObserving(panel_container)) {
     for (aura::Window* window : panel_container->children())
       OnUserWindowAdded(window);
     observed_container_windows_.Add(panel_container);
   }
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash