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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_model_impl.cc

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test debugging Created 5 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
OLDNEW
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/chrome_autocomplete_scheme_classifier.h" 10 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/search/search.h" 12 #include "chrome/browser/search/search.h"
13 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 13 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
14 #include "chrome/browser/ssl/security_state_model.h"
15 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 14 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
16 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
17 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
18 #include "chrome/grit/generated_resources.h" 17 #include "chrome/grit/generated_resources.h"
19 #include "components/google/core/browser/google_util.h" 18 #include "components/google/core/browser/google_util.h"
20 #include "components/omnibox/browser/autocomplete_classifier.h" 19 #include "components/omnibox/browser/autocomplete_classifier.h"
21 #include "components/omnibox/browser/autocomplete_input.h" 20 #include "components/omnibox/browser/autocomplete_input.h"
22 #include "components/omnibox/browser/autocomplete_match.h" 21 #include "components/omnibox/browser/autocomplete_match.h"
22 #include "components/security_state/security_state_model.h"
23 #include "components/url_formatter/elide_url.h" 23 #include "components/url_formatter/elide_url.h"
24 #include "components/url_formatter/url_formatter.h" 24 #include "components/url_formatter/url_formatter.h"
25 #include "content/public/browser/cert_store.h" 25 #include "content/public/browser/cert_store.h"
26 #include "content/public/browser/navigation_controller.h" 26 #include "content/public/browser/navigation_controller.h"
27 #include "content/public/browser/navigation_entry.h" 27 #include "content/public/browser/navigation_entry.h"
28 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
29 #include "content/public/browser/web_ui.h" 29 #include "content/public/browser/web_ui.h"
30 #include "content/public/common/content_constants.h" 30 #include "content/public/common/content_constants.h"
31 #include "content/public/common/ssl_status.h" 31 #include "content/public/common/ssl_status.h"
32 #include "grit/components_scaled_resources.h" 32 #include "grit/components_scaled_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "net/cert/cert_status_flags.h" 34 #include "net/cert/cert_status_flags.h"
35 #include "net/cert/x509_certificate.h" 35 #include "net/cert/x509_certificate.h"
36 #include "net/ssl/ssl_connection_status_flags.h" 36 #include "net/ssl/ssl_connection_status_flags.h"
37 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
38 #include "ui/gfx/text_elider.h" 38 #include "ui/gfx/text_elider.h"
39 #include "ui/gfx/vector_icons_public.h" 39 #include "ui/gfx/vector_icons_public.h"
40 40
41 using content::NavigationController; 41 using content::NavigationController;
42 using content::NavigationEntry; 42 using content::NavigationEntry;
43 using content::WebContents; 43 using content::WebContents;
44 using security_state::SecurityStateModel;
44 45
45 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate) 46 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate)
46 : delegate_(delegate) { 47 : delegate_(delegate) {
47 } 48 }
48 49
49 ToolbarModelImpl::~ToolbarModelImpl() { 50 ToolbarModelImpl::~ToolbarModelImpl() {
50 } 51 }
51 52
52 // ToolbarModelImpl Implementation. 53 // ToolbarModelImpl Implementation.
53 base::string16 ToolbarModelImpl::GetText() const { 54 base::string16 ToolbarModelImpl::GetText() const {
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 276
276 // Otherwise, extract search terms for HTTPS pages that do not have a security 277 // Otherwise, extract search terms for HTTPS pages that do not have a security
277 // error. 278 // error.
278 SecurityStateModel::SecurityLevel security_level = 279 SecurityStateModel::SecurityLevel security_level =
279 GetSecurityLevel(ignore_editing); 280 GetSecurityLevel(ignore_editing);
280 return ((security_level == SecurityStateModel::NONE) || 281 return ((security_level == SecurityStateModel::NONE) ||
281 (security_level == SecurityStateModel::SECURITY_ERROR)) 282 (security_level == SecurityStateModel::SECURITY_ERROR))
282 ? base::string16() 283 ? base::string16()
283 : search_terms; 284 : search_terms;
284 } 285 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698