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

Side by Side Diff: chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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
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/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/strings/string16.h" 6 #include "base/strings/string16.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" 8 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
9 #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h" 9 #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h"
10 #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h" 10 #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 accept_clicked_(accept_clicked), 51 accept_clicked_(accept_clicked),
52 cancel_clicked_(cancel_clicked), 52 cancel_clicked_(cancel_clicked),
53 link_clicked_(link_clicked) { 53 link_clicked_(link_clicked) {
54 } 54 }
55 55
56 TestConfirmBubbleModel::~TestConfirmBubbleModel() { 56 TestConfirmBubbleModel::~TestConfirmBubbleModel() {
57 *model_deleted_ = true; 57 *model_deleted_ = true;
58 } 58 }
59 59
60 base::string16 TestConfirmBubbleModel::GetTitle() const { 60 base::string16 TestConfirmBubbleModel::GetTitle() const {
61 return ASCIIToUTF16("Test"); 61 return base::ASCIIToUTF16("Test");
62 } 62 }
63 63
64 base::string16 TestConfirmBubbleModel::GetMessageText() const { 64 base::string16 TestConfirmBubbleModel::GetMessageText() const {
65 return ASCIIToUTF16("Test Message"); 65 return base::ASCIIToUTF16("Test Message");
66 } 66 }
67 67
68 gfx::Image* TestConfirmBubbleModel::GetIcon() const { 68 gfx::Image* TestConfirmBubbleModel::GetIcon() const {
69 return &ResourceBundle::GetSharedInstance().GetImageNamed( 69 return &ResourceBundle::GetSharedInstance().GetImageNamed(
70 IDR_PRODUCT_LOGO_16); 70 IDR_PRODUCT_LOGO_16);
71 } 71 }
72 72
73 int TestConfirmBubbleModel::GetButtons() const { 73 int TestConfirmBubbleModel::GetButtons() const {
74 return BUTTON_OK | BUTTON_CANCEL; 74 return BUTTON_OK | BUTTON_CANCEL;
75 } 75 }
76 76
77 base::string16 TestConfirmBubbleModel::GetButtonLabel( 77 base::string16 TestConfirmBubbleModel::GetButtonLabel(
78 BubbleButton button) const { 78 BubbleButton button) const {
79 return button == BUTTON_OK ? ASCIIToUTF16("OK") : ASCIIToUTF16("Cancel"); 79 return button == BUTTON_OK ? base::ASCIIToUTF16("OK")
80 : base::ASCIIToUTF16("Cancel");
80 } 81 }
81 82
82 void TestConfirmBubbleModel::Accept() { 83 void TestConfirmBubbleModel::Accept() {
83 *accept_clicked_ = true; 84 *accept_clicked_ = true;
84 } 85 }
85 86
86 void TestConfirmBubbleModel::Cancel() { 87 void TestConfirmBubbleModel::Cancel() {
87 *cancel_clicked_ = true; 88 *cancel_clicked_ = true;
88 } 89 }
89 90
90 base::string16 TestConfirmBubbleModel::GetLinkText() const { 91 base::string16 TestConfirmBubbleModel::GetLinkText() const {
91 return ASCIIToUTF16("Link"); 92 return base::ASCIIToUTF16("Link");
92 } 93 }
93 94
94 void TestConfirmBubbleModel::LinkClicked() { 95 void TestConfirmBubbleModel::LinkClicked() {
95 *link_clicked_ = true; 96 *link_clicked_ = true;
96 } 97 }
97 98
98 } // namespace 99 } // namespace
99 100
100 class ConfirmBubbleControllerTest : public CocoaTest { 101 class ConfirmBubbleControllerTest : public CocoaTest {
101 public: 102 public:
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 // Click its link and verify this view has been removed from the test window. 185 // Click its link and verify this view has been removed from the test window.
185 // Also verify TestConfirmBubbleModel::LinkClicked() has been called. 186 // Also verify TestConfirmBubbleModel::LinkClicked() has been called.
186 [bubble clickLink]; 187 [bubble clickLink];
187 188
188 contains_bubble_view = [[view subviews] containsObject:bubble]; 189 contains_bubble_view = [[view subviews] containsObject:bubble];
189 EXPECT_FALSE(contains_bubble_view); 190 EXPECT_FALSE(contains_bubble_view);
190 EXPECT_FALSE(accept_clicked()); 191 EXPECT_FALSE(accept_clicked());
191 EXPECT_FALSE(cancel_clicked()); 192 EXPECT_FALSE(cancel_clicked());
192 EXPECT_TRUE(link_clicked()); 193 EXPECT_TRUE(link_clicked());
193 } 194 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698