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

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

Issue 2547633002: Desktop Capture API: Pass Audio Selection Information To Javascript (Closed)
Patch Set: Browser Test Case Created 4 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/desktop_capture/desktop_capture_base.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 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 <array> 5 #include <array>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 // chooseMedia() 181 // chooseMedia()
182 {true, true, false, false, 182 {true, true, false, false,
183 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 183 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
184 content::DesktopMediaID::kNullId)}, 184 content::DesktopMediaID::kNullId)},
185 // screensOnly() 185 // screensOnly()
186 {true, false, false, false, content::DesktopMediaID()}, 186 {true, false, false, false, content::DesktopMediaID()},
187 // WindowsOnly() 187 // WindowsOnly()
188 {false, true, false, false, content::DesktopMediaID()}, 188 {false, true, false, false, content::DesktopMediaID()},
189 // tabOnly() 189 // tabOnly()
190 {false, false, true, false, content::DesktopMediaID()}, 190 {false, false, true, false, content::DesktopMediaID()},
191 // audioShare() 191 // audioShareNoApproval()
192 {true, true, true, true, content::DesktopMediaID()}, 192 {true, true, true, true,
193 content::DesktopMediaID(content::DesktopMediaID::TYPE_WEB_CONTENTS, 123,
194 false)},
195 // audioShareApproval()
196 {true, true, true, true,
197 content::DesktopMediaID(content::DesktopMediaID::TYPE_WEB_CONTENTS, 123,
198 true)},
193 // chooseMediaAndGetStream() 199 // chooseMediaAndGetStream()
194 {true, true, false, false, 200 {true, true, false, false,
195 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 201 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
196 webrtc::kFullDesktopScreenId)}, 202 webrtc::kFullDesktopScreenId)},
197 // chooseMediaAndTryGetStreamWithInvalidId() 203 // chooseMediaAndTryGetStreamWithInvalidId()
198 {true, true, false, false, 204 {true, true, false, false,
199 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 205 content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
200 webrtc::kFullDesktopScreenId)}, 206 webrtc::kFullDesktopScreenId)},
201 // cancelDialog() 207 // cancelDialog()
202 {true, true, false, false, content::DesktopMediaID(), true}, 208 {true, true, false, false, content::DesktopMediaID(), true},
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 EXPECT_TRUE(result); 286 EXPECT_TRUE(result);
281 EXPECT_TRUE(test_flags[2].picker_created); 287 EXPECT_TRUE(test_flags[2].picker_created);
282 EXPECT_FALSE(test_flags[2].picker_deleted); 288 EXPECT_FALSE(test_flags[2].picker_deleted);
283 289
284 web_contents->Close(); 290 web_contents->Close();
285 destroyed_watcher.Wait(); 291 destroyed_watcher.Wait();
286 EXPECT_TRUE(test_flags[2].picker_deleted); 292 EXPECT_TRUE(test_flags[2].picker_deleted);
287 } 293 }
288 294
289 } // namespace extensions 295 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698