ash/system/bluetooth/tray_bluetooth.cc - Issue 2808723004: Renames WmShell to ShellPort

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/bluetooth/tray_bluetooth.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

« no previous file with comments | « ash/system/audio/volume_view.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/bluetooth/tray_bluetooth.cc

diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc

index 3631487fa57cd3612167bd6b281a3c4afcae7029..895dc594328cd60a6e487b3c5206584ab88310a1 100644

--- a/ash/system/bluetooth/tray_bluetooth.cc

+++ b/ash/system/bluetooth/tray_bluetooth.cc

@@ -8,6 +8,7 @@

#include "ash/resources/vector_icons/vector_icons.h"

#include "ash/session/session_state_delegate.h"

#include "ash/shell.h"

+#include "ash/shell_port.h"

#include "ash/strings/grit/ash_strings.h"

#include "ash/system/bluetooth/tray_bluetooth_helper.h"

#include "ash/system/tray/hover_highlight_view.h"

@@ -21,7 +22,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 "device/bluetooth/bluetooth_common.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

@@ -458,7 +458,7 @@ class BluetoothDetailedView : public TrayDetailsView {

const ui::Event& event) override {

if (sender == toggle_) {

TrayBluetoothHelper* helper = Shell::Get()->tray_bluetooth_helper();

- WmShell::Get()->RecordUserMetricsAction(

+ ShellPort::Get()->RecordUserMetricsAction(

helper->GetBluetoothEnabled() ? UMA_STATUS_AREA_BLUETOOTH_DISABLED

: UMA_STATUS_AREA_BLUETOOTH_ENABLED);

helper->ToggleBluetoothEnabled();

@@ -620,7 +620,7 @@ views::View* TrayBluetooth::CreateDefaultView(LoginStatus status) {

views::View* TrayBluetooth::CreateDetailedView(LoginStatus status) {

if (!Shell::Get()->tray_bluetooth_helper()->GetBluetoothAvailable())

return NULL;

- WmShell::Get()->RecordUserMetricsAction(

+ ShellPort::Get()->RecordUserMetricsAction(

UMA_STATUS_AREA_DETAILED_BLUETOOTH_VIEW);

CHECK(detailed_ == NULL);

detailed_ = new tray::BluetoothDetailedView(this, status);

« no previous file with comments | « ash/system/audio/volume_view.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')