chrome/browser/search/search.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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/search/hotword_service_unittest.cc ('k') | chrome/browser/search/search_unittest.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/search/search.h"	5 #include "chrome/browser/search/search.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

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

10 #include "base/metrics/field_trial.h"	10 #include "base/metrics/field_trial.h"

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

12 #include "base/prefs/pref_service.h"

13 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

14 #include "base/strings/string_split.h"	13 #include "base/strings/string_split.h"

15 #include "base/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

16 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

19 #include "chrome/browser/search/instant_service.h"	18 #include "chrome/browser/search/instant_service.h"

20 #include "chrome/browser/search/instant_service_factory.h"	19 #include "chrome/browser/search/instant_service_factory.h"

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

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

23 #include "chrome/browser/ui/browser.h"	22 #include "chrome/browser/ui/browser.h"

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

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

26 #include "chrome/common/chrome_switches.h"	25 #include "chrome/common/chrome_switches.h"

27 #include "chrome/common/pref_names.h"	26 #include "chrome/common/pref_names.h"

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

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

30 #include "components/google/core/browser/google_util.h"	29 #include "components/google/core/browser/google_util.h"

31 #include "components/pref_registry/pref_registry_syncable.h"	30 #include "components/pref_registry/pref_registry_syncable.h"

	31 #include "components/prefs/pref_service.h"

32 #include "components/search/search.h"	32 #include "components/search/search.h"

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

34 #include "components/sessions/core/serialized_navigation_entry.h"	34 #include "components/sessions/core/serialized_navigation_entry.h"

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

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

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

38	38

39 #if defined(ENABLE_SUPERVISED_USERS)	39 #if defined(ENABLE_SUPERVISED_USERS)

40 #include "chrome/browser/supervised_user/supervised_user_service.h"	40 #include "chrome/browser/supervised_user/supervised_user_service.h"

41 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"	41 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"

(...skipping 546 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
588 kUseAltInstantURL, false, flags);	588 kUseAltInstantURL, false, flags);

589 }	589 }

590	590

591 bool ShouldUseSearchPathForInstant() {	591 bool ShouldUseSearchPathForInstant() {

592 FieldTrialFlags flags;	592 FieldTrialFlags flags;

593 return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(	593 return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(

594 kUseSearchPathForInstant, false, flags);	594 kUseSearchPathForInstant, false, flags);

595 }	595 }

596	596

597 } // namespace search	597 } // namespace search

OLD	NEW