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

Side by Side Diff: ui/aura/window_tree_host_mac.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/window_tracker.h ('k') | ui/aura/window_tree_host_ozone.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_WINDOW_TREE_HOST_MAC_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_MAC_H_
6 #define UI_AURA_WINDOW_TREE_HOST_MAC_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_MAC_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 12 matching lines...) Expand all
23 class TouchEventCalibrate; 23 class TouchEventCalibrate;
24 } 24 }
25 25
26 class AURA_EXPORT WindowTreeHostMac : public WindowTreeHost { 26 class AURA_EXPORT WindowTreeHostMac : public WindowTreeHost {
27 public: 27 public:
28 explicit WindowTreeHostMac(const gfx::Rect& bounds); 28 explicit WindowTreeHostMac(const gfx::Rect& bounds);
29 virtual ~WindowTreeHostMac(); 29 virtual ~WindowTreeHostMac();
30 30
31 private: 31 private:
32 // WindowTreeHost Overrides. 32 // WindowTreeHost Overrides.
33 virtual ui::EventSource* GetEventSource() OVERRIDE; 33 virtual ui::EventSource* GetEventSource() override;
34 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; 34 virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;
35 virtual void Show() OVERRIDE; 35 virtual void Show() override;
36 virtual void Hide() OVERRIDE; 36 virtual void Hide() override;
37 virtual void ToggleFullScreen() OVERRIDE; 37 virtual void ToggleFullScreen() override;
38 virtual gfx::Rect GetBounds() const OVERRIDE; 38 virtual gfx::Rect GetBounds() const override;
39 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 39 virtual void SetBounds(const gfx::Rect& bounds) override;
40 virtual gfx::Insets GetInsets() const OVERRIDE; 40 virtual gfx::Insets GetInsets() const override;
41 virtual void SetInsets(const gfx::Insets& insets) OVERRIDE; 41 virtual void SetInsets(const gfx::Insets& insets) override;
42 virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; 42 virtual gfx::Point GetLocationOnNativeScreen() const override;
43 virtual void SetCapture() OVERRIDE; 43 virtual void SetCapture() override;
44 virtual void ReleaseCapture() OVERRIDE; 44 virtual void ReleaseCapture() override;
45 virtual bool ConfineCursorToRootWindow() OVERRIDE; 45 virtual bool ConfineCursorToRootWindow() override;
46 virtual void UnConfineCursor() OVERRIDE; 46 virtual void UnConfineCursor() override;
47 virtual void SetCursorNative(gfx::NativeCursor cursor_type) OVERRIDE; 47 virtual void SetCursorNative(gfx::NativeCursor cursor_type) override;
48 virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; 48 virtual void MoveCursorToNative(const gfx::Point& location) override;
49 virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; 49 virtual void OnCursorVisibilityChangedNative(bool show) override;
50 virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE; 50 virtual void PostNativeEvent(const base::NativeEvent& event) override;
51 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 51 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override;
52 52
53 private: 53 private:
54 base::scoped_nsobject<NSWindow> window_; 54 base::scoped_nsobject<NSWindow> window_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMac); 56 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMac);
57 }; 57 };
58 58
59 } // namespace aura 59 } // namespace aura
60 60
61 #endif // UI_AURA_WINDOW_TREE_HOST_MAC_H_ 61 #endif // UI_AURA_WINDOW_TREE_HOST_MAC_H_
OLDNEW
« no previous file with comments | « ui/aura/window_tracker.h ('k') | ui/aura/window_tree_host_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698