chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc - Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell

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/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« ash/system/web_notification/web_notification_tray_unittest.cc ('K') | « ash/wm/overview/window_selector_controller.cc ('k') | chrome/browser/chromeos/power/power_button_observer.cc » ('j') | chrome/browser/chromeos/power/power_button_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

index b69cc595fa8e51793beffdaaf4dee3e1d53ac550..ff7daa795b6bd9fe82f3e76b7de2fa588b240a9b 100644

--- a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

+++ b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

@@ -2,6 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/system/date/date_default_view.h"

#include "ash/system/date/date_view.h"

@@ -66,7 +67,7 @@ class SystemUse24HourClockPolicyTest

static bool GetSystemTrayDelegateShouldUse24HourClock() {

chromeos::SystemTrayDelegateChromeOS* tray_delegate =

static_cast<chromeos::SystemTrayDelegateChromeOS*>(

- ash::Shell::GetInstance()->system_tray_delegate());

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

return tray_delegate->GetShouldUse24HourClockForTesting();

msw 2016/06/10 18:48:21 aside: calls into g_browser_process under the hood

}