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

chrome/renderer/searchbox/searchbox_extension.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/renderer/searchbox/searchbox_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/renderer/searchbox/searchbox.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
+#include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
 const char kCSSBackgroundImageFormat[] =
     "-webkit-image-set(url(chrome://theme/IDR_THEME_BACKGROUND?%s) 1x)";
 
 const char kCSSBackgroundColorFormat[] = "rgba(%d,%d,%d,%s)";
 
 const char kCSSBackgroundPositionCenter[] = "center";
 const char kCSSBackgroundPositionLeft[] = "left";
@@ skipping 660 matching lines @@
         GetAutocompleteResultWithId(args[0]->Uint32Value());
     if (result) {
       destination_url = GURL(result->destination_url);
       transition = result->transition;
     }
   } else {
     destination_url = GURL(V8ValueToUTF16(args[0]));
   }
 
   // Navigate the main frame.
-  if (destination_url.is_valid())
-    SearchBox::Get(render_view)->NavigateToURL(destination_url, transition);
-
+  if (destination_url.is_valid()) {
+    WindowOpenDisposition disposition = CURRENT_TAB;
+    if ((args[1]->IsUint32()) && (args[1]->Uint32Value() == 2))

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

You don't need the first clause. Just this:
    if (args[1]->Uint32Value() == 2)

Reason is, args[1] is always present, given that searchbox_api.js line 232
unconditionally passes 2 params. It could be null, of course. In which case,
Uint32Value() will be zero, and not pass the 'if' check.

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

Done.

+        disposition = NEW_BACKGROUND_TAB;
+    SearchBox::Get(render_view)->NavigateToURL(
+        destination_url, transition, disposition);
+  }
   return v8::Undefined();
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::SetSuggestions(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view || !args.Length()) return v8::Undefined();
 
   DVLOG(1) << render_view << " SetSuggestions";
@@ skipping 244 matching lines @@
   Dispatch(frame, kDispatchThemeAreaHeightChangeEventScript);
 }
 
 // static
 v8::Extension* SearchBoxExtension::Get() {
   return new SearchBoxExtensionWrapper(ResourceBundle::GetSharedInstance().
       GetRawDataResource(IDR_SEARCHBOX_API));
 }
 
 }  // namespace extensions_v8