summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_automation.h
diff options
context:
space:
mode:
authormad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 19:58:32 +0000
committermad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 19:58:32 +0000
commitf701930f2094bea08a1aa8425c8d704b8f3ef579 (patch)
tree6e94e3064dae27712be507f744c3fb1a6480a241 /chrome_frame/chrome_frame_automation.h
parentb03794d3a1bb536655207d73a78f115e3722893d (diff)
downloadchromium_src-f701930f2094bea08a1aa8425c8d704b8f3ef579.zip
chromium_src-f701930f2094bea08a1aa8425c8d704b8f3ef579.tar.gz
chromium_src-f701930f2094bea08a1aa8425c8d704b8f3ef579.tar.bz2
Committing for Eric Dingle.
http://codereview.chromium.org/890005 BUG=0 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
-rw-r--r--chrome_frame/chrome_frame_automation.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 8a7c54a..6c0d895 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -84,11 +84,12 @@ struct ChromeFrameLaunchParams {
int automation_server_launch_timeout;
GURL url;
GURL referrer;
+ FilePath profile_path;
std::wstring profile_name;
std::wstring extra_chrome_arguments;
bool perform_version_check;
bool incognito_mode;
- FilePath profile_path;
+ bool is_widget_mode;
};
// We must create and destroy automation proxy in a thread with a message loop.
@@ -159,11 +160,7 @@ class ChromeFrameAutomationClient
// Called from UI thread.
virtual bool Initialize(ChromeFrameDelegate* chrome_frame_delegate,
- int automation_server_launch_timeout,
- bool perform_version_check,
- const FilePath& profile_path,
- const std::wstring& extra_chrome_arguments,
- bool incognito);
+ const ChromeFrameLaunchParams& chrome_launch_params);
void Uninitialize();
virtual bool InitiateNavigation(const std::string& url,