Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars ...

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 432 matching lines @@
       navigate_after_initialization_(false) {
 }
 
 ChromeFrameAutomationClient::~ChromeFrameAutomationClient() {
   // Uninitialize must be called prior to the destructor
   DCHECK(automation_server_ == NULL);
 }
 
 bool ChromeFrameAutomationClient::Initialize(
     ChromeFrameDelegate* chrome_frame_delegate,
-    const ChromeFrameLaunchParams& chrome_launch_params) {
+    int automation_server_launch_timeout,
+    bool perform_version_check,
+    const std::wstring& profile_name,
+    const std::wstring& extra_chrome_arguments,
+    bool incognito) {
   DCHECK(!IsWindow());
   chrome_frame_delegate_ = chrome_frame_delegate;
-  chrome_launch_params_ = chrome_launch_params;
   ui_thread_id_ = PlatformThread::CurrentId();
 #ifndef NDEBUG
   // In debug mode give more time to work with a debugger.
   if (IsDebuggerPresent()) {
     // Don't use INFINITE (which is -1) or even MAXINT since we will convert
     // from milliseconds to microseconds when stored in a base::TimeDelta,
     // thus * 1000. An hour should be enough.
-    chrome_launch_params_.automation_server_launch_timeout = 60 * 60 * 1000;
+    automation_server_launch_timeout = 60 * 60 * 1000;
   } else {
-    DCHECK_LT(chrome_launch_params_.automation_server_launch_timeout,
-              MAXINT / 2000);
-    chrome_launch_params_.automation_server_launch_timeout *= 2;
+    DCHECK_LT(automation_server_launch_timeout, MAXINT / 2000);
+    automation_server_launch_timeout *= 2;
   }
 #endif  // NDEBUG
 
   // Create a window on the UI thread for marshaling messages back and forth
   // from the IPC thread. This window cannot be a message only window as the
   // external chrome tab window is created as a child of this window. This
   // window is eventually reparented to the ActiveX/NPAPI plugin window.
   if (!Create(GetDesktopWindow(), NULL, NULL,
               WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
               WS_EX_TOOLWINDOW)) {
     NOTREACHED();
     return false;
   }
 
   // Keep object in memory, while the window is alive.
   // Corresponsing Release is in OnFinalMessage();
   AddRef();
 
   // Mark our state as initializing.  We'll reach initialized once
   // InitializeComplete is called successfully.
   init_state_ = INITIALIZING;
 
-  if (navigate_after_initialization_) {
-    chrome_launch_params_.url = url_;
-  }
+  chrome_launch_params_.automation_server_launch_timeout =
+      automation_server_launch_timeout;
+  chrome_launch_params_.profile_name = profile_name;
+  chrome_launch_params_.extra_chrome_arguments = extra_chrome_arguments;
+  chrome_launch_params_.perform_version_check = perform_version_check;
+  chrome_launch_params_.url = navigate_after_initialization_ ? GURL() : url_;
+  chrome_launch_params_.incognito_mode = incognito;
 
   proxy_factory_->GetAutomationServer(
       static_cast<ProxyFactory::LaunchDelegate*>(this),
       chrome_launch_params_, &automation_server_id_);
 
   return true;
 }
 
 void ChromeFrameAutomationClient::Uninitialize() {
   DLOG(INFO) << __FUNCTION__;
@@ skipping 324 matching lines @@
   // We should pass in the referrer for the initial navigation.
   const IPC::ExternalTabSettings settings = {
     m_hWnd,
     gfx::Rect(),
     WS_CHILD,
     chrome_launch_params_.incognito_mode,
     !use_chrome_network_,
     handle_top_level_requests_,
     chrome_launch_params_.url,
     chrome_launch_params_.referrer,
-    !chrome_launch_params_.is_widget_mode  // Infobars disabled in widget mode.
   };
 
   THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS(
       "ChromeFrame.HostNetworking", !use_chrome_network_, 0, 1, 2);
 
   THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS(
       "ChromeFrame.HandleTopLevelRequests", handle_top_level_requests_, 0, 1,
       2);
 
   IPC::SyncMessage* message =
@@ skipping 380 matching lines @@
   automation_server_->Send(new AutomationMsg_RequestData(0, tab_->handle(),
       request_id, data));
 }
 
 void ChromeFrameAutomationClient::OnResponseEnd(int request_id,
     const URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(0, tab_->handle(),
       request_id, status));
 }