diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:28:56 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:28:56 +0000 |
commit | 6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch) | |
tree | 6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /chrome/browser | |
parent | dd8d12a86e01b35b76f4add67cf5e222a475662b (diff) | |
download | chromium_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')
62 files changed, 79 insertions, 105 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index 8d1a363..585fdd5 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -1018,7 +1018,6 @@ void AutocompleteController::CheckIfDone() { void AutocompleteController::StartExpireTimer() { if (result_.HasCopiedMatches()) - expire_timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kExpireTimeMS), + expire_timer_.Start(base::TimeDelta::FromMilliseconds(kExpireTimeMS), this, &AutocompleteController::ExpireCopiedEntries); } diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index c50b8c8..11a335b 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -365,8 +365,7 @@ void SearchProvider::StartOrStopSuggestQuery(bool minimal_changes) { // Kick off a timer that will start the URL fetch if it completes before // the user types another character. int delay = query_suggest_immediately_ ? 0 : kQueryDelayMs; - timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(delay), this, - &SearchProvider::Run); + timer_.Start(TimeDelta::FromMilliseconds(delay), this, &SearchProvider::Run); } bool SearchProvider::IsQuerySuitableForSuggest() const { diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc index 1b0b3e6..30d1f03 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.cc +++ b/chrome/browser/bookmarks/bookmark_drop_info.cc @@ -42,7 +42,7 @@ void BookmarkDropInfo::Update(const views::DropTargetEvent& event) { scroll_up_ = (last_y_ <= top_margin_ + views::kAutoscrollSize); if (scroll_up_ || scroll_down) { if (!scroll_timer_.IsRunning()) { - scroll_timer_.Start(FROM_HERE, + scroll_timer_.Start( base::TimeDelta::FromMilliseconds(views::kAutoscrollRowTimerMS), this, &BookmarkDropInfo::Scroll); diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index ca60f3b..c46580a 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -652,7 +652,7 @@ void BrowserProcessImpl::Observe(int type, #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) void BrowserProcessImpl::StartAutoupdateTimer() { - autoupdate_timer_.Start(FROM_HERE, + autoupdate_timer_.Start( base::TimeDelta::FromHours(kUpdateCheckIntervalHours), this, &BrowserProcessImpl::OnAutoupdateTimer); diff --git a/chrome/browser/chromeos/cros/login_library.cc b/chrome/browser/chromeos/cros/login_library.cc index 238b52b..af42d4a 100644 --- a/chrome/browser/chromeos/cros/login_library.cc +++ b/chrome/browser/chromeos/cros/login_library.cc @@ -89,7 +89,7 @@ class LoginLibraryImpl : public LoginLibrary { // just kills us so settings may be lost. See http://crosbug.com/13102 local_state_->CommitPendingWrite(); timer_.Start( - FROM_HERE, base::TimeDelta::FromSeconds(3), this, + base::TimeDelta::FromSeconds(3), this, &JobRestartRequest::RestartJob); // Post task on file thread thus it occurs last on task queue, so it // would be executed after committing pending write on file thread. diff --git a/chrome/browser/chromeos/cros/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc index 721202b..a8e62dc 100644 --- a/chrome/browser/chromeos/cros/power_library.cc +++ b/chrome/browser/chromeos/cros/power_library.cc @@ -172,7 +172,6 @@ class PowerLibraryStubImpl : public PowerLibrary { battery_percentage_(20), pause_count_(0) { timer_.Start( - FROM_HERE, base::TimeDelta::FromMilliseconds(100), this, &PowerLibraryStubImpl::Update); diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index bd47d4a..4f944e6 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -346,8 +346,7 @@ void ServicesCustomizationDocument::OnURLFetchComplete( NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary(); if (!network->Connected() && num_retries_ < kMaxFetchRetries) { num_retries_++; - retry_timer_.Start(FROM_HERE, - base::TimeDelta::FromSeconds(kRetriesDelayInSec), + retry_timer_.Start(base::TimeDelta::FromSeconds(kRetriesDelayInSec), this, &ServicesCustomizationDocument::StartFileFetch); return; } diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc index a860934e..7fabbb9 100644 --- a/chrome/browser/chromeos/login/network_screen.cc +++ b/chrome/browser/chromeos/login/network_screen.cc @@ -170,8 +170,7 @@ void NetworkScreen::StopWaitingForConnection(const string16& network_id) { void NetworkScreen::WaitForConnection(const string16& network_id) { if (network_id_ != network_id || !connection_timer_.IsRunning()) { connection_timer_.Stop(); - connection_timer_.Start(FROM_HERE, - base::TimeDelta::FromSeconds(kConnectionTimeoutSec), + connection_timer_.Start(base::TimeDelta::FromSeconds(kConnectionTimeoutSec), this, &NetworkScreen::OnConnectionTimeout); } diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index b9d40f9..fe1616b 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -675,8 +675,7 @@ class LockerInputEventObserver : public MessageLoopForUI::Observer { explicit LockerInputEventObserver(ScreenLocker* screen_locker) : screen_locker_(screen_locker), ALLOW_THIS_IN_INITIALIZER_LIST( - timer_(FROM_HERE, - base::TimeDelta::FromSeconds(kScreenSaverIdleTimeout), this, + timer_(base::TimeDelta::FromSeconds(kScreenSaverIdleTimeout), this, &LockerInputEventObserver::StartScreenSaver)) { } diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc index 676c22e..8e70834 100644 --- a/chrome/browser/chromeos/login/update_screen.cc +++ b/chrome/browser/chromeos/login/update_screen.cc @@ -156,8 +156,7 @@ void UpdateScreen::UpdateStatusChanged(UpdateLibrary* library) { actor_->ShowCurtain(false); VLOG(1) << "Initiate reboot after update"; CrosLibrary::Get()->GetUpdateLibrary()->RebootAfterUpdate(); - reboot_timer_.Start(FROM_HERE, - base::TimeDelta::FromSeconds(reboot_check_delay_), + reboot_timer_.Start(base::TimeDelta::FromSeconds(reboot_check_delay_), this, &UpdateScreen::OnWaitForRebootTimeElapsed); } else { diff --git a/chrome/browser/chromeos/login/web_page_screen.cc b/chrome/browser/chromeos/login/web_page_screen.cc index ae5d33f..694cad7 100644 --- a/chrome/browser/chromeos/login/web_page_screen.cc +++ b/chrome/browser/chromeos/login/web_page_screen.cc @@ -50,8 +50,7 @@ void WebPageScreen::OnNetworkTimeout() { void WebPageScreen::StartTimeoutTimer() { StopTimeoutTimer(); - timeout_timer_.Start(FROM_HERE, - TimeDelta::FromSeconds(kNetworkTimeoutSec), + timeout_timer_.Start(TimeDelta::FromSeconds(kNetworkTimeoutSec), this, &WebPageScreen::OnNetworkTimeout); } diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 4ce06c5..7c4826d 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -123,8 +123,7 @@ void WebPageView::Init() { connecting_label_->SetVisible(false); AddChildView(connecting_label_ ); - start_timer_.Start(FROM_HERE, - TimeDelta::FromMilliseconds(kStartDelayMs), + start_timer_.Start(TimeDelta::FromMilliseconds(kStartDelayMs), this, &WebPageView::ShowWaitingControls); } @@ -151,8 +150,7 @@ void WebPageView::ShowPageContent() { // TODO(nkostylev): Show throbber as an overlay until page has been rendered. start_timer_.Stop(); if (!stop_timer_.IsRunning()) { - stop_timer_.Start(FROM_HERE, - TimeDelta::FromMilliseconds(kStopDelayMs), + stop_timer_.Start(TimeDelta::FromMilliseconds(kStopDelayMs), this, &WebPageView::ShowRenderedPage); } diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 5fc5e5e..a2445314 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -502,7 +502,6 @@ void WizardController::SetCurrentScreenSmooth(WizardScreen* new_current, if (use_smoothing) { smooth_show_timer_.Start( - FROM_HERE, base::TimeDelta::FromMilliseconds(kShowDelayMs), this, &WizardController::ShowCurrentScreen); diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc index 7a35a99..116c445 100644 --- a/chrome/browser/chromeos/setting_level_bubble.cc +++ b/chrome/browser/chromeos/setting_level_bubble.cc @@ -148,8 +148,7 @@ void SettingLevelBubble::ShowBubble(double percent, bool enabled) { view_->SetEnabled(enabled); } - hide_timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kBubbleShowTimeoutMs), + hide_timer_.Start(base::TimeDelta::FromMilliseconds(kBubbleShowTimeoutMs), this, &SettingLevelBubble::OnHideTimeout); } @@ -233,8 +232,7 @@ void SettingLevelBubble::UpdateTargetPercent(double percent) { target_time_ = now + TimeDelta::FromMilliseconds(duration_ms); if (!is_animating_) { - animation_timer_.Start(FROM_HERE, - TimeDelta::FromMilliseconds(kAnimationIntervalMs), + animation_timer_.Start(TimeDelta::FromMilliseconds(kAnimationIntervalMs), this, &SettingLevelBubble::OnAnimationTimeout); is_animating_ = true; diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 5df5502..ac5b0b6 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -80,7 +80,7 @@ void ClockMenuButton::UpdateTextAndSetNextTimer() { // called just a teeny bit early, then it will skip the next minute. seconds_left += kTimerSlopSeconds; - timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(seconds_left), this, + timer_.Start(base::TimeDelta::FromSeconds(seconds_left), this, &ClockMenuButton::UpdateTextAndSetNextTimer); } diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc index cda69ff..fe4c33c 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.cc +++ b/chrome/browser/chromeos/status/memory_menu_button.cc @@ -66,8 +66,7 @@ MemoryMenuButton::~MemoryMenuButton() { void MemoryMenuButton::UpdateTextAndSetNextTimer() { UpdateText(); - timer_.Start(FROM_HERE, - base::TimeDelta::FromSeconds(kUpdateIntervalSeconds), this, + timer_.Start(base::TimeDelta::FromSeconds(kUpdateIntervalSeconds), this, &MemoryMenuButton::UpdateTextAndSetNextTimer); } diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.cc b/chrome/browser/chromeos/upgrade_detector_chromeos.cc index 9445c04..809ba4a 100644 --- a/chrome/browser/chromeos/upgrade_detector_chromeos.cc +++ b/chrome/browser/chromeos/upgrade_detector_chromeos.cc @@ -37,7 +37,7 @@ void UpgradeDetectorChromeos::UpdateStatusChanged( // Setup timer to to move along the upgrade advisory system. upgrade_notification_timer_.Start( - FROM_HERE, base::TimeDelta::FromMilliseconds(kNotifyCycleTimeMs), + base::TimeDelta::FromMilliseconds(kNotifyCycleTimeMs), this, &UpgradeDetectorChromeos::NotifyOnUpgrade); } diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index d92516a..8b78857 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -336,7 +336,7 @@ ComponentUpdateService::Status CrxUpdateService::Start() { Source<ComponentUpdateService>(this), NotificationService::NoDetails()); - timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(config_->InitialDelay()), + timer_.Start(base::TimeDelta::FromSeconds(config_->InitialDelay()), this, &CrxUpdateService::ProcessPendingItems); return kOk; } @@ -374,7 +374,7 @@ void CrxUpdateService::ScheduleNextRun(bool step_delay) { return; } - timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(delay), + timer_.Start(base::TimeDelta::FromSeconds(delay), this, &CrxUpdateService::ProcessPendingItems); } diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 694de06..e056cd4 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -904,7 +904,7 @@ EnumerateModulesModel::EnumerateModulesModel() suspected_bad_modules_detected_(0) { const CommandLine& cmd_line = *CommandLine::ForCurrentProcess(); if (cmd_line.HasSwitch(switches::kConflictingModulesCheck)) { - check_modules_timer_.Start(FROM_HERE, + check_modules_timer_.Start( base::TimeDelta::FromMilliseconds(kModuleCheckDelayMs), this, &EnumerateModulesModel::ScanNow); } diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index bede960..2bd4e6b 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -942,7 +942,7 @@ void ExtensionUpdater::ScheduleNextCheck(const TimeDelta& target_delay) { prefs_->SetInt64(kNextExtensionsUpdateCheck, next.ToInternalValue()); prefs_->ScheduleSavePersistentPrefs(); - timer_.Start(FROM_HERE, actual_delay, this, &ExtensionUpdater::TimerFired); + timer_.Start(actual_delay, this, &ExtensionUpdater::TimerFired); } void ExtensionUpdater::TimerFired() { diff --git a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc index 9b38568..1eaf24c 100644 --- a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc +++ b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc @@ -59,7 +59,7 @@ bool WebSocketProxyPrivateGetPassportForTCPFunction::RunImpl() { if (delay_response) { const int kTimeout = 3; - timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeout), + timer_.Start(base::TimeDelta::FromSeconds(kTimeout), this, &WebSocketProxyPrivateGetPassportForTCPFunction::Finalize); } else { Finalize(); diff --git a/chrome/browser/extensions/extensions_quota_service.cc b/chrome/browser/extensions/extensions_quota_service.cc index 6c441b1..0c41656 100644 --- a/chrome/browser/extensions/extensions_quota_service.cc +++ b/chrome/browser/extensions/extensions_quota_service.cc @@ -18,8 +18,7 @@ const char QuotaLimitHeuristic::kGenericOverQuotaError[] = ExtensionsQuotaService::ExtensionsQuotaService() { if (MessageLoop::current() != NULL) { // Null in unit tests. - purge_timer_.Start(FROM_HERE, - base::TimeDelta::FromDays(kPurgeIntervalInDays), + purge_timer_.Start(base::TimeDelta::FromDays(kPurgeIntervalInDays), this, &ExtensionsQuotaService::Purge); } } diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 25e333b..d6bb0dc 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -946,7 +946,7 @@ void TopSites::RestartQueryForTopSitesTimer(base::TimeDelta delta) { timer_start_time_ = base::TimeTicks::Now(); timer_.Stop(); - timer_.Start(FROM_HERE, delta, this, &TopSites::TimerFired); + timer_.Start(delta, this, &TopSites::TimerFired); } void TopSites::OnHistoryMigrationWrittenToDisk(TopSitesBackend::Handle handle) { diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index f24cf5e..deac866 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -520,7 +520,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(FROM_HERE, + show_timer_.Start( base::TimeDelta::FromMilliseconds(kShowDelayMS), this, &InstantController::ShowTimerFired); UpdateDisplayableLoader(); @@ -669,8 +669,7 @@ void InstantController::ScheduleUpdate(const GURL& url) { scheduled_url_ = url; update_timer_.Stop(); - update_timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kUpdateDelayMS), + update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdateDelayMS), this, &InstantController::ProcessScheduledUpdate); } @@ -725,7 +724,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(FROM_HERE, + show_timer_.Start( base::TimeDelta::FromMilliseconds(kShowDelayMS), this, &InstantController::ShowTimerFired); } diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 0ad7f8b..1a71176 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -684,7 +684,7 @@ void InstantLoader::SetOmniboxBounds(const gfx::Rect& bounds) { if (omnibox_bounds_.height() > last_omnibox_bounds_.height()) { SendBoundsToPage(false); } else { - update_bounds_timer_.Start(FROM_HERE, + update_bounds_timer_.Start( base::TimeDelta::FromMilliseconds(kUpdateBoundsDelayMS), this, &InstantLoader::ProcessBoundsChange); } diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc index 76e32b4..ac8d91f 100644 --- a/chrome/browser/internal_auth.cc +++ b/chrome/browser/internal_auth.cc @@ -343,7 +343,7 @@ class InternalAuthGenerationService : public base::ThreadChecker { void GenerateNewKey() { DCHECK(CalledOnValidThread()); if (!timer_.IsRunning()) { - timer_.Start(FROM_HERE, + timer_.Start( base::TimeDelta::FromMicroseconds( kKeyRegenerationSoftTicks * kTickUs), this, diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 23b4ca0..70a39c9 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -85,7 +85,7 @@ class PredictorTest : public testing::Test { void WaitForResolution(Predictor* predictor, const UrlList& hosts) { HelperTimer* timer = new HelperTimer(); - timer->Start(FROM_HERE, TimeDelta::FromMilliseconds(100), + timer->Start(TimeDelta::FromMilliseconds(100), new WaitForResolutionHelper(predictor, hosts, timer), &WaitForResolutionHelper::Run); MessageLoop::current()->Run(); diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc index f4ed3d8..a2fdf24 100644 --- a/chrome/browser/notifications/notification_ui_manager.cc +++ b/chrome/browser/notifications/notification_ui_manager.cc @@ -164,7 +164,7 @@ void NotificationUIManager::CheckUserState() { ShowNotifications(); } else if (!user_state_check_timer_.IsRunning()) { // Start a timer to detect the moment at which the user becomes active. - user_state_check_timer_.Start(FROM_HERE, + user_state_check_timer_.Start( base::TimeDelta::FromSeconds(kUserStatePollingIntervalSeconds), this, &NotificationUIManager::CheckUserState); } diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc index d3db051..fcd7a91 100644 --- a/chrome/browser/oom_priority_manager.cc +++ b/chrome/browser/oom_priority_manager.cc @@ -48,8 +48,7 @@ OomPriorityManager::~OomPriorityManager() { void OomPriorityManager::StartTimer() { if (!timer_.IsRunning()) { - timer_.Start(FROM_HERE, - TimeDelta::FromSeconds(ADJUSTMENT_INTERVAL_SECONDS), + timer_.Start(TimeDelta::FromSeconds(ADJUSTMENT_INTERVAL_SECONDS), this, &OomPriorityManager::AdjustOomPriorities); } diff --git a/chrome/browser/policy/delayed_work_scheduler.cc b/chrome/browser/policy/delayed_work_scheduler.cc index 35fd049..b751cb6 100644 --- a/chrome/browser/policy/delayed_work_scheduler.cc +++ b/chrome/browser/policy/delayed_work_scheduler.cc @@ -30,8 +30,7 @@ void DelayedWorkScheduler::PostDelayedWork( const base::Closure& callback, int64 delay) { callback_ = callback; - timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(delay), + timer_.Start(base::TimeDelta::FromMilliseconds(delay), this, &DelayedWorkScheduler::DoDelayedWork); } diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 6c53557..b33d31f 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -180,7 +180,7 @@ class PrerenderManager::MostVisitedSites : public NotificationObserver { if (profile && profile->GetTopSitesWithoutCreating()) { Init(); } else { - timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(3), this, + timer_.Start(base::TimeDelta::FromSeconds(3), this, &prerender::PrerenderManager::MostVisitedSites::Init); } } @@ -795,7 +795,7 @@ void PrerenderManager::StartSchedulingPeriodicCleanups() { DCHECK(CalledOnValidThread()); if (repeating_timer_.IsRunning()) return; - repeating_timer_.Start(FROM_HERE, + repeating_timer_.Start( base::TimeDelta::FromMilliseconds(kPeriodicCleanupIntervalMs), this, &PrerenderManager::PeriodicCleanup); diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 0b180a2..c1e61e3 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -183,7 +183,7 @@ bool PrintJob::FlushJob(int timeout_ms) { // wrong. base::OneShotTimer<MessageLoop> quit_task; if (timeout_ms) { - quit_task.Start(FROM_HERE, TimeDelta::FromMilliseconds(timeout_ms), + quit_task.Start(TimeDelta::FromMilliseconds(timeout_ms), MessageLoop::current(), &MessageLoop::Quit); } diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 015b1f3..2fbd080 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -481,8 +481,7 @@ bool PrintViewManager::RunInnerMessageLoop() { // memory-bound. static const int kPrinterSettingsTimeout = 60000; base::OneShotTimer<MessageLoop> quit_timer; - quit_timer.Start(FROM_HERE, - TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), + quit_timer.Start(TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), MessageLoop::current(), &MessageLoop::Quit); inside_inner_message_loop_ = true; diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index f4808e6..9055e59 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -470,7 +470,7 @@ class ProcessSingleton::LinuxWatcher // Wait for reads. MessageLoopForIO::current()->WatchFileDescriptor( fd, true, MessageLoopForIO::WATCH_READ, &fd_reader_, this); - timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeoutInSeconds), + timer_.Start(base::TimeDelta::FromSeconds(kTimeoutInSeconds), this, &SocketReader::OnTimerExpiry); } diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 0b3acf5..1ddbd12 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -310,7 +310,7 @@ ProfileImpl::ProfileImpl(const FilePath& path, DCHECK(!path.empty()) << "Using an empty path will attempt to write " << "profile files to the root directory!"; - create_session_service_timer_.Start(FROM_HERE, + create_session_service_timer_.Start( TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this, &ProfileImpl::EnsureSessionServiceCreated); diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc index 97a2bb9..043b6e0 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc +++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc @@ -282,8 +282,7 @@ bool SafeBrowsingResourceHandler::CheckUrl(const GURL& url) { url_check_start_time_ = base::TimeTicks::Now(); // Start a timer to abort the check if it takes too long. - timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kCheckUrlTimeoutMs), + timer_.Start(base::TimeDelta::FromMilliseconds(kCheckUrlTimeoutMs), this, &SafeBrowsingResourceHandler::OnCheckUrlTimeout); return false; diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index f412b04..78c1bab 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -502,8 +502,8 @@ void SafeBrowsingProtocolManager::ForceScheduleNextUpdate( DCHECK_GE(next_update_msec, 0); // Unschedule any current timer. update_timer_.Stop(); - update_timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(next_update_msec), - this, &SafeBrowsingProtocolManager::GetNextUpdate); + update_timer_.Start(TimeDelta::FromMilliseconds(next_update_msec), this, + &SafeBrowsingProtocolManager::GetNextUpdate); } // According to section 5 of the SafeBrowsing protocol specification, we must @@ -620,8 +620,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete( request_->Start(); // Begin the update request timeout. - update_timer_.Start(FROM_HERE, TimeDelta::FromSeconds(kSbMaxUpdateWaitSec), - this, + update_timer_.Start(TimeDelta::FromSeconds(kSbMaxUpdateWaitSec), this, &SafeBrowsingProtocolManager::UpdateResponseTimeout); } diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index ddf793d..2cbe188 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -222,7 +222,7 @@ void TabLoader::LoadNextTab() { force_load_timer_.Stop(); // Each time we load a tab we also set a timer to force us to start loading // the next tab if this one doesn't load quickly enough. - force_load_timer_.Start(FROM_HERE, + force_load_timer_.Start( base::TimeDelta::FromMilliseconds(force_load_delay_), this, &TabLoader::ForceLoadTimerFired); } diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics.cc b/chrome/browser/spellchecker/spellcheck_host_metrics.cc index 1ad9ba4..87021cb 100644 --- a/chrome/browser/spellchecker/spellcheck_host_metrics.cc +++ b/chrome/browser/spellchecker/spellcheck_host_metrics.cc @@ -14,7 +14,7 @@ SpellCheckHostMetrics::SpellCheckHostMetrics() replaced_word_count_(0), start_time_(base::Time::Now()) { const uint64 kHistogramTimerDurationInMinutes = 30; - recording_timer_.Start(FROM_HERE, + recording_timer_.Start( base::TimeDelta::FromMinutes(kHistogramTimerDurationInMinutes), this, &SpellCheckHostMetrics::OnHistogramTimerExpired); RecordWordCounts(); diff --git a/chrome/browser/sync/engine/sync_scheduler.cc b/chrome/browser/sync/engine/sync_scheduler.cc index d7d68ab..3782aff 100644 --- a/chrome/browser/sync/engine/sync_scheduler.cc +++ b/chrome/browser/sync/engine/sync_scheduler.cc @@ -901,13 +901,13 @@ void SyncScheduler::AdjustPolling(const SyncSessionJob* old_job) { // Adjust poll rate. poll_timer_.Stop(); - poll_timer_.Start(FROM_HERE, poll, this, &SyncScheduler::PollTimerCallback); + poll_timer_.Start(poll, this, &SyncScheduler::PollTimerCallback); } void SyncScheduler::RestartWaiting() { CHECK(wait_interval_.get()); wait_interval_->timer.Stop(); - wait_interval_->timer.Start(FROM_HERE, wait_interval_->length, + wait_interval_->timer.Start(wait_interval_->length, this, &SyncScheduler::DoCanaryJob); } @@ -1077,7 +1077,7 @@ void SyncScheduler::OnSilencedUntil(const base::TimeTicks& silenced_until) { DCHECK_EQ(MessageLoop::current(), sync_loop_); wait_interval_.reset(new WaitInterval(WaitInterval::THROTTLED, silenced_until - TimeTicks::Now())); - wait_interval_->timer.Start(FROM_HERE, wait_interval_->length, this, + wait_interval_->timer.Start(wait_interval_->length, this, &SyncScheduler::Unthrottle); } diff --git a/chrome/browser/sync/glue/database_model_worker_unittest.cc b/chrome/browser/sync/glue/database_model_worker_unittest.cc index 150dd31..40fc978 100644 --- a/chrome/browser/sync/glue/database_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/database_model_worker_unittest.cc @@ -38,7 +38,7 @@ class DatabaseModelWorkerTest : public testing::Test { void ScheduleWork() { scoped_ptr<Callback0::Type> c(NewCallback(this, &DatabaseModelWorkerTest::DoWork)); - timer()->Start(FROM_HERE, TimeDelta::FromSeconds(10), + timer()->Start(TimeDelta::FromSeconds(10), this, &DatabaseModelWorkerTest::Timeout); worker()->DoWorkAndWaitUntilDone(c.get()); } diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index f8a1849..486ca47 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -896,7 +896,7 @@ void SyncBackendHost::Core::HandleAuthErrorEventOnFrontendLoop( } void SyncBackendHost::Core::StartSavingChanges() { - save_changes_timer_.Start(FROM_HERE, + save_changes_timer_.Start( base::TimeDelta::FromSeconds(kSaveChangesIntervalSeconds), this, &Core::SaveChanges); } diff --git a/chrome/browser/sync/notifier/registration_manager.cc b/chrome/browser/sync/notifier/registration_manager.cc index b505729..0308dbe 100644 --- a/chrome/browser/sync/notifier/registration_manager.cc +++ b/chrome/browser/sync/notifier/registration_manager.cc @@ -192,7 +192,7 @@ void RegistrationManager::TryRegisterType(syncable::ModelType model_type, << syncable::ModelTypeToString(model_type) << " in " << delay.InMilliseconds() << " ms"; status->registration_timer.Stop(); - status->registration_timer.Start(FROM_HERE, + status->registration_timer.Start( delay, status, &RegistrationManager::RegistrationStatus::DoRegister); double next_delay_seconds = CalculateBackoff(static_cast<double>(status->next_delay.InSeconds()), diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 80c6009..4d23502 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -482,7 +482,7 @@ void ProfileSyncService::Shutdown(bool sync_disabled) { void ProfileSyncService::ClearServerData() { clear_server_data_state_ = CLEAR_CLEARING; - clear_server_data_timer_.Start(FROM_HERE, + clear_server_data_timer_.Start( base::TimeDelta::FromSeconds(kSyncClearDataTimeoutInSeconds), this, &ProfileSyncService::OnClearServerDataTimeout); backend_->RequestClearServerData(); diff --git a/chrome/browser/ui/fullscreen_exit_bubble.cc b/chrome/browser/ui/fullscreen_exit_bubble.cc index be3db4e..8c42fa1 100644 --- a/chrome/browser/ui/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/fullscreen_exit_bubble.cc @@ -26,12 +26,11 @@ FullscreenExitBubble::~FullscreenExitBubble() { void FullscreenExitBubble::StartWatchingMouse() { // Start the initial delay timer and begin watching the mouse. - initial_delay_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kInitialDelayMs), this, + initial_delay_.Start(base::TimeDelta::FromMilliseconds(kInitialDelayMs), this, &FullscreenExitBubble::CheckMousePosition); gfx::Point cursor_pos = GetCursorScreenPoint(); last_mouse_pos_ = cursor_pos; - mouse_position_checker_.Start(FROM_HERE, + mouse_position_checker_.Start( base::TimeDelta::FromMilliseconds(1000 / kPositionCheckHz), this, &FullscreenExitBubble::CheckMousePosition); } @@ -63,8 +62,7 @@ void FullscreenExitBubble::CheckMousePosition() { if (cursor_pos != last_mouse_pos_) { // The mouse moved; reset the idle timer. idle_timeout_.Stop(); // If the timer isn't running, this is a no-op. - idle_timeout_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kIdleTimeMs), this, + idle_timeout_.Start(base::TimeDelta::FromMilliseconds(kIdleTimeMs), this, &FullscreenExitBubble::CheckMousePosition); } last_mouse_pos_ = cursor_pos; 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); } diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc index 5f9218e..5766738 100644 --- a/chrome/browser/ui/gtk/download/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc @@ -424,7 +424,7 @@ void DownloadItemGtk::UpdateDownloadProgress() { void DownloadItemGtk::StartDownloadProgress() { if (progress_timer_.IsRunning()) return; - progress_timer_.Start(FROM_HERE, + progress_timer_.Start( base::TimeDelta::FromMilliseconds(download_util::kProgressRateMs), this, &DownloadItemGtk::UpdateDownloadProgress); } diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc index b945934..d6e2501 100644 --- a/chrome/browser/ui/gtk/reload_button_gtk.cc +++ b/chrome/browser/ui/gtk/reload_button_gtk.cc @@ -119,7 +119,7 @@ void ReloadButtonGtk::ChangeMode(Mode mode, bool force) { // Go ahead and change to reload after a bit, which allows repeated reloads // without moving the mouse. if (!stop_to_reload_timer_.IsRunning()) { - stop_to_reload_timer_.Start(FROM_HERE, stop_to_reload_timer_delay_, this, + stop_to_reload_timer_.Start(stop_to_reload_timer_delay_, this, &ReloadButtonGtk::OnStopToReloadTimer); } } @@ -185,7 +185,7 @@ void ReloadButtonGtk::OnClicked(GtkWidget* /* sender */) { // here as the browser will do that when it actually starts loading (which // may happen synchronously, thus the need to do this before telling the // browser to execute the reload command). - double_click_timer_.Start(FROM_HERE, double_click_timer_delay_, this, + double_click_timer_.Start(double_click_timer_delay_, this, &ReloadButtonGtk::OnDoubleClickTimer); if (browser_) diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc index 6640a8b..df31d84 100644 --- a/chrome/browser/ui/gtk/status_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc @@ -99,8 +99,7 @@ void StatusBubbleGtk::SetStatusTextToURL() { int desired_width = parent->allocation.width; if (!expanded()) { expand_timer_.Stop(); - expand_timer_.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kExpandHoverDelay), + expand_timer_.Start(base::TimeDelta::FromMilliseconds(kExpandHoverDelay), this, &StatusBubbleGtk::ExpandURL); // When not expanded, we limit the size to one third the browser's // width. @@ -134,7 +133,7 @@ void StatusBubbleGtk::Hide() { void StatusBubbleGtk::SetStatusTextTo(const std::string& status_utf8) { if (status_utf8.empty()) { hide_timer_.Stop(); - hide_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kHideDelay), + hide_timer_.Start(base::TimeDelta::FromMilliseconds(kHideDelay), this, &StatusBubbleGtk::Hide); } else { gtk_label_set_text(GTK_LABEL(label_.get()), status_utf8.c_str()); diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc index ac08691..73dd699 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc @@ -245,7 +245,7 @@ void DraggedTabControllerGtk::ContinueDragging() { } if (!target_tabstrip) { - bring_to_front_timer_.Start(FROM_HERE, + bring_to_front_timer_.Start( base::TimeDelta::FromMilliseconds(kBringToFrontDelay), this, &DraggedTabControllerGtk::BringWindowUnderMouseToFront); } diff --git a/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc b/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc index b10aadd..944c6b1 100644 --- a/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc +++ b/chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc @@ -43,7 +43,7 @@ void AutoHidingDesktopBarWin::UpdateWorkArea(const gfx::Rect& work_area) { // called due to the work area change. if (taskbar_exists) { if (!polling_timer_.IsRunning()) { - polling_timer_.Start(FROM_HERE, + polling_timer_.Start( base::TimeDelta::FromMilliseconds(kCheckTaskbarPollingIntervalMs), this, &AutoHidingDesktopBarWin::OnPollingTimer); diff --git a/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc b/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc index 216473d..88e8194 100644 --- a/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc +++ b/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc @@ -478,8 +478,7 @@ void CompactLocationBarViewHost::StartAutoHideTimer() { // Restart the timer. auto_hide_timer_->Reset(); } else { - auto_hide_timer_->Start(FROM_HERE, - base::TimeDelta::FromSeconds(kHideTimeoutInSeconds), + auto_hide_timer_->Start(base::TimeDelta::FromSeconds(kHideTimeoutInSeconds), this, &CompactLocationBarViewHost::HideCallback); } } diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 58c42d3..836504a 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -315,7 +315,7 @@ void DownloadItemView::UpdateDownloadProgress() { void DownloadItemView::StartDownloadProgress() { if (progress_timer_.IsRunning()) return; - progress_timer_.Start(FROM_HERE, + progress_timer_.Start( base::TimeDelta::FromMilliseconds(download_util::kProgressRateMs), this, &DownloadItemView::UpdateDownloadProgress); } diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 7f586b6..4020129 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -759,7 +759,7 @@ void BrowserView::UpdateLoadingAnimations(bool should_animate) { if (!loading_animation_timer_.IsRunning()) { // Loads are happening, and the timer isn't running, so start it. last_animation_time_ = base::TimeTicks::Now(); - loading_animation_timer_.Start(FROM_HERE, + loading_animation_timer_.Start( TimeDelta::FromMilliseconds(kLoadingAnimationFrameTimeMs), this, &BrowserView::LoadingAnimationCallback); } diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc index db95490..0670d63 100644 --- a/chrome/browser/ui/views/reload_button.cc +++ b/chrome/browser/ui/views/reload_button.cc @@ -60,7 +60,7 @@ void ReloadButton::ChangeMode(Mode mode, bool force) { // Go ahead and change to reload after a bit, which allows repeated reloads // without moving the mouse. if (!stop_to_reload_timer_.IsRunning()) { - stop_to_reload_timer_.Start(FROM_HERE, stop_to_reload_timer_delay_, this, + stop_to_reload_timer_.Start(stop_to_reload_timer_delay_, this, &ReloadButton::OnStopToReloadTimer); } } @@ -106,7 +106,7 @@ void ReloadButton::ButtonPressed(views::Button* /* button */, // here as the browser will do that when it actually starts loading (which // may happen synchronously, thus the need to do this before telling the // browser to execute the reload command). - double_click_timer_.Start(FROM_HERE, double_click_timer_delay_, this, + double_click_timer_.Start(double_click_timer_delay_, this, &ReloadButton::OnDoubleClickTimer); if (browser_) diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc index ab91362..0c2f2f3 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc @@ -385,8 +385,8 @@ void TabContentsViewViews::OnNativeTabContentsViewMouseMove(bool motion) { void TabContentsViewViews::OnNativeTabContentsViewDraggingEnded() { if (close_tab_after_drag_ends_) { - close_tab_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(0), - this, &TabContentsViewViews::CloseTab); + close_tab_timer_.Start(base::TimeDelta::FromMilliseconds(0), this, + &TabContentsViewViews::CloseTab); } tab_contents_->SystemDragEnded(); } diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index eab3310..685e0d5 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -667,7 +667,7 @@ void DraggedTabController::ContinueDragging() { Attach(target_tabstrip, screen_point); } if (!target_tabstrip) { - bring_to_front_timer_.Start(FROM_HERE, + bring_to_front_timer_.Start( base::TimeDelta::FromMilliseconds(kBringToFrontDelay), this, &DraggedTabController::BringWindowUnderMouseToFront); } diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 2f088a1..ef94964 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -1127,7 +1127,6 @@ void MobileSetupHandler::ChangeState(chromeos::CellularNetwork* network, // limbo by the network library. if (!reconnect_timer_.IsRunning()) { reconnect_timer_.Start( - FROM_HERE, base::TimeDelta::FromMilliseconds(kReconnectTimerDelayMS), this, &MobileSetupHandler::ReconnectTimerFired); } diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index f69bc77..a973bfa 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -133,7 +133,7 @@ FlashDOMHandler::FlashDOMHandler() // And lastly, we fire off a timer to make sure we never get stuck at the // "Loading..." message. - timeout_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kTimeout), + timeout_.Start(base::TimeDelta::FromMilliseconds(kTimeout), this, &FlashDOMHandler::OnTimeout); } diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 2ad0c41..b0ce383 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -278,7 +278,7 @@ void NewTabUI::PaintTimeout() { // Not enough quiet time has elapsed. // Some more paints must've occurred since we set the timeout. // Wait some more. - timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kTimeoutMs), this, + timer_.Start(base::TimeDelta::FromMilliseconds(kTimeoutMs), this, &NewTabUI::PaintTimeout); } } @@ -288,7 +288,7 @@ void NewTabUI::StartTimingPaint(RenderViewHost* render_view_host) { last_paint_ = start_; registrar_.Add(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT, Source<RenderWidgetHost>(render_view_host)); - timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kTimeoutMs), this, + timer_.Start(base::TimeDelta::FromMilliseconds(kTimeoutMs), this, &NewTabUI::PaintTimeout); } diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index 34b58c1..d6fa033 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -159,7 +159,7 @@ UpgradeDetectorImpl::UpgradeDetectorImpl() if (keystone_glue::KeystoneEnabled()) #endif { - detect_upgrade_timer_.Start(FROM_HERE, + detect_upgrade_timer_.Start( base::TimeDelta::FromMilliseconds(GetCheckForUpgradeEveryMs()), this, &UpgradeDetectorImpl::CheckForUpgrade); } @@ -195,7 +195,7 @@ void UpgradeDetectorImpl::UpgradeDetected() { // and stop the timer. int cycle_time = CmdLineInterval().empty() ? kNotifyCycleTimeMs : kNotifyCycleTimeForTestingMs; - upgrade_notification_timer_.Start(FROM_HERE, + upgrade_notification_timer_.Start( base::TimeDelta::FromMilliseconds(cycle_time), this, &UpgradeDetectorImpl::NotifyOnUpgrade); } diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.cc b/chrome/browser/visitedlink/visitedlink_event_listener.cc index 0741bc8..478faac 100644 --- a/chrome/browser/visitedlink/visitedlink_event_listener.cc +++ b/chrome/browser/visitedlink/visitedlink_event_listener.cc @@ -134,7 +134,7 @@ void VisitedLinkEventListener::Add(VisitedLinkMaster::Fingerprint fingerprint) { pending_visited_links_.push_back(fingerprint); if (!coalesce_timer_.IsRunning()) { - coalesce_timer_.Start(FROM_HERE, + coalesce_timer_.Start( TimeDelta::FromMilliseconds(kCommitIntervalMs), this, &VisitedLinkEventListener::CommitVisitedLinks); } |