Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2828)

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 7812036: Update base/timer.h code to pass through Location from call sites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build, consistency Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 7334e48026702307fbdfc2473f8424fd2b282d92..cf3f7bd3ff554f5537676577c7cb3013b1c0f3af 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -515,7 +515,7 @@ void InstantController::InstantStatusChanged(InstantLoader* loader) {
// Status isn't ok, start a timer that when fires shows the result. This
// delays showing 403 pages and the like.
show_timer_.Stop();
- show_timer_.Start(
+ show_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kShowDelayMS),
this, &InstantController::ShowTimerFired);
UpdateDisplayableLoader();
@@ -664,7 +664,8 @@ void InstantController::ScheduleUpdate(const GURL& url) {
scheduled_url_ = url;
update_timer_.Stop();
- update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdateDelayMS),
+ update_timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMilliseconds(kUpdateDelayMS),
this, &InstantController::ProcessScheduledUpdate);
}
@@ -719,7 +720,7 @@ void InstantController::UpdateLoader(const TemplateURL* template_url,
user_text, verbatim, suggested_text)) {
show_timer_.Stop();
if (!new_loader->http_status_ok()) {
- show_timer_.Start(
+ show_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kShowDelayMS),
this, &InstantController::ShowTimerFired);
}

Powered by Google App Engine
This is Rietveld 408576698