diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 16:48:58 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 16:48:58 +0000 |
| commit | 8050ca9e629f560af14653566de54a12dc2bcc78 (patch) | |
| tree | 7a260a343229527e5a958d52f2d81d89da4610d7 /views/widget | |
| parent | 94cf539833e4c68c2a2ceaf59443a6cdc0cc684d (diff) | |
| download | chromium_src-8050ca9e629f560af14653566de54a12dc2bcc78.zip chromium_src-8050ca9e629f560af14653566de54a12dc2bcc78.tar.gz chromium_src-8050ca9e629f560af14653566de54a12dc2bcc78.tar.bz2 | |
Remove wstring from views. Part 1: Switch member variables to string16.
BUG=68267
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6123003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/tooltip_manager_win.cc | 2 | ||||
| -rw-r--r-- | views/widget/tooltip_manager_win.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc index b7b3a09..04e990b 100644 --- a/views/widget/tooltip_manager_win.cc +++ b/views/widget/tooltip_manager_win.cc @@ -160,7 +160,7 @@ LRESULT TooltipManagerWin::OnNotify(int w_param, clipped_text_.clear(); if (last_tooltip_view_ != NULL) { tooltip_text_.clear(); - // Mouse is over a View, ask the View for it's tooltip. + // Mouse is over a View, ask the View for its tooltip. gfx::Point view_loc = last_mouse_pos_; View::ConvertPointToView(widget_->GetRootView(), last_tooltip_view_, &view_loc); diff --git a/views/widget/tooltip_manager_win.h b/views/widget/tooltip_manager_win.h index 27c7e7a..3bca4ef 100644 --- a/views/widget/tooltip_manager_win.h +++ b/views/widget/tooltip_manager_win.h @@ -11,6 +11,7 @@ #include <string> #include "base/basictypes.h" +#include "base/string16.h" #include "gfx/native_widget_types.h" #include "gfx/point.h" #include "base/task.h" @@ -125,10 +126,10 @@ class TooltipManagerWin : public TooltipManager { bool last_view_out_of_sync_; // Text for tooltip from the view. - std::wstring tooltip_text_; + string16 tooltip_text_; // The clipped tooltip. - std::wstring clipped_text_; + string16 clipped_text_; // Number of lines in the tooltip. int line_count_; |