summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_automation.h
diff options
context:
space:
mode:
authorslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 00:11:23 +0000
committerslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 00:11:23 +0000
commitb0b85fe971a8d61eae09b0ffdc791bd29f3a91d5 (patch)
tree7263b208a6c5ff9e97c53f47810ec3ce2738d50c /chrome_frame/chrome_frame_automation.h
parent3dc629440ed5310c07182ae46ff39b0a164e281c (diff)
downloadchromium_src-b0b85fe971a8d61eae09b0ffdc791bd29f3a91d5.zip
chromium_src-b0b85fe971a8d61eae09b0ffdc791bd29f3a91d5.tar.gz
chromium_src-b0b85fe971a8d61eae09b0ffdc791bd29f3a91d5.tar.bz2
Give ourselves 20 seconds for Chrome startup vs 4 to help alleviate intermittent "blank page" GCF bugs.
BUG=23414 TEST=None Review URL: http://codereview.chromium.org/293035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
-rw-r--r--chrome_frame/chrome_frame_automation.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 31acc97..a1d6d55 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -23,7 +23,10 @@
#include "chrome_frame/chrome_frame_histograms.h"
#include "chrome_frame/plugin_url_request.h"
-const unsigned long kCommandExecutionTimeout = 4000; // NOLINT, 4 seconds
+// By a convoluated route, this timeout also winds up being the sync automation
+// message timeout. See the ChromeFrameAutomationProxyImpl ctor and the
+// AutomationProxy ctor for details.
+const unsigned long kCommandExecutionTimeout = 60000; // NOLINT, 60 seconds
class ProxyFactory;
enum AutomationPageFontSize;