Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1207)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

Issue 1948143003: Add null check to ToolbarControlContainer#getProgressBarDrawingInfo() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix line breaks Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
index 683b0e679b2899868cd522628e69529a816fb96a..b4de13bbc872fdaeea46baedfd00f09082f7843c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandl
import org.chromium.chrome.browser.contextualsearch.SwipeRecognizer;
import org.chromium.chrome.browser.widget.ClipDrawableProgressBar.DrawingInfo;
import org.chromium.chrome.browser.widget.ControlContainer;
+import org.chromium.chrome.browser.widget.ToolbarProgressBar;
import org.chromium.chrome.browser.widget.ViewResourceFrameLayout;
import org.chromium.ui.UiUtils;
import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
@@ -57,7 +58,8 @@ public class ToolbarControlContainer extends FrameLayout implements ControlConta
@Override
public void getProgressBarDrawingInfo(DrawingInfo drawingInfoOut) {
// TODO(yusufo): Avoid casting to the layout without making the interface bigger.
- ((ToolbarLayout) mToolbar).getProgressBar().getDrawingInfo(drawingInfoOut);
+ ToolbarProgressBar progressBar = ((ToolbarLayout) mToolbar).getProgressBar();
+ if (progressBar != null) progressBar.getDrawingInfo(drawingInfoOut);
}
@Override
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698