diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 19:28:34 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 19:28:34 +0000 |
| commit | 0fbd7033b5818725b4e956b93193f20f94fd698f (patch) | |
| tree | b8f8b1bfda547db52d90b7afaa79eab3989a2ddd /chrome/browser/autocomplete | |
| parent | 68228cdf78bbc4abf2dbef712693ec8ee59d1f64 (diff) | |
| download | chromium_src-0fbd7033b5818725b4e956b93193f20f94fd698f.zip chromium_src-0fbd7033b5818725b4e956b93193f20f94fd698f.tar.gz chromium_src-0fbd7033b5818725b4e956b93193f20f94fd698f.tar.bz2 | |
Fixing AutoReset to be a template.
I've run into a couple of times this week when I needed one of these, for two different types besides bool. Time to fix the TODO.
TEST=trybots FTW, and built locally.
BUG=none
Review URL: http://codereview.chromium.org/2394001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 6a17f80..38bc75e 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -1693,7 +1693,7 @@ LRESULT AutocompleteEditViewWin::OnSetText(const wchar_t* text) { // We wouldn't need to do this update anyway, because either we're in the // middle of updating the omnibox already or the caller of SetWindowText() // is going to update the omnibox next. - AutoReset auto_reset_ignore_ime_messages(&ignore_ime_messages_, true); + AutoReset<bool> auto_reset_ignore_ime_messages(&ignore_ime_messages_, true); return DefWindowProc(WM_SETTEXT, 0, reinterpret_cast<LPARAM>(text)); } @@ -2336,7 +2336,7 @@ void AutocompleteEditViewWin::StartDragIfNecessary(const CPoint& point) { scoped_refptr<BaseDragSource> drag_source(new BaseDragSource); DWORD dropped_mode; - AutoReset auto_reset_in_drag(&in_drag_, true); + AutoReset<bool> auto_reset_in_drag(&in_drag_, true); if (DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source, supported_modes, &dropped_mode) == DRAGDROP_S_DROP) { if ((dropped_mode == DROPEFFECT_MOVE) && (start_text == GetText())) { |