chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java - Issue 2233023002: Adding BlimpNavigationController to Tab

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/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

Issue 2233023002: Adding BlimpNavigationController to Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nav_handler_remove

Patch Set: Fixing unit tests Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/TabBlimpContentsObserver.java ('k') | chrome/android/java_sources.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

index 12e70db9eba593e8b254a18517e1079646f3aaa9..cf9538c1b54e01604eb67ac2d0f58d1700128814 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

@@ -87,6 +87,8 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool

@Override

public String getText() {

+ if (mTab != null && mTab.isBlimpTab()) return mTab.getUrl().trim();

String displayText = super.getText();

if (mTab == null || mTab.isFrozen()) return displayText;