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/toolbar/toolbar_model_impl.h" | 5 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 10 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "content/public/browser/cert_store.h" | 23 #include "content/public/browser/cert_store.h" |
24 #include "content/public/browser/navigation_controller.h" | 24 #include "content/public/browser/navigation_controller.h" |
25 #include "content/public/browser/navigation_entry.h" | 25 #include "content/public/browser/navigation_entry.h" |
26 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
27 #include "content/public/browser/web_ui.h" | 27 #include "content/public/browser/web_ui.h" |
28 #include "content/public/common/content_constants.h" | 28 #include "content/public/common/content_constants.h" |
29 #include "content/public/common/ssl_status.h" | 29 #include "content/public/common/ssl_status.h" |
30 #include "extensions/common/constants.h" | 30 #include "extensions/common/constants.h" |
31 #include "grit/generated_resources.h" | 31 #include "grit/generated_resources.h" |
32 #include "grit/theme_resources.h" | 32 #include "grit/theme_resources.h" |
33 #include "net/base/cert_status_flags.h" | |
34 #include "net/base/net_util.h" | 33 #include "net/base/net_util.h" |
35 #include "net/base/x509_certificate.h" | 34 #include "net/cert/cert_status_flags.h" |
| 35 #include "net/cert/x509_certificate.h" |
36 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
37 | 37 |
38 using content::NavigationController; | 38 using content::NavigationController; |
39 using content::NavigationEntry; | 39 using content::NavigationEntry; |
40 using content::SSLStatus; | 40 using content::SSLStatus; |
41 using content::WebContents; | 41 using content::WebContents; |
42 | 42 |
43 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate) | 43 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate) |
44 : delegate_(delegate), | 44 : delegate_(delegate), |
45 input_in_progress_(false) { | 45 input_in_progress_(false) { |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 Profile* profile = | 261 Profile* profile = |
262 Profile::FromBrowserContext(contents->GetBrowserContext()); | 262 Profile::FromBrowserContext(contents->GetBrowserContext()); |
263 AutocompleteClassifierFactory::GetForProfile(profile)->Classify( | 263 AutocompleteClassifierFactory::GetForProfile(profile)->Classify( |
264 search_terms, false, false, &match, NULL); | 264 search_terms, false, false, &match, NULL); |
265 if (!AutocompleteMatch::IsSearchType(match.type)) | 265 if (!AutocompleteMatch::IsSearchType(match.type)) |
266 search_terms.clear(); | 266 search_terms.clear(); |
267 } | 267 } |
268 | 268 |
269 return search_terms; | 269 return search_terms; |
270 } | 270 } |
OLD | NEW |