summaryrefslogtreecommitdiffstats
path: root/views/controls/progress_bar.h
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 18:01:01 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 18:01:01 +0000
commit8d37b11e3db0bf4ef7bfb76ae0148d2420eb7cd4 (patch)
tree2340c444189431df19b1685ecf9ecbe21efc5fb1 /views/controls/progress_bar.h
parent6417f0b7a24856edba82bd8385a55e940af875c9 (diff)
downloadchromium_src-8d37b11e3db0bf4ef7bfb76ae0148d2420eb7cd4.zip
chromium_src-8d37b11e3db0bf4ef7bfb76ae0148d2420eb7cd4.tar.gz
chromium_src-8d37b11e3db0bf4ef7bfb76ae0148d2420eb7cd4.tar.bz2
wstring: remove wstrings from all tooltip-related code
This is a nearly-mechanical translation of wstring to string16. Removes a *ton* of string conversions. Review URL: http://codereview.chromium.org/7886023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/progress_bar.h')
-rw-r--r--views/controls/progress_bar.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/views/controls/progress_bar.h b/views/controls/progress_bar.h
index 5156c8f..c4d3f24 100644
--- a/views/controls/progress_bar.h
+++ b/views/controls/progress_bar.h
@@ -39,8 +39,7 @@ class VIEWS_EXPORT ProgressBar : public View {
virtual std::string GetClassName() const OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
- virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
- OVERRIDE;
+ virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE;
// Sets the inclusive range of values to be displayed. Values outside of the
// range will be capped when displayed.
@@ -54,7 +53,7 @@ class VIEWS_EXPORT ProgressBar : public View {
// Sets the tooltip text. Default behavior for a progress bar is to show no
// tooltip on mouse hover. Calling this lets you set a custom tooltip. To
// revert to default behavior, call this with an empty string.
- virtual void SetTooltipText(const std::wstring& tooltip_text);
+ void SetTooltipText(const string16& tooltip_text);
private: