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

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

Issue 1361613002: Move all core files in //components/sessions into core/ subdir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/ui/browser_iterator.h" 23 #include "chrome/browser/ui/browser_iterator.h"
24 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 24 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
27 #include "chrome/common/search_urls.h" 27 #include "chrome/common/search_urls.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "components/google/core/browser/google_util.h" 29 #include "components/google/core/browser/google_util.h"
30 #include "components/pref_registry/pref_registry_syncable.h" 30 #include "components/pref_registry/pref_registry_syncable.h"
31 #include "components/search/search.h" 31 #include "components/search/search.h"
32 #include "components/search_engines/template_url_service.h" 32 #include "components/search_engines/template_url_service.h"
33 #include "components/sessions/serialized_navigation_entry.h" 33 #include "components/sessions/core/serialized_navigation_entry.h"
34 #include "content/public/browser/navigation_entry.h" 34 #include "content/public/browser/navigation_entry.h"
35 #include "content/public/browser/render_process_host.h" 35 #include "content/public/browser/render_process_host.h"
36 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 37
38 #if defined(ENABLE_SUPERVISED_USERS) 38 #if defined(ENABLE_SUPERVISED_USERS)
39 #include "chrome/browser/supervised_user/supervised_user_service.h" 39 #include "chrome/browser/supervised_user/supervised_user_service.h"
40 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 40 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
41 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" 41 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
42 #endif 42 #endif
43 43
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 kUseAltInstantURL, false, flags); 595 kUseAltInstantURL, false, flags);
596 } 596 }
597 597
598 bool ShouldUseSearchPathForInstant() { 598 bool ShouldUseSearchPathForInstant() {
599 FieldTrialFlags flags; 599 FieldTrialFlags flags;
600 return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault( 600 return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
601 kUseSearchPathForInstant, false, flags); 601 kUseSearchPathForInstant, false, flags);
602 } 602 }
603 603
604 } // namespace search 604 } // namespace search
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698