summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
commit6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch)
tree6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /chrome/browser/ui/gtk/browser_window_gtk.cc
parentdd8d12a86e01b35b76f4add67cf5e222a475662b (diff)
downloadchromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.zip
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.gz
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.bz2
Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location,
so the original code that created the delayed callback is lost." This reverts commit 4cf5cf73d319b69c32ad30af8954235755856455. (r99284) TBR=jbates@chromium.org Review URL: http://codereview.chromium.org/7825026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 94f6066..4c52e9f 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -792,7 +792,7 @@ void BrowserWindowGtk::UpdateLoadingAnimations(bool should_animate) {
if (should_animate) {
if (!loading_animation_timer_.IsRunning()) {
// Loads are happening, and the timer isn't running, so start it.
- loading_animation_timer_.Start(FROM_HERE,
+ loading_animation_timer_.Start(
base::TimeDelta::FromMilliseconds(kLoadingAnimationFrameTimeMs), this,
&BrowserWindowGtk::LoadingAnimationCallback);
}
@@ -1419,8 +1419,8 @@ gboolean BrowserWindowGtk::OnConfigure(GtkWidget* widget,
// (In that case Stop() is a no-op.)
if (!debounce_timer_disabled_) {
window_configure_debounce_timer_.Stop();
- window_configure_debounce_timer_.Start(FROM_HERE,
- base::TimeDelta::FromMilliseconds(kDebounceTimeoutMilliseconds), this,
+ window_configure_debounce_timer_.Start(base::TimeDelta::FromMilliseconds(
+ kDebounceTimeoutMilliseconds), this,
&BrowserWindowGtk::OnDebouncedBoundsChanged);
}