Added support for passing WindowOpenDisposition into BrowserInstantController::OpenURL() from the o…

chrome/browser/instant/instant_loader.cc

 // Copyright 2012 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/browser/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message.h"
+#include "webkit/glue/window_open_disposition.h"

[sreeram, 2013/01/22 06:01:19]

You don't need this include (it's already being included by way of
instant_client.h).

[dougw, 2013/01/24 03:05:25]

Done.

+
 
 namespace {
 
 int kUserDataKey;
 
 class InstantLoaderUserData : public base::SupportsUserData::Data {
  public:
   explicit InstantLoaderUserData(InstantLoader* loader) : loader_(loader) {}
 
   InstantLoader* loader() const { return loader_; }
@@ skipping 276 matching lines @@
 
 void InstantLoader::RenderViewGone() {
   controller_->InstantLoaderRenderViewGone();
 }
 
 void InstantLoader::AboutToNavigateMainFrame(const GURL& url) {
   controller_->InstantLoaderAboutToNavigateMainFrame(url);
 }
 
 void InstantLoader::NavigateToURL(const GURL& url,
-                                  content::PageTransition transition) {
+                                  content::PageTransition transition,
+                                  WindowOpenDisposition disposition) {
   InstantSupportDetermined(true);
-  controller_->NavigateToURL(url, transition);
+  controller_->NavigateToURL(url, transition, disposition);
 }
 
 void InstantLoader::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
 #if defined(OS_MACOSX)
   if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
     if (content::RenderWidgetHostView* rwhv =
             contents_->GetRenderWidgetHostView())
       rwhv->SetTakesFocusOnlyOnMouseDown(true);
@@ skipping 76 matching lines @@
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the WebContents.
   ignore_result(contents_.release());
   contents_.reset(new_contents);
   SetupPreviewContents();
   controller_->SwappedWebContents();
 }