chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc - Issue 2761063002: Move more from WmShell to Shell

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: chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

Issue 2761063002: Move more from WmShell to Shell (Closed)

Patch Set: merge Created 3 years, 9 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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

index 6e45b847b35af1f7e8ef3c7d4bbf5092f7c5a7ef..ba48d99e9b4e2815009cad796e706ab11d89c401 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

@@ -130,8 +130,7 @@ IN_PROC_BROWSER_TEST_F(SystemTrayDelegateBluetoothTest, Basics) {

BluezDBusManager::Get()->GetBluetoothAdapterClient());

adapter_client->SetSimulationIntervalMs(0);

- ash::SystemTrayDelegate* delegate =

- ash::WmShell::Get()->system_tray_delegate();

+ ash::SystemTrayDelegate* delegate = ash::Shell::Get()->system_tray_delegate();

EXPECT_TRUE(delegate->GetBluetoothAvailable());

EXPECT_FALSE(delegate->GetBluetoothEnabled());

EXPECT_FALSE(delegate->GetBluetoothDiscovering());