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

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

Issue 100303004: Use FakeDesktopMediaList for Desktop Capture API tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
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/extensions/api/desktop_capture/desktop_capture_api.h" 5 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_tab_util.h" 9 #include "chrome/browser/extensions/extension_tab_util.h"
10 #include "chrome/browser/media/desktop_streams_registry.h" 10 #include "chrome/browser/media/desktop_streams_registry.h"
11 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 11 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
12 #include "chrome/browser/media/native_desktop_media_list.h" 12 #include "chrome/browser/media/native_desktop_media_list.h"
13 #include "chrome/common/extensions/api/tabs.h" 13 #include "chrome/common/extensions/api/tabs.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
16 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 #include "content/public/browser/web_contents_view.h" 18 #include "content/public/browser/web_contents_view.h"
19 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
19 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 20 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
20 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h" 21 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
21 22
22 namespace extensions { 23 namespace extensions {
23 24
24 namespace { 25 namespace {
25 26
26 const char kInvalidSourceNameError[] = "Invalid source type specified."; 27 const char kInvalidSourceNameError[] = "Invalid source type specified.";
27 const char kEmptySourcesListError[] = 28 const char kEmptySourcesListError[] =
28 "At least one source type must be specified."; 29 "At least one source type must be specified.";
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 parent_window = web_contents->GetView()->GetTopLevelNativeWindow(); 120 parent_window = web_contents->GetView()->GetTopLevelNativeWindow();
120 } else { 121 } else {
121 origin_ = GetExtension()->url(); 122 origin_ = GetExtension()->url();
122 render_view = render_view_host(); 123 render_view = render_view_host();
123 parent_window = 124 parent_window =
124 GetAssociatedWebContents()->GetView()->GetTopLevelNativeWindow(); 125 GetAssociatedWebContents()->GetView()->GetTopLevelNativeWindow();
125 } 126 }
126 render_process_id_ = render_view->GetProcess()->GetID(); 127 render_process_id_ = render_view->GetProcess()->GetID();
127 render_view_id_ = render_view->GetRoutingID(); 128 render_view_id_ = render_view->GetRoutingID();
128 129
129 scoped_ptr<webrtc::ScreenCapturer> screen_capturer; 130
130 scoped_ptr<webrtc::WindowCapturer> window_capturer; 131 bool show_screens = false;
132 bool show_windows = false;
131 133
132 for (std::vector<api::desktop_capture::DesktopCaptureSourceType>::iterator 134 for (std::vector<api::desktop_capture::DesktopCaptureSourceType>::iterator
133 it = params->sources.begin(); it != params->sources.end(); ++it) { 135 it = params->sources.begin(); it != params->sources.end(); ++it) {
134 switch (*it) { 136 switch (*it) {
135 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_NONE: 137 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_NONE:
136 error_ = kInvalidSourceNameError; 138 error_ = kInvalidSourceNameError;
137 return false; 139 return false;
138 140
139 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_SCREEN: 141 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_SCREEN:
140 #if defined(OS_WIN) 142 show_screens = true;
141 // ScreenCapturerWin disables Aero by default.
142 screen_capturer.reset(
143 webrtc::ScreenCapturer::CreateWithDisableAero(false));
144 #else
145 screen_capturer.reset(webrtc::ScreenCapturer::Create());
146 #endif
147 break; 143 break;
148 144
149 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_WINDOW: 145 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_WINDOW:
150 window_capturer.reset(webrtc::WindowCapturer::Create()); 146 show_windows = true;
151 break; 147 break;
152 148
153 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_TAB: 149 case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_TAB:
154 error_ = kTabCaptureNotSupportedError; 150 error_ = kTabCaptureNotSupportedError;
155 return false; 151 return false;
156 } 152 }
157 } 153 }
158 154
159 if (!screen_capturer && !window_capturer) { 155 if (!show_screens && !show_windows) {
160 error_ = kEmptySourcesListError; 156 error_ = kEmptySourcesListError;
161 return false; 157 return false;
162 } 158 }
163 159
164 scoped_ptr<DesktopMediaList> media_list; 160 scoped_ptr<DesktopMediaList> media_list;
165 if (g_picker_factory) { 161 if (g_picker_factory) {
166 media_list = g_picker_factory->CreateModel( 162 media_list = g_picker_factory->CreateModel(
167 screen_capturer.Pass(), window_capturer.Pass()); 163 show_screens, show_windows);
168 picker_ = g_picker_factory->CreatePicker(); 164 picker_ = g_picker_factory->CreatePicker();
169 } else { 165 } else {
170 // DesktopMediaPicker is implemented only for Windows, OSX and 166 // DesktopMediaPicker is implemented only for Windows, OSX and
171 // Aura Linux builds. 167 // Aura Linux builds.
172 #if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) 168 #if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
169 webrtc::DesktopCaptureOptions options =
170 webrtc::DesktopCaptureOptions::CreateDefault();
171 options.set_disable_effects(false);
172 scoped_ptr<webrtc::ScreenCapturer> screen_capturer(
173 show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
174 scoped_ptr<webrtc::WindowCapturer> window_capturer(
175 show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
176
173 media_list.reset(new NativeDesktopMediaList( 177 media_list.reset(new NativeDesktopMediaList(
174 screen_capturer.Pass(), window_capturer.Pass())); 178 screen_capturer.Pass(), window_capturer.Pass()));
175 picker_ = DesktopMediaPicker::Create(); 179 picker_ = DesktopMediaPicker::Create();
176 #else 180 #else
177 const char kNotImplementedError[] = 181 error_ = "Desktop Capture API is not yet implemented for this platform.";
178 "Desktop Capture API is not yet implemented for this platform.";
179 error_ = kNotImplementedError;
180 return false; 182 return false;
181 #endif 183 #endif
182 } 184 }
183 DesktopMediaPicker::DoneCallback callback = base::Bind( 185 DesktopMediaPicker::DoneCallback callback = base::Bind(
184 &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this); 186 &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this);
185 187
186 picker_->Show(parent_window, parent_window, 188 picker_->Show(parent_window, parent_window,
187 UTF8ToUTF16(GetExtension()->name()), 189 UTF8ToUTF16(GetExtension()->name()),
188 media_list.Pass(), callback); 190 media_list.Pass(), callback);
189 return true; 191 return true;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 259
258 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id, 260 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
259 int request_id) { 261 int request_id) {
260 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id)); 262 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
261 if (it != requests_.end()) 263 if (it != requests_.end())
262 it->second->Cancel(); 264 it->second->Cancel();
263 } 265 }
264 266
265 267
266 } // namespace extensions 268 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698