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

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

Issue 1651103003: Componentize IDS_SECURE_CONNECTION_EV. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2
Patch Set: Rebase Created 4 years, 10 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 | « chrome/app/generated_resources.grd ('k') | components/omnibox_strings.grdp » ('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 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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 10 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
11 #include "chrome/grit/generated_resources.h"
12 #include "components/google/core/browser/google_util.h" 11 #include "components/google/core/browser/google_util.h"
13 #include "components/prefs/pref_service.h" 12 #include "components/prefs/pref_service.h"
14 #include "components/security_state/security_state_model.h" 13 #include "components/security_state/security_state_model.h"
15 #include "components/url_formatter/elide_url.h" 14 #include "components/url_formatter/elide_url.h"
16 #include "components/url_formatter/url_formatter.h" 15 #include "components/url_formatter/url_formatter.h"
17 #include "grit/components_scaled_resources.h" 16 #include "grit/components_scaled_resources.h"
17 #include "grit/components_strings.h"
18 #include "net/cert/cert_status_flags.h" 18 #include "net/cert/cert_status_flags.h"
19 #include "net/cert/x509_certificate.h" 19 #include "net/cert/x509_certificate.h"
20 #include "net/ssl/ssl_connection_status_flags.h" 20 #include "net/ssl/ssl_connection_status_flags.h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
22 #include "ui/gfx/text_elider.h" 22 #include "ui/gfx/text_elider.h"
23 #include "ui/gfx/vector_icons_public.h" 23 #include "ui/gfx/vector_icons_public.h"
24 24
25 using security_state::SecurityStateModel; 25 using security_state::SecurityStateModel;
26 26
27 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate, 27 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate,
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 bool ToolbarModelImpl::ShouldDisplayURL() const { 166 bool ToolbarModelImpl::ShouldDisplayURL() const {
167 return delegate_->ShouldDisplayURL(); 167 return delegate_->ShouldDisplayURL();
168 } 168 }
169 169
170 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const { 170 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
171 if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing)) 171 if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing))
172 return base::string16(); 172 return base::string16();
173 173
174 return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing)); 174 return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing));
175 } 175 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | components/omnibox_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698