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

Side by Side Diff: chrome/browser/autocomplete/search_provider.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/autocomplete/search_provider.h" 5 #include "chrome/browser/autocomplete/search_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/i18n/icu_string_conversions.h" 12 #include "base/i18n/icu_string_conversions.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string16.h" 14 #include "base/string16.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/autocomplete/keyword_provider.h" 16 #include "chrome/browser/autocomplete/keyword_provider.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/google_util.h" 18 #include "chrome/browser/google_util.h"
19 #include "chrome/browser/history/history.h" 19 #include "chrome/browser/history/history.h"
20 #include "chrome/browser/net/url_fixer_upper.h" 20 #include "chrome/browser/net/url_fixer_upper.h"
21 #include "chrome/browser/pref_service.h" 21 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/profile.h" 22 #include "chrome/browser/profile.h"
23 #include "chrome/browser/search_engines/template_url_model.h" 23 #include "chrome/browser/search_engines/template_url_model.h"
24 #include "chrome/common/json_value_serializer.h" 24 #include "chrome/common/json_value_serializer.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "googleurl/src/url_util.h" 27 #include "googleurl/src/url_util.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "net/base/escape.h" 29 #include "net/base/escape.h"
30 #include "net/http/http_response_headers.h" 30 #include "net/http/http_response_headers.h"
31 #include "net/url_request/url_request_status.h" 31 #include "net/url_request/url_request_status.h"
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 if (input_.type() == AutocompleteInput::FORCED_QUERY) 771 if (input_.type() == AutocompleteInput::FORCED_QUERY)
772 match.fill_into_edit.assign(L"?"); 772 match.fill_into_edit.assign(L"?");
773 match.fill_into_edit.append( 773 match.fill_into_edit.append(
774 AutocompleteInput::FormattedStringWithEquivalentMeaning(navigation.url, 774 AutocompleteInput::FormattedStringWithEquivalentMeaning(navigation.url,
775 match.contents)); 775 match.contents));
776 // TODO(pkasting): http://b/1112879 These should perhaps be 776 // TODO(pkasting): http://b/1112879 These should perhaps be
777 // inline-autocompletable? 777 // inline-autocompletable?
778 778
779 return match; 779 return match;
780 } 780 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698