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

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

Issue 5512009: Remove unneeded browser_process.h includes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix linux build Created 10 years 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 | Annotate | Revision Log
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/autocomplete/autocomplete_match.h" 17 #include "chrome/browser/autocomplete/autocomplete_match.h"
18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/google/google_util.h" 18 #include "chrome/browser/google/google_util.h"
20 #include "chrome/browser/history/history.h" 19 #include "chrome/browser/history/history.h"
21 #include "chrome/browser/instant/instant_controller.h" 20 #include "chrome/browser/instant/instant_controller.h"
22 #include "chrome/browser/net/url_fixer_upper.h" 21 #include "chrome/browser/net/url_fixer_upper.h"
23 #include "chrome/browser/prefs/pref_service.h" 22 #include "chrome/browser/prefs/pref_service.h"
24 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/history/in_memory_database.h" 24 #include "chrome/browser/history/in_memory_database.h"
26 #include "chrome/browser/search_engines/template_url_model.h" 25 #include "chrome/browser/search_engines/template_url_model.h"
27 #include "chrome/common/json_value_serializer.h" 26 #include "chrome/common/json_value_serializer.h"
28 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 803
805 return match; 804 return match;
806 } 805 }
807 806
808 void SearchProvider::UpdateDone() { 807 void SearchProvider::UpdateDone() {
809 // We're done when there are no more suggest queries pending (this is set to 1 808 // We're done when there are no more suggest queries pending (this is set to 1
810 // when the timer is started) and we're not waiting on instant. 809 // when the timer is started) and we're not waiting on instant.
811 done_ = ((suggest_results_pending_ == 0) && 810 done_ = ((suggest_results_pending_ == 0) &&
812 (instant_finalized_ || !InstantController::IsEnabled(profile_))); 811 (instant_finalized_ || !InstantController::IsEnabled(profile_)));
813 } 812 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698