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

Side by Side Diff: ui/aura/test/test_focus_client.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/aura/test/test_cursor_client.h ('k') | ui/aura/test/test_screen.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 UI_AURA_TEST_TEST_FOCUS_CLIENT_H_ 5 #ifndef UI_AURA_TEST_TEST_FOCUS_CLIENT_H_
6 #define UI_AURA_TEST_TEST_FOCUS_CLIENT_H_ 6 #define UI_AURA_TEST_TEST_FOCUS_CLIENT_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/scoped_observer.h" 10 #include "base/scoped_observer.h"
11 #include "ui/aura/client/focus_client.h" 11 #include "ui/aura/client/focus_client.h"
12 #include "ui/aura/window_observer.h" 12 #include "ui/aura/window_observer.h"
13 13
14 namespace aura { 14 namespace aura {
15 namespace test { 15 namespace test {
16 16
17 class TestFocusClient : public client::FocusClient, 17 class TestFocusClient : public client::FocusClient,
18 public WindowObserver { 18 public WindowObserver {
19 public: 19 public:
20 TestFocusClient(); 20 TestFocusClient();
21 virtual ~TestFocusClient(); 21 virtual ~TestFocusClient();
22 22
23 private: 23 private:
24 // Overridden from client::FocusClient: 24 // Overridden from client::FocusClient:
25 virtual void AddObserver(client::FocusChangeObserver* observer) OVERRIDE; 25 virtual void AddObserver(client::FocusChangeObserver* observer) override;
26 virtual void RemoveObserver(client::FocusChangeObserver* observer) OVERRIDE; 26 virtual void RemoveObserver(client::FocusChangeObserver* observer) override;
27 virtual void FocusWindow(Window* window) OVERRIDE; 27 virtual void FocusWindow(Window* window) override;
28 virtual void ResetFocusWithinActiveWindow(Window* window) OVERRIDE; 28 virtual void ResetFocusWithinActiveWindow(Window* window) override;
29 virtual Window* GetFocusedWindow() OVERRIDE; 29 virtual Window* GetFocusedWindow() override;
30 30
31 // Overridden from WindowObserver: 31 // Overridden from WindowObserver:
32 virtual void OnWindowDestroying(Window* window) OVERRIDE; 32 virtual void OnWindowDestroying(Window* window) override;
33 33
34 Window* focused_window_; 34 Window* focused_window_;
35 ScopedObserver<Window, WindowObserver> observer_manager_; 35 ScopedObserver<Window, WindowObserver> observer_manager_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(TestFocusClient); 37 DISALLOW_COPY_AND_ASSIGN(TestFocusClient);
38 }; 38 };
39 39
40 } // namespace test 40 } // namespace test
41 } // namespace aura 41 } // namespace aura
42 42
43 #endif // UI_AURA_TEST_TEST_FOCUS_CLIENT_H_ 43 #endif // UI_AURA_TEST_TEST_FOCUS_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/test/test_cursor_client.h ('k') | ui/aura/test/test_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698