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/tab_contents | |
| 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/tab_contents')
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h index c43503a..43afdd7 100644 --- a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h +++ b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h @@ -31,7 +31,7 @@ class RenderViewContextMenuMac : public RenderViewContextMenu { virtual void UpdateMenuItem(int command_id, bool enabled, bool hidden, - const string16& title) OVERRIDE; + const base::string16& title) OVERRIDE; protected: // RenderViewContextMenu implementation. diff --git a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm index 4caf5ce..47c4516 100644 --- a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm @@ -265,7 +265,7 @@ void RenderViewContextMenuMac::StopSpeaking() { void RenderViewContextMenuMac::UpdateMenuItem(int command_id, bool enabled, bool hidden, - const string16& title) { + const base::string16& title) { NSMenuItem* item = GetMenuItemByID(&menu_model_, [menu_controller_ menu], command_id); if (!item) diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm index 411ffff..769ea74 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm @@ -147,7 +147,7 @@ static const CGFloat kTabHorzMargin = 13; // Get the help text and link. size_t linkOffset = 0; NSString* helpMessage(base::SysUTF16ToNSString(l10n_util::GetStringFUTF16( - IDS_SAD_TAB_HELP_MESSAGE, string16(), &linkOffset))); + IDS_SAD_TAB_HELP_MESSAGE, base::string16(), &linkOffset))); NSString* helpLink = l10n_util::GetNSString(IDS_SAD_TAB_HELP_LINK); NSFont* font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]; [help_.get() setMessageAndLink:helpMessage |