Instant: Make clicks on Most Visited items work.

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/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 276 matching lines @@
   // Gets whether the browser is capturing key strokes.
   static v8::Handle<v8::Value> IsKeyCaptureEnabled(const v8::Arguments& args);
 
   // Gets the font family of the text in the omnibox.
   static v8::Handle<v8::Value> GetFont(const v8::Arguments& args);
 
   // Gets the font size of the text in the omnibox.
   static v8::Handle<v8::Value> GetFontSize(const v8::Arguments& args);
 
   // Navigates the window to a URL represented by either a URL string or a
-  // restricted ID.
+  // restricted ID. The two variants handle restricted IDs in their
+  // respective namespaces.
+  static v8::Handle<v8::Value> NavigateSearchBox(const v8::Arguments& args);
+  static v8::Handle<v8::Value> NavigateNewTabPage(const v8::Arguments& args);
+  // DEPRECATED: TODO(sreeram): Remove when google.com no longer uses this.
   static v8::Handle<v8::Value> NavigateContentWindow(const v8::Arguments& args);
 
   // Sets ordered suggestions. Valid for current |value|.
   static v8::Handle<v8::Value> SetSuggestions(const v8::Arguments& args);
 
   // Sets the text to be autocompleted into the search box.
   static v8::Handle<v8::Value> SetQuerySuggestion(const v8::Arguments& args);
 
-  // Like |SetQuerySuggestion| but uses a restricted ID to identify the text.
+  // Like |SetQuerySuggestion| but uses a restricted autocomplete result ID to
+  // identify the text.
   static v8::Handle<v8::Value> SetQuerySuggestionFromAutocompleteResult(
       const v8::Arguments& args);
 
   // Sets the search box text, completely replacing what the user typed.
   static v8::Handle<v8::Value> SetQuery(const v8::Arguments& args);
 
-  // Like |SetQuery| but uses a restricted ID to identify the text.
+  // Like |SetQuery| but uses a restricted autocomplete result ID to identify
+  // the text.
   static v8::Handle<v8::Value> SetQueryFromAutocompleteResult(
       const v8::Arguments& args);
 
   // Requests the overlay be shown with the specified contents and height.
   static v8::Handle<v8::Value> ShowOverlay(const v8::Arguments& args);
 
   // Sets the focus to the omnibox.
   static v8::Handle<v8::Value> FocusOmnibox(const v8::Arguments& args);
 
   // Start capturing user key strokes.
@@ skipping 52 matching lines @@
   if (name->Equals(v8::String::New("GetDisplayInstantResults")))
     return v8::FunctionTemplate::New(GetDisplayInstantResults);
   if (name->Equals(v8::String::New("GetThemeBackgroundInfo")))
     return v8::FunctionTemplate::New(GetThemeBackgroundInfo);
   if (name->Equals(v8::String::New("IsKeyCaptureEnabled")))
     return v8::FunctionTemplate::New(IsKeyCaptureEnabled);
   if (name->Equals(v8::String::New("GetFont")))
     return v8::FunctionTemplate::New(GetFont);
   if (name->Equals(v8::String::New("GetFontSize")))
     return v8::FunctionTemplate::New(GetFontSize);
+  if (name->Equals(v8::String::New("NavigateSearchBox")))
+    return v8::FunctionTemplate::New(NavigateSearchBox);
+  if (name->Equals(v8::String::New("NavigateNewTabPage")))
+    return v8::FunctionTemplate::New(NavigateNewTabPage);
   if (name->Equals(v8::String::New("NavigateContentWindow")))
     return v8::FunctionTemplate::New(NavigateContentWindow);
   if (name->Equals(v8::String::New("SetSuggestions")))
     return v8::FunctionTemplate::New(SetSuggestions);
   if (name->Equals(v8::String::New("SetQuerySuggestion")))
     return v8::FunctionTemplate::New(SetQuerySuggestion);
   if (name->Equals(v8::String::New("SetQuerySuggestionFromAutocompleteResult")))
     return v8::FunctionTemplate::New(SetQuerySuggestionFromAutocompleteResult);
   if (name->Equals(v8::String::New("SetQuery")))
     return v8::FunctionTemplate::New(SetQuery);
@@ skipping 277 matching lines @@
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetFontSize(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
 
   return v8::Uint32::New(SearchBox::Get(render_view)->omnibox_font_size());
 }
 
 // static
-v8::Handle<v8::Value> SearchBoxExtensionWrapper::NavigateContentWindow(
+v8::Handle<v8::Value> SearchBoxExtensionWrapper::NavigateSearchBox(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view || !args.Length()) return v8::Undefined();
 
   GURL destination_url;
   content::PageTransition transition = content::PAGE_TRANSITION_TYPED;
   if (args[0]->IsNumber()) {
     const InstantAutocompleteResult* result = SearchBox::Get(render_view)->
         GetAutocompleteResultWithId(args[0]->Uint32Value());
     if (result) {
       destination_url = GURL(result->destination_url);
       transition = result->transition;
     }
   } else {
     destination_url = GURL(V8ValueToUTF16(args[0]));
   }
 
+  DVLOG(1) << render_view << " NavigateSearchBox: " << destination_url;
+
   // Navigate the main frame.
   if (destination_url.is_valid()) {
     WindowOpenDisposition disposition = CURRENT_TAB;
+    if (args[1]->Uint32Value() == 2)
+      disposition = NEW_BACKGROUND_TAB;
+    SearchBox::Get(render_view)->NavigateToURL(
+        destination_url, transition, disposition);
+  }
+  return v8::Undefined();
+}
+
+// static
+v8::Handle<v8::Value> SearchBoxExtensionWrapper::NavigateNewTabPage(
+    const v8::Arguments& args) {
+  content::RenderView* render_view = GetRenderView();
+  if (!render_view || !args.Length()) return v8::Undefined();
+
+  GURL destination_url;
+  content::PageTransition transition = content::PAGE_TRANSITION_TYPED;
+  if (args[0]->IsNumber()) {
+    destination_url = GURL(SearchBox::Get(render_view)->MostVisitedItemIDToURL(
+        args[0]->Uint32Value()));
+  } else {
+    destination_url = GURL(V8ValueToUTF16(args[0]));
+  }
+
+  DVLOG(1) << render_view << " NavigateNewTabPage: " << destination_url;
+
+  // Navigate the main frame.
+  if (destination_url.is_valid()) {
+    WindowOpenDisposition disposition = CURRENT_TAB;
     if (args[1]->Uint32Value() == 2)
       disposition = NEW_BACKGROUND_TAB;
     SearchBox::Get(render_view)->NavigateToURL(
         destination_url, transition, disposition);
   }
   return v8::Undefined();
 }
 
 // static
+v8::Handle<v8::Value> SearchBoxExtensionWrapper::NavigateContentWindow(
+    const v8::Arguments& args) {
+  content::RenderView* render_view = GetRenderView();
+  if (!render_view || !args.Length()) return v8::Undefined();
+
+  DVLOG(1) << render_view << " NavigateContentWindow; query="
+           << SearchBox::Get(render_view)->query();
+
+  // If the query is blank and verbatim is false, this must be the NTP. If the
+  // user were clicking on an autocomplete suggestion, either the query would
+  // be non-blank, or it would be blank due to SetQueryFromAutocompleteResult()
+  // but verbatim would be true.
+  if (SearchBox::Get(render_view)->query().empty() &&
+      !SearchBox::Get(render_view)->verbatim())
+    return NavigateNewTabPage(args);
+  return NavigateSearchBox(args);
+}
+
+// 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";
   v8::Handle<v8::Object> suggestion_json = args[0]->ToObject();
 
   InstantCompleteBehavior behavior = INSTANT_COMPLETE_NOW;
   InstantSuggestionType type = INSTANT_SUGGESTION_SEARCH;
@@ skipping 153 matching lines @@
 
   DVLOG(1) << render_view << " GetMostVisitedItems";
 
   const std::vector<MostVisitedItem>& items =
       SearchBox::Get(render_view)->GetMostVisitedItems();
   v8::Handle<v8::Array> items_array = v8::Array::New(items.size());
   for (size_t i = 0; i < items.size(); ++i) {
 
     const string16 url = UTF8ToUTF16(items[i].url.spec());
     const string16 host = UTF8ToUTF16(items[i].url.host());
-    int restrict_id =
-        SearchBox::Get(render_view)->UrlToRestrictedId(url);
+    int most_visited_item_id =
+        SearchBox::Get(render_view)->URLToMostVisitedItemID(url);
 
     // We set the "dir" attribute of the title, so that in RTL locales, a LTR
     // title is rendered left-to-right and truncated from the right. For
     // example, the title of http://msdn.microsoft.com/en-us/default.aspx is
     // "MSDN: Microsoft developer network". In RTL locales, in the New Tab
     // page, if the "dir" of this title is not specified, it takes Chrome UI's
     // directionality. So the title will be truncated as "soft developer
     // network". Setting the "dir" attribute as "ltr" renders the truncated
     // title as "MSDN: Microsoft D...". As another example, the title of
     // http://yahoo.com is "Yahoo!". In RTL locales, in the New Tab page, the
     // title will be rendered as "!Yahoo" if its "dir" attribute is not set to
     // "ltr".
     std::string direction;
     if (base::i18n::StringContainsStrongRTLChars(items[i].title))
       direction = kRTLHtmlTextDirection;
     else
       direction = kLTRHtmlTextDirection;
 
     string16 title = items[i].title;
     if (title.empty())
       title = url;
 
     v8::Handle<v8::Object> item = v8::Object::New();
     item->Set(v8::String::New("rid"),
-              v8::Int32::New(restrict_id));
+              v8::Int32::New(most_visited_item_id));
     item->Set(v8::String::New("thumbnailUrl"),
               UTF16ToV8String(SearchBox::Get(render_view)->
-                              GenerateThumbnailUrl(restrict_id)));
+                              GenerateThumbnailUrl(most_visited_item_id)));
     item->Set(v8::String::New("faviconUrl"),
               UTF16ToV8String(SearchBox::Get(render_view)->
-                              GenerateFaviconUrl(restrict_id)));
+                              GenerateFaviconUrl(most_visited_item_id)));
     item->Set(v8::String::New("title"),
               UTF16ToV8String(title));
     item->Set(v8::String::New("domain"), UTF16ToV8String(host));
     item->Set(v8::String::New("direction"),
               UTF8ToV8String(direction));
 
     items_array->Set(i, item);
   }
   return items_array;
 }
@@ skipping 138 matching lines @@
 void SearchBoxExtension::DispatchThemeChange(WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchThemeChangeEventScript);
 }
 
 // static
 void SearchBoxExtension::DispatchMostVisitedChanged(
     WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchMostVisitedChangedScript);
 }
 }  // namespace extensions_v8