summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 21:01:54 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 21:01:54 +0000
commit5c69d0840291641a73bbe040a6e6cebe0c3114d4 (patch)
treedf80996df716d4188d55071e228a51805dccb085 /chrome/tools
parent0d02104a4c82b4989e830e140cb6129f320c2191 (diff)
downloadchromium_src-5c69d0840291641a73bbe040a6e6cebe0c3114d4.zip
chromium_src-5c69d0840291641a73bbe040a6e6cebe0c3114d4.tar.gz
chromium_src-5c69d0840291641a73bbe040a6e6cebe0c3114d4.tar.bz2
Revert 141482 - Pepper Flash settings integration - camera and microphone.
BUG=112190 TEST=None Review URL: https://chromiumcodereview.appspot.com/10479015 TBR=yzshen@chromium.org Review URL: https://chromiumcodereview.appspot.com/10536103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/chromeactions.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index 2908df8..f50b740 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -118,7 +118,6 @@
0x3c463d9eb1c92f64 BadMessageTerminate_DSMF_1
0x8b956c45b0f38be9 BadMessageTerminate_DSMF_2
0x6ebaa5e3651107fa BadMessageTerminate_EFD
-0xff06108fb2aa73fa BadMessageTerminate_FAMF
0xbecb3852be04c506 BadMessageTerminate_IDBMF
0xd7e4d61883121c76 BadMessageTerminate_NC
0x448f44d226b839b7 BadMessageTerminate_NC17
@@ -935,7 +934,6 @@
0xe2fd858f8395432f Options_CustomFrame_Disable
0x531823c36ca21da2 Options_CustomFrame_Enable
0x33e7b018e003c5b1 Options_DefaultCookieSettingChanged
-0xd5a152f698cfa270 Options_DefaultFlashCameraMicSettingChanged
0x3864ed1197ddceb8 Options_DefaultGeolocationSettingChanged
0x3f92cd6678d2f595 Options_DefaultHandlersSettingChanged
0x5dfe307474e6b526 Options_DefaultImagesSettingChanged
@@ -979,8 +977,6 @@
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