Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Side by Side Diff: chrome/browser/search/instant_service.cc

Issue 13375003: Fixing iframe jank in the local omnibox popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing comment. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/search/instant_service.h" 5 #include "chrome/browser/search/instant_service.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "chrome/browser/history/history_notifications.h" 8 #include "chrome/browser/history/history_notifications.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search/instant_io_context.h" 10 #include "chrome/browser/search/instant_io_context.h"
11 #include "chrome/browser/search/instant_service_factory.h" 11 #include "chrome/browser/search/instant_service_factory.h"
12 #include "chrome/browser/search/local_ntp_source.h" 12 #include "chrome/browser/search/local_ntp_source.h"
13 #include "chrome/browser/search/local_omnibox_popup_source.h" 13 #include "chrome/browser/search/local_omnibox_popup_source.h"
14 #include "chrome/browser/search/suggestion_source.h"
14 #include "chrome/browser/ui/webui/favicon_source.h" 15 #include "chrome/browser/ui/webui/favicon_source.h"
15 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" 16 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
16 #include "chrome/browser/ui/webui/theme_source.h" 17 #include "chrome/browser/ui/webui/theme_source.h"
17 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/notification_service.h" 20 #include "content/public/browser/notification_service.h"
20 #include "content/public/browser/notification_types.h" 21 #include "content/public/browser/notification_types.h"
21 #include "content/public/browser/render_process_host.h" 22 #include "content/public/browser/render_process_host.h"
22 #include "content/public/browser/url_data_source.h" 23 #include "content/public/browser/url_data_source.h"
23 #include "googleurl/src/gurl.h" 24 #include "googleurl/src/gurl.h"
(...skipping 23 matching lines...) Expand all
47 48
48 // Set up the data sources that Instant uses on the NTP. 49 // Set up the data sources that Instant uses on the NTP.
49 #if defined(ENABLE_THEMES) 50 #if defined(ENABLE_THEMES)
50 content::URLDataSource::Add(profile, new ThemeSource(profile)); 51 content::URLDataSource::Add(profile, new ThemeSource(profile));
51 #endif 52 #endif
52 content::URLDataSource::Add(profile, new ThumbnailSource(profile)); 53 content::URLDataSource::Add(profile, new ThumbnailSource(profile));
53 content::URLDataSource::Add(profile, new FaviconSource( 54 content::URLDataSource::Add(profile, new FaviconSource(
54 profile, FaviconSource::FAVICON)); 55 profile, FaviconSource::FAVICON));
55 content::URLDataSource::Add(profile, new LocalOmniboxPopupSource()); 56 content::URLDataSource::Add(profile, new LocalOmniboxPopupSource());
56 content::URLDataSource::Add(profile, new LocalNtpSource()); 57 content::URLDataSource::Add(profile, new LocalNtpSource());
58 content::URLDataSource::Add(profile, new SuggestionSource());
57 } 59 }
58 60
59 InstantService::~InstantService() { 61 InstantService::~InstantService() {
60 } 62 }
61 63
62 // static 64 // static
63 const std::string InstantService::MaybeTranslateInstantPathOnUI( 65 const std::string InstantService::MaybeTranslateInstantPathOnUI(
64 Profile* profile, const std::string& path) { 66 Profile* profile, const std::string& path) {
65 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
66 InstantService* instant_service = 68 InstantService* instant_service =
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 BrowserThread::IO, FROM_HERE, 176 BrowserThread::IO, FROM_HERE,
175 base::Bind(&InstantIOContext::RemoveInstantProcessOnIO, 177 base::Bind(&InstantIOContext::RemoveInstantProcessOnIO,
176 instant_io_context_, process_id)); 178 instant_io_context_, process_id));
177 } 179 }
178 break; 180 break;
179 } 181 }
180 default: 182 default:
181 NOTREACHED() << "Unexpected notification type in InstantService."; 183 NOTREACHED() << "Unexpected notification type in InstantService.";
182 } 184 }
183 } 185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698