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

Unified Diff: ash/wm/workspace_controller_unittest.cc

Issue 645513008: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ash/wm/wm_event.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller_unittest.cc
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index aa4cee7dd34186ef2ecac3bb674d48a74705c082..df1de84d5617218d272c4c0dd65c4845a8dd1053 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -82,7 +82,7 @@ std::string GetLayerNames(const aura::Window* window) {
class WorkspaceControllerTest : public test::AshTestBase {
public:
WorkspaceControllerTest() {}
- virtual ~WorkspaceControllerTest() {}
+ ~WorkspaceControllerTest() override {}
aura::Window* CreateTestWindowUnparented() {
aura::Window* window = new aura::Window(NULL);
@@ -646,8 +646,8 @@ class DontCrashOnChangeAndActivateDelegate
void set_window(aura::Window* window) { window_ = window; }
// WindowDelegate overrides:
- virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
+ void OnBoundsChanged(const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {
if (window_) {
wm::ActivateWindow(window_);
window_ = NULL;
@@ -1329,8 +1329,7 @@ class DragMaximizedNonTrackedWindowObserver
// aura::WindowObserver overrides:
// Counts number of times a window is reparented. Ignores reparenting into and
// from a docked container which is expected when a tab is dragged.
- virtual void OnWindowHierarchyChanged(
- const HierarchyChangeParams& params) override {
+ void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override {
if (params.target != window_ ||
(params.old_parent->id() == kShellWindowId_DefaultContainer &&
params.new_parent->id() == kShellWindowId_DockedContainer) ||
@@ -1376,7 +1375,7 @@ namespace {
class WorkspaceControllerTestDragging : public WorkspaceControllerTest {
public:
WorkspaceControllerTestDragging() {}
- virtual ~WorkspaceControllerTestDragging() {}
+ ~WorkspaceControllerTestDragging() override {}
private:
DISALLOW_COPY_AND_ASSIGN(WorkspaceControllerTestDragging);
« no previous file with comments | « ash/wm/wm_event.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698