chrome/browser/ui/search/instant_controller.cc - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

Side by Side Diff: chrome/browser/ui/search/instant_controller.cc

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (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/ui/search/instant_controller.h ('k') | chrome/browser/ui/search/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/ui/search/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"

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

18 #include "chrome/browser/instant/instant_service.h"	16 #include "chrome/browser/instant/instant_service.h"

19 #include "chrome/browser/instant/instant_service_factory.h"	17 #include "chrome/browser/instant/instant_service_factory.h"

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

21 #include "chrome/browser/instant/search.h"	18 #include "chrome/browser/instant/search.h"

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

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

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

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

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

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

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

	26 #include "chrome/browser/ui/search/instant_tab.h"

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

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

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

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

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

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

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

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

35 #include "content/public/browser/user_metrics.h"	35 #include "content/public/browser/user_metrics.h"

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

(...skipping 1536 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1573 // for instance, if the user types 'i' and the suggestion is 'INSTANT',	1573 // for instance, if the user types 'i' and the suggestion is 'INSTANT',

1574 // suggest 'nstant'. Otherwise, the user text really isn't a prefix, so	1574 // suggest 'nstant'. Otherwise, the user text really isn't a prefix, so

1575 // suggest nothing.	1575 // suggest nothing.

1576 // TODO(samarth\|jered): revisit this logic. http://crbug.com/196572.	1576 // TODO(samarth\|jered): revisit this logic. http://crbug.com/196572.

1577 return true;	1577 return true;

1578 }	1578 }

1579 }	1579 }

1580	1580

1581 return false;	1581 return false;

1582 }	1582 }

OLD	NEW