Move more from WmShell to Shell

ash/common/system/chromeos/tray_caps_lock.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/common/system/chromeos/tray_caps_lock.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 72 matching lines @@
 
   // Updates the label text and the shortcut text.
   void Update(bool caps_lock_enabled) {
     const int text_string_id = caps_lock_enabled
                                    ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED
                                    : IDS_ASH_STATUS_TRAY_CAPS_LOCK_DISABLED;
     text_label_->SetText(l10n_util::GetStringUTF16(text_string_id));
 
     int shortcut_string_id = 0;
     bool search_mapped_to_caps_lock =
-        WmShell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock();
+        Shell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock();
     if (caps_lock_enabled) {
       shortcut_string_id =
           search_mapped_to_caps_lock
               ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_SEARCH_OR_SHIFT
               : IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_ALT_SEARCH_OR_SHIFT;
     } else {
       shortcut_string_id =
           search_mapped_to_caps_lock
               ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_SEARCH
               : IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_ALT_SEARCH;
@@ skipping 98 matching lines @@
       views::BoxLayout::kHorizontal, kTrayPopupPaddingHorizontal, 10,
       kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
   image->SetImage(
       CreateVectorIcon(kSystemMenuCapsLockIcon, kMenuIconSize, kMenuIconColor));
   detailed_->AddChildView(image);
 
   const int string_id =
-      WmShell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock()
+      Shell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock()
           ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH
           : IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH;
   views::Label* label = TrayPopupUtils::CreateDefaultLabel();
   label->SetText(bundle.GetLocalizedString(string_id));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   detailed_->AddChildView(label);
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
 
   return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = nullptr;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = nullptr;
 }
 
 }  // namespace ash