diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 23:58:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 23:58:45 +0000 |
| commit | dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0 (patch) | |
| tree | de67c3f98feabf0222a0b82113c4c6d796117c0f /chrome/browser/ui/cocoa/external_protocol_dialog.mm | |
| parent | 8daeb41bb826c0908d1b5a2132c90a068ecf2c46 (diff) | |
| download | chromium_src-dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0.zip chromium_src-dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0.tar.gz chromium_src-dcd0249870cc1ead35ce6d3d8295b1c96a83aeb0.tar.bz2 | |
Use base namespace for string16 in chrome/browser.
This converts 200 more files.
TBR=sky
Review URL: https://codereview.chromium.org/108353004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/external_protocol_dialog.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/external_protocol_dialog.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.mm b/chrome/browser/ui/cocoa/external_protocol_dialog.mm index d4aacba..5525925 100644 --- a/chrome/browser/ui/cocoa/external_protocol_dialog.mm +++ b/chrome/browser/ui/cocoa/external_protocol_dialog.mm @@ -44,7 +44,7 @@ void ExternalProtocolHandler::RunExternalProtocolDialog( url_ = *url; creation_time_ = base::Time::Now(); - string16 appName = [self appNameForProtocol]; + base::string16 appName = [self appNameForProtocol]; if (appName.length() == 0) { // No registered apps for this protocol; give up and go home. [self autorelease]; @@ -64,7 +64,7 @@ void ExternalProtocolHandler::RunExternalProtocolDialog( IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT)]; const int kMaxUrlWithoutSchemeSize = 256; - string16 elided_url_without_scheme; + base::string16 elided_url_without_scheme; gfx::ElideString(ASCIIToUTF16(url_.possibly_invalid_spec()), kMaxUrlWithoutSchemeSize, &elided_url_without_scheme); @@ -143,7 +143,7 @@ void ExternalProtocolHandler::RunExternalProtocolDialog( &openingApp); if (status != noErr) { // likely kLSApplicationNotFoundErr - return string16(); + return base::string16(); } NSString* appPath = [(NSURL*)openingApp path]; CFRelease(openingApp); // NOT A BUG; LSGetApplicationForURL retains for us |