ui/message_center/cocoa/tray_view_controller_unittest.mm - Issue 19631002: Use a direct include of the message_loop header in ui/, part 2.

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: ui/message_center/cocoa/tray_view_controller_unittest.mm

Issue 19631002: Use a direct include of the message_loop header in ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « ui/message_center/cocoa/popup_collection_unittest.mm ('k') | ui/message_center/message_center_impl_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #import "ui/message_center/cocoa/tray_view_controller.h"	5 #import "ui/message_center/cocoa/tray_view_controller.h"

6	6

7 #include "base/mac/scoped_nsobject.h"	7 #include "base/mac/scoped_nsobject.h"

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

9 #include "base/run_loop.h"	9 #include "base/run_loop.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #import "ui/base/test/ui_cocoa_test_helper.h"	11 #import "ui/base/test/ui_cocoa_test_helper.h"

12 #include "ui/message_center/fake_notifier_settings_provider.h"	12 #include "ui/message_center/fake_notifier_settings_provider.h"

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

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

15 #include "ui/message_center/message_center_style.h"	15 #include "ui/message_center/message_center_style.h"

16 #include "ui/message_center/notification.h"	16 #include "ui/message_center/notification.h"

17 #include "ui/message_center/notifier_settings.h"	17 #include "ui/message_center/notifier_settings.h"

18	18

(...skipping 212 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
231 EXPECT_LT(trayHeight, NSHeight([[tray_ view] frame]));	231 EXPECT_LT(trayHeight, NSHeight([[tray_ view] frame]));

232	232

233 [tray_ hideSettings:nil];	233 [tray_ hideSettings:nil];

234 EXPECT_EQ(1, provider.closed_called_count());	234 EXPECT_EQ(1, provider.closed_called_count());

235	235

236 // The tray should be back at its previous height now.	236 // The tray should be back at its previous height now.

237 EXPECT_EQ(trayHeight, NSHeight([[tray_ view] frame]));	237 EXPECT_EQ(trayHeight, NSHeight([[tray_ view] frame]));

238 }	238 }

239	239

240 } // namespace message_center	240 } // namespace message_center

OLD	NEW