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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/instant/search.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/instant/search.h ('k') | chrome/browser/instant/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/ui/search/search.h"	5 #include "chrome/browser/instant/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"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

12 #include "base/strings/string_split.h"	12 #include "base/strings/string_split.h"

13 #include "chrome/browser/instant/instant_service.h"	13 #include "chrome/browser/instant/instant_service.h"

14 #include "chrome/browser/instant/instant_service_factory.h"	14 #include "chrome/browser/instant/instant_service_factory.h"

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

(...skipping 505 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
521 GURL::Replacements replacements;	521 GURL::Replacements replacements;

522 replacements.SetSchemeStr(search_scheme);	522 replacements.SetSchemeStr(search_scheme);

523 replacements.SetHostStr(search_host);	523 replacements.SetHostStr(search_host);

524 replacements.SetPortStr(search_port);	524 replacements.SetPortStr(search_port);

525 replacements.SetPathStr(search_path);	525 replacements.SetPathStr(search_path);

526 return instant_url.ReplaceComponents(replacements);	526 return instant_url.ReplaceComponents(replacements);

527 }	527 }

528	528

529 } // namespace search	529 } // namespace search

530 } // namespace chrome	530 } // namespace chrome

OLD	NEW