| Index: ash/wm/workspace/workspace_event_handler_unittest.cc
|
| diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc
|
| index 85572fc8d50413ec5d27791d258fcb696ca7f6be..99dc2c8c421fcc9b35b0c0c9c3ef21a9b793bb53 100644
|
| --- a/ash/wm/workspace/workspace_event_handler_unittest.cc
|
| +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc
|
| @@ -32,7 +32,7 @@ namespace ash {
|
| class WorkspaceEventHandlerTest : public test::AshTestBase {
|
| public:
|
| WorkspaceEventHandlerTest() {}
|
| - virtual ~WorkspaceEventHandlerTest() {}
|
| + ~WorkspaceEventHandlerTest() override {}
|
|
|
| protected:
|
| aura::Window* CreateTestWindow(aura::WindowDelegate* delegate,
|
| @@ -58,9 +58,7 @@ class WindowPropertyObserver : public aura::WindowObserver {
|
| window->AddObserver(this);
|
| }
|
|
|
| - virtual ~WindowPropertyObserver() {
|
| - window_->RemoveObserver(this);
|
| - }
|
| + ~WindowPropertyObserver() override { window_->RemoveObserver(this); }
|
|
|
| bool DidPropertyChange(const void* property) const {
|
| return std::find(properties_changed_.begin(),
|
| @@ -69,9 +67,9 @@ class WindowPropertyObserver : public aura::WindowObserver {
|
| }
|
|
|
| private:
|
| - virtual void OnWindowPropertyChanged(aura::Window* window,
|
| - const void* key,
|
| - intptr_t old) override {
|
| + void OnWindowPropertyChanged(aura::Window* window,
|
| + const void* key,
|
| + intptr_t old) override {
|
| properties_changed_.push_back(key);
|
| }
|
|
|
|
|