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

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

Issue 2089933002: Context Menu Refactor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing nits Created 4 years, 6 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; 5 package org.chromium.chrome.browser;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.annotation.TargetApi; 8 import android.annotation.TargetApi;
9 import android.app.Activity; 9 import android.app.Activity;
10 import android.app.SearchManager; 10 import android.app.SearchManager;
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 1391
1392 @Override 1392 @Override
1393 public final void onBackPressed() { 1393 public final void onBackPressed() {
1394 RecordUserAction.record("SystemBack"); 1394 RecordUserAction.record("SystemBack");
1395 if (mCompositorViewHolder != null) { 1395 if (mCompositorViewHolder != null) {
1396 LayoutManager layoutManager = mCompositorViewHolder.getLayoutManager (); 1396 LayoutManager layoutManager = mCompositorViewHolder.getLayoutManager ();
1397 if (layoutManager != null && layoutManager.onBackPressed()) return; 1397 if (layoutManager != null && layoutManager.onBackPressed()) return;
1398 } 1398 }
1399 1399
1400 ContentViewCore contentViewCore = getContentViewCore(); 1400 ContentViewCore contentViewCore = getContentViewCore();
1401 if (contentViewCore != null && contentViewCore.isSelectActionBarShowing( )) { 1401 if (contentViewCore != null) {
1402 contentViewCore.clearSelection(); 1402 contentViewCore.clearSelection();
1403 return; 1403 return;
1404 } 1404 }
1405 1405
1406 if (mContextualSearchManager != null && mContextualSearchManager.onBackP ressed()) return; 1406 if (mContextualSearchManager != null && mContextualSearchManager.onBackP ressed()) return;
1407 1407
1408 if (handleBackPressed()) return; 1408 if (handleBackPressed()) return;
1409 1409
1410 super.onBackPressed(); 1410 super.onBackPressed();
1411 } 1411 }
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 "Android.MultiWindowMode.IsTabletScreenWidthBelow600", 1743 "Android.MultiWindowMode.IsTabletScreenWidthBelow600",
1744 mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP); 1744 mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP);
1745 1745
1746 if (mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP) { 1746 if (mScreenWidthDp < DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP) {
1747 RecordHistogram.recordLinearCountHistogram( 1747 RecordHistogram.recordLinearCountHistogram(
1748 "Android.MultiWindowMode.TabletScreenWidth", mScreenWidthDp, 1, 1748 "Android.MultiWindowMode.TabletScreenWidth", mScreenWidthDp, 1,
1749 DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP, 50); 1749 DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP, 50);
1750 } 1750 }
1751 } 1751 }
1752 } 1752 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698