diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 20:03:44 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 20:03:44 +0000 |
| commit | 2aadf21d2ff4882cb94510e4107067a70a928850 (patch) | |
| tree | 8acbc4f186e6fc73a20292b2baca8efc954d47cb /ui/views/linux_ui | |
| parent | df97969962d83bf8ad962bc3d46b824ebeee4af0 (diff) | |
| download | chromium_src-2aadf21d2ff4882cb94510e4107067a70a928850.zip chromium_src-2aadf21d2ff4882cb94510e4107067a70a928850.tar.gz chromium_src-2aadf21d2ff4882cb94510e4107067a70a928850.tar.bz2 | |
Prefix string16 with base:: in ui/.
R=sky@chromium.org, tsepez@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/117983002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/linux_ui')
| -rw-r--r-- | ui/views/linux_ui/linux_ui.h | 2 | ||||
| -rw-r--r-- | ui/views/linux_ui/status_icon_linux.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h index 152b364..3a27067 100644 --- a/ui/views/linux_ui/linux_ui.h +++ b/ui/views/linux_ui/linux_ui.h @@ -86,7 +86,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, // Create a native status icon. virtual scoped_ptr<StatusIconLinux> CreateLinuxStatusIcon( const gfx::ImageSkia& image, - const string16& tool_tip) const = 0; + const base::string16& tool_tip) const = 0; // Returns the icon for a given content type from the icon theme. // TODO(davidben): Add an observer for the theme changing, so we can drop the diff --git a/ui/views/linux_ui/status_icon_linux.h b/ui/views/linux_ui/status_icon_linux.h index 5ed8be2..b7ed3c7 100644 --- a/ui/views/linux_ui/status_icon_linux.h +++ b/ui/views/linux_ui/status_icon_linux.h @@ -38,7 +38,7 @@ class VIEWS_EXPORT StatusIconLinux { virtual void SetImage(const gfx::ImageSkia& image) = 0; virtual void SetPressedImage(const gfx::ImageSkia& image) = 0; - virtual void SetToolTip(const string16& tool_tip) = 0; + virtual void SetToolTip(const base::string16& tool_tip) = 0; // Invoked after a call to SetContextMenu() to let the platform-specific // subclass update the native context menu based on the new model. The |