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

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

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: win build fixes Created 10 years, 5 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 | « base/weak_ptr_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/autocomplete_edit.h" 5 #include "chrome/browser/autocomplete/autocomplete_edit.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/histogram.h"
10 #include "base/string_util.h" 11 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
12 #include "chrome/app/chrome_dll_resource.h" 13 #include "chrome/app/chrome_dll_resource.h"
13 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 14 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
14 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" 15 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
15 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 16 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
16 #include "chrome/browser/autocomplete/keyword_provider.h" 17 #include "chrome/browser/autocomplete/keyword_provider.h"
17 #include "chrome/browser/command_updater.h" 18 #include "chrome/browser/command_updater.h"
18 #include "chrome/browser/extensions/extension_omnibox_api.h" 19 #include "chrome/browser/extensions/extension_omnibox_api.h"
19 #include "chrome/browser/metrics/user_metrics.h" 20 #include "chrome/browser/metrics/user_metrics.h"
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 AutocompleteMatch* match, 677 AutocompleteMatch* match,
677 GURL* alternate_nav_url) const { 678 GURL* alternate_nav_url) const {
678 if (popup_->IsOpen() || query_in_progress()) { 679 if (popup_->IsOpen() || query_in_progress()) {
679 popup_->InfoForCurrentSelection(match, alternate_nav_url); 680 popup_->InfoForCurrentSelection(match, alternate_nav_url);
680 } else { 681 } else {
681 profile_->GetAutocompleteClassifier()->Classify( 682 profile_->GetAutocompleteClassifier()->Classify(
682 UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(), match, 683 UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(), match,
683 alternate_nav_url); 684 alternate_nav_url);
684 } 685 }
685 } 686 }
OLDNEW
« no previous file with comments | « base/weak_ptr_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698