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

Side by Side Diff: ash/test/test_activation_delegate.h

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/test/shelf_view_test_api.cc ('k') | ash/test/test_lock_state_controller_delegate.h » ('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 #ifndef ASH_TEST_TEST_ACTIVATION_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
6 #define ASH_TEST_TEST_ACTIVATION_DELEGATE_H_ 6 #define ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/events/event_handler.h" 10 #include "ui/events/event_handler.h"
(...skipping 22 matching lines...) Expand all
33 void set_activate(bool v) { activate_ = v; } 33 void set_activate(bool v) { activate_ = v; }
34 int activated_count() const { return activated_count_; } 34 int activated_count() const { return activated_count_; }
35 int lost_active_count() const { return lost_active_count_; } 35 int lost_active_count() const { return lost_active_count_; }
36 int should_activate_count() const { return should_activate_count_; } 36 int should_activate_count() const { return should_activate_count_; }
37 void Clear() { 37 void Clear() {
38 activated_count_ = lost_active_count_ = should_activate_count_ = 0; 38 activated_count_ = lost_active_count_ = should_activate_count_ = 0;
39 window_was_active_ = false; 39 window_was_active_ = false;
40 } 40 }
41 41
42 // Overridden from aura::client::ActivationDelegate: 42 // Overridden from aura::client::ActivationDelegate:
43 virtual bool ShouldActivate() const OVERRIDE; 43 virtual bool ShouldActivate() const override;
44 44
45 private: 45 private:
46 // Overridden from aura::client::ActivationChangeObserver: 46 // Overridden from aura::client::ActivationChangeObserver:
47 virtual void OnWindowActivated(aura::Window* gained_active, 47 virtual void OnWindowActivated(aura::Window* gained_active,
48 aura::Window* lost_active) OVERRIDE; 48 aura::Window* lost_active) override;
49 49
50 aura::Window* window_; 50 aura::Window* window_;
51 bool window_was_active_; 51 bool window_was_active_;
52 bool activate_; 52 bool activate_;
53 int activated_count_; 53 int activated_count_;
54 int lost_active_count_; 54 int lost_active_count_;
55 mutable int should_activate_count_; 55 mutable int should_activate_count_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate); 57 DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
58 }; 58 };
59 59
60 } // namespace test 60 } // namespace test
61 } // namespace ash 61 } // namespace ash
62 62
63 #endif // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_ 63 #endif // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/shelf_view_test_api.cc ('k') | ash/test/test_lock_state_controller_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698