Chromium Code Reviews| Index: chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java |
| diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java |
| index 3aa3d287b18715af296c555ce14f57a0423ac0af..c071e5c044d7ce35dbed8db749da9c9e4c4f8045 100644 |
| --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java |
| +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java |
| @@ -105,11 +105,11 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool |
| * @param color The primary color for the current tab. |
| */ |
| public void setPrimaryColor(int color) { |
| - mPrimaryColor = color; |
| Context context = ApplicationStatus.getApplicationContext(); |
| + int defaultColor = context.getResources().getColor(R.color.default_primary_color); |
|
Ted C
2015/05/26 18:44:35
This logic doesn't look like it changed. just mak
Yusuf
2015/05/26 18:57:23
Yes, just cleanup here.
|
| + mPrimaryColor = color; |
| mIsUsingBrandColor = FeatureUtilities.isDocumentMode(context) |
| - && !isIncognito() |
| - && mPrimaryColor != context.getResources().getColor(R.color.default_primary_color) |
| + && !isIncognito() && color != defaultColor |
| && getTab() != null && !getTab().isNativePage(); |
| } |