Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm

Issue 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
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/strings/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 #include "chrome/app/theme/grit/chrome_unscaled_resources.h"
9 #include "chrome/browser/status_icons/status_icon_menu_model.h" 8 #include "chrome/browser/status_icons/status_icon_menu_model.h"
10 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 9 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
11 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" 10 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h"
11 #include "grit/chrome_unscaled_resources.h"
12 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 15
16 class SkBitmap; 16 class SkBitmap;
17 17
18 class StatusIconMacTest : public CocoaTest { 18 class StatusIconMacTest : public CocoaTest {
19 }; 19 };
20 20
21 TEST_F(StatusIconMacTest, Create) { 21 TEST_F(StatusIconMacTest, Create) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(base::ASCIIToUTF16(tool_tip)); 56 icon->SetToolTip(base::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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698