ui/base/cocoa/menu_controller_unittest.mm - Issue 16402012: Use a direct include of strings headers in ui/, 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: ui/base/cocoa/menu_controller_unittest.mm

Issue 16402012: Use a direct include of strings headers in ui/, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « ui/base/cocoa/menu_controller.h ('k') | ui/base/cursor/cursor_loader.h » ('j') | no next file with comments »

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 #import <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

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

8 #include "base/strings/sys_string_conversions.h"	8 #include "base/strings/sys_string_conversions.h"

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

10 #include "grit/ui_resources.h"	10 #include "grit/ui_resources.h"

11 #include "grit/ui_strings.h"	11 #include "grit/ui_strings.h"

12 #include "third_party/skia/include/core/SkBitmap.h"	12 #include "third_party/skia/include/core/SkBitmap.h"

13 #import "ui/base/cocoa/menu_controller.h"	13 #import "ui/base/cocoa/menu_controller.h"

14 #include "ui/base/models/simple_menu_model.h"	14 #include "ui/base/models/simple_menu_model.h"

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

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

17 #include "ui/gfx/image/image.h"	17 #include "ui/gfx/image/image.h"

18	18

19 namespace ui {	19 namespace ui {

(...skipping 333 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
353 // Pump the task that notifies the delegate.	353 // Pump the task that notifies the delegate.

354 message_loop.RunUntilIdle();	354 message_loop.RunUntilIdle();

355	355

356 // Expect that the delegate got notified properly.	356 // Expect that the delegate got notified properly.

357 EXPECT_TRUE(delegate.did_close_);	357 EXPECT_TRUE(delegate.did_close_);

358 }	358 }

359	359

360 } // namespace	360 } // namespace

361	361

362 } // namespace ui	362 } // namespace ui

OLD	NEW