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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java

Issue 1345373007: Move management delegate from base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extract-state-handler
Patch Set: rebase Created 5 years, 3 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 | « chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java ('k') | 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/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
index e97c4751712431c8de21e204dcc9dedf78789f84..3af21450a9a96a806af3dfc66ede06d07a96623d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java
@@ -16,7 +16,6 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchOptOutPromo.ContextualSearchPromoHost;
import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.PanelState;
import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.StateChangeReason;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
import org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment;
import org.chromium.chrome.browser.util.MathUtils;
@@ -195,11 +194,6 @@ abstract class ContextualSearchPanelBase implements ContextualSearchPromoHost {
protected final Context mContext;
/**
- * The object for handling global Contextual Search management duties
- */
- private ContextualSearchManagementDelegate mManagementDelegate;
-
- /**
* The {@link ContextualSearchPanelFeatures} for this panel.
*/
protected ContextualSearchPanelFeatures mSearchPanelFeatures;
@@ -278,28 +272,22 @@ abstract class ContextualSearchPanelBase implements ContextualSearchPromoHost {
protected abstract void onClose(StateChangeReason reason);
// ============================================================================================
- // Contextual Search Manager Integration
+ // General methods from Contextual Search Manager
// ============================================================================================
/**
- * Sets the {@code ContextualSearchManagementDelegate} associated with this panel.
- * @param delegate The {@code ContextualSearchManagementDelegate}.
+ * TODO(mdjones): This method should be removed from this class.
+ * @return True if the tab hosting the panel is a custom tab.
*/
- public void setManagementDelegate(ContextualSearchManagementDelegate delegate) {
- if (mManagementDelegate != delegate) {
- mManagementDelegate = delegate;
- if (delegate != null) {
- initializeUiState();
- }
- }
- }
+ public abstract boolean isCustomTab();
/**
- * @return The {@code ContextualSearchManagementDelegate} associated with this Layout.
+ * TODO(mdjones): This method should be removed from this class.
+ * @return The resource id that contains how large the top controls are.
*/
- public ContextualSearchManagementDelegate getManagementDelegate() {
- return mManagementDelegate;
- }
+ public abstract int getControlContainerHeightResource();
+
+
// ============================================================================================
// Layout Integration
@@ -856,14 +844,14 @@ abstract class ContextualSearchPanelBase implements ContextualSearchPromoHost {
* Initializes the UI state.
*/
protected void initializeUiState() {
- mSearchPanelFeatures = new ContextualSearchPanelFeatures(mManagementDelegate.isCustomTab());
+ mSearchPanelFeatures = new ContextualSearchPanelFeatures(isCustomTab());
mIsShowing = false;
// Static values.
mPxToDp = 1.f / mContext.getResources().getDisplayMetrics().density;
mToolbarHeight = mContext.getResources().getDimension(
- mManagementDelegate.getControlContainerHeightResource()) * mPxToDp;
+ getControlContainerHeightResource()) * mPxToDp;
mSearchBarPaddingTop = PANEL_SHADOW_HEIGHT_DP;
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698