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

Side by Side Diff: components/toolbar/test_toolbar_model.cc

Issue 2144903004: New location security strings and animation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't look at level any more Created 4 years, 3 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
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 "components/toolbar/test_toolbar_model.h" 5 #include "components/toolbar/test_toolbar_model.h"
6 6
7 #include "components/grit/components_scaled_resources.h" 7 #include "components/grit/components_scaled_resources.h"
8 #include "ui/gfx/vector_icons_public.h" 8 #include "ui/gfx/vector_icons_public.h"
9 9
10 TestToolbarModel::TestToolbarModel() 10 TestToolbarModel::TestToolbarModel()
(...skipping 23 matching lines...) Expand all
34 34
35 int TestToolbarModel::GetIcon() const { 35 int TestToolbarModel::GetIcon() const {
36 // This placeholder implementation should be removed when MD is default. 36 // This placeholder implementation should be removed when MD is default.
37 return IDR_LOCATION_BAR_HTTP; 37 return IDR_LOCATION_BAR_HTTP;
38 } 38 }
39 39
40 gfx::VectorIconId TestToolbarModel::GetVectorIcon() const { 40 gfx::VectorIconId TestToolbarModel::GetVectorIcon() const {
41 return icon_; 41 return icon_;
42 } 42 }
43 43
44 base::string16 TestToolbarModel::GetSecureVerboseText() const {
45 return base::string16();
46 }
47
44 base::string16 TestToolbarModel::GetEVCertName() const { 48 base::string16 TestToolbarModel::GetEVCertName() const {
45 return (security_level_ == security_state::SecurityStateModel::EV_SECURE) 49 return (security_level_ == security_state::SecurityStateModel::EV_SECURE)
46 ? ev_cert_name_ 50 ? ev_cert_name_
47 : base::string16(); 51 : base::string16();
48 } 52 }
49 53
50 bool TestToolbarModel::ShouldDisplayURL() const { 54 bool TestToolbarModel::ShouldDisplayURL() const {
51 return should_display_url_; 55 return should_display_url_;
52 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698