summaryrefslogtreecommitdiffstats
path: root/extensions/common
diff options
context:
space:
mode:
authorqiangchen <qiangchen@chromium.org>2016-02-04 11:05:32 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-04 19:07:01 +0000
commit1ab5937e528db4ba1a1d361ac39f079a17b6f0d4 (patch)
tree229e8543e4cd66d5e95401d23384702444d6e557 /extensions/common
parent4c670a47efee15429ab7374ec622f52eb6731eb0 (diff)
downloadchromium_src-1ab5937e528db4ba1a1d361ac39f079a17b6f0d4.zip
chromium_src-1ab5937e528db4ba1a1d361ac39f079a17b6f0d4.tar.gz
chromium_src-1ab5937e528db4ba1a1d361ac39f079a17b6f0d4.tar.bz2
In this CL, we extend API chooseDesktopMedia by adding one
more source type "audio". With that, the window picker will show a checkbox which serves the purpose as asking user permission for audio share. If the user checks the checkbox, then we will generate audio stream. Current functionality is behind flag --enable-audio-support-for-desktop-share. Design Doc is at https://goo.gl/yIJ08b This CL is implementation of Use Case 4.a BUG=557222 Review URL: https://codereview.chromium.org/1644073002 Cr-Commit-Position: refs/heads/master@{#373576}
Diffstat (limited to 'extensions/common')
-rw-r--r--extensions/common/switches.cc3
-rw-r--r--extensions/common/switches.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc
index 9a14e75..41e1d27 100644
--- a/extensions/common/switches.cc
+++ b/extensions/common/switches.cc
@@ -31,6 +31,9 @@ const char kEnableAppWindowControls[] = "enable-app-window-controls";
// Enable BLE Advertisiing in apps.
const char kEnableBLEAdvertising[] = "enable-ble-advertising-in-apps";
+const char kEnableDesktopCaptureAudio[] =
+ "enable-audio-support-for-desktop-share";
+
// Hack so that feature switch can work with about_flags. See
// kEnableScriptsRequireAction.
const char kEnableEmbeddedExtensionOptions[] =
diff --git a/extensions/common/switches.h b/extensions/common/switches.h
index 43517cf..7c891d8 100644
--- a/extensions/common/switches.h
+++ b/extensions/common/switches.h
@@ -16,6 +16,7 @@ extern const char kAllowLegacyExtensionManifests[];
extern const char kEmbeddedExtensionOptions[];
extern const char kEnableAppsShowOnFirstPaint[];
extern const char kEnableAppWindowControls[];
+extern const char kEnableDesktopCaptureAudio[];
extern const char kEnableEmbeddedExtensionOptions[];
extern const char kEnableExperimentalExtensionApis[];
extern const char kEnableExtensionActionRedesign[];