chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/system/date/date_default_view.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

25 #include "components/prefs/pref_service.h"	25 #include "components/prefs/pref_service.h"

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

106	106

107 user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);	107 user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);

108 // Allow clock setting to be sent to ash over mojo.	108 // Allow clock setting to be sent to ash over mojo.

109 content::RunAllPendingInMessageLoop();	109 content::RunAllPendingInMessageLoop();

110 CreateDefaultView();	110 CreateDefaultView();

111 EXPECT_EQ(base::k24HourClock, GetHourType());	111 EXPECT_EQ(base::k24HourClock, GetHourType());

112 }	112 }

113	113

114 } // namespace chromeos	114 } // namespace chromeos

OLD	NEW