Revert 42366 - 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


TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/1205001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42378 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 12 deletions

diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index 641d7a7..078a611 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -51,22 +51,14 @@ END_MSG_MAP()
 
   bool InitializeAutomation(const std::wstring& profile_name,
                             const std::wstring& extra_chrome_arguments,
-                            bool incognito, bool is_widget_mode) {
+                            bool incognito) {
     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;
-    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);
+    return automation_client_->Initialize(this, kCommandExecutionTimeout, true,
+                                          profile_name, extra_chrome_arguments,
+                                          incognito_mode);
   }
 
   // ChromeFrameDelegate implementation