PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix incorrect code deletions

Browse Source
This commit is contained in:
Carmelo Messina
2023-05-07 17:25:32 +02:00
parent f863060176
commit 1d1f5e3ec7
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Move-navigation-bar-to-bottom.patch
+22 -23
View File
@@ -44,7 +44,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../chrome/browser/ntp/NewTabPage.java | 13 ++-
.../chrome/browser/ntp/RecentTabsPage.java | 22 ++++-
.../browser/searchwidget/SearchActivity.java | 13 ++-
.../browser/settings/SettingsActivity.java | 6 +-
.../browser/settings/SettingsActivity.java | 5 ++
.../StatusIndicatorCoordinator.java | 10 +++
.../StatusIndicatorSceneLayer.java | 7 +-
.../browser/toolbar/ToolbarManager.java | 37 +++++++--
@@ -88,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../accessibility/AccessibilitySettings.java | 16 ++++
.../AccessibilitySettingsDelegate.java | 6 ++
.../render_widget_host_view_android.cc | 3 +
76 files changed, 888 insertions(+), 64 deletions(-)
76 files changed, 888 insertions(+), 63 deletions(-)
diff --git a/cc/base/features.cc b/cc/base/features.cc
--- a/cc/base/features.cc
@@ -492,7 +492,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* Construct a coordinator for UI that shows a list of tabs.
* @param mode Modes of showing the list of tabs. Can be used in GRID or STRIP.
@@ -249,6 +321,12 @@ public class TabListCoordinator
@@ -252,6 +324,12 @@ public class TabListCoordinator
if (mMode == TabListMode.GRID) {
GridLayoutManager gridLayoutManager =
new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
@@ -505,7 +505,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mRecyclerView.setLayoutManager(gridLayoutManager);
mMediator.registerOrientationListener(gridLayoutManager);
mMediator.updateSpanCount(gridLayoutManager,
@@ -488,6 +566,9 @@ public class TabListCoordinator
@@ -498,6 +576,9 @@ public class TabListCoordinator
}
registerLayoutChangeListener();
mRecyclerView.prepareTabSwitcherView();
@@ -595,9 +595,9 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
import org.chromium.chrome.browser.price_tracking.PriceTrackingUtilities;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabCreationState;
@@ -457,11 +458,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -497,11 +498,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
updateTopControlsProperties();
mContainerViewModel.set(
BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
@@ -620,7 +620,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
if (backPressManager != null && BackPressManager.isEnabled()) {
assert !mIsStartSurfaceEnabled || mIsStartSurfaceRefactorEnabled;
backPressManager.addHandler(this, BackPressHandler.Type.TAB_SWITCHER);
@@ -589,6 +601,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -629,6 +641,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
mContainerViewModel.set(TOP_MARGIN, contentOffset);
@@ -710,7 +710,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -241,6 +241,9 @@ import java.util.ArrayList;
@@ -253,6 +253,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -720,7 +720,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
/**
* A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder}
* and associated classes.
@@ -749,6 +752,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -769,6 +772,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
int toolbarLayoutId = getToolbarLayoutId();
if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
controlContainer.initWithToolbar(toolbarLayoutId);
@@ -1232,7 +1232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/messages/Messag
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java
@@ -274,7 +274,7 @@ public class ChromeTabModalPresenter
@@ -284,7 +284,7 @@ public class ChromeTabModalPresenter
Resources resources, BrowserControlsStateProvider provider) {
int scrimVerticalMargin =
resources.getDimensionPixelSize(R.dimen.tab_modal_scrim_vertical_margin);
@@ -1388,19 +1388,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -310,7 +310,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -311,6 +311,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
if (fragment instanceof INeedSnackbarManager) {
((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
}
- initBackPressHandler();
+ if (fragment instanceof AccessibilitySettings) {
+ ((ChromeAccessibilitySettingsDelegate)
+ ((AccessibilitySettings) fragment)
+ .getDelegate()).setSnackbarManager(mSnackbarManager);
+ }
initBackPressHandler();
}
@Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
@@ -1455,7 +1454,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -177,6 +177,9 @@ import org.chromium.url.GURL;
@@ -175,6 +175,9 @@ import org.chromium.url.GURL;
import java.util.List;
@@ -1465,7 +1464,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
/**
* Contains logic for managing the toolbar visual component. This class manages the interactions
* with the rest of the application to ensure the toolbar is always visually up to date.
@@ -647,7 +650,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -645,7 +648,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mEphemeralTabCoordinatorSupplier);
// clang-format off
LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@@ -1474,7 +1473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
mActionModeController.getActionModeCallback(),
new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
@@ -881,11 +884,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -879,11 +882,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
// the height won't be measured by the background image.
if (mControlContainer.getBackground() == null) {
setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1488,7 +1487,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
mLayoutChangeListener = null;
}
@@ -1307,13 +1312,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1291,13 +1296,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return ((LocationBarCoordinator) mLocationBar).getUrlBarTextWithoutAutocomplete();
}
@@ -1516,7 +1515,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
mTabContentManager, mCompositorViewHolder,
@@ -1321,8 +1338,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1305,8 +1322,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mLayoutStateProviderSupplier, mSnackbarManager);
var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid,
mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
@@ -1528,7 +1527,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver(
(x) -> { onBackPressStateChanged(); });
@@ -2120,6 +2138,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2119,6 +2137,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
private void setControlContainerTopMargin(int margin) {
final ViewGroup.MarginLayoutParams layoutParams =
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -1618,7 +1617,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7389,6 +7389,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7418,6 +7418,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
@@ -1784,7 +1783,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
#include "base/metrics/field_trial_params.h"
#include "base/no_destructor.h"
#include "base/strings/string_piece_forward.h"
@@ -245,6 +246,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -251,6 +252,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kInstantStart,
&kLensCameraAssistedSearch,
&kLensOnQuickActionSearchWidget,
@@ -1851,7 +1850,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1753,7 +1753,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1750,7 +1750,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#if BUILDFLAG(IS_ANDROID)
registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
@@ -2289,7 +2288,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1626,6 +1626,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1674,6 +1674,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
Force Tablet Mode
</message>
build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
+1 -13
View File
@@ -4,21 +4,9 @@ Subject: Remove blocklisted URLs upon bookmark creation
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../chromium/chrome/browser/app/ChromeActivity.java | 1 -
.../chrome/browser/bookmarks/TabBookmarker.java | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
1 file changed, 13 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -293,7 +293,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private TabContentManager mTabContentManager;
private UmaSessionStats mUmaSessionStats;
- private ContextReporter mContextReporter;
private boolean mPartnerBrowserRefreshNeeded;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java