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

Side by Side Diff: chrome/browser/metrics/thread_watcher.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/metrics/thread_watcher.h" 5 #include "chrome/browser/metrics/thread_watcher.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 start_time_clock_= base::Time::Now(); 925 start_time_clock_= base::Time::Now();
926 start_time_monotonic_ = base::TimeTicks::Now(); 926 start_time_monotonic_ = base::TimeTicks::Now();
927 start_time_thread_now_ = base::TimeTicks::IsThreadNowSupported() 927 start_time_thread_now_ = base::TimeTicks::IsThreadNowSupported()
928 ? base::TimeTicks::ThreadNow() : base::TimeTicks::Now(); 928 ? base::TimeTicks::ThreadNow() : base::TimeTicks::Now();
929 #endif // OS_ANDROID 929 #endif // OS_ANDROID
930 } 930 }
931 931
932 // Alarm is called if the time expires after an Arm() without someone calling 932 // Alarm is called if the time expires after an Arm() without someone calling
933 // Disarm(). When Alarm goes off, in release mode we get the crash dump 933 // Disarm(). When Alarm goes off, in release mode we get the crash dump
934 // without crashing and in debug mode we break into the debugger. 934 // without crashing and in debug mode we break into the debugger.
935 virtual void Alarm() OVERRIDE { 935 virtual void Alarm() override {
936 #if !defined(NDEBUG) 936 #if !defined(NDEBUG)
937 StartupHang(); 937 StartupHang();
938 return; 938 return;
939 #elif !defined(OS_ANDROID) 939 #elif !defined(OS_ANDROID)
940 WatchDogThread::PostTask(FROM_HERE, base::Bind(&StartupHang)); 940 WatchDogThread::PostTask(FROM_HERE, base::Bind(&StartupHang));
941 return; 941 return;
942 #else // Android release: gather stats to figure out when to crash. 942 #else // Android release: gather stats to figure out when to crash.
943 // TODO(rtenneti): Delete this code, after getting data. 943 // TODO(rtenneti): Delete this code, after getting data.
944 UMA_HISTOGRAM_TIMES("StartupTimeBomb.Alarm.TimeDuration", 944 UMA_HISTOGRAM_TIMES("StartupTimeBomb.Alarm.TimeDuration",
945 base::Time::Now() - start_time_clock_); 945 base::Time::Now() - start_time_clock_);
(...skipping 25 matching lines...) Expand all
971 class ShutdownWatchDogThread : public base::Watchdog { 971 class ShutdownWatchDogThread : public base::Watchdog {
972 public: 972 public:
973 // Constructor specifies how long the ShutdownWatchDogThread will wait before 973 // Constructor specifies how long the ShutdownWatchDogThread will wait before
974 // alarming. 974 // alarming.
975 explicit ShutdownWatchDogThread(const base::TimeDelta& duration) 975 explicit ShutdownWatchDogThread(const base::TimeDelta& duration)
976 : base::Watchdog(duration, "Shutdown watchdog thread", true) { 976 : base::Watchdog(duration, "Shutdown watchdog thread", true) {
977 } 977 }
978 978
979 // Alarm is called if the time expires after an Arm() without someone calling 979 // Alarm is called if the time expires after an Arm() without someone calling
980 // Disarm(). We crash the browser if this method is called. 980 // Disarm(). We crash the browser if this method is called.
981 virtual void Alarm() OVERRIDE { 981 virtual void Alarm() override {
982 ShutdownHang(); 982 ShutdownHang();
983 } 983 }
984 984
985 private: 985 private:
986 DISALLOW_COPY_AND_ASSIGN(ShutdownWatchDogThread); 986 DISALLOW_COPY_AND_ASSIGN(ShutdownWatchDogThread);
987 }; 987 };
988 } // namespace 988 } // namespace
989 989
990 // StartupTimeBomb methods and members. 990 // StartupTimeBomb methods and members.
991 // 991 //
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 1081
1082 #if defined(OS_WIN) 1082 #if defined(OS_WIN)
1083 // On Windows XP, give twice the time for shutdown. 1083 // On Windows XP, give twice the time for shutdown.
1084 if (base::win::GetVersion() <= base::win::VERSION_XP) 1084 if (base::win::GetVersion() <= base::win::VERSION_XP)
1085 actual_duration *= 2; 1085 actual_duration *= 2;
1086 #endif 1086 #endif
1087 1087
1088 shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration); 1088 shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
1089 shutdown_watchdog_->Arm(); 1089 shutdown_watchdog_->Arm();
1090 } 1090 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/thread_watcher.h ('k') | chrome/browser/metrics/thread_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698