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

Side by Side Diff: webkit/tools/test_shell/test_webview_delegate_mac.mm

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 "webkit/tools/test_shell/test_webview_delegate.h" 5 #include "webkit/tools/test_shell/test_webview_delegate.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 } 254 }
255 255
256 // Public methods ------------------------------------------------------------- 256 // Public methods -------------------------------------------------------------
257 257
258 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) { 258 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
259 // No selection clipboard on mac, do nothing. 259 // No selection clipboard on mac, do nothing.
260 } 260 }
261 261
262 // Private methods ------------------------------------------------------------ 262 // Private methods ------------------------------------------------------------
263 263
264 void TestWebViewDelegate::ShowJavaScriptAlert(const string16& message) { 264 void TestWebViewDelegate::ShowJavaScriptAlert(const base::string16& message) {
265 NSString *text = 265 NSString *text =
266 [NSString stringWithUTF8String:UTF16ToUTF8(message).c_str()]; 266 [NSString stringWithUTF8String:UTF16ToUTF8(message).c_str()];
267 NSAlert *alert = [NSAlert alertWithMessageText:@"JavaScript Alert" 267 NSAlert *alert = [NSAlert alertWithMessageText:@"JavaScript Alert"
268 defaultButton:@"OK" 268 defaultButton:@"OK"
269 alternateButton:nil 269 alternateButton:nil
270 otherButton:nil 270 otherButton:nil
271 informativeTextWithFormat:@"%@", text]; 271 informativeTextWithFormat:@"%@", text];
272 [alert runModal]; 272 [alert runModal];
273 } 273 }
274 274
275 void TestWebViewDelegate::SetPageTitle(const string16& title) { 275 void TestWebViewDelegate::SetPageTitle(const base::string16& title) {
276 [[shell_->webViewHost()->view_handle() window] 276 [[shell_->webViewHost()->view_handle() window]
277 setTitle:[NSString stringWithUTF8String:UTF16ToUTF8(title).c_str()]]; 277 setTitle:[NSString stringWithUTF8String:UTF16ToUTF8(title).c_str()]];
278 } 278 }
279 279
280 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) { 280 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
281 const char* frameURL = url.spec().c_str(); 281 const char* frameURL = url.spec().c_str();
282 NSString *address = [NSString stringWithUTF8String:frameURL]; 282 NSString *address = [NSString stringWithUTF8String:frameURL];
283 [shell_->editWnd() setStringValue:address]; 283 [shell_->editWnd() setStringValue:address];
284 } 284 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698