chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java - Issue 1505913003: Add update menu item and app menu icon badge

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/ToolbarManager.java

Issue 1505913003: Add update menu item and app menu icon badge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years 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

« chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index bcf6cb914dfe65314b1ad64b345b49dea6ab0656..a332c328e0dfee5544f240eb7c86977a49650b0c 100644

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

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

@@ -617,7 +617,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

* @return The view that the pop up menu should be anchored to on the UI.

public View getMenuAnchor() {

- return mToolbar.shouldShowMenuButton() ? mToolbar.getMenuButton()

+ return mToolbar.shouldShowMenuButton() ? mToolbar.getMenuButtonWrapper()

: mToolbar.getLocationBar().getMenuAnchor();

}

@@ -933,7 +933,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

updateReloadState(tabCrashed);

updateBookmarkButtonStatus();

- mToolbar.getMenuButton().setVisibility(

+ mToolbar.getMenuButtonWrapper().setVisibility(

mToolbar.shouldShowMenuButton() ? View.VISIBLE : View.GONE);

}