components/toolbar/toolbar_model_impl.cc - Issue 1652153003: Move toolbar_model_{impl,delegate}.{cc,h} to components/toolbar.

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/toolbar_model_impl.cc

Issue 1652153003: Move toolbar_model_{impl,delegate}.{cc,h} to components/toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3

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

« components/toolbar/toolbar_model_impl.h ('K') | « components/toolbar/toolbar_model_impl.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/toolbar_model_impl.h"	5 #include "components/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"

11 #include "components/google/core/browser/google_util.h"	10 #include "components/google/core/browser/google_util.h"

	11 #include "components/grit/components_scaled_resources.h"

12 #include "components/prefs/pref_service.h"	12 #include "components/prefs/pref_service.h"

13 #include "components/security_state/security_state_model.h"	13 #include "components/security_state/security_state_model.h"

	14 #include "components/strings/grit/components_strings.h"

	15 #include "components/toolbar/toolbar_model_delegate.h"

14 #include "components/url_formatter/elide_url.h"	16 #include "components/url_formatter/elide_url.h"

15 #include "components/url_formatter/url_formatter.h"	17 #include "components/url_formatter/url_formatter.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 141 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 bool ToolbarModelImpl::ShouldDisplayURL() const {	169 bool ToolbarModelImpl::ShouldDisplayURL() const {

170 return delegate_->ShouldDisplayURL();	170 return delegate_->ShouldDisplayURL();

171 }	171 }

172	172

173 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {	173 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {

174 if (!url_replacement_enabled() \|\| (input_in_progress() && !ignore_editing))	174 if (!url_replacement_enabled() \|\| (input_in_progress() && !ignore_editing))

175 return base::string16();	175 return base::string16();

176	176

177 return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing));	177 return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing));

178 }	178 }

OLD	NEW