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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

Issue 2630513003: Expand bottom sheet when URL bar is focused (Closed)
Patch Set: address comments Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.toolbar; 5 package org.chromium.chrome.browser.toolbar;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.content.res.Configuration; 8 import android.content.res.Configuration;
9 import android.graphics.drawable.Drawable; 9 import android.graphics.drawable.Drawable;
10 import android.os.Handler; 10 import android.os.Handler;
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 } 194 }
195 }; 195 };
196 196
197 mToolbarModel = new ToolbarModelImpl(); 197 mToolbarModel = new ToolbarModelImpl();
198 mControlContainer = controlContainer; 198 mControlContainer = controlContainer;
199 assert mControlContainer != null; 199 assert mControlContainer != null;
200 200
201 mToolbar = (ToolbarLayout) controlContainer.findViewById(R.id.toolbar); 201 mToolbar = (ToolbarLayout) controlContainer.findViewById(R.id.toolbar);
202 202
203 mToolbar.setPaintInvalidator(invalidator); 203 mToolbar.setPaintInvalidator(invalidator);
204 mToolbar.setBottomSheet(activity.getBottomSheet());
204 205
205 mActionModeController = new ActionModeController(activity, mActionBarDel egate); 206 mActionModeController = new ActionModeController(activity, mActionBarDel egate);
206 mActionModeController.setCustomSelectionActionModeCallback( 207 mActionModeController.setCustomSelectionActionModeCallback(
207 new ToolbarActionModeCallback()); 208 new ToolbarActionModeCallback());
208 mActionModeController.setTabStripHeight(mToolbar.getTabStripHeight()); 209 mActionModeController.setTabStripHeight(mToolbar.getTabStripHeight());
209 210
210 MenuDelegatePhone menuDelegate = new MenuDelegatePhone() { 211 MenuDelegatePhone menuDelegate = new MenuDelegatePhone() {
211 @Override 212 @Override
212 public void updateReloadButtonState(boolean isLoading) { 213 public void updateReloadButtonState(boolean isLoading) {
213 if (mAppMenuPropertiesDelegate != null) { 214 if (mAppMenuPropertiesDelegate != null) {
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 } 1252 }
1252 1253
1253 /** 1254 /**
1254 * Cancels simulating load progress. 1255 * Cancels simulating load progress.
1255 */ 1256 */
1256 public void cancel() { 1257 public void cancel() {
1257 mHandler.removeMessages(MSG_ID_UPDATE_PROGRESS); 1258 mHandler.removeMessages(MSG_ID_UPDATE_PROGRESS);
1258 } 1259 }
1259 } 1260 }
1260 } 1261 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698