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

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.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
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/native_desktop_media_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/extensions/api/desktop_capture/desktop_capture_base.h" 5 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h"
6 6
7 #include <tuple> 7 #include <tuple>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "chrome/browser/extensions/extension_tab_util.h" 14 #include "chrome/browser/extensions/extension_tab_util.h"
15 #include "chrome/browser/media/webrtc/desktop_media_list_ash.h" 15 #include "chrome/browser/media/webrtc/desktop_media_list_ash.h"
16 #include "chrome/browser/media/webrtc/desktop_streams_registry.h" 16 #include "chrome/browser/media/webrtc/desktop_streams_registry.h"
17 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 17 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
18 #include "chrome/browser/media/webrtc/native_desktop_media_list.h" 18 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
19 #include "chrome/browser/media/webrtc/tab_desktop_media_list.h" 19 #include "chrome/browser/media/webrtc/tab_desktop_media_list.h"
20 #include "chrome/browser/ui/browser_finder.h" 20 #include "chrome/browser/ui/browser_finder.h"
21 #include "chrome/browser/ui/browser_window.h" 21 #include "chrome/browser/ui/browser_window.h"
22 #include "chrome/grit/chromium_strings.h" 22 #include "chrome/grit/chromium_strings.h"
23 #include "content/public/browser/render_frame_host.h" 23 #include "content/public/browser/render_frame_host.h"
24 #include "content/public/browser/render_process_host.h" 24 #include "content/public/browser/render_process_host.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "extensions/common/manifest.h" 26 #include "extensions/common/manifest.h"
27 #include "extensions/common/switches.h" 27 #include "extensions/common/switches.h"
28 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" 28 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
29 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 29 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
30 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
31 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
32 31
33 namespace extensions { 32 namespace extensions {
34 33
35 namespace { 34 namespace {
36 35
37 const char kInvalidSourceNameError[] = "Invalid source type specified."; 36 const char kInvalidSourceNameError[] = "Invalid source type specified.";
38 const char kEmptySourcesListError[] = 37 const char kEmptySourcesListError[] =
39 "At least one source type must be specified."; 38 "At least one source type must be specified.";
40 39
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 295
297 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id, 296 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
298 int request_id) { 297 int request_id) {
299 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id)); 298 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
300 if (it != requests_.end()) 299 if (it != requests_.end())
301 it->second->Cancel(); 300 it->second->Cancel();
302 } 301 }
303 302
304 303
305 } // namespace extensions 304 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/native_desktop_media_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698