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

Side by Side Diff: chrome/browser/media/native_desktop_media_list.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/media/native_desktop_media_list.h" 5 #include "chrome/browser/media/native_desktop_media_list.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <sstream> 9 #include <sstream>
10 10
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 scoped_ptr<webrtc::WindowCapturer> window_capturer); 90 scoped_ptr<webrtc::WindowCapturer> window_capturer);
91 virtual ~Worker(); 91 virtual ~Worker();
92 92
93 void Refresh(const gfx::Size& thumbnail_size, 93 void Refresh(const gfx::Size& thumbnail_size,
94 content::DesktopMediaID::Id view_dialog_id); 94 content::DesktopMediaID::Id view_dialog_id);
95 95
96 private: 96 private:
97 typedef std::map<DesktopMediaID, uint32> ImageHashesMap; 97 typedef std::map<DesktopMediaID, uint32> ImageHashesMap;
98 98
99 // webrtc::DesktopCapturer::Callback interface. 99 // webrtc::DesktopCapturer::Callback interface.
100 virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE; 100 virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
101 virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE; 101 virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
102 102
103 base::WeakPtr<NativeDesktopMediaList> media_list_; 103 base::WeakPtr<NativeDesktopMediaList> media_list_;
104 104
105 scoped_ptr<webrtc::ScreenCapturer> screen_capturer_; 105 scoped_ptr<webrtc::ScreenCapturer> screen_capturer_;
106 scoped_ptr<webrtc::WindowCapturer> window_capturer_; 106 scoped_ptr<webrtc::WindowCapturer> window_capturer_;
107 107
108 scoped_ptr<webrtc::DesktopFrame> current_frame_; 108 scoped_ptr<webrtc::DesktopFrame> current_frame_;
109 109
110 ImageHashesMap image_hashes_; 110 ImageHashesMap image_hashes_;
111 111
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 observer_->OnSourceThumbnailChanged(index); 361 observer_->OnSourceThumbnailChanged(index);
362 } 362 }
363 363
364 void NativeDesktopMediaList::OnRefreshFinished() { 364 void NativeDesktopMediaList::OnRefreshFinished() {
365 BrowserThread::PostDelayedTask( 365 BrowserThread::PostDelayedTask(
366 BrowserThread::UI, FROM_HERE, 366 BrowserThread::UI, FROM_HERE,
367 base::Bind(&NativeDesktopMediaList::Refresh, 367 base::Bind(&NativeDesktopMediaList::Refresh,
368 weak_factory_.GetWeakPtr()), 368 weak_factory_.GetWeakPtr()),
369 update_period_); 369 update_period_);
370 } 370 }
OLDNEW
« no previous file with comments | « chrome/browser/media/native_desktop_media_list.h ('k') | chrome/browser/media/native_desktop_media_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698