Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

chrome/browser/ui/search/instant_controller.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/ui/search/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 444 matching lines @@
 
   if (!UseInstantTabToShowSuggestions()) {
     if (first_interaction_time_.is_null())
       first_interaction_time_ = base::Time::Now();
     allow_overlay_to_show_search_suggestions_ = true;
 
     // For extended mode, if the loader is not ready at this point, switch over
     // to a backup loader.
     if (extended_enabled_ && !overlay_->supports_instant() &&
         !overlay_->IsLocalOverlay() && browser_->GetActiveWebContents()) {
-      CreateOverlay(chrome::kChromeSearchLocalOmniboxPopupURL,
+      CreateOverlay(chrome::kChromeSearchLocalNtpUrl,

[samarth, 2013/04/15 19:01:34]

Replace this (and below) with a GetLocalInstantURL() helper that does the
is-google check.

[jeremycho, 2013/04/16 01:42:37]

Done.

                     browser_->GetActiveWebContents());
     }
 
     overlay_->Update(extended_enabled_ ? user_text : full_text,
                      selection_start, selection_end, verbatim);
   }
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
       content::Source<InstantController>(this),
@@ skipping 187 matching lines @@
   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "CommitIfPossible: type=%d last_omnibox_text_='%s' "
       "last_match_was_search_=%d instant_tab_=%d", type,
       UTF16ToUTF8(last_omnibox_text_).c_str(), last_match_was_search_,
       instant_tab_ != NULL));
 
   // If we are on an already committed search results page, send a submit event
   // to the page, but otherwise, nothing else to do.
   if (UseInstantTabToShowSuggestions()) {
     if (type == INSTANT_COMMIT_PRESSED_ENTER &&
+        !instant_tab_->IsLocalNTP() &&
         (last_match_was_search_ ||
          last_suggestion_.behavior == INSTANT_COMPLETE_NEVER)) {
       last_suggestion_.text.clear();
       instant_tab_->Submit(last_omnibox_text_);
       instant_tab_->contents()->GetView()->Focus();
       EnsureSearchTermsAreSet(instant_tab_->contents(), last_omnibox_text_);
       return true;
     }
     return false;
   }
@@ skipping 239 matching lines @@
 #if defined(USE_AURA)
   // On aura the omnibox only receives a focus lost if we initiate the focus
   // change. This does that.
   if (!model_.mode().is_default())
     browser_->InstantOverlayFocused();
 #endif
 }
 
 void InstantController::ReloadOverlayIfStale() {
   // The local overlay is never stale.
   if (overlay_ && overlay_->IsLocalOverlay())

[samarth, 2013/04/15 19:01:34]

Replace all instances of IsLocalOverlay with IsLocalNTP (even better, replace
them both with IsLocalInstantPage).

[jeremycho, 2013/04/16 01:42:37]

Done.  Will do the rename in a followup.

     return;
 
   // If the overlay is showing or the omnibox has focus, don't delete the
   // overlay. It will get refreshed the next time the overlay is hidden or the
   // omnibox loses focus.
   if ((!overlay_ || overlay_->is_stale()) &&
       omnibox_focus_state_ == OMNIBOX_FOCUS_NONE &&
       model_.mode().is_default()) {
     overlay_.reset();
     EnsureOverlayIsCurrent(false);
@@ skipping 318 matching lines @@
   else if (!IsViewInContents(GetViewGainingFocus(view_gaining_focus),
                              overlay_->contents()))
     HideOverlay();
 #endif
 }
 
 void InstantController::ResetNTP(bool ignore_blacklist, bool use_local_ntp) {
   std::string instant_url;
   if (use_local_ntp ||
       !GetInstantURL(browser_->profile(), ignore_blacklist, &instant_url))
     instant_url = chrome::kChromeSearchLocalNtpUrl;

[samarth, 2013/04/15 19:01:34]

Use the GetLocalInstantURL() function here too.

[jeremycho, 2013/04/16 01:42:37]

Done.

   ntp_.reset(new InstantNTP(this, instant_url));
   ntp_->InitContents(browser_->profile(), browser_->GetActiveWebContents(),
                      base::Bind(&InstantController::ResetNTP,
                                 base::Unretained(this), false, false));
 }
 
 bool InstantController::EnsureOverlayIsCurrent(bool ignore_blacklist) {
   // If there's no active tab, the browser is closing.
   const content::WebContents* active_tab = browser_->GetActiveWebContents();
   if (!active_tab)
     return false;
 
   Profile* profile = Profile::FromBrowserContext(
       active_tab->GetBrowserContext());
   std::string instant_url;
   if (!GetInstantURL(profile, ignore_blacklist, &instant_url)) {
     // If we are in extended mode, fallback to the local overlay.
     if (extended_enabled_)
-      instant_url = chrome::kChromeSearchLocalOmniboxPopupURL;
+      instant_url = chrome::kChromeSearchLocalNtpUrl;

[samarth, 2013/04/15 19:01:34]

Use the GetLocalInstantURL() function here too.

[jeremycho, 2013/04/16 01:42:37]

Done.

     else
       return false;
   }
 
   if (!overlay_ || overlay_->instant_url() != instant_url)
     CreateOverlay(instant_url, active_tab);
 
   return true;
 }
 
@@ skipping 306 matching lines @@
       // suggest 'nstant'. Otherwise, the user text really isn't a prefix, so
       // suggest nothing.
       // TODO(samarth|jered): revisit this logic. http://crbug.com/196572.
       return true;
     }
   }
 
   return false;
 }
 
 bool InstantController::UseInstantTabToShowSuggestions() const {

[samarth, 2013/04/15 19:01:34]

You can just inline this check wherever this function is used.

[jeremycho, 2013/04/16 01:42:37]

Done.

-  return instant_tab_ && !instant_tab_->IsLocalNTP();
+  return instant_tab_;
 }
 
 bool InstantController::ShouldSwitchToLocalNTP() const {
   // If there is no Instant URL or the NTP is stale, switch.
   std::string instant_url;
   if (!GetInstantURL(browser_->profile(), false, &instant_url) ||
       !chrome::MatchesOriginAndPath(GURL(ntp_->instant_url()),
                                     GURL(instant_url))) {
     return true;
   }
 
   if (ntp_->supports_instant())
     return false;
 
   // If this is not window startup, switch.
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   if (browser_->GetActiveWebContents())
     return true;
 
   return chrome::IsAggressiveLocalNTPFallbackEnabled();
 }