summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 15:49:33 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 15:49:33 +0000
commitee4dd68fe9bd0b42421cacf87d989d6cc65f982e (patch)
tree18219822f46a15c47c09cf329891bd2bd396d7ff /chrome/tools
parentfeca7602c5acb99dadd8946a7fe6d66fadfde075 (diff)
downloadchromium_src-ee4dd68fe9bd0b42421cacf87d989d6cc65f982e.zip
chromium_src-ee4dd68fe9bd0b42421cacf87d989d6cc65f982e.tar.gz
chromium_src-ee4dd68fe9bd0b42421cacf87d989d6cc65f982e.tar.bz2
Reland: Pepper Flash settings integration - camera and microphone.
The original code review: http://codereview.chromium.org/10479015/ TBR=csilv@chromium.org, brettw@chromium.org BUG=112190 TEST=None Review URL: https://chromiumcodereview.appspot.com/10541108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/chromeactions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index f50b740..2908df8 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -118,6 +118,7 @@
0x3c463d9eb1c92f64 BadMessageTerminate_DSMF_1
0x8b956c45b0f38be9 BadMessageTerminate_DSMF_2
0x6ebaa5e3651107fa BadMessageTerminate_EFD
+0xff06108fb2aa73fa BadMessageTerminate_FAMF
0xbecb3852be04c506 BadMessageTerminate_IDBMF
0xd7e4d61883121c76 BadMessageTerminate_NC
0x448f44d226b839b7 BadMessageTerminate_NC17
@@ -934,6 +935,7 @@
0xe2fd858f8395432f Options_CustomFrame_Disable
0x531823c36ca21da2 Options_CustomFrame_Enable
0x33e7b018e003c5b1 Options_DefaultCookieSettingChanged
+0xd5a152f698cfa270 Options_DefaultFlashCameraMicSettingChanged
0x3864ed1197ddceb8 Options_DefaultGeolocationSettingChanged
0x3f92cd6678d2f595 Options_DefaultHandlersSettingChanged
0x5dfe307474e6b526 Options_DefaultImagesSettingChanged
@@ -977,6 +979,8 @@
0x4aa2c70a745dbb49 Options_MetricsReportingCheckbox_Enable
0x224b0bf60dccdeda Options_MousePrimaryRight_Disable
0xb23cd3cde814d929 Options_MousePrimaryRight_Enable
+0x820f29cc9c44d0d5 Options_PasswordGenerationCheckbox_Disable
+0x4df19d1fb4741c2a Options_PasswordGenerationCheckbox_Enable
0xc5fbe9d9b3a165dd Options_PasswordManager_Disable
0x59b4f208d9d9f648 Options_PasswordManager_Enable
0x6149925370ef4f47 Options_PluginsCheckbox_Disable