Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2088)

Unified Diff: ash/system/tray_caps_lock.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/tray_caps_lock.cc
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc
index 2ec2e02debb1cc75a64f006d21f07eb761754cf2..2471888f8b5b59caf939e9e791e4926260d19551 100644
--- a/ash/system/tray_caps_lock.cc
+++ b/ash/system/tray_caps_lock.cc
@@ -8,6 +8,7 @@
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/actionable_view.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -15,7 +16,6 @@
#include "ash/system/tray/tray_popup_item_style.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "ash/system/tray/tri_view.h"
-#include "ash/wm_shell.h"
#include "base/sys_info.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/ime/chromeos/ime_keyboard.h"
@@ -118,7 +118,7 @@ class CapsLockDefaultView : public ActionableView {
chromeos::input_method::ImeKeyboard* keyboard =
chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
if (keyboard) {
- WmShell::Get()->RecordUserMetricsAction(
+ ShellPort::Get()->RecordUserMetricsAction(
keyboard->CapsLockIsEnabled()
? UMA_STATUS_AREA_CAPS_LOCK_DISABLED_BY_CLICK
: UMA_STATUS_AREA_CAPS_LOCK_ENABLED_BY_CLICK);
@@ -170,7 +170,7 @@ void TrayCapsLock::OnCapsLockChanged(bool enabled) {
} else {
if (caps_lock_enabled_) {
if (!message_shown_) {
- WmShell::Get()->RecordUserMetricsAction(
+ ShellPort::Get()->RecordUserMetricsAction(
UMA_STATUS_AREA_CAPS_LOCK_POPUP);
ShowDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
message_shown_ = true;
@@ -217,7 +217,7 @@ views::View* TrayCapsLock::CreateDetailedView(LoginStatus status) {
label->SetMultiLine(true);
label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
detailed_->AddChildView(label);
- WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
+ ShellPort::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
return detailed_;
}

Powered by Google App Engine
This is Rietveld 408576698