| Index: ash/extended_desktop_unittest.cc
|
| diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
|
| index 71f68e492bb35c9aba39d3a83a17e68259737750..7e88d4777ba49eb713aee710e631f4cf2ce3ba9d 100644
|
| --- a/ash/extended_desktop_unittest.cc
|
| +++ b/ash/extended_desktop_unittest.cc
|
| @@ -48,10 +48,10 @@ class ModalWidgetDelegate : public views::WidgetDelegateView {
|
| virtual ~ModalWidgetDelegate() {}
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual views::View* GetContentsView() OVERRIDE {
|
| + virtual views::View* GetContentsView() override {
|
| return this;
|
| }
|
| - virtual ui::ModalType GetModalType() const OVERRIDE {
|
| + virtual ui::ModalType GetModalType() const override {
|
| return ui::MODAL_TYPE_SYSTEM;
|
| }
|
|
|
| @@ -69,7 +69,7 @@ class MoveWindowByClickEventHandler : public ui::EventHandler {
|
|
|
| private:
|
| // ui::EventHandler overrides:
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) override {
|
| if (event->type() == ui::ET_MOUSE_RELEASED) {
|
| aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
| DCHECK_LT(1u, root_windows.size());
|
| @@ -98,7 +98,7 @@ class EventLocationRecordingEventHandler : public ui::EventHandler {
|
|
|
| private:
|
| // ui::EventHandler overrides:
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) override {
|
| if (event->type() == ui::ET_MOUSE_MOVED ||
|
| event->type() == ui::ET_MOUSE_DRAGGED) {
|
| location_ = event->location();
|
| @@ -127,7 +127,7 @@ class EventLocationHandler : public ui::EventHandler {
|
|
|
| private:
|
| // ui::EventHandler:
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) override {
|
| if (event->type() == ui::ET_MOUSE_PRESSED)
|
| press_location_ = event->location();
|
| else if (event->type() == ui::ET_MOUSE_RELEASED)
|
|
|