Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
index e79d47a9df396cff10ee8182e0c016d6f9883fc6..3df208e2b94f268dbbc7c41ffc2493e420425a39 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
@@ -431,18 +431,18 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
ControlContainer controlContainer = |
(ControlContainer) findViewById(R.id.control_container); |
+ // Inflate the correct toolbar layout for the device. |
+ int toolbarLayoutId = getToolbarLayoutId(); |
+ if (toolbarLayoutId != NO_TOOLBAR_LAYOUT && controlContainer != null) { |
+ controlContainer.initWithToolbar(toolbarLayoutId); |
+ } |
+ |
// Get a handle to the bottom sheet if using the bottom control container. |
if (controlContainerLayoutId == R.layout.bottom_control_container) { |
View coordinator = findViewById(R.id.coordinator); |
mBottomSheet = (BottomSheet) findViewById(R.id.bottom_sheet); |
mBottomSheet.init(coordinator, controlContainer.getView()); |
} |
- |
- // Inflate the correct toolbar layout for the device. |
- int toolbarLayoutId = getToolbarLayoutId(); |
- if (toolbarLayoutId != NO_TOOLBAR_LAYOUT && controlContainer != null) { |
- controlContainer.initWithToolbar(toolbarLayoutId); |
- } |
} finally { |
StrictMode.setThreadPolicy(oldPolicy); |
} |