Patches for 135 (no changes)
This commit is contained in:
@@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
|
||||
import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
|
||||
@@ -1615,7 +1617,9 @@ public class RootUiCoordinator
|
||||
@@ -1616,7 +1618,9 @@ public class RootUiCoordinator
|
||||
if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
|
||||
|
||||
int stubId = R.id.find_toolbar_stub;
|
||||
|
||||
@@ -77,7 +77,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;
|
||||
@@ -1695,7 +1696,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
|
||||
@@ -1700,7 +1701,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
|
||||
Intent intent = getIntent();
|
||||
|
||||
boolean hadCipherData =
|
||||
|
||||
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
|
||||
diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
|
||||
--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
|
||||
+++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
|
||||
@@ -25,6 +25,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
|
||||
@@ -24,6 +24,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.function.Function;
|
||||
@@ -39,7 +39,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
|
||||
|
||||
/**
|
||||
* Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
|
||||
@@ -185,6 +186,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
|
||||
@@ -184,6 +185,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
|
||||
void setCurrentFolder(BookmarkId folder) {
|
||||
mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
|
||||
enableImportExportMenu();
|
||||
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
|
||||
}
|
||||
|
||||
void enableImportExportMenu() {
|
||||
@@ -217,6 +223,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
|
||||
@@ -216,6 +222,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
|
||||
mExportBookmarkRunnable.run();
|
||||
return true;
|
||||
}
|
||||
@@ -69,7 +69,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
|
||||
return mMenuIdClickedFunction.apply(menuItem.getItemId());
|
||||
}
|
||||
|
||||
@@ -234,6 +251,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
|
||||
@@ -233,6 +250,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
|
||||
|
||||
getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
|
||||
getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
|
||||
|
||||
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod
|
||||
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
|
||||
@@ -793,10 +793,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
|
||||
@@ -798,10 +798,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
|
||||
@TabLaunchType int type,
|
||||
@TabCreationState int creationState,
|
||||
boolean markedForSelection) {
|
||||
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.base.TraceEvent;
|
||||
import org.chromium.base.lifetime.Destroyable;
|
||||
import org.chromium.base.metrics.RecordUserAction;
|
||||
@@ -782,11 +783,16 @@ public class RootUiCoordinator
|
||||
@@ -783,11 +784,16 @@ public class RootUiCoordinator
|
||||
TrackerFactory.getTrackerForProfile(tab.getProfile())
|
||||
.notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
|
||||
--- a/components/endpoint_fetcher/endpoint_fetcher.cc
|
||||
+++ b/components/endpoint_fetcher/endpoint_fetcher.cc
|
||||
@@ -429,7 +429,7 @@ void EndpointFetcher::OnResponseFetched(
|
||||
@@ -442,7 +442,7 @@ void EndpointFetcher::OnResponseFetched(
|
||||
}
|
||||
} else {
|
||||
std::string net_error = net::ErrorToString(net_error_code);
|
||||
|
||||
@@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
|
||||
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
|
||||
import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
|
||||
@@ -564,10 +563,6 @@ public class RootUiCoordinator
|
||||
@@ -565,10 +564,6 @@ public class RootUiCoordinator
|
||||
}
|
||||
|
||||
public void onAttachFragment(Fragment fragment) {
|
||||
|
||||
@@ -56,7 +56,7 @@ new file mode 100644
|
||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||
--- a/services/network/network_context.cc
|
||||
+++ b/services/network/network_context.cc
|
||||
@@ -3120,7 +3120,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const {
|
||||
@@ -3122,7 +3122,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const {
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
const bool enable_exclusive_access =
|
||||
|
||||
@@ -94,7 +94,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
|
||||
@@ -2455,6 +2455,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
|
||||
@@ -2460,6 +2460,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
|
||||
mInactivityTracker =
|
||||
new ChromeInactivityTracker(
|
||||
ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF);
|
||||
|
||||
@@ -79,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl;
|
||||
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
|
||||
import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
|
||||
@@ -1153,10 +1152,8 @@ public class RootUiCoordinator
|
||||
@@ -1154,10 +1153,8 @@ public class RootUiCoordinator
|
||||
String url =
|
||||
TemplateUrlServiceFactory.getForProfile(tab.getProfile())
|
||||
.getUrlForSearchQuery(query);
|
||||
|
||||
Reference in New Issue
Block a user