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

Side by Side Diff: ash/display/mirror_window_controller.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/display/mirror_window_controller.h" 5 #include "ash/display/mirror_window_controller.h"
6 6
7 #if defined(USE_X11) 7 #if defined(USE_X11)
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 #endif 56 #endif
57 57
58 class NoneCaptureClient : public aura::client::CaptureClient { 58 class NoneCaptureClient : public aura::client::CaptureClient {
59 public: 59 public:
60 NoneCaptureClient() {} 60 NoneCaptureClient() {}
61 virtual ~NoneCaptureClient() {} 61 virtual ~NoneCaptureClient() {}
62 62
63 private: 63 private:
64 // Does a capture on the |window|. 64 // Does a capture on the |window|.
65 virtual void SetCapture(aura::Window* window) OVERRIDE {} 65 virtual void SetCapture(aura::Window* window) override {}
66 66
67 // Releases a capture from the |window|. 67 // Releases a capture from the |window|.
68 virtual void ReleaseCapture(aura::Window* window) OVERRIDE {} 68 virtual void ReleaseCapture(aura::Window* window) override {}
69 69
70 // Returns the current capture window. 70 // Returns the current capture window.
71 virtual aura::Window* GetCaptureWindow() OVERRIDE { 71 virtual aura::Window* GetCaptureWindow() override {
72 return NULL; 72 return NULL;
73 } 73 }
74 virtual aura::Window* GetGlobalCaptureWindow() OVERRIDE { 74 virtual aura::Window* GetGlobalCaptureWindow() override {
75 return NULL; 75 return NULL;
76 } 76 }
77 77
78 DISALLOW_COPY_AND_ASSIGN(NoneCaptureClient); 78 DISALLOW_COPY_AND_ASSIGN(NoneCaptureClient);
79 }; 79 };
80 80
81 } // namespace 81 } // namespace
82 82
83 MirrorWindowController::MirrorWindowController() {} 83 MirrorWindowController::MirrorWindowController() {}
84 84
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 display_manager->mirrored_display_id()); 182 display_manager->mirrored_display_id());
183 const DisplayInfo& source_display_info = display_manager->GetDisplayInfo( 183 const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
184 Shell::GetScreen()->GetPrimaryDisplay().id()); 184 Shell::GetScreen()->GetPrimaryDisplay().id());
185 DCHECK(display_manager->IsMirrored()); 185 DCHECK(display_manager->IsMirrored());
186 return scoped_ptr<RootWindowTransformer>( 186 return scoped_ptr<RootWindowTransformer>(
187 CreateRootWindowTransformerForMirroredDisplay(source_display_info, 187 CreateRootWindowTransformerForMirroredDisplay(source_display_info,
188 mirror_display_info)); 188 mirror_display_info));
189 } 189 }
190 190
191 } // namespace ash 191 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/mirror_window_controller.h ('k') | ash/display/mirror_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698