chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc - Issue 2061123004: mash: Move //ash/system/date to //ash/common

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 2061123004: mash: Move //ash/system/date to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@uma

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

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/tray_date.h"

9 #include "ash/display/display_manager.h"	12 #include "ash/display/display_manager.h"

10 #include "ash/shell.h"	13 #include "ash/shell.h"

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

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

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

14 #include "ash/test/display_manager_test_api.h"	14 #include "ash/test/display_manager_test_api.h"

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

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

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

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

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

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

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

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

23 #include "chrome/browser/ui/tabs/tab_strip_model.h"	23 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
153	153

154 UpdateDisplay("400x400");	154 UpdateDisplay("400x400");

155	155

156 ui_test_utils::NavigateToURL(browser(), GURL("chrome://version"));	156 ui_test_utils::NavigateToURL(browser(), GURL("chrome://version"));

157 UpdateDisplay("400x400/r");	157 UpdateDisplay("400x400/r");

158 // Ensure that there is a notification that is shown.	158 // Ensure that there is a notification that is shown.

159 EXPECT_FALSE(GetVisibleNotifications().empty());	159 EXPECT_FALSE(GetVisibleNotifications().empty());

160 }	160 }

161	161

162 } // namespace chromeos	162 } // namespace chromeos

OLD	NEW

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