summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_plugin.h
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-10 15:03:11 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-10 15:03:11 +0000
commit034452926aad6077ac6fb4b7801c4cd1da89a53c (patch)
treea1cf32ff8da859bb4b2e256dae7fae268934d798 /chrome_frame/chrome_frame_plugin.h
parent7bc8f430438372708d975d284e4406baf9347e57 (diff)
downloadchromium_src-034452926aad6077ac6fb4b7801c4cd1da89a53c.zip
chromium_src-034452926aad6077ac6fb4b7801c4cd1da89a53c.tar.gz
chromium_src-034452926aad6077ac6fb4b7801c4cd1da89a53c.tar.bz2
Making no automation the default - this was the intent of a previous
change (not calling SetEnableExtensionAutomation on startup unless some functions are being automated) that missed this outstanding issue. BUG=none TEST=none Review URL: http://codereview.chromium.org/380009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_plugin.h')
-rw-r--r--chrome_frame/chrome_frame_plugin.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index fbc3f77..6d29948 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -19,7 +19,6 @@ class ChromeFramePlugin : public ChromeFrameDelegateImpl {
ChromeFramePlugin()
: ignore_setfocus_(false),
is_privileged_(false) {
- functions_enabled_.push_back("*");
}
~ChromeFramePlugin() {
Uninitialize();
@@ -210,8 +209,10 @@ END_MSG_MAP()
// When privileged, additional interfaces are made available to the user.
bool is_privileged_;
- // List of functions to enable for automation, or a single entry "*" to enable
- // all functions for automation. Ignored unless is_privileged_ is true.
+ // List of functions to enable for automation, or a single entry "*" to
+ // enable all functions for automation. Ignored unless is_privileged_ is
+ // true. Defaults to the empty list, meaning automation will not be
+ // turned on.
std::vector<std::string> functions_enabled_;
};