chrome/browser/ui/toolbar/toolbar_model_impl.cc - Issue 149643010: Cleanup: Move kChromeUIScheme constant into content namespace.

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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model_impl.cc

Issue 149643010: Cleanup: Move kChromeUIScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc

diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc

index 10dee3efa3e564070cb87faaed3be4dde28dd9d2..f0de3dc6efc719a64137347548894b021710adc1 100644

--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc

+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc

@@ -193,9 +193,9 @@ bool ToolbarModelImpl::ShouldDisplayURL() const {

GURL url = entry->GetURL();

GURL virtual_url = entry->GetVirtualURL();

- if (url.SchemeIs(chrome::kChromeUIScheme) ||

- virtual_url.SchemeIs(chrome::kChromeUIScheme)) {

- if (!url.SchemeIs(chrome::kChromeUIScheme))

+ if (url.SchemeIs(content::kChromeUIScheme) ||

+ virtual_url.SchemeIs(content::kChromeUIScheme)) {

+ if (!url.SchemeIs(content::kChromeUIScheme))

url = virtual_url;

return url.host() != chrome::kChromeUINewTabHost;

}