From 1f2bc2729404d314d01875cb24260b6f555c56ca Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Tue, 10 Mar 2020 10:06:05 -0700 Subject: [PATCH] git cl format --- .../appmenu/BraveTabbedAppMenuPropertiesDelegate.java | 10 +++++----- .../bytecode/BraveMainPreferenceBaseClassAdapter.java | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 9dd6971fe8c..df3d8e207fb 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -42,7 +42,8 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie @Nullable ObservableSupplier overviewModeBehaviorSupplier, ObservableSupplier bookmarkBridgeSupplier) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, - toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier, bookmarkBridgeSupplier); + toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier, + bookmarkBridgeSupplier); } @Override @@ -54,8 +55,7 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie // Brave's items are only visible for page menu. // To make logic simple, below three items are added whenever menu gets visible // and removed when menu is dismissed. - if (!shouldShowPageMenu()) - return; + if (!shouldShowPageMenu()) return; // Brave donesn't show help menu item in app menu. menu.findItem(R.id.help_id).setVisible(false).setEnabled(false); @@ -64,8 +64,8 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie if (!mIsTablet) menu.findItem(R.id.share_row_menu_id).setVisible(false); menu.add(Menu.NONE, R.id.set_default_browser, 0, R.string.menu_set_default_browser); - if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) && - !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) { + if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) + && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) { menu.add(Menu.NONE, R.id.brave_rewards_id, 0, R.string.menu_brave_rewards); } menu.add(Menu.NONE, R.id.exit_id, 0, R.string.menu_exit); diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveMainPreferenceBaseClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveMainPreferenceBaseClassAdapter.java index d91c7359158..381f96442c6 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveMainPreferenceBaseClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveMainPreferenceBaseClassAdapter.java @@ -8,7 +8,6 @@ package org.brave.bytecode; import org.objectweb.asm.ClassVisitor; public class BraveMainPreferenceBaseClassAdapter extends BraveClassVisitor { - static String sMainPreferencesClassName = "org/chromium/chrome/browser/settings/MainPreferences";