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

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

Issue 2495453002: [Chromoting] Remove screen_capturer.h & desktop_capturer.h (Closed)
Patch Set: Include ipc_desktop_environment_unittest.cc Created 4 years, 1 month 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/webrtc/native_desktop_media_list.h" 5 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
6 6
7 #include "base/hash.h" 7 #include "base/hash.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/threading/sequenced_worker_pool.h" 9 #include "base/threading/sequenced_worker_pool.h"
10 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h" 10 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
11 #include "chrome/grit/generated_resources.h" 11 #include "chrome/grit/generated_resources.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "media/base/video_util.h" 13 #include "media/base/video_util.h"
14 #include "third_party/libyuv/include/libyuv/scale_argb.h" 14 #include "third_party/libyuv/include/libyuv/scale_argb.h"
15 #include "third_party/skia/include/core/SkBitmap.h" 15 #include "third_party/skia/include/core/SkBitmap.h"
16 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
16 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" 17 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
17 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
18 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
19 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
20 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/snapshot/snapshot.h" 20 #include "ui/snapshot/snapshot.h"
22 21
23 #if defined(OS_WIN) 22 #if defined(OS_WIN)
24 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" 23 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
25 #endif // defined(OS_WIN) 24 #endif // defined(OS_WIN)
26 25
27 #if defined(USE_X11) && !defined(OS_CHROMEOS) 26 #if defined(USE_X11) && !defined(OS_CHROMEOS)
28 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 27 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 if (pending_aura_capture_requests_ == 0) { 365 if (pending_aura_capture_requests_ == 0) {
367 previous_aura_thumbnail_hashes_ = std::move(new_aura_thumbnail_hashes_); 366 previous_aura_thumbnail_hashes_ = std::move(new_aura_thumbnail_hashes_);
368 // Schedule next refresh if aura thumbnail captures finished after native 367 // Schedule next refresh if aura thumbnail captures finished after native
369 // thumbnail captures. 368 // thumbnail captures.
370 if (!pending_native_thumbnail_capture_) 369 if (!pending_native_thumbnail_capture_)
371 ScheduleNextRefresh(); 370 ScheduleNextRefresh();
372 } 371 }
373 } 372 }
374 373
375 #endif // defined(USE_AURA) 374 #endif // defined(USE_AURA)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698