components/toolbar/test_toolbar_model.cc - Issue 1634743003: Componentize TestToolbarModel

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1634743003: Componentize TestToolbarModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix gyp dependency 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 | « components/toolbar/test_toolbar_model.h ('k') | no next file » | no next file with comments »

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/test_toolbar_model.h"	5 #include "components/toolbar/test_toolbar_model.h"

6	6

7 #include "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()

11 : perform_search_term_replacement_(false),	11 : perform_search_term_replacement_(false),

12 security_level_(security_state::SecurityStateModel::NONE),	12 security_level_(security_state::SecurityStateModel::NONE),

13 #if defined(TOOLKIT_VIEWS)	13 #if defined(TOOLKIT_VIEWS)

14 icon_(gfx::VectorIconId::LOCATION_BAR_HTTP),	14 icon_(gfx::VectorIconId::LOCATION_BAR_HTTP),

15 #else	15 #else

16 icon_(gfx::VectorIconId::VECTOR_ICON_NONE),	16 icon_(gfx::VectorIconId::VECTOR_ICON_NONE),

17 #endif	17 #endif

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57	57

58 base::string16 TestToolbarModel::GetEVCertName() const {	58 base::string16 TestToolbarModel::GetEVCertName() const {

59 return (security_level_ == security_state::SecurityStateModel::EV_SECURE)	59 return (security_level_ == security_state::SecurityStateModel::EV_SECURE)

60 ? ev_cert_name_	60 ? ev_cert_name_

61 : base::string16();	61 : base::string16();

62 }	62 }

63	63

64 bool TestToolbarModel::ShouldDisplayURL() const {	64 bool TestToolbarModel::ShouldDisplayURL() const {

65 return should_display_url_;	65 return should_display_url_;

66 }	66 }

OLD	NEW