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

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

Issue 302453002: New animation for the origin chip URL showing/hiding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bugfixes and more animations Created 6 years, 7 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 | Annotate | Revision Log
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/test_toolbar_model.h" 5 #include "chrome/browser/ui/toolbar/test_toolbar_model.h"
6 6
7 #include "grit/theme_resources.h" 7 #include "grit/theme_resources.h"
8 8
9 TestToolbarModel::TestToolbarModel() 9 TestToolbarModel::TestToolbarModel()
10 : ToolbarModel(), 10 : ToolbarModel(),
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 int TestToolbarModel::GetIcon() const { 49 int TestToolbarModel::GetIcon() const {
50 return icon_; 50 return icon_;
51 } 51 }
52 52
53 int TestToolbarModel::GetIconForSecurityLevel(SecurityLevel level) const { 53 int TestToolbarModel::GetIconForSecurityLevel(SecurityLevel level) const {
54 return icon_; 54 return icon_;
55 } 55 }
56 56
57 base::string16 TestToolbarModel::GetEVCertName() const { 57 base::string16 TestToolbarModel::GetEVCertName() const {
58 return ev_cert_name_; 58 return (security_level_ == EV_SECURE) ? ev_cert_name_ : base::string16();
59 } 59 }
60 60
61 bool TestToolbarModel::ShouldDisplayURL() const { 61 bool TestToolbarModel::ShouldDisplayURL() const {
62 return should_display_url_; 62 return should_display_url_;
63 } 63 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698