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

Side by Side Diff: ash/host/ash_window_tree_host_x11.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/host/ash_window_tree_host_win.cc ('k') | ash/host/ash_window_tree_host_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 ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ 5 #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_
6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ 6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/host/ash_window_tree_host.h" 9 #include "ash/host/ash_window_tree_host.h"
10 #include "ash/host/transformer_helper.h" 10 #include "ash/host/transformer_helper.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/aura/env_observer.h" 12 #include "ui/aura/env_observer.h"
13 #include "ui/aura/window_tree_host_x11.h" 13 #include "ui/aura/window_tree_host_x11.h"
14 14
15 namespace ash { 15 namespace ash {
16 class RootWindowTransformer; 16 class RootWindowTransformer;
17 class MouseCursorEventFilter; 17 class MouseCursorEventFilter;
18 18
19 class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, 19 class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost,
20 public aura::WindowTreeHostX11, 20 public aura::WindowTreeHostX11,
21 public aura::EnvObserver { 21 public aura::EnvObserver {
22 public: 22 public:
23 explicit AshWindowTreeHostX11(const gfx::Rect& initial_bounds); 23 explicit AshWindowTreeHostX11(const gfx::Rect& initial_bounds);
24 virtual ~AshWindowTreeHostX11(); 24 virtual ~AshWindowTreeHostX11();
25 25
26 private: 26 private:
27 // AshWindowTreeHost: 27 // AshWindowTreeHost:
28 virtual void ToggleFullScreen() OVERRIDE; 28 virtual void ToggleFullScreen() override;
29 virtual bool ConfineCursorToRootWindow() OVERRIDE; 29 virtual bool ConfineCursorToRootWindow() override;
30 virtual void UnConfineCursor() OVERRIDE; 30 virtual void UnConfineCursor() override;
31 virtual void SetRootWindowTransformer( 31 virtual void SetRootWindowTransformer(
32 scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; 32 scoped_ptr<RootWindowTransformer> transformer) override;
33 virtual gfx::Insets GetHostInsets() const OVERRIDE; 33 virtual gfx::Insets GetHostInsets() const override;
34 virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; 34 virtual aura::WindowTreeHost* AsWindowTreeHost() override;
35 virtual void UpdateDisplayID(int64 id1, int64 id2) OVERRIDE; 35 virtual void UpdateDisplayID(int64 id1, int64 id2) override;
36 virtual void PrepareForShutdown() OVERRIDE; 36 virtual void PrepareForShutdown() override;
37 37
38 // aura::WindowTreehost: 38 // aura::WindowTreehost:
39 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 39 virtual void SetBounds(const gfx::Rect& bounds) override;
40 virtual gfx::Transform GetRootTransform() const OVERRIDE; 40 virtual gfx::Transform GetRootTransform() const override;
41 virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE; 41 virtual void SetRootTransform(const gfx::Transform& transform) override;
42 virtual gfx::Transform GetInverseRootTransform() const OVERRIDE; 42 virtual gfx::Transform GetInverseRootTransform() const override;
43 virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE; 43 virtual void UpdateRootWindowSize(const gfx::Size& host_size) override;
44 virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; 44 virtual void OnCursorVisibilityChangedNative(bool show) override;
45 45
46 // aura::WindowTreeHostX11: 46 // aura::WindowTreeHostX11:
47 virtual void OnConfigureNotify() OVERRIDE; 47 virtual void OnConfigureNotify() override;
48 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 48 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
49 virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) 49 virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event)
50 OVERRIDE; 50 override;
51 51
52 // EnvObserver overrides. 52 // EnvObserver overrides.
53 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; 53 virtual void OnWindowInitialized(aura::Window* window) override;
54 virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; 54 virtual void OnHostInitialized(aura::WindowTreeHost* host) override;
55 55
56 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
57 // Set the CrOS touchpad "tap paused" property. It is used to temporarily 57 // Set the CrOS touchpad "tap paused" property. It is used to temporarily
58 // turn off the Tap-to-click feature when the mouse pointer is invisible. 58 // turn off the Tap-to-click feature when the mouse pointer is invisible.
59 void SetCrOSTapPaused(bool state); 59 void SetCrOSTapPaused(bool state);
60 #endif 60 #endif
61 61
62 scoped_ptr<XID[]> pointer_barriers_; 62 scoped_ptr<XID[]> pointer_barriers_;
63 63
64 TransformerHelper transformer_helper_; 64 TransformerHelper transformer_helper_;
65 65
66 // The display IDs associated with this root window. 66 // The display IDs associated with this root window.
67 // In single monitor or extended mode dual monitor case, the root window 67 // In single monitor or extended mode dual monitor case, the root window
68 // is associated with one display. 68 // is associated with one display.
69 // In mirror mode dual monitors case, the root window is associated with 69 // In mirror mode dual monitors case, the root window is associated with
70 // both displays. 70 // both displays.
71 std::pair<int64, int64> display_ids_; 71 std::pair<int64, int64> display_ids_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); 73 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11);
74 }; 74 };
75 75
76 } // namespace ash 76 } // namespace ash
77 77
78 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ 78 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_win.cc ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698