chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc - Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc

Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell (Closed)

Patch Set: Created 4 years, 1 month 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 unified diff | Download patch

« ash/common/wm_shell.h ('K') | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"	5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "ash/common/material_design/material_design_controller.h"	9 #include "ash/common/material_design/material_design_controller.h"

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

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

12 #include "ash/common/system/date/system_info_default_view.h"	12 #include "ash/common/system/date/system_info_default_view.h"

13 #include "ash/common/system/date/tray_date.h"	13 #include "ash/common/system/date/tray_date.h"

14 #include "ash/common/system/date/tray_system_info.h"	14 #include "ash/common/system/date/tray_system_info.h"

	15 #include "ash/common/system/tray/system_tray.h"

15 #include "ash/shell.h"	16 #include "ash/shell.h"

16 #include "base/macros.h"	17 #include "base/macros.h"

17 #include "chrome/browser/chromeos/login/login_manager_test.h"	18 #include "chrome/browser/chromeos/login/login_manager_test.h"

18 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	19 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

19 #include "chrome/browser/chromeos/login/startup_utils.h"	20 #include "chrome/browser/chromeos/login/startup_utils.h"

20 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"	21 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

21 #include "chrome/browser/chromeos/profiles/profile_helper.h"	22 #include "chrome/browser/chromeos/profiles/profile_helper.h"

22 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

23 #include "chrome/common/pref_names.h"	24 #include "chrome/common/pref_names.h"

24 #include "chrome/test/base/in_process_browser_test.h"	25 #include "chrome/test/base/in_process_browser_test.h"

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
122 EXPECT_EQ(base::k12HourClock, GetHourType());	123 EXPECT_EQ(base::k12HourClock, GetHourType());

123	124

124 user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);	125 user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);

125 // Allow clock setting to be sent to ash over mojo.	126 // Allow clock setting to be sent to ash over mojo.

126 content::RunAllPendingInMessageLoop();	127 content::RunAllPendingInMessageLoop();

127 CreateDefaultView();	128 CreateDefaultView();

128 EXPECT_EQ(base::k24HourClock, GetHourType());	129 EXPECT_EQ(base::k24HourClock, GetHourType());

129 }	130 }

130	131

131 } // namespace chromeos	132 } // namespace chromeos

OLD	NEW