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

Side by Side Diff: ui/aura/scoped_window_targeter.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/remote_window_tree_host_win.h ('k') | ui/aura/test/aura_test_base.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SCOPED_WINDOW_TARGETER_H_ 5 #ifndef UI_AURA_SCOPED_WINDOW_TARGETER_H_
6 #define UI_AURA_SCOPED_WINDOW_TARGETER_H_ 6 #define UI_AURA_SCOPED_WINDOW_TARGETER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/aura/window_observer.h" 10 #include "ui/aura/window_observer.h"
(...skipping 15 matching lines...) Expand all
26 scoped_ptr<ui::EventTargeter> new_targeter); 26 scoped_ptr<ui::EventTargeter> new_targeter);
27 27
28 virtual ~ScopedWindowTargeter(); 28 virtual ~ScopedWindowTargeter();
29 29
30 ui::EventTargeter* old_targeter() { 30 ui::EventTargeter* old_targeter() {
31 return old_targeter_.get(); 31 return old_targeter_.get();
32 } 32 }
33 33
34 private: 34 private:
35 // WindowObserver: 35 // WindowObserver:
36 virtual void OnWindowDestroyed(Window* window) OVERRIDE; 36 virtual void OnWindowDestroyed(Window* window) override;
37 37
38 Window* window_; 38 Window* window_;
39 scoped_ptr<ui::EventTargeter> old_targeter_; 39 scoped_ptr<ui::EventTargeter> old_targeter_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(ScopedWindowTargeter); 41 DISALLOW_COPY_AND_ASSIGN(ScopedWindowTargeter);
42 }; 42 };
43 43
44 } // namespace aura 44 } // namespace aura
45 45
46 #endif // UI_AURA_SCOPED_WINDOW_TARGETER_H_ 46 #endif // UI_AURA_SCOPED_WINDOW_TARGETER_H_
OLDNEW
« no previous file with comments | « ui/aura/remote_window_tree_host_win.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698