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

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

Issue 870743003: Update {virtual,override,final} to follow C++11 style in media, round 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « media/video/capture/linux/video_capture_device_chromeos.h ('k') | no next file » | 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 "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 23 matching lines...) Expand all
34 DCHECK(capture_task_runner_->BelongsToCurrentThread()); 34 DCHECK(capture_task_runner_->BelongsToCurrentThread());
35 capture_device_ = NULL; 35 capture_device_ = NULL;
36 ui_task_runner_->PostTask( 36 ui_task_runner_->PostTask(
37 FROM_HERE, 37 FROM_HERE,
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 ~ScreenObserverDelegate() override { DCHECK(!capture_device_); }
45 DCHECK(!capture_device_);
46 }
47 45
48 virtual void OnDisplayAdded(const gfx::Display& /*new_display*/) override {} 46 void OnDisplayAdded(const gfx::Display& /*new_display*/) override {}
49 virtual void OnDisplayRemoved(const gfx::Display& /*old_display*/) override {} 47 void OnDisplayRemoved(const gfx::Display& /*old_display*/) override {}
50 virtual void OnDisplayMetricsChanged(const gfx::Display& display, 48 void OnDisplayMetricsChanged(const gfx::Display& display,
51 uint32_t metrics) override { 49 uint32_t metrics) override {
52 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 50 DCHECK(ui_task_runner_->BelongsToCurrentThread());
53 if (!(metrics & DISPLAY_METRIC_ROTATION)) 51 if (!(metrics & DISPLAY_METRIC_ROTATION))
54 return; 52 return;
55 SendDisplayRotation(display); 53 SendDisplayRotation(display);
56 } 54 }
57 55
58 void AddObserverOnUIThread() { 56 void AddObserverOnUIThread() {
59 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 57 DCHECK(ui_task_runner_->BelongsToCurrentThread());
60 gfx::Screen* screen = 58 gfx::Screen* screen =
61 gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE); 59 gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 screen_observer_delegate_->RemoveObserver(); 105 screen_observer_delegate_->RemoveObserver();
108 } 106 }
109 107
110 void VideoCaptureDeviceChromeOS::SetDisplayRotation( 108 void VideoCaptureDeviceChromeOS::SetDisplayRotation(
111 const gfx::Display& display) { 109 const gfx::Display& display) {
112 if (display.IsInternal()) 110 if (display.IsInternal())
113 SetRotation(display.rotation() * 90); 111 SetRotation(display.rotation() * 90);
114 } 112 }
115 113
116 } // namespace media 114 } // namespace media
OLDNEW
« no previous file with comments | « media/video/capture/linux/video_capture_device_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698