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

Side by Side Diff: media/video/capture/linux/video_capture_device_chromeos.cc

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (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 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 "media/video/capture/linux/video_capture_device_chromeos.h" 5 #include "media/video/capture/linux/video_capture_device_chromeos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "ui/gfx/display.h" 10 #include "ui/gfx/display.h"
(...skipping 27 matching lines...) Expand all
38 base::Bind(&ScreenObserverDelegate::RemoveObserverOnUIThread, this)); 38 base::Bind(&ScreenObserverDelegate::RemoveObserverOnUIThread, this));
39 } 39 }
40 40
41 private: 41 private:
42 friend class base::RefCountedThreadSafe<ScreenObserverDelegate>; 42 friend class base::RefCountedThreadSafe<ScreenObserverDelegate>;
43 43
44 virtual ~ScreenObserverDelegate() { 44 virtual ~ScreenObserverDelegate() {
45 DCHECK(!capture_device_); 45 DCHECK(!capture_device_);
46 } 46 }
47 47
48 virtual void OnDisplayAdded(const gfx::Display& /*new_display*/) OVERRIDE {} 48 virtual void OnDisplayAdded(const gfx::Display& /*new_display*/) override {}
49 virtual void OnDisplayRemoved(const gfx::Display& /*old_display*/) OVERRIDE {} 49 virtual void OnDisplayRemoved(const gfx::Display& /*old_display*/) override {}
50 virtual void OnDisplayMetricsChanged(const gfx::Display& display, 50 virtual void OnDisplayMetricsChanged(const gfx::Display& display,
51 uint32_t metrics) OVERRIDE { 51 uint32_t metrics) override {
52 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 52 DCHECK(ui_task_runner_->BelongsToCurrentThread());
53 if (!(metrics & DISPLAY_METRIC_ROTATION)) 53 if (!(metrics & DISPLAY_METRIC_ROTATION))
54 return; 54 return;
55 SendDisplayRotation(display); 55 SendDisplayRotation(display);
56 } 56 }
57 57
58 void AddObserverOnUIThread() { 58 void AddObserverOnUIThread() {
59 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 59 DCHECK(ui_task_runner_->BelongsToCurrentThread());
60 gfx::Screen* screen = 60 gfx::Screen* screen =
61 gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE); 61 gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 screen_observer_delegate_->RemoveObserver(); 107 screen_observer_delegate_->RemoveObserver();
108 } 108 }
109 109
110 void VideoCaptureDeviceChromeOS::SetDisplayRotation( 110 void VideoCaptureDeviceChromeOS::SetDisplayRotation(
111 const gfx::Display& display) { 111 const gfx::Display& display) {
112 if (display.IsInternal()) 112 if (display.IsInternal())
113 SetRotation(display.rotation() * 90); 113 SetRotation(display.rotation() * 90);
114 } 114 }
115 115
116 } // namespace media 116 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698