chrome/browser/search/instant_service.cc - Issue 368273011: Revert of Componentize TemplateURLService

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

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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

« no previous file with comments | « chrome/browser/search/instant_service.h ('k') | chrome/browser/search/instant_unittest_base.h » ('j') | no next file with comments »

OLD	NEW
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 "chrome/browser/chrome_notification_types.h"	7 #include "chrome/browser/chrome_notification_types.h"

8 #include "chrome/browser/history/most_visited_tiles_experiment.h"	8 #include "chrome/browser/history/most_visited_tiles_experiment.h"

9 #include "chrome/browser/history/top_sites.h"	9 #include "chrome/browser/history/top_sites.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/search/instant_io_context.h"	11 #include "chrome/browser/search/instant_io_context.h"

12 #include "chrome/browser/search/instant_service_observer.h"	12 #include "chrome/browser/search/instant_service_observer.h"

13 #include "chrome/browser/search/local_ntp_source.h"	13 #include "chrome/browser/search/local_ntp_source.h"

14 #include "chrome/browser/search/most_visited_iframe_source.h"	14 #include "chrome/browser/search/most_visited_iframe_source.h"

15 #include "chrome/browser/search/search.h"	15 #include "chrome/browser/search/search.h"

16 #include "chrome/browser/search/suggestions/suggestions_source.h"	16 #include "chrome/browser/search/suggestions/suggestions_source.h"

	17 #include "chrome/browser/search_engines/template_url_service.h"

17 #include "chrome/browser/search_engines/template_url_service_factory.h"	18 #include "chrome/browser/search_engines/template_url_service_factory.h"

18 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"	19 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"

19 #include "chrome/browser/themes/theme_properties.h"	20 #include "chrome/browser/themes/theme_properties.h"

20 #include "chrome/browser/themes/theme_service.h"	21 #include "chrome/browser/themes/theme_service.h"

21 #include "chrome/browser/themes/theme_service_factory.h"	22 #include "chrome/browser/themes/theme_service_factory.h"

22 #include "chrome/browser/thumbnails/thumbnail_list_source.h"	23 #include "chrome/browser/thumbnails/thumbnail_list_source.h"

23 #include "chrome/browser/ui/search/instant_search_prerenderer.h"	24 #include "chrome/browser/ui/search/instant_search_prerenderer.h"

24 #include "chrome/browser/ui/webui/favicon_source.h"	25 #include "chrome/browser/ui/webui/favicon_source.h"

25 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"	26 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"

26 #include "chrome/browser/ui/webui/theme_source.h"	27 #include "chrome/browser/ui/webui/theme_source.h"

27 #include "chrome/common/render_messages.h"	28 #include "chrome/common/render_messages.h"

28 #include "components/search_engines/template_url_service.h"

29 #include "content/public/browser/browser_thread.h"	29 #include "content/public/browser/browser_thread.h"

30 #include "content/public/browser/notification_service.h"	30 #include "content/public/browser/notification_service.h"

31 #include "content/public/browser/notification_types.h"	31 #include "content/public/browser/notification_types.h"

32 #include "content/public/browser/render_process_host.h"	32 #include "content/public/browser/render_process_host.h"

33 #include "content/public/browser/url_data_source.h"	33 #include "content/public/browser/url_data_source.h"

34 #include "grit/theme_resources.h"	34 #include "grit/theme_resources.h"

35 #include "third_party/skia/include/core/SkColor.h"	35 #include "third_party/skia/include/core/SkColor.h"

36 #include "ui/gfx/color_utils.h"	36 #include "ui/gfx/color_utils.h"

37 #include "ui/gfx/image/image_skia.h"	37 #include "ui/gfx/image/image_skia.h"

38 #include "ui/gfx/sys_color_change_listener.h"	38 #include "ui/gfx/sys_color_change_listener.h"

(...skipping 386 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
425 }	425 }

426	426

427 void InstantService::ResetInstantSearchPrerenderer() {	427 void InstantService::ResetInstantSearchPrerenderer() {

428 if (!chrome::ShouldPrefetchSearchResults())	428 if (!chrome::ShouldPrefetchSearchResults())

429 return;	429 return;

430	430

431 GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_));	431 GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_));

432 instant_prerenderer_.reset(	432 instant_prerenderer_.reset(

433 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL);	433 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL);

434 }	434 }

OLD	NEW