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

Side by Side Diff: ui/aura/window_tree_host_mac.h

Issue 1081103008: Update {virtual,override} to follow C++11 style in ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « no previous file | ui/base/ime/chromeos/ime_keyboard_x11_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 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"
11 #include "ui/aura/aura_export.h" 11 #include "ui/aura/aura_export.h"
12 #include "ui/aura/window_tree_host.h" 12 #include "ui/aura/window_tree_host.h"
13 #include "ui/gfx/geometry/insets.h" 13 #include "ui/gfx/geometry/insets.h"
14 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
15 15
16 namespace ui { 16 namespace ui {
17 class MouseEvent; 17 class MouseEvent;
18 } 18 }
19 19
20 namespace aura { 20 namespace aura {
21 21
22 namespace internal { 22 namespace internal {
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 ~WindowTreeHostMac() override;
30 30
31 private: 31 private:
32 // WindowTreeHost Overrides. 32 // WindowTreeHost Overrides.
33 virtual ui::EventSource* GetEventSource() override; 33 ui::EventSource* GetEventSource() override;
34 virtual gfx::AcceleratedWidget GetAcceleratedWidget() override; 34 gfx::AcceleratedWidget GetAcceleratedWidget() override;
35 virtual void Show() override; 35 void Show() override;
36 virtual void Hide() override; 36 void Hide() override;
37 virtual void ToggleFullScreen() override; 37 void ToggleFullScreen() override;
38 virtual gfx::Rect GetBounds() const override; 38 gfx::Rect GetBounds() const override;
39 virtual void SetBounds(const gfx::Rect& bounds) override; 39 void SetBounds(const gfx::Rect& bounds) override;
40 virtual gfx::Insets GetInsets() const override; 40 gfx::Insets GetInsets() const override;
41 virtual void SetInsets(const gfx::Insets& insets) override; 41 void SetInsets(const gfx::Insets& insets) override;
42 virtual gfx::Point GetLocationOnNativeScreen() const override; 42 gfx::Point GetLocationOnNativeScreen() const override;
43 virtual void SetCapture() override; 43 void SetCapture() override;
44 virtual void ReleaseCapture() override; 44 void ReleaseCapture() override;
45 virtual bool ConfineCursorToRootWindow() override; 45 bool ConfineCursorToRootWindow() override;
46 virtual void UnConfineCursor() override; 46 void UnConfineCursor() override;
47 virtual void SetCursorNative(gfx::NativeCursor cursor_type) override; 47 void SetCursorNative(gfx::NativeCursor cursor_type) override;
48 virtual void MoveCursorToNative(const gfx::Point& location) override; 48 void MoveCursorToNative(const gfx::Point& location) override;
49 virtual void OnCursorVisibilityChangedNative(bool show) override; 49 void OnCursorVisibilityChangedNative(bool show) override;
50 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; 50 void OnDeviceScaleFactorChanged(float device_scale_factor) override;
51 51
52 private: 52 private:
53 base::scoped_nsobject<NSWindow> window_; 53 base::scoped_nsobject<NSWindow> window_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMac); 55 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMac);
56 }; 56 };
57 57
58 } // namespace aura 58 } // namespace aura
59 59
60 #endif // UI_AURA_WINDOW_TREE_HOST_MAC_H_ 60 #endif // UI_AURA_WINDOW_TREE_HOST_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | ui/base/ime/chromeos/ime_keyboard_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698