diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 19:08:02 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 19:08:02 +0000 |
| commit | 63fb3f856dda398cc82782a6be635a8c55df4f85 (patch) | |
| tree | 05a1a4accbf5fbb723fc428091d62b2928192ba1 /chrome_frame/chrome_frame_plugin.h | |
| parent | bff69fd91bdab01463cb3505ccbbba51cd373d4b (diff) | |
| download | chromium_src-63fb3f856dda398cc82782a6be635a8c55df4f85.zip chromium_src-63fb3f856dda398cc82782a6be635a8c55df4f85.tar.gz chromium_src-63fb3f856dda398cc82782a6be635a8c55df4f85.tar.bz2 | |
Allow TabContentsDelegate classes to specify whether InfoBars are enabled.
Allow ChromeFrame to pass infobar enabled parameter to ExternalTabContainer.
BUG=2444936
Patch contributed by ericdingle@google.com
Original review at http://codereview.chromium.org/890005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_plugin.h')
| -rw-r--r-- | chrome_frame/chrome_frame_plugin.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h index 078a611..641d7a7 100644 --- a/chrome_frame/chrome_frame_plugin.h +++ b/chrome_frame/chrome_frame_plugin.h @@ -51,14 +51,22 @@ 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; - return automation_client_->Initialize(this, kCommandExecutionTimeout, true, - profile_name, extra_chrome_arguments, - incognito_mode); + ChromeFrameLaunchParams chrome_launch_params = { + kCommandExecutionTimeout, + GURL(), + GURL(), + profile_name, + extra_chrome_arguments, + true, + incognito_mode, + is_widget_mode + }; + return automation_client_->Initialize(this, chrome_launch_params); } // ChromeFrameDelegate implementation |