summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 19:28:34 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 19:28:34 +0000
commit0fbd7033b5818725b4e956b93193f20f94fd698f (patch)
treeb8f8b1bfda547db52d90b7afaa79eab3989a2ddd /views
parent68228cdf78bbc4abf2dbef712693ec8ee59d1f64 (diff)
downloadchromium_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 'views')
-rw-r--r--views/focus/focus_util_win.cc2
-rw-r--r--views/widget/widget_gtk.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/views/focus/focus_util_win.cc b/views/focus/focus_util_win.cc
index 2490528..381d02b 100644
--- a/views/focus/focus_util_win.cc
+++ b/views/focus/focus_util_win.cc
@@ -103,7 +103,7 @@ bool RerouteMouseWheel(HWND window, WPARAM w_param, LPARAM l_param) {
// window_under_wheel is a Chrome window. If allowed, redirect.
if (IsCompatibleWithMouseWheelRedirection(window_under_wheel)) {
- AutoReset auto_reset_recursion_break(&recursion_break, true);
+ AutoReset<bool> auto_reset_recursion_break(&recursion_break, true);
SendMessage(window_under_wheel, WM_MOUSEWHEEL, w_param, l_param);
return true;
}
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 1014af7..b166fce 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -721,7 +721,7 @@ void WidgetGtk::PaintNow(const gfx::Rect& update_rect) {
gtk_widget_queue_draw_area(widget_, update_rect.x(), update_rect.y(),
update_rect.width(), update_rect.height());
// Force the paint to occur now.
- AutoReset auto_reset_in_paint_now(&in_paint_now_, true);
+ AutoReset<bool> auto_reset_in_paint_now(&in_paint_now_, true);
gdk_window_process_updates(widget_->window, true);
}
}