chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm - Issue 16012017: Use a direct include of strings headers in chrome/browser/ui/cocoa/.

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/cocoa/status_icons/status_icon_mac_unittest.mm

Issue 16012017: Use a direct include of strings headers in chrome/browser/ui/cocoa/. (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 | « chrome/browser/ui/cocoa/status_icons/status_icon_mac.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "base/string_util.h"	5 #include "base/strings/string_util.h"

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

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

8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"	8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"

9 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h"	9 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h"

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

11 #include "testing/gmock/include/gmock/gmock.h"	11 #include "testing/gmock/include/gmock/gmock.h"

12 #include "testing/gtest/include/gtest/gtest.h"	12 #include "testing/gtest/include/gtest/gtest.h"

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

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

15	15

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 scoped_ptr<StatusIconMac> icon(new StatusIconMac());	54 scoped_ptr<StatusIconMac> icon(new StatusIconMac());

55 icon->UpdatePlatformContextMenu(model.get());	55 icon->UpdatePlatformContextMenu(model.get());

56 icon->SetToolTip(ASCIIToUTF16(tool_tip));	56 icon->SetToolTip(ASCIIToUTF16(tool_tip));

57 EXPECT_EQ(2, [[icon->item() menu] numberOfItems]);	57 EXPECT_EQ(2, [[icon->item() menu] numberOfItems]);

58	58

59 NSMenuItem* toolTipItem = [[icon->item() menu] itemAtIndex:0];	59 NSMenuItem* toolTipItem = [[icon->item() menu] itemAtIndex:0];

60 EXPECT_STREQ(tool_tip, [[toolTipItem title] UTF8String]);	60 EXPECT_STREQ(tool_tip, [[toolTipItem title] UTF8String]);

61 NSMenuItem* menuItem = [[icon->item() menu] itemAtIndex:1];	61 NSMenuItem* menuItem = [[icon->item() menu] itemAtIndex:1];

62 EXPECT_STREQ(menu_title, [[menuItem title] UTF8String]);	62 EXPECT_STREQ(menu_title, [[menuItem title] UTF8String]);

63 }	63 }

OLD	NEW