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/ash/launcher/launcher_context_menu.cc | |
| 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/ash/launcher/launcher_context_menu.cc')
| -rw-r--r-- | chrome/browser/ui/ash/launcher/launcher_context_menu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc index 620ca95..ea15a95 100644 --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc @@ -73,7 +73,7 @@ void LauncherContextMenu::Init() { item_.type == ash::TYPE_WINDOWED_APP) { // V1 apps can be started from the menu - but V2 apps should not. if (!controller_->IsPlatformApp(item_.id)) { - AddItem(MENU_OPEN_NEW, string16()); + AddItem(MENU_OPEN_NEW, base::string16()); AddSeparator(ui::NORMAL_SEPARATOR); } AddItem( @@ -129,7 +129,7 @@ void LauncherContextMenu::Init() { if (!app_id.empty()) { int index = 0; extension_items_->AppendExtensionItems( - app_id, string16(), &index); + app_id, base::string16(), &index); AddSeparator(ui::NORMAL_SEPARATOR); } } @@ -175,7 +175,7 @@ string16 LauncherContextMenu::GetLabelForCommandId(int command_id) const { } } NOTREACHED(); - return string16(); + return base::string16(); } bool LauncherContextMenu::IsCommandIdChecked(int command_id) const { |