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

Unified Diff: chrome/browser/ui/views/desktop_media_picker_views.cc

Issue 378273003: Add command-line flag for tests to bypass the screenshare window picker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index 9e21558ab41626f2653c01dc77cfdb0eeac42430..560191dd6f2297662d79caea55c9dc75b935aca8 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -5,10 +5,13 @@
#include "chrome/browser/media/desktop_media_picker.h"
#include "base/callback.h"
+#include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/media/desktop_media_list.h"
#include "chrome/browser/media/desktop_media_list_observer.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/views/constrained_window_views.h"
+#include "chrome/common/chrome_switches.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/browser_thread.h"
#include "grit/generated_resources.h"
@@ -62,6 +65,16 @@ int GetMediaListViewHeightForRows(size_t rows) {
return kListItemHeight * rows;
}
+static bool ShouldAutoSelectSource(const DesktopMediaList::Source& source) {
+ std::string desired_source =
+ CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kAutoSelectDesktopCaptureSource);
+ if (desired_source.empty())
+ return false;
+
+ return desired_source == base::UTF16ToASCII(source.name);
+}
+
class DesktopMediaListView;
class DesktopMediaPickerDialogView;
class DesktopMediaPickerViews;
@@ -473,6 +486,7 @@ void DesktopMediaListView::OnSourceAdded(int index) {
DesktopMediaSourceView* source_view =
new DesktopMediaSourceView(this, source.id);
source_view->SetName(source.name);
+ std::cout << "!!! " << source.name << std::endl;
source_view->SetGroup(kDesktopMediaSourceViewGroupId);
AddChildViewAt(source_view, index);
@@ -480,6 +494,12 @@ void DesktopMediaListView::OnSourceAdded(int index) {
if (child_count() % kListColumns == 1)
parent_->OnMediaListRowsChanged();
+
+ if (ShouldAutoSelectSource(source)) {
jiayl 2014/07/09 17:02:34 It's not safe to do these in this callback, as it
phoglund_chromium 2014/08/04 12:37:25 Oh, right. Umm, I'm not very familiar with Chrome
+ source_view->SetSelected(true);
+ OnSelectionChanged();
+ parent_->OnDoubleClick();
+ }
}
void DesktopMediaListView::OnSourceRemoved(int index) {
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698