summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/ash/chrome_shell_delegate.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-06 23:58:45 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-06 23:58:45 +0000
commitdcd0249870cc1ead35ce6d3d8295b1c96a83aeb0 (patch)
treede67c3f98feabf0222a0b82113c4c6d796117c0f /chrome/browser/ui/ash/chrome_shell_delegate.h
parent8daeb41bb826c0908d1b5a2132c90a068ecf2c46 (diff)
downloadchromium_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/chrome_shell_delegate.h')
-rw-r--r--chrome/browser/ui/ash/chrome_shell_delegate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index 1fd08b59..ce73296 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -60,7 +60,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;
virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;
virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
- virtual string16 GetProductName() const OVERRIDE;
+ virtual base::string16 GetProductName() const OVERRIDE;
// content::NotificationObserver override:
virtual void Observe(int type,