Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
index 295e06d5f2644e40e3d79e83bb7b1257fb728f34..bf1eb4d6905d8aa837009cc482b36eb085eac162 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java |
@@ -17,6 +17,7 @@ import android.view.MotionEvent; |
import android.view.View; |
import android.view.ViewGroup; |
import android.widget.FrameLayout; |
+import android.widget.ImageView; |
import android.widget.ProgressBar; |
import org.chromium.base.ApiCompatibilityUtils; |
@@ -48,6 +49,8 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
* The ImageButton view that represents the menu button. |
*/ |
protected TintedImageButton mMenuButton; |
+ protected ImageView mMenuBadge; |
+ protected View mMenuButtonWrapper; |
private AppMenuButtonHelper mAppMenuButtonHelper; |
protected final ColorStateList mDarkModeTint; |
@@ -92,6 +95,9 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
} |
mMenuButton = (TintedImageButton) findViewById(R.id.menu_button); |
+ mMenuBadge = (ImageView) findViewById(R.id.menu_badge); |
+ mMenuButtonWrapper = findViewById(R.id.menu_button_wrapper); |
+ |
// Initialize the provider to an empty version to avoid null checking everywhere. |
mToolbarDataProvider = new ToolbarDataProvider() { |
@Override |
@@ -182,10 +188,10 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
} |
/** |
- * @return The menu button view. |
+ * @return The view containing the menu button and menu button badge. |
*/ |
- protected View getMenuButton() { |
- return mMenuButton; |
+ protected View getMenuButtonWrapper() { |
+ return mMenuButtonWrapper; |
} |
/** |
@@ -609,4 +615,9 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar { |
getLocationBar().hideSuggestions(); |
if (mToolbarTabController != null) mToolbarTabController.openHomepage(); |
} |
+ |
+ @Override |
+ public void removeAppMenuUpdateBadge() { |
+ mMenuBadge.setVisibility(View.GONE); |
+ } |
} |