chrome/browser/ui/toolbar/toolbar_model_impl.cc - Issue 200783003: [OriginChip] Add animations for the hiding and showing of the chip.

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 200783003: [OriginChip] Add animations for the hiding and showing of the chip. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Respond to comments, merge Created 6 years, 9 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 eac490966b8e6216b50bde7db328f8896e53fd3c..1a36ba21fe52b47eebfba6895724412274385f2d 100644

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

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

@@ -103,6 +103,10 @@ base::string16 ToolbarModelImpl::GetText() const {

if (WouldOmitURLDueToOriginChip())

return base::string16();

+ return GetFormattedURL();

+base::string16 ToolbarModelImpl::GetFormattedURL() const {

std::string languages; // Empty if we don't have a |navigation_controller|.

Profile* profile = GetProfile();

if (profile)