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

Unified Diff: athena/resource_manager/resource_manager_impl.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (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 side-by-side diff with in-line comments
Download patch
Index: athena/resource_manager/resource_manager_impl.cc
diff --git a/athena/resource_manager/resource_manager_impl.cc b/athena/resource_manager/resource_manager_impl.cc
index 65eed30fc804514c4a3f9ff6950a42658138d03f..b88d7d762fd4d8d5af6c0d651bc71ecf32343e56 100644
--- a/athena/resource_manager/resource_manager_impl.cc
+++ b/athena/resource_manager/resource_manager_impl.cc
@@ -35,15 +35,15 @@ class ResourceManagerImpl : public ResourceManager,
// ResourceManager:
virtual void SetMemoryPressureAndStopMonitoring(
- MemoryPressure pressure) OVERRIDE;
- virtual void SetWaitTimeBetweenResourceManageCalls(int time_in_ms) OVERRIDE {
+ MemoryPressure pressure) override;
+ virtual void SetWaitTimeBetweenResourceManageCalls(int time_in_ms) override {
wait_time_for_resource_deallocation_ =
base::TimeDelta::FromMilliseconds(time_in_ms);
// Reset the timeout to force the next resource call to execute immediately.
next_resource_management_time_ = base::Time::Now();
}
- virtual void Pause(bool pause) OVERRIDE {
+ virtual void Pause(bool pause) override {
if (pause) {
if (!pause_)
queued_command_ = false;
@@ -59,23 +59,23 @@ class ResourceManagerImpl : public ResourceManager,
}
// ActivityManagerObserver:
- virtual void OnActivityStarted(Activity* activity) OVERRIDE;
- virtual void OnActivityEnding(Activity* activity) OVERRIDE;
+ virtual void OnActivityStarted(Activity* activity) override;
+ virtual void OnActivityEnding(Activity* activity) override;
// WindowManagerObserver:
- virtual void OnOverviewModeEnter() OVERRIDE;
- virtual void OnOverviewModeExit() OVERRIDE;
- virtual void OnSplitViewModeEnter() OVERRIDE;
- virtual void OnSplitViewModeExit() OVERRIDE;
+ virtual void OnOverviewModeEnter() override;
+ virtual void OnOverviewModeExit() override;
+ virtual void OnSplitViewModeEnter() override;
+ virtual void OnSplitViewModeExit() override;
// MemoryPressureObserver:
- virtual void OnMemoryPressure(MemoryPressure pressure) OVERRIDE;
- virtual ResourceManagerDelegate* GetDelegate() OVERRIDE;
+ virtual void OnMemoryPressure(MemoryPressure pressure) override;
+ virtual ResourceManagerDelegate* GetDelegate() override;
// WindowListProviderObserver:
- virtual void OnWindowStackingChanged() OVERRIDE;
+ virtual void OnWindowStackingChanged() override;
virtual void OnWindowRemoved(aura::Window* removed_window,
- int index) OVERRIDE;
+ int index) override;
private:
// Manage the resources for our activities.
« no previous file with comments | « athena/resource_manager/memory_pressure_notifier_unittest.cc ('k') | athena/resource_manager/resource_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698