chrome/browser/instant/instant_controller.cc - Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/

Side by Side Diff: chrome/browser/instant/instant_controller.cc

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. 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

« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/instant/instant_extended_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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/instant/instant_controller.h"	5 #include "chrome/browser/instant/instant_controller.h"

6	6

7 #include "base/metrics/histogram.h"	7 #include "base/metrics/histogram.h"

8 #include "base/string_util.h"	8 #include "base/string_util.h"

9 #include "base/stringprintf.h"	9 #include "base/stringprintf.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/autocomplete/autocomplete_provider.h"	11 #include "chrome/browser/autocomplete/autocomplete_provider.h"

12 #include "chrome/browser/history/history_service.h"	12 #include "chrome/browser/history/history_service.h"

13 #include "chrome/browser/history/history_service_factory.h"	13 #include "chrome/browser/history/history_service_factory.h"

14 #include "chrome/browser/history/history_tab_helper.h"	14 #include "chrome/browser/history/history_tab_helper.h"

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

16 #include "chrome/browser/instant/instant_ntp.h"	16 #include "chrome/browser/instant/instant_ntp.h"

17 #include "chrome/browser/instant/instant_overlay.h"	17 #include "chrome/browser/instant/instant_overlay.h"

18 #include "chrome/browser/instant/instant_tab.h"	18 #include "chrome/browser/instant/instant_tab.h"

	19 #include "chrome/browser/instant/search.h"

19 #include "chrome/browser/platform_util.h"	20 #include "chrome/browser/platform_util.h"

20 #include "chrome/browser/search_engines/search_terms_data.h"	21 #include "chrome/browser/search_engines/search_terms_data.h"

21 #include "chrome/browser/search_engines/template_url_service.h"	22 #include "chrome/browser/search_engines/template_url_service.h"

22 #include "chrome/browser/search_engines/template_url_service_factory.h"	23 #include "chrome/browser/search_engines/template_url_service_factory.h"

23 #include "chrome/browser/ui/browser_instant_controller.h"	24 #include "chrome/browser/ui/browser_instant_controller.h"

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

25 #include "chrome/browser/ui/search/search_tab_helper.h"	25 #include "chrome/browser/ui/search/search_tab_helper.h"

26 #include "chrome/common/chrome_notification_types.h"	26 #include "chrome/common/chrome_notification_types.h"

27 #include "chrome/common/chrome_switches.h"	27 #include "chrome/common/chrome_switches.h"

28 #include "chrome/common/url_constants.h"	28 #include "chrome/common/url_constants.h"

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

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

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

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

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

34 #include "net/base/escape.h"	34 #include "net/base/escape.h"

(...skipping 1438 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1473 overlay_->SendMostVisitedItems(items);	1473 overlay_->SendMostVisitedItems(items);

1474 if (ntp_)	1474 if (ntp_)

1475 ntp_->SendMostVisitedItems(items);	1475 ntp_->SendMostVisitedItems(items);

1476 if (instant_tab_)	1476 if (instant_tab_)

1477 instant_tab_->SendMostVisitedItems(items);	1477 instant_tab_->SendMostVisitedItems(items);

1478 content::NotificationService::current()->Notify(	1478 content::NotificationService::current()->Notify(

1479 chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,	1479 chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,

1480 content::Source<InstantController>(this),	1480 content::Source<InstantController>(this),

1481 content::NotificationService::NoDetails());	1481 content::NotificationService::NoDetails());

1482 }	1482 }

OLD	NEW