[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
356eff743b
commit
13788fa3cd
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -8680,9 +8680,9 @@
|
||||
@@ -8685,9 +8685,9 @@
|
||||
"expiry_milestone": 150
|
||||
},
|
||||
{
|
||||
|
||||
@@ -285,7 +285,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
// Defer creation of this helper so it triggers after TabGroupModelFilter observers.
|
||||
mUndoRefocusHelper =
|
||||
new UndoRefocusHelper(
|
||||
@@ -3152,7 +3161,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3137,7 +3146,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
}
|
||||
|
||||
// We determine the model as soon as possible so every systems get initialized coherently.
|
||||
@@ -2201,7 +2201,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone
|
||||
diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
|
||||
--- a/components/omnibox/browser/base_search_provider.cc
|
||||
+++ b/components/omnibox/browser/base_search_provider.cc
|
||||
@@ -431,7 +431,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
|
||||
@@ -432,7 +432,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
|
||||
|
||||
// Don't make a suggest request if in incognito mode; unless for the Lens
|
||||
// searchboxes.
|
||||
|
||||
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
/**
|
||||
* This is the main activity for ChromeMobile when not running in document mode. All the tabs are
|
||||
* accessible via a chrome specific tab switching UI.
|
||||
@@ -3707,6 +3709,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3692,6 +3694,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
.closeTabs(
|
||||
TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
|
||||
RecordUserAction.record("MobileTabClosed");
|
||||
|
||||
@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
|
||||
#include "base/feature_list.h"
|
||||
#include "base/format_macros.h"
|
||||
#include "base/functional/bind.h"
|
||||
@@ -567,6 +568,15 @@ AutocompleteController::AutocompleteController(
|
||||
@@ -569,6 +570,15 @@ AutocompleteController::AutocompleteController(
|
||||
provider_client_->GetOmniboxTriggeredFeatureService()),
|
||||
steady_state_omnibox_position_(
|
||||
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
|
||||
|
||||
@@ -73,7 +73,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
|
||||
import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper;
|
||||
import org.chromium.components.browser_ui.edge_to_edge.TabbedSystemBarColorHelper;
|
||||
@@ -3739,6 +3745,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3724,6 +3730,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
getTabModelSelectorSupplier().get(),
|
||||
closeAllTabsRunnable);
|
||||
RecordUserAction.record("MobileMenuCloseAllTabs");
|
||||
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
} else if (id == R.id.close_all_incognito_tabs_menu_id) {
|
||||
boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
|
||||
|
||||
@@ -3863,6 +3871,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3848,6 +3856,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -3779,6 +3779,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3764,6 +3764,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
|
||||
}
|
||||
RecordUserAction.record("MobileMenuDownloadManager");
|
||||
|
||||
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
import org.chromium.base.IntentUtils;
|
||||
import org.chromium.base.Log;
|
||||
import org.chromium.base.MemoryPressureListener;
|
||||
@@ -2101,8 +2102,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -2086,8 +2087,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
boolean hadCipherData =
|
||||
CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
|
||||
import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
|
||||
import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
|
||||
@@ -2106,7 +2107,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -2091,7 +2092,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
Intent intent = getIntent();
|
||||
|
||||
boolean hadCipherData =
|
||||
|
||||
@@ -838,7 +838,7 @@ new file mode 100644
|
||||
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
|
||||
--- a/skia/BUILD.gn
|
||||
+++ b/skia/BUILD.gn
|
||||
@@ -459,6 +459,18 @@ component("skia") {
|
||||
@@ -463,6 +463,18 @@ component("skia") {
|
||||
sources += skia_ports_fci_sources
|
||||
}
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
|
||||
#include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
|
||||
#include "third_party/blink/public/platform/web_audio_latency_hint.h"
|
||||
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
|
||||
@@ -696,7 +697,9 @@ double AudioContext::baseLatency() const {
|
||||
@@ -678,7 +679,9 @@ double AudioContext::baseLatency() const {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
|
||||
DCHECK(destination());
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
|
||||
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
|
||||
import org.chromium.chrome.browser.pdf.PdfUtils;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
@@ -297,9 +296,6 @@ public class IntentHandler {
|
||||
@@ -293,9 +292,6 @@ public class IntentHandler {
|
||||
|
||||
public static final String EXTRA_CCT_EARLY_NAV = "org.chromium.chrome.browser.cct_early_nav";
|
||||
|
||||
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
|
||||
private static Pair<Integer, String> sPendingReferrer;
|
||||
private static int sReferrerId;
|
||||
private static String sPendingIncognitoUrl;
|
||||
@@ -592,8 +588,6 @@ public class IntentHandler {
|
||||
@@ -588,8 +584,6 @@ public class IntentHandler {
|
||||
return ExternalAppId.LINE;
|
||||
} else if (packageName.equals(PACKAGE_WHATSAPP)) {
|
||||
return ExternalAppId.WHATSAPP;
|
||||
|
||||
@@ -902,18 +902,18 @@ diff --git a/components/autofill/core/browser/ml_model/field_classification_mode
|
||||
diff --git a/components/omnibox/browser/aim_eligibility_service.cc b/components/omnibox/browser/aim_eligibility_service.cc
|
||||
--- a/components/omnibox/browser/aim_eligibility_service.cc
|
||||
+++ b/components/omnibox/browser/aim_eligibility_service.cc
|
||||
@@ -33,6 +33,7 @@ namespace {
|
||||
@@ -41,6 +41,7 @@ namespace {
|
||||
|
||||
// If disabled, AIM is completely turned off (kill switch).
|
||||
BASE_FEATURE(kAimEnabled, "AimEnabled", base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+SET_CROMITE_FEATURE_DISABLED(kAimEnabled); // Disable AI Mode starter pack
|
||||
|
||||
// If enabled, uses the server response for AIM eligibility for all locales.
|
||||
BASE_FEATURE(kAimServerEligibilityEnabled,
|
||||
// If enabled, uses the server response for AIM eligibility for English locales.
|
||||
// Has no effect if kAimServerEligibilityEnabled is enabled.
|
||||
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
|
||||
--- a/components/omnibox/browser/autocomplete_controller.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_controller.cc
|
||||
@@ -52,7 +52,9 @@
|
||||
@@ -54,7 +54,9 @@
|
||||
#include "components/omnibox/browser/autocomplete_match.h"
|
||||
#include "components/omnibox/browser/autocomplete_match_type.h"
|
||||
#include "components/omnibox/browser/autocomplete_provider.h"
|
||||
@@ -923,7 +923,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
|
||||
#include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h"
|
||||
#include "components/omnibox/browser/bookmark_provider.h"
|
||||
#include "components/omnibox/browser/bookmark_scoring_signals_annotator.h"
|
||||
@@ -126,6 +128,7 @@ using ProviderType = AutocompleteProvider::Type;
|
||||
@@ -128,6 +130,7 @@ using ProviderType = AutocompleteProvider::Type;
|
||||
|
||||
constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
|
||||
|
||||
@@ -931,7 +931,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
|
||||
void RecordMlScoreCoverage(size_t matches_with_non_null_scores,
|
||||
size_t total_scored_matches) {
|
||||
int percent_score_coverage =
|
||||
@@ -234,6 +237,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
|
||||
@@ -236,6 +239,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
|
||||
base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches",
|
||||
num_scored);
|
||||
}
|
||||
@@ -942,7 +942,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
|
||||
diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
|
||||
--- a/components/omnibox/browser/base_search_provider.cc
|
||||
+++ b/components/omnibox/browser/base_search_provider.cc
|
||||
@@ -100,14 +100,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
|
||||
@@ -101,14 +101,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
|
||||
bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) {
|
||||
// TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for
|
||||
// non-debugging purposes.
|
||||
|
||||
@@ -1032,7 +1032,7 @@ diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.h b/
|
||||
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
|
||||
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
|
||||
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
|
||||
@@ -29,13 +29,14 @@ KeywordEditorController::~KeywordEditorController() = default;
|
||||
@@ -30,13 +30,14 @@ KeywordEditorController::~KeywordEditorController() = default;
|
||||
|
||||
int KeywordEditorController::AddTemplateURL(const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -1049,7 +1049,7 @@ diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chr
|
||||
|
||||
return new_index;
|
||||
}
|
||||
@@ -43,7 +44,8 @@ int KeywordEditorController::AddTemplateURL(const std::u16string& title,
|
||||
@@ -44,7 +45,8 @@ int KeywordEditorController::AddTemplateURL(const std::u16string& title,
|
||||
void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -1059,7 +1059,7 @@ diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chr
|
||||
DCHECK(!url.empty());
|
||||
const std::optional<size_t> index =
|
||||
table_model_->IndexOfTemplateURL(template_url);
|
||||
@@ -55,11 +57,12 @@ void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,
|
||||
@@ -56,11 +58,12 @@ void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,
|
||||
|
||||
// Don't do anything if the entry didn't change.
|
||||
if ((template_url->short_name() == title) &&
|
||||
|
||||
@@ -201,7 +201,7 @@ new file mode 100644
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
|
||||
@@ -194,6 +194,9 @@ public class IntentHandler {
|
||||
@@ -190,6 +190,9 @@ public class IntentHandler {
|
||||
private static final String EXTRA_TAB_LAUNCH_TYPE =
|
||||
"org.chromium.chrome.browser.tab_launch_type";
|
||||
|
||||
@@ -211,7 +211,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
|
||||
/** A hash code for the URL to verify intent data hasn't been modified. */
|
||||
public static final String EXTRA_DATA_HASH_CODE = "org.chromium.chrome.browser.data_hash";
|
||||
|
||||
@@ -1514,6 +1517,17 @@ public class IntentHandler {
|
||||
@@ -1510,6 +1513,17 @@ public class IntentHandler {
|
||||
return TabGroupMetadata.maybeCreateFromBundle(bundle);
|
||||
}
|
||||
|
||||
@@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
|
||||
/**
|
||||
* Creates an Intent that will launch a ChromeTabbedActivity on the new tab page. The Intent
|
||||
* will be trusted and therefore able to launch Incognito tabs.
|
||||
@@ -1681,7 +1695,7 @@ public class IntentHandler {
|
||||
@@ -1677,7 +1691,7 @@ public class IntentHandler {
|
||||
String headers = getExtraHeadersFromIntent(intent);
|
||||
headers = maybeAddAdditionalContentHeaders(intent, url, headers);
|
||||
|
||||
|
||||
@@ -874,7 +874,7 @@ diff --git a/chrome/browser/adblock/android/java/src/org/chromium/chrome/browser
|
||||
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -6412,7 +6412,9 @@ ChromeContentBrowserClient::
|
||||
@@ -6420,7 +6420,9 @@ ChromeContentBrowserClient::
|
||||
}
|
||||
|
||||
bool ChromeContentBrowserClient::WillInterceptWebSocket(
|
||||
@@ -885,7 +885,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
||||
if (!frame) {
|
||||
return false;
|
||||
@@ -6435,9 +6437,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
|
||||
@@ -6443,9 +6445,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
|
||||
}
|
||||
|
||||
void ChromeContentBrowserClient::CreateWebSocket(
|
||||
|
||||
@@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_classifier.cc b/components/
|
||||
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
|
||||
--- a/components/omnibox/browser/omnibox_field_trial.cc
|
||||
+++ b/components/omnibox/browser/omnibox_field_trial.cc
|
||||
@@ -895,11 +895,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default;
|
||||
@@ -896,11 +896,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default;
|
||||
|
||||
ScopedMLConfigForTesting::ScopedMLConfigForTesting()
|
||||
: original_config_(std::make_unique<MLConfig>(GetMLConfig())) {
|
||||
|
||||
@@ -1370,7 +1370,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.ViewStub;
|
||||
@@ -214,7 +217,12 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -216,7 +219,12 @@ public class NewTabPageLayout extends LinearLayout
|
||||
mFakeSearchBoxLayout = findViewById(R.id.search_box);
|
||||
mFakeSearchBoxEditText = findViewById(R.id.search_box_text);
|
||||
initializeSiteSectionView();
|
||||
|
||||
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
|
||||
@@ -86,7 +86,6 @@ class SearchBoxMediator implements DestroyObserver, NativeInitObserver {
|
||||
@@ -92,7 +92,6 @@ class SearchBoxMediator implements DestroyObserver, NativeInitObserver {
|
||||
|
||||
ColorStateList colorStateList =
|
||||
ThemeUtils.getThemedToolbarIconTint(mContext, BrandedColorScheme.APP_DEFAULT);
|
||||
@@ -201,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
|
||||
- () -> addVoiceSearchAdaptiveButton(trackerSupplier),
|
||||
+ () -> {},
|
||||
groupSuggestionsButtonControllerSupplier,
|
||||
mTabModelSelectorSupplier.get().getTabGroupModelFilterProvider());
|
||||
mTabModelSelectorSupplier);
|
||||
}
|
||||
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
|
||||
|
||||
@@ -573,7 +573,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -3322,7 +3322,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3307,7 +3307,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
mEdgeToEdgeControllerSupplier,
|
||||
mTopInsetCoordinatorSupplier,
|
||||
getStartupMetricsTracker(),
|
||||
@@ -877,7 +877,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
private boolean mSearchProviderIsGoogle;
|
||||
private boolean mShowingNonStandardGoogleLogo;
|
||||
private boolean mIsOmniboxMobileParityUpdateV2Enabled;
|
||||
@@ -300,6 +304,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -302,6 +306,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
initializeMostVisitedTilesCoordinator(
|
||||
mProfile, lifecycleDispatcher, tileGroupDelegate, touchEnabledDelegate);
|
||||
initializeDseIconView(shouldShowDseIcon());
|
||||
@@ -885,7 +885,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
initializeSearchBoxTextView();
|
||||
initializeVoiceSearchButton();
|
||||
initializeLensButton();
|
||||
@@ -684,7 +689,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -671,7 +676,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
|
||||
if (mInitialTileNum == null) {
|
||||
mInitialTileNum =
|
||||
@@ -894,7 +894,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
}
|
||||
|
||||
int currentOrientation = getResources().getConfiguration().orientation;
|
||||
@@ -752,7 +757,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -739,7 +744,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
&& mInitialized) {
|
||||
return;
|
||||
}
|
||||
@@ -1318,13 +1318,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til
|
||||
TileRenderer renderer,
|
||||
PropertyModel propertyModel,
|
||||
boolean isTablet,
|
||||
@@ -211,15 +211,10 @@ public class MostVisitedTilesMediator implements TileGroup.Observer {
|
||||
@@ -211,7 +211,6 @@ public class MostVisitedTilesMediator implements TileGroup.Observer {
|
||||
|
||||
@Override
|
||||
public void onCustomTileCreation(Tile tile) {
|
||||
- mMvTilesLayout.ensureTileIsInViewOnNextLayout(tile.getIndex());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -221,10 +220,6 @@ public class MostVisitedTilesMediator implements TileGroup.Observer {
|
||||
|
||||
@Override
|
||||
public void onCustomTileNonReorderChange() {
|
||||
- SuggestionsTileVerticalDivider divider = mMvTilesLayout.getDividerMaybeNull();
|
||||
@@ -1334,7 +1337,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til
|
||||
}
|
||||
|
||||
public void onConfigurationChanged() {
|
||||
@@ -329,7 +324,5 @@ public class MostVisitedTilesMediator implements TileGroup.Observer {
|
||||
@@ -334,7 +329,5 @@ public class MostVisitedTilesMediator implements TileGroup.Observer {
|
||||
|
||||
double firstTileScore = mTileGroup.getSuggestionScore(firstTile.getUrl());
|
||||
if (firstTileScore < MVT_CUSTOMIZATION_IPH_TILE_SCORE_THRESHOULD) return;
|
||||
@@ -1382,7 +1385,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -269,12 +261,12 @@ class TileDragDelegateImpl implements TileDragDelegate, TileDragSession.Delegate
|
||||
@@ -282,12 +274,12 @@ class TileDragDelegateImpl implements TileDragDelegate, TileDragSession.Delegate
|
||||
|
||||
@Override
|
||||
public SiteSuggestion getTileViewData(TileView view) {
|
||||
|
||||
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivit
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -2951,6 +2951,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -2936,6 +2936,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
mInactivityTracker =
|
||||
new ChromeInactivityTracker(
|
||||
ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF);
|
||||
|
||||
@@ -3990,7 +3990,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
"../browser/ai/ai_data_keyed_service_browsertest.cc",
|
||||
"../browser/attribution_reporting/chrome_attribution_browsertest.cc",
|
||||
"../browser/autocomplete/autocomplete_browsertest.cc",
|
||||
@@ -4685,6 +4694,7 @@ if (!is_android) {
|
||||
@@ -4687,6 +4696,7 @@ if (!is_android) {
|
||||
]
|
||||
}
|
||||
|
||||
@@ -3998,7 +3998,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
if (is_chromeos) {
|
||||
deps += [
|
||||
"//chrome/browser/ui/webui/ash/parent_access:test_support",
|
||||
@@ -6247,6 +6257,7 @@ test("unit_tests") {
|
||||
@@ -6249,6 +6259,7 @@ test("unit_tests") {
|
||||
sources = [
|
||||
# All unittests in browser, common, renderer and service.
|
||||
"../browser/about_flags_unittest.cc",
|
||||
@@ -4006,7 +4006,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
"../browser/after_startup_task_utils_unittest.cc",
|
||||
"../browser/apps/icon_standardizer_unittest.cc",
|
||||
"../browser/apps/user_type_filter_unittest.cc",
|
||||
@@ -10777,6 +10788,7 @@ if (!is_android) {
|
||||
@@ -10780,6 +10791,7 @@ if (!is_android) {
|
||||
"//chrome/browser/ui/exclusive_access",
|
||||
"//chrome/browser/ui/views/frame:toolbar_button_provider",
|
||||
"//chrome/browser/ui/views/side_panel",
|
||||
|
||||
@@ -4155,7 +4155,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -4149,6 +4149,20 @@ if (!is_android) {
|
||||
@@ -4151,6 +4151,20 @@ if (!is_android) {
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -885,7 +885,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
@@ -563,12 +563,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
|
||||
@@ -570,12 +570,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
|
||||
// chrome-untrusted://new-tab-page for other external content and resources.
|
||||
// NOTE: Use caution when overriding content security policies as that cean
|
||||
// lead to subtle security bugs such as https://crbug.com/1251541.
|
||||
@@ -963,7 +963,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -6828,7 +6828,6 @@ test("unit_tests") {
|
||||
@@ -6830,7 +6830,6 @@ test("unit_tests") {
|
||||
"//chrome/browser/file_system_access:unit_tests",
|
||||
"//chrome/browser/fingerprinting_protection",
|
||||
"//chrome/browser/first_party_sets",
|
||||
|
||||
Reference in New Issue
Block a user