mash: Move SystemTrayDelegate ownership to WmShell

ash/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/system/chromeos/tray_caps_lock.h"
 
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/sys_info.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
@@ skipping 45 matching lines @@
 
   // Updates the label text and the shortcut text.
   void Update(bool caps_lock_enabled) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     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(bundle.GetLocalizedString(text_string_id));
 
     int shortcut_string_id = 0;
-    bool search_mapped_to_caps_lock = Shell::GetInstance()->
-        system_tray_delegate()->IsSearchKeyMappedToCapsLock();
+    bool search_mapped_to_caps_lock =
+        WmShell::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;
     }
     shortcut_label_->SetText(bundle.GetLocalizedString(shortcut_string_id));
@@ skipping 103 matching lines @@
       views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 10, kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
   image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
       ToImageSkia());
 
   detailed_->AddChildView(image);
 
-  const int string_id = Shell::GetInstance()->system_tray_delegate()->
-                            IsSearchKeyMappedToCapsLock() ?
-      IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH :
-      IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH;
+  const int string_id =
+      WmShell::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 = new views::Label(bundle.GetLocalizedString(string_id));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   detailed_->AddChildView(label);
   Shell::GetInstance()->metrics()->RecordUserMetricsAction(
       ash::UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
 
   return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 }  // namespace ash