| 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/prefs/pref_service.h" |    7 #include "base/prefs/pref_service.h" | 
|    8 #include "base/strings/utf_string_conversions.h" |    8 #include "base/strings/utf_string_conversions.h" | 
|    9 #include "base/time/time.h" |    9 #include "base/time/time.h" | 
|   10 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |  | 
|   11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |   10 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 
|   12 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |   11 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 
|   13 #include "chrome/browser/profiles/profile.h" |   12 #include "chrome/browser/profiles/profile.h" | 
|   14 #include "chrome/browser/search/search.h" |   13 #include "chrome/browser/search/search.h" | 
|   15 #include "chrome/browser/ssl/connection_security.h" |   14 #include "chrome/browser/ssl/connection_security.h" | 
|   16 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" |   15 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" | 
|   17 #include "chrome/common/pref_names.h" |   16 #include "chrome/common/pref_names.h" | 
|   18 #include "chrome/common/url_constants.h" |   17 #include "chrome/common/url_constants.h" | 
|   19 #include "chrome/grit/generated_resources.h" |   18 #include "chrome/grit/generated_resources.h" | 
|   20 #include "components/google/core/browser/google_util.h" |   19 #include "components/google/core/browser/google_util.h" | 
 |   20 #include "components/omnibox/autocomplete_classifier.h" | 
|   21 #include "components/omnibox/autocomplete_input.h" |   21 #include "components/omnibox/autocomplete_input.h" | 
|   22 #include "components/omnibox/autocomplete_match.h" |   22 #include "components/omnibox/autocomplete_match.h" | 
|   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 "grit/components_scaled_resources.h" |   30 #include "grit/components_scaled_resources.h" | 
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  239  |  239  | 
|  240   // Otherwise, extract search terms for HTTPS pages that do not have a security |  240   // Otherwise, extract search terms for HTTPS pages that do not have a security | 
|  241   // error. |  241   // error. | 
|  242   connection_security::SecurityLevel security_level = |  242   connection_security::SecurityLevel security_level = | 
|  243       GetSecurityLevel(ignore_editing); |  243       GetSecurityLevel(ignore_editing); | 
|  244   return ((security_level == connection_security::NONE) || |  244   return ((security_level == connection_security::NONE) || | 
|  245           (security_level == connection_security::SECURITY_ERROR)) |  245           (security_level == connection_security::SECURITY_ERROR)) | 
|  246              ? base::string16() |  246              ? base::string16() | 
|  247              : search_terms; |  247              : search_terms; | 
|  248 } |  248 } | 
| OLD | NEW |