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

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

Issue 12840003: Implement local NTP for fallback. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Respond to Samarth's comments. Created 7 years, 9 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
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_omnibox_popup_source.h" 13 #include "chrome/browser/search/local_omnibox_popup_source.h"
13 #include "chrome/browser/ui/webui/favicon_source.h" 14 #include "chrome/browser/ui/webui/favicon_source.h"
14 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" 15 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
15 #include "chrome/browser/ui/webui/theme_source.h" 16 #include "chrome/browser/ui/webui/theme_source.h"
16 #include "chrome/common/chrome_notification_types.h" 17 #include "chrome/common/chrome_notification_types.h"
17 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
18 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
19 #include "content/public/browser/notification_types.h" 20 #include "content/public/browser/notification_types.h"
20 #include "content/public/browser/render_process_host.h" 21 #include "content/public/browser/render_process_host.h"
21 #include "content/public/browser/url_data_source.h" 22 #include "content/public/browser/url_data_source.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 64 }
64 65
65 // Set up the data sources that Instant uses on the NTP. 66 // Set up the data sources that Instant uses on the NTP.
66 #if defined(ENABLE_THEMES) 67 #if defined(ENABLE_THEMES)
67 content::URLDataSource::Add(profile, new ThemeSource(profile)); 68 content::URLDataSource::Add(profile, new ThemeSource(profile));
68 #endif 69 #endif
69 content::URLDataSource::Add(profile, new ThumbnailSource(profile)); 70 content::URLDataSource::Add(profile, new ThumbnailSource(profile));
70 content::URLDataSource::Add(profile, new FaviconSource( 71 content::URLDataSource::Add(profile, new FaviconSource(
71 profile, FaviconSource::FAVICON)); 72 profile, FaviconSource::FAVICON));
72 content::URLDataSource::Add(profile, new LocalOmniboxPopupSource()); 73 content::URLDataSource::Add(profile, new LocalOmniboxPopupSource());
74 content::URLDataSource::Add(profile, new LocalNTPSource());
73 } 75 }
74 76
75 InstantService::~InstantService() { 77 InstantService::~InstantService() {
76 } 78 }
77 79
78 // static 80 // static
79 const std::string InstantService::MaybeTranslateInstantPathOnUI( 81 const std::string InstantService::MaybeTranslateInstantPathOnUI(
80 Profile* profile, const std::string& path) { 82 Profile* profile, const std::string& path) {
81 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
82 InstantService* instant_service = 84 InstantService* instant_service =
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 url_to_most_visited_item_id_map_.find(*it); 242 url_to_most_visited_item_id_map_.find(*it);
241 if (item != url_to_most_visited_item_id_map_.end()) { 243 if (item != url_to_most_visited_item_id_map_.end()) {
242 uint64 most_visited_item_id = item->second; 244 uint64 most_visited_item_id = item->second;
243 url_to_most_visited_item_id_map_.erase(item); 245 url_to_most_visited_item_id_map_.erase(item);
244 most_visited_item_id_to_url_map_.erase( 246 most_visited_item_id_to_url_map_.erase(
245 most_visited_item_id_to_url_map_.find(most_visited_item_id)); 247 most_visited_item_id_to_url_map_.find(most_visited_item_id));
246 deleted_ids->push_back(most_visited_item_id); 248 deleted_ids->push_back(most_visited_item_id);
247 } 249 }
248 } 250 }
249 } 251 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698