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

Side by Side Diff: ash/host/ash_window_tree_host_ozone.cc

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_remote_window_tree_host_win.h ('k') | ash/host/ash_window_tree_host_win.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 #include "ash/host/ash_window_tree_host.h" 5 #include "ash/host/ash_window_tree_host.h"
6 6
7 #include "ash/host/ash_window_tree_host_init_params.h" 7 #include "ash/host/ash_window_tree_host_init_params.h"
8 #include "ash/host/root_window_transformer.h" 8 #include "ash/host/root_window_transformer.h"
9 #include "ash/host/transformer_helper.h" 9 #include "ash/host/transformer_helper.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "ui/aura/window_tree_host_ozone.h" 11 #include "ui/aura/window_tree_host_ozone.h"
12 #include "ui/gfx/geometry/insets.h" 12 #include "ui/gfx/geometry/insets.h"
13 #include "ui/gfx/transform.h" 13 #include "ui/gfx/transform.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace { 16 namespace {
17 17
18 class AshWindowTreeHostOzone : public AshWindowTreeHost, 18 class AshWindowTreeHostOzone : public AshWindowTreeHost,
19 public aura::WindowTreeHostOzone { 19 public aura::WindowTreeHostOzone {
20 public: 20 public:
21 explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds); 21 explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds);
22 virtual ~AshWindowTreeHostOzone(); 22 virtual ~AshWindowTreeHostOzone();
23 23
24 private: 24 private:
25 // AshWindowTreeHost: 25 // AshWindowTreeHost:
26 virtual void ToggleFullScreen() OVERRIDE; 26 virtual void ToggleFullScreen() override;
27 virtual bool ConfineCursorToRootWindow() OVERRIDE; 27 virtual bool ConfineCursorToRootWindow() override;
28 virtual void UnConfineCursor() OVERRIDE; 28 virtual void UnConfineCursor() override;
29 virtual void SetRootWindowTransformer( 29 virtual void SetRootWindowTransformer(
30 scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; 30 scoped_ptr<RootWindowTransformer> transformer) override;
31 virtual gfx::Insets GetHostInsets() const OVERRIDE; 31 virtual gfx::Insets GetHostInsets() const override;
32 virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE; 32 virtual aura::WindowTreeHost* AsWindowTreeHost() override;
33 virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE; 33 virtual void SetRootTransform(const gfx::Transform& transform) override;
34 virtual gfx::Transform GetRootTransform() const OVERRIDE; 34 virtual gfx::Transform GetRootTransform() const override;
35 virtual gfx::Transform GetInverseRootTransform() const OVERRIDE; 35 virtual gfx::Transform GetInverseRootTransform() const override;
36 virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE; 36 virtual void UpdateRootWindowSize(const gfx::Size& host_size) override;
37 37
38 TransformerHelper transformer_helper_; 38 TransformerHelper transformer_helper_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostOzone); 40 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostOzone);
41 }; 41 };
42 42
43 AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds) 43 AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds)
44 : aura::WindowTreeHostOzone(initial_bounds), 44 : aura::WindowTreeHostOzone(initial_bounds),
45 transformer_helper_(this) {} 45 transformer_helper_(this) {}
46 46
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 89
90 } // namespace 90 } // namespace
91 91
92 AshWindowTreeHost* AshWindowTreeHost::Create( 92 AshWindowTreeHost* AshWindowTreeHost::Create(
93 const AshWindowTreeHostInitParams& init_params) { 93 const AshWindowTreeHostInitParams& init_params) {
94 return new AshWindowTreeHostOzone(init_params.initial_bounds); 94 return new AshWindowTreeHostOzone(init_params.initial_bounds);
95 } 95 }
96 96
97 } // namespace ash 97 } // namespace ash
OLDNEW
« no previous file with comments | « ash/host/ash_remote_window_tree_host_win.h ('k') | ash/host/ash_window_tree_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698