Renames WmShell to ShellPort

ash/system/tray/system_tray.cc

 // Copyright (c) 2012 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/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "ash/key_event_watcher.h"
 #include "ash/login_status.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shelf/wm_shelf_util.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/audio/tray_audio.h"
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/cast/tray_cast.h"
 #include "ash/system/date/tray_system_info.h"
 #include "ash/system/enterprise/tray_enterprise.h"
 #include "ash/system/ime/tray_ime_chromeos.h"
 #include "ash/system/media_security/multi_profile_media_tray_item.h"
 #include "ash/system/network/tray_network.h"
@@ skipping 11 matching lines @@
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/tray_tracing.h"
 #include "ash/system/update/tray_update.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm/container_finder.h"
 #include "ash/wm/widget_finder.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/timer.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ skipping 264 matching lines @@
 
 std::vector<SystemTrayItem*> SystemTray::GetTrayItems() const {
   std::vector<SystemTrayItem*> result;
   for (const auto& item : items_)
     result.push_back(item.get());
   return result;
 }
 
 void SystemTray::ShowDefaultView(BubbleCreationType creation_type) {
   if (creation_type != BUBBLE_USE_EXISTING)
-    WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_MENU_OPENED);
+    ShellPort::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_MENU_OPENED);
   ShowItems(GetTrayItems(), false, true, creation_type, false);
 }
 
 void SystemTray::ShowPersistentDefaultView() {
   ShowItems(GetTrayItems(), false, false, BUBBLE_CREATE_NEW, true);
 }
 
 void SystemTray::ShowDetailedView(SystemTrayItem* item,
                                   int close_delay,
                                   bool activate,
@@ skipping 317 matching lines @@
 void SystemTray::ActivateAndStartNavigation(const ui::KeyEvent& key_event) {
   if (!system_bubble_)
     return;
   ActivateBubble();
 
   views::Widget* widget = GetSystemBubble()->bubble_view()->GetWidget();
   widget->GetFocusManager()->OnKeyEvent(key_event);
 }
 
 void SystemTray::CreateKeyEventWatcher() {
-  key_event_watcher_ = WmShell::Get()->CreateKeyEventWatcher();
+  key_event_watcher_ = ShellPort::Get()->CreateKeyEventWatcher();
   // mustash does not yet support KeyEventWatcher. http://crbug.com/649600.
   if (!key_event_watcher_)
     return;
   key_event_watcher_->AddKeyEventCallback(
       ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE),
       base::Bind(&SystemTray::CloseBubble, base::Unretained(this)));
   key_event_watcher_->AddKeyEventCallback(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE),
       base::Bind(&SystemTray::ActivateAndStartNavigation,
                  base::Unretained(this)));
@@ skipping 59 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash