chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc - Issue 2072013002: mash: Move tray settings and deps to 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/notifications/login_state_notification_blocker_chromeos_browsertest.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. 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

« ash/common/DEPS ('K') | « chrome/browser/notifications/login_state_notification_blocker_chromeos.cc ('k') | chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "ash/common/system/system_notifier.h"

5 #include "ash/shell.h"	6 #include "ash/shell.h"

6 #include "ash/system/system_notifier.h"

7 #include "base/command_line.h"	7 #include "base/command_line.h"

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

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

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

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

12 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos .h"	12 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos .h"

13 #include "content/public/test/test_utils.h"	13 #include "content/public/test/test_utils.h"

14 #include "ui/message_center/message_center.h"	14 #include "ui/message_center/message_center.h"

15	15

16 using namespace testing;	16 using namespace testing;

(...skipping 150 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167 EXPECT_EQ(1, GetStateChangedCountAndReset());	167 EXPECT_EQ(1, GetStateChangedCountAndReset());

168 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));	168 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));

169	169

170 // Multi-login user switch off.	170 // Multi-login user switch off.

171 chromeos::UserAddingScreen::Get()->Cancel();	171 chromeos::UserAddingScreen::Get()->Cancel();

172 observer.WaitUntilUserAddingFinishedOrCancelled();	172 observer.WaitUntilUserAddingFinishedOrCancelled();

173 content::RunAllPendingInMessageLoop();	173 content::RunAllPendingInMessageLoop();

174 EXPECT_EQ(1, GetStateChangedCountAndReset());	174 EXPECT_EQ(1, GetStateChangedCountAndReset());

175 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));	175 EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));

176 }	176 }

OLD	NEW