Fixing iframe jank in the local omnibox popup.

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/search/instant_service.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/local_ntp_source.h"
 #include "chrome/browser/search/local_omnibox_popup_source.h"
+#include "chrome/browser/search/suggestion_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "googleurl/src/gurl.h"
@@ skipping 23 matching lines @@
 
   // Set up the data sources that Instant uses on the NTP.
 #if defined(ENABLE_THEMES)
   content::URLDataSource::Add(profile, new ThemeSource(profile));
 #endif
   content::URLDataSource::Add(profile, new ThumbnailSource(profile));
   content::URLDataSource::Add(profile, new FaviconSource(
       profile, FaviconSource::FAVICON));
   content::URLDataSource::Add(profile, new LocalOmniboxPopupSource());
   content::URLDataSource::Add(profile, new LocalNtpSource());
+  content::URLDataSource::Add(profile, new SuggestionSource());
 }
 
 InstantService::~InstantService() {
 }
 
 // static
 const std::string InstantService::MaybeTranslateInstantPathOnUI(
     Profile* profile, const std::string& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   InstantService* instant_service =
@@ skipping 31 matching lines @@
 // static
 bool InstantService::IsInstantPath(const GURL& url) {
   // Strip leading slash.
   std::string path = url.path().substr(1);
 
   // Check that path is of Most Visited item ID form.
   InstantRestrictedID dummy = 0;
   return base::StringToInt(path, &dummy);
 }
 
-void InstantService::AddInstantProcess(int process_id) {
+void InstantService::AddInstantProcess(int process_id, const GURL& site_url) {
   process_ids_.insert(process_id);
 
   if (instant_io_context_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&InstantIOContext::AddInstantProcessOnIO,
-                   instant_io_context_, process_id));
+                   instant_io_context_, process_id, site_url));
   }
 }
 
 bool InstantService::IsInstantProcess(int process_id) const {
   return process_ids_.find(process_id) != process_ids_.end();
 }
 
 void InstantService::AddMostVisitedItems(
     const std::vector<InstantMostVisitedItem>& items) {
   most_visited_item_cache_.AddItems(items);
@@ skipping 48 matching lines @@
             BrowserThread::IO, FROM_HERE,
             base::Bind(&InstantIOContext::RemoveInstantProcessOnIO,
                        instant_io_context_, process_id));
       }
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
 }