diff options
author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 19:58:32 +0000 |
---|---|---|
committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 19:58:32 +0000 |
commit | f701930f2094bea08a1aa8425c8d704b8f3ef579 (patch) | |
tree | 6e94e3064dae27712be507f744c3fb1a6480a241 /chrome_frame/chrome_frame_plugin.h | |
parent | b03794d3a1bb536655207d73a78f115e3722893d (diff) | |
download | chromium_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_plugin.h')
-rw-r--r-- | chrome_frame/chrome_frame_plugin.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h index 7f397e6..c7b0598 100644 --- a/chrome_frame/chrome_frame_plugin.h +++ b/chrome_frame/chrome_frame_plugin.h @@ -58,16 +58,25 @@ END_MSG_MAP() bool InitializeAutomation(const std::wstring& profile_name, const std::wstring& extra_chrome_arguments, - bool incognito) { + bool incognito, bool is_widget_mode) { DCHECK(IsValid()); // We don't want to do incognito when privileged, since we're // running in browser chrome or some other privileged context. bool incognito_mode = !is_privileged_ && incognito; FilePath profile_path; GetProfilePath(profile_name, &profile_path); - return automation_client_->Initialize(this, kCommandExecutionTimeout, true, - profile_path, extra_chrome_arguments, - incognito_mode); + ChromeFrameLaunchParams chrome_launch_params = { + kCommandExecutionTimeout, + GURL(), + GURL(), + profile_path, + profile_name, + extra_chrome_arguments, + true, + incognito_mode, + is_widget_mode + }; + return automation_client_->Initialize(this, chrome_launch_params); } // ChromeFrameDelegate implementation |