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

Side by Side Diff: ash/wm/window_modality_controller_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 unified diff | Download patch
« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | ash/wm/window_positioner_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/wm/core/window_modality_controller.h" 5 #include "ui/wm/core/window_modality_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ash/test/child_modal_window.h" 9 #include "ash/test/child_modal_window.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 void reset() { 320 void reset() {
321 received_touch_ = false; 321 received_touch_ = false;
322 last_event_type_ = ui::ET_UNKNOWN; 322 last_event_type_ = ui::ET_UNKNOWN;
323 } 323 }
324 324
325 bool received_touch() const { return received_touch_; } 325 bool received_touch() const { return received_touch_; }
326 ui::EventType last_event_type() const { return last_event_type_; } 326 ui::EventType last_event_type() const { return last_event_type_; }
327 327
328 private: 328 private:
329 // Overridden from aura::test::TestWindowDelegate. 329 // Overridden from aura::test::TestWindowDelegate.
330 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { 330 virtual void OnTouchEvent(ui::TouchEvent* event) override {
331 received_touch_ = true; 331 received_touch_ = true;
332 last_event_type_ = event->type(); 332 last_event_type_ = event->type();
333 aura::test::TestWindowDelegate::OnTouchEvent(event); 333 aura::test::TestWindowDelegate::OnTouchEvent(event);
334 } 334 }
335 335
336 bool received_touch_; 336 bool received_touch_;
337 ui::EventType last_event_type_; 337 ui::EventType last_event_type_;
338 338
339 DISALLOW_COPY_AND_ASSIGN(TouchTrackerWindowDelegate); 339 DISALLOW_COPY_AND_ASSIGN(TouchTrackerWindowDelegate);
340 }; 340 };
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 EXPECT_TRUE(wm::IsActiveWindow(w4.get())); 577 EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
578 578
579 wm::ActivateWindow(w3.get()); 579 wm::ActivateWindow(w3.get());
580 EXPECT_TRUE(wm::IsActiveWindow(w4.get())); 580 EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
581 581
582 wm::ActivateWindow(w4.get()); 582 wm::ActivateWindow(w4.get());
583 EXPECT_TRUE(wm::IsActiveWindow(w4.get())); 583 EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
584 } 584 }
585 585
586 } // namespace ash 586 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | ash/wm/window_positioner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698