diff --git a/BUILD.gn b/BUILD.gn index dd75ffe7728..6281a3a9061 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -285,6 +285,7 @@ process_version("generate_version") { template_file = "version.version" extra_args = [ "-e", "BRAVE_BROWSER_VERSION=\"$brave_version\"" ] output = "$root_out_dir/version" + process_only = true } if (!is_android && !is_ios) { diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp index cabba467e41..a174561ebf7 100644 --- a/app/app_management_strings.grdp +++ b/app/app_management_strings.grdp @@ -49,8 +49,8 @@ Permissions - - More permissions + + More settings and permissions This app can: @@ -76,4 +76,13 @@ Version: $14.0 + + Pinned by administrator + + + Contacts + + + Storage + diff --git a/app/brave_strings.grd b/app/brave_strings.grd index a46827ed9f0..4f79e4fcb9c 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -589,7 +589,10 @@ Brave is unable to recover your settings. - + + About &Brave + + About &Brave OS @@ -1163,28 +1166,6 @@ Please check your email at $2jane.doe@example.com - - - - Welcome to Brave - - - Get to Brave faster - - - Make Brave your default browser - - - Pin Brave to your taskbar - - - Select <div class="logo-small"></div> <strong>Brave</strong> - - - Click <strong>Switch anyway</strong>, if it appears - - - @@ -1247,6 +1228,12 @@ Please check your email at $2jane.doe@example.com Share a Brave tab + + + + Help us improve Brave + + diff --git a/app/generated_resources.grd b/app/generated_resources.grd index eb4a588171f..6c1239bbe86 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -901,8 +901,8 @@ are declared in tools/grit/grit_rule.gni. Save page &as... - - Distill page + + Toggle distilled page contents More too&ls @@ -2902,7 +2902,7 @@ are declared in tools/grit/grit_rule.gni. Sharing $1youtube.com to $2meet.google.com - Share this tab + Share this tab instead Stop @@ -3196,7 +3196,6 @@ are declared in tools/grit/grit_rule.gni. No-op Service - Installed theme "$1Snowflake Theme" @@ -3512,6 +3511,9 @@ are declared in tools/grit/grit_rule.gni. Read and change anything you type + + Launch and exit managed guest sessions + Display UI on the login screen @@ -3687,6 +3689,9 @@ are declared in tools/grit/grit_rule.gni. Replace the page you see when opening a new tab + + Run in the background when requested by a cooperating native application + @@ -4403,20 +4408,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Updated just now - - - This page will use a lot of data. - - - Page paused. - - - Continue - - - Stop using data on this page - - Lite mode now makes browsing faster on all pages, including HTTPS. @@ -4830,9 +4821,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Restore default shortcuts - - Customize this page - Brave backgrounds @@ -4932,12 +4920,18 @@ Keep your key file in a safe place. You will need it to create new versions of y Most visited sites - + Shortcuts are suggested based on websites you visit often - + Shortcuts are curated by you + + Current theme you have installed + + + Uninstall + @@ -5034,8 +5028,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Remember my choice - - Use app + + Open Stay in Brave @@ -5264,7 +5258,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - Nope + No thanks @@ -6253,6 +6247,25 @@ Keep your key file in a safe place. You will need it to create new versions of y + + + + Call from your devices + + + Call from $1Jimmy's Pixel + + + + + + Call from Your Devices + + + Call from $1Jimmy's Pixel + + + @@ -6730,45 +6743,22 @@ Keep your key file in a safe place. You will need it to create new versions of y - - You've signed in and turned on Sync - - + Turn on sync? - + Sync your bookmarks, passwords, history, and more on all your devices - + Brave may use your history to personalize Search, ads, and other Brave services - + You can always choose what to sync in settings. - - - - Brave Sync - - - Your bookmarks, history, passwords, and other settings will be synced to your Brave Account so you can use them on all your devices - - - Personalize Brave services - - - Brave may use your browsing history to personalize Search, ads, and other Brave services - - - Brave may use your browsing history to personalize Search and other Brave services - - - Want to manage sync and personalization before they’re turned on? Visit <a id="settingsLink" href="chrome://settings">Settings</a></a>. - - + Yes, I'm in - + Settings @@ -7137,20 +7127,17 @@ Please help our engineers fix this problem. Tell us what happened right before y Sign in to $1Brave - + Sync is disabled by your administrator. - + Sync has been stopped via the Brave Dashboard. Confirm sync settings to start sync. - - Error signing in. - - - Oops, Sync has stopped working. + + Setup in progress... Sync isn’t working. Try signing in again. @@ -7201,20 +7188,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Advanced settings - - - Setup in progress... - - - - - Please wait... - - - - - Sync everything - + + + + Please wait... + + @@ -7229,16 +7208,18 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Sept 1, 2012. This doesn't include payment methods and addresses from Brave Pay. - - - Not signed in to $1Brave - - - (You're missing out—$1sign in) - - - sign in - + + + + Not signed in to $1Brave + + + (You're missing out—$1sign in) + + + sign in + + @@ -7258,7 +7239,6 @@ Please help our engineers fix this problem. Tell us what happened right before y This page could not be translated - Options @@ -7269,6 +7249,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Change languages + + More languages... + + + Page is not in $1French ? + Translate @@ -7317,6 +7303,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Language settings + + Language to translate into + + + Page language to translate + @@ -7328,6 +7320,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Change Languages + + More Languages... + + + Page Is Not In $1French ? + Translate @@ -7376,10 +7374,19 @@ Please help our engineers fix this problem. Tell us what happened right before y Language Settings + + Language To Translate Into + + + Page Language To Translate + Unknown + + Reset + @@ -7598,6 +7605,22 @@ Please help our engineers fix this problem. Tell us what happened right before y Check Grammar With Spelling + + + Substitutions + + + Show Substitutions + + + Smart Quotes + + + Smart Dashes + + + Text Replacement + Always Show Bookmarks Bar @@ -8466,38 +8489,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - Identity API Token Cache - - - Access Token - - - Extension Name - - - Extension Id - - - Token Status - - - Not Found - - - Token Present - - - Expiration Time - - - Scopes - - - Revoke - - A fast, simple, and secure web browser, built for the modern web. @@ -8789,6 +8780,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Refresh + + Clear + + + No log entries + Show: @@ -8972,16 +8969,16 @@ Please help our engineers fix this problem. Tell us what happened right before y - + No nearby devices found. - $1www.google.com wants to scan for nearby Bluetooth devices, the following devices have been found: + $1www.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: - + Allow - + Block @@ -9065,6 +9062,17 @@ Please help our engineers fix this problem. Tell us what happened right before y Ads blocked on this site + + + Details + + + Ad removed. + + + This ad uses too many resources for your device, so Brave removed it. + + Windows Utilities @@ -9138,31 +9146,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - - Open Windows Settings - - - Click <strong>Microsoft Edge</strong> under Web Browser - - - Switch anyway - - - Right click the <div class="logo-small"></div> icon in the taskbar - - - Select <strong>Pin to taskbar</strong> - - - Pin to taskbar - - - Continue - - - @@ -9243,6 +9226,101 @@ Please help our engineers fix this problem. Tell us what happened right before y Upload + + + + Save changes to $1README.md? + + + Save changes to files? + + + $1example.com will be able to save your changes directly to $2README.md. The site can save changes until you close this tab. + + + $1example.com will be able to save your changes directly to the files in $2My Project. The site can save changes until you close this tab. + + + Save changes + + + + + This page is allowed to save to files. + + + This page is allowed to view all the files in a folder on your device. + + + $1example.com can save your changes directly to $2README.md + + + $1example.com can save your changes directly to the following files + + + $1example.com can save your changes directly to the files in $2My Project + + + $1example.com can save your changes directly to the following folders + + + $1example.com can save your changes directly to the following files and folders + + + $1example.com can view all the files in $2My Project + + + $1example.com can view all the files in the following folders + + + $1example.com can view and save your changes directly to the following files and folders + + + Save changes + + + View changes + + + {0, plural, offset:2 + =1 {{1}README.md} + =2 {{1}README.md, {2}Brave.png} + other {{1}README.md, {2}Brave.png, and # more} + } + + + Expand... + + + Collapse... + + + Remove access + + + + + + Can't save to this folder + + + $1example.com can't save your changes to this folder because it contains system files. + + + Choose a different folder + + + + + Let site view files? + + + $1example.com will be able to view all files in $2My Project. The site can see any changes to the folder until you close this tab. + + + View files + + @@ -9505,6 +9583,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Allow + + Try again + @@ -9531,6 +9612,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Exit Private + + + + + Take Survey + + + Your feedback is important to us. + + - + diff --git a/app/mac/BUILD.gn b/app/mac/BUILD.gn index a1739c7d7fb..3cdc1262d37 100644 --- a/app/mac/BUILD.gn +++ b/app/mac/BUILD.gn @@ -54,7 +54,7 @@ action("generate_breakpad_symbols") { deps = [ "//brave:chrome_app", "//chrome:chrome_framework", - "//chrome:chrome_helper_app", + "//chrome:chrome_helper_app_default", "//chrome:chrome_dump_syms", "//third_party/crashpad/crashpad/handler:crashpad_handler", "//third_party/breakpad:dump_syms", diff --git a/app/media_router_strings.grdp b/app/media_router_strings.grdp index d57bb063745..c2062a6f63c 100644 --- a/app/media_router_strings.grdp +++ b/app/media_router_strings.grdp @@ -3,43 +3,14 @@ - - Media Router - Display on another screen &Cast... - - Cast - - - - - Back - - - Close - - - Search - - - View cast mode list - - - View device list - - - Stop, $1Living Room TV, $2Casting YouTube - - - Cast to - Cast $1google.com @@ -54,15 +25,6 @@ - - Select source - - - Share your screen - - - Stream a video or audio file - Cast $1my_media.mp3 @@ -93,39 +55,7 @@ Optimize fullscreen videos - - - Enable casting to cloud-based services like Brave Hangouts. - - - - Welcome to the Cast experience in Brave! - - - You can use this feature to display content from Brave on your TV or other devices. - - - - - Welcome to the Cast experience in Brave! - - - You can use this feature to display content from Brave on your TV or other devices. - - - - Ok, got it - - - - - Dismiss - - - - Error - Unable to cast $1youtube.com. @@ -135,9 +65,6 @@ Unable to cast tab. - - Only one session can be created at a time. - Unable to cast desktop. @@ -148,59 +75,6 @@ Unable to cast $1my_media.mp3. - - - Casting: $1Video - - - Cast - - - Stop - - - Play - - - Pause - - - Mute - - - Unmute - - - Seek - - - Volume - - - Current time - - - Duration - - - Smooth Motion [beta] - - - Use high bandwidth for best video or animation. Other people with slow connections may not see your content. - - - Always use mirroring - - - Show fullscreen videos on - - - Both screens - - - Remote screen - - Looking for devices @@ -230,14 +104,6 @@ Source not supported - - - Search - - - No matches - - Audio/Video diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index ecc95783e00..87c19e25eeb 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -45,6 +45,12 @@ $1User: Sync paused + + Sync is paused because you clear cookies on start up. Change $1your settings to keep syncing. + + + your settings + $1Markus (Supervised) @@ -469,6 +475,9 @@ Add person + + Name + The new user couldn't be created. Please check your hard drive space and permissions and try again. diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index f52ba6a1365..bfbd642a3c9 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -3,13 +3,13 @@ + + About Brave + + + Get help with Brave + - - About Brave - - - Get help with Brave - Updating Brave @@ -24,10 +24,10 @@ - + About Brave OS - + Get help with Brave OS diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index a833a66f7a1..c1a14903d43 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -12,6 +12,9 @@ + + Continue + More actions @@ -136,9 +139,6 @@ Download update using mobile data - - Continue - @@ -163,6 +163,78 @@ + + Captions + + + Text size + + + Text font + + + Text color + + + Text opacity + + + Background opacity + + + 0 + + + 100 + + + Text shadow + + + None + + + Raised + + + Depressed + + + Uniform + + + Drop shadow + + + Background color + + + Black + + + White + + + Red + + + Green + + + Blue + + + Yellow + + + Cyan + + + Magenta + + + Default + Accessibility @@ -191,6 +263,42 @@ Select and customize text-to-speech voices + + Switch Access settings + + + Switch action assignment + + + Space + + + Enter + + + None + + + Select + + + Next + + + Previous + + + Auto-scan + + + Enable auto-scan + + + Scanning speed: $11.5s + + + $11.5s + Show large mouse cursor @@ -464,36 +572,6 @@ - - - Kiosk Next Shell (Dev) - - - Kiosk Next Shell - - - Enables the Kiosk Next Shell for the next sign in. - - - Disable the Kiosk Next Shell and return to the normal Brave OS experience. - - - Turn off - - - Turn off the Kiosk Next Shell - - - Turn on the Kiosk Next Shell - - - This will turn off the Kiosk Next Shell, sign you out and return you to the normal Brave OS experience. - - - This will sign you out and turn on the Kiosk Next Shell. - Linux (Beta) @@ -543,6 +621,12 @@ Replace your Linux apps and files with a previous backup + + Confirm Restore + + + Restoring from a backup will delete existing Linux applications and data in your Linux files folder. + USB preferences @@ -564,7 +648,7 @@ Plugin VM - Manage settings for running Plugin VM on your $1Bravebook + Set up permissions Give access to printers @@ -629,6 +713,9 @@ Manage your apps + + Open App Management + @@ -1027,6 +1114,9 @@ Connected + + Connected, $1100% battery + Not connected @@ -1362,6 +1452,12 @@ Add Printer + + + Saved detected printers to your profile, or add a new printer. + + + Available printers to save Edit @@ -1369,9 +1465,15 @@ Remove + + Configure + Search printers + + Your saved printers + Add a nearby printer @@ -1513,6 +1615,14 @@ End User License Agreement + + Couldn't detect a printer. Please enter printer address again. + + + Unable to set up printer. Please check configuration and try again. + + + @@ -1552,7 +1662,7 @@ Set up or manage network file shares. - Add File Share + Add file share File share URL @@ -1566,6 +1676,9 @@ Password (optional) + + Remember sign-in info + Share mounted successfully. @@ -1591,7 +1704,7 @@ Invalid URL format. Server must be specified as a host name when SSO authentication is used. - Authentication Method + Authentication method Standard @@ -1601,67 +1714,127 @@ - + - - Kerberos Accounts + + Kerberos tickets - - Kerberos Accounts + + Kerberos tickets - - All Kerberos Accounts for single sign-on into certain apps and websites and file shares can be managed here. + + Choose a ticket to use for authentication. <a target="_blank" href="$1https://google.com/">Learn more</a> - - Accounts + + Tickets - - Add account + + Add a ticket - - Remove account from this device + + Refresh now - - Signed in + + Set as active ticket - - Sign in again + + Remove from this device - - Sign in + + Ticket removed - - Add Kerberos Account + + Valid for $17 hours 12 minutes - - Username + + Expired + + + Refresh + + + Active + + + Add a Kerberos ticket - + + Refresh a Kerberos ticket + + + To automatically refresh a ticket, check “Remember password.” Your password will be stored on your device only. + + + Kerberos username + + Password - + + Remember password + + + Refresh + + + Advanced + + + Configure Kerberos + + + Edit the configuration file + + Network problem or bad realm - - Username invalid (should be user@realm.com) + + Username invalid - + Username not known to server - + + A ticket with this username already exists + + Contacting server for realm failed - + Password invalid - + Password expired - + KDC does not support encryption type - - Oops! Something went wrong (error code $1123). + + Couldn't get Kerberos ticket. Try again, or contact your organization's device admin. (Error code $1123). + + + Section nested in group: $1[realms] (inside a block of curly braces '{ ... }) + + + Section syntax error: $1[realms + + + Expected opening curly brace: $1ticket_lifetime = 1d (in the line after 'EXAMPLE.COM = )' + + + Extra curly brace: $1} (without having a corresponding opening curly brace '{') + + + Relation syntax error: $1ticket_lifetime : 1d + + + Configuration option not supported: $1ccache_type = 1 + + + Section not supported: $1[appdefaults] + + + Failed to parse configuration @@ -1828,6 +2001,9 @@ Allow other users of this device to use this network + + Automatically connecting to a hidden network allows others to see your device and some network settings, and is not recommended. + Save identity and password @@ -1897,6 +2073,15 @@ Allow mobile data roaming + + On, not roaming + + + On, roaming + + + Roaming off + Mobile data network @@ -1984,6 +2169,8 @@ Port + + Change PIN @@ -2032,6 +2219,22 @@ Enter PIN Unlock Key + + Incorrect PIN. Retries left: $13. + + + Incorrect PUK. Retries left: $13. + + + Invalid PIN. Retries left: $13. + + + Invalid PUK. Retries left: $13. + + + PIN values do not match. + + Prefer this network @@ -2499,16 +2702,9 @@ - - - Languages and input - - - - - Languages - - + + Languages + Language @@ -2876,12 +3072,6 @@ Brave Assistant - - Related info - - - Let the Assistant show you info related to what's on your screen - "Ok Brave" @@ -2903,9 +3093,6 @@ Voice match - - Teach your Assistant to recognize your voice - Retrain @@ -3581,9 +3768,6 @@ PINs do not match - - Continue - Show lock screen when waking from sleep @@ -3639,11 +3823,14 @@ Note: Your fingerprint may be less secure than a strong password or PIN. - delete [$1Fingerprint 1], button + delete [$1Fingerprint 1] Finger $11 + + Enable Brave media playback at lock screen + Add account @@ -3665,12 +3852,21 @@ Not updated yet + + More actions, $1abcd@google.com + Update account Sign in + + Update account, $1abcd@google.com + + + Sign in, $1abcd@google.com + Remove this account @@ -3680,15 +3876,30 @@ Primary account + + $1abcd@google.com was removed from this device + Set up your fingerprint - + + Touch the power button with your finger - + The fingerprint sensor is in the power button. Touch it lightly with any finger. + + + Touch the fingerprint sensor with your finger + + + The fingerprint sensor is the bottom right-hand key on your keyboard. Touch it lightly with any finger. + + + The fingerprint sensor is the top right-hand key on your keyboard. Touch it lightly with any finger. + + Fingerprint added. @@ -4610,8 +4821,14 @@ Use hardware acceleration when available - - Open proxy settings + + Open your computer's proxy settings + + + $1Brave is using proxy settings from an extension + + + $1Brave is using proxy settings from your administrator @@ -4929,6 +5146,9 @@ PIN must be at least 4 characters + + Too short + PIN must be at most 63 characters @@ -4953,4 +5173,52 @@ The security key is locked because the wrong PIN was entered too many times. To unlock it, remove and reinsert it. + + Show PINs + + + Hide PINs + + + Manage sign-in data + + + View and delete the sign-in data stored on your security key + + + Security key sign-in data + + + Website + + + Username + + + To view sign-in data, insert and touch your security key + + + To view sign-in data, enter the PIN for your security key. If you don’t know the PIN, you’ll need to reset the security key. + + + This security key does not have any sign-in data + + + This security key can't store any sign-in data + + + Your security key was removed. + + + Your security key is not protected with a PIN. To manage sign-in data, first create a PIN. + + + Your security key couldn't be read + + + Your sign-in data was deleted + + + Your sign-in data couldn't be deleted + diff --git a/app/vr_strings.grdp b/app/vr_strings.grdp index fabd938fef6..353e8953e0d 100644 --- a/app/vr_strings.grdp +++ b/app/vr_strings.grdp @@ -7,10 +7,6 @@ Press App button to exit - - XR Isolated Device Service - - Site is tracking your location @@ -150,18 +146,12 @@ New private tab - - New private tab - Settings Close private tabs - - Close private tabs - Tabs diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 08d3929c16a..f98854b4cf2 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -202,8 +202,7 @@ bool BraveContentBrowserClient::HandleExternalProtocol( bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture, - network::mojom::URLLoaderFactoryRequest* factory_request, - network::mojom::URLLoaderFactory*& out_factory) { // NOLINT + network::mojom::URLLoaderFactoryPtr* out_factory) { #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) if (webtorrent::HandleMagnetProtocol(url, web_contents_getter, page_transition, has_user_gesture)) { @@ -220,7 +219,7 @@ bool BraveContentBrowserClient::HandleExternalProtocol( return ChromeContentBrowserClient::HandleExternalProtocol( url, web_contents_getter, child_id, navigation_data, is_main_frame, - page_transition, has_user_gesture, factory_request, out_factory); + page_transition, has_user_gesture, out_factory); } base::Optional diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h index 4f5a0ffad21..c649f93dd5e 100644 --- a/browser/brave_content_browser_client.h +++ b/browser/brave_content_browser_client.h @@ -50,8 +50,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture, - network::mojom::URLLoaderFactoryRequest* factory_request, - network::mojom::URLLoaderFactory*& out_factory) override; // NOLINT + network::mojom::URLLoaderFactoryPtr* out_factory) override; content::ContentBrowserClient::AllowWebBluetoothResult AllowWebBluetooth( content::BrowserContext* browser_context, diff --git a/browser/extensions/api/brave_extensions_api_client.cc b/browser/extensions/api/brave_extensions_api_client.cc index 564b2f8bd25..697332fe136 100644 --- a/browser/extensions/api/brave_extensions_api_client.cc +++ b/browser/extensions/api/brave_extensions_api_client.cc @@ -10,11 +10,13 @@ namespace extensions { bool BraveExtensionsAPIClient::ShouldHideBrowserNetworkRequest( + content::BrowserContext* context, const WebRequestInfo& request) const { if (IsBraveProtectedUrl(request.url)) { return true; } - return ChromeExtensionsAPIClient::ShouldHideBrowserNetworkRequest(request); + return ChromeExtensionsAPIClient::ShouldHideBrowserNetworkRequest(context, + request); } } // namespace extensions diff --git a/browser/extensions/api/brave_extensions_api_client.h b/browser/extensions/api/brave_extensions_api_client.h index 486e784a413..7de70f56d83 100644 --- a/browser/extensions/api/brave_extensions_api_client.h +++ b/browser/extensions/api/brave_extensions_api_client.h @@ -13,6 +13,7 @@ namespace extensions { class BraveExtensionsAPIClient : public ChromeExtensionsAPIClient { bool ShouldHideBrowserNetworkRequest( + content::BrowserContext* context, const WebRequestInfo& request) const override; }; diff --git a/browser/importer/brave_profile_writer.cc b/browser/importer/brave_profile_writer.cc index 8844385b2fc..e601e18dd4c 100644 --- a/browser/importer/brave_profile_writer.cc +++ b/browser/importer/brave_profile_writer.cc @@ -25,6 +25,7 @@ #include "brave/browser/search_engines/search_engine_provider_util.h" #include "base/files/file_util.h" +#include "base/optional.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "base/task/post_task.h" @@ -400,11 +401,10 @@ void OpenImportedBrowserTabs(Browser* browser, entry.set_is_restored(true); e.push_back(entry); - chrome::AddRestoredTab( - browser, e, browser->tab_strip_model()->count(), 0, - "", false, pinned, true, - base::TimeTicks::UnixEpoch(), nullptr, - "", true /* from_session_restore */); + chrome::AddRestoredTab(browser, e, browser->tab_strip_model()->count(), 0, + "", base::nullopt, false, pinned, true, + base::TimeTicks::UnixEpoch(), nullptr, "", + true /* from_session_restore */); } } diff --git a/browser/ui/webui/brave_rewards_source.cc b/browser/ui/webui/brave_rewards_source.cc index e89e50572fb..3ff9dbb067a 100644 --- a/browser/ui/webui/brave_rewards_source.cc +++ b/browser/ui/webui/brave_rewards_source.cc @@ -57,7 +57,7 @@ BraveRewardsSource::BraveRewardsSource(Profile* profile) BraveRewardsSource::~BraveRewardsSource() { } -std::string BraveRewardsSource::GetSource() const { +std::string BraveRewardsSource::GetSource() { return "rewards-image"; } @@ -112,17 +112,17 @@ void BraveRewardsSource::StartDataRequest( } } -std::string BraveRewardsSource::GetMimeType(const std::string&) const { +std::string BraveRewardsSource::GetMimeType(const std::string&) { // We need to explicitly return a mime type, otherwise if the user tries to // drag the image they get no extension. return "image/png"; } -bool BraveRewardsSource::AllowCaching() const { +bool BraveRewardsSource::AllowCaching() { return false; } -bool BraveRewardsSource::ShouldReplaceExistingSource() const { +bool BraveRewardsSource::ShouldReplaceExistingSource() { // Leave the existing DataSource in place, otherwise we'll drop any pending // requests on the floor. return false; @@ -131,7 +131,7 @@ bool BraveRewardsSource::ShouldReplaceExistingSource() const { bool BraveRewardsSource::ShouldServiceRequest( const GURL& url, content::ResourceContext* resource_context, - int render_process_id) const { + int render_process_id) { return URLDataSource::ShouldServiceRequest(url, resource_context, render_process_id); } diff --git a/browser/ui/webui/brave_rewards_source.h b/browser/ui/webui/brave_rewards_source.h index fce550f58d9..87a4ae3b4b9 100644 --- a/browser/ui/webui/brave_rewards_source.h +++ b/browser/ui/webui/brave_rewards_source.h @@ -23,18 +23,18 @@ class BraveRewardsSource : public content::URLDataSource { ~BraveRewardsSource() override; // content::URLDataSource implementation. - std::string GetSource() const override; + std::string GetSource() override; void StartDataRequest( const std::string& path, const content::ResourceRequestInfo::WebContentsGetter& wc_getter, const content::URLDataSource::GotDataCallback& got_data_callback) override; - std::string GetMimeType(const std::string&) const override; - bool AllowCaching() const override; - bool ShouldReplaceExistingSource() const override; + std::string GetMimeType(const std::string&) override; + bool AllowCaching() override; + bool ShouldReplaceExistingSource() override; bool ShouldServiceRequest(const GURL& url, content::ResourceContext* resource_context, - int render_process_id) const override; + int render_process_id) override; private: void OnBitmapFetched( diff --git a/chromium_src/chrome/common/chrome_constants.cc b/chromium_src/chrome/common/chrome_constants.cc index 137832d3cfa..c4f879e251a 100644 --- a/chromium_src/chrome/common/chrome_constants.cc +++ b/chromium_src/chrome/common/chrome_constants.cc @@ -127,7 +127,6 @@ const base::FilePath::CharType kSystemProfileDir[] = FPL("System Profile"); // filenames const base::FilePath::CharType kCacheDirname[] = FPL("Cache"); -const base::FilePath::CharType kChannelIDFilename[] = FPL("Origin Bound Certs"); const base::FilePath::CharType kCookieFilename[] = FPL("Cookies"); const base::FilePath::CharType kCRLSetFilename[] = FPL("Certificate Revocation Lists"); @@ -147,6 +146,8 @@ const base::FilePath::CharType kLocalStateFilename[] = FPL("Local State"); const base::FilePath::CharType kMediaCacheDirname[] = FPL("Media Cache"); const base::FilePath::CharType kNetworkPersistentStateFilename[] = FPL("Network Persistent State"); +const base::FilePath::CharType kNotificationSchedulerStorageDirname[] = + FPL("Notification Scheduler"); const base::FilePath::CharType kOfflinePageArchivesDirname[] = FPL("Offline Pages/archives"); const base::FilePath::CharType kOfflinePageMetadataDirname[] = diff --git a/components/omnibox/browser/topsites_provider.cc b/components/omnibox/browser/topsites_provider.cc index b72028abc01..23e389b34c5 100644 --- a/components/omnibox/browser/topsites_provider.cc +++ b/components/omnibox/browser/topsites_provider.cc @@ -28,7 +28,7 @@ void TopSitesProvider::Start(const AutocompleteInput& input, bool minimal_changes) { matches_.clear(); if (input.from_omnibox_focus() || - (input.type() == metrics::OmniboxInputType::INVALID) || + (input.type() == metrics::OmniboxInputType::EMPTY) || (input.type() == metrics::OmniboxInputType::QUERY)) return; diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index 3dc90e750b6..abdda3f3564 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 7063da0f26c5691f01214c2dc014128d7c8c5e09..3e18855c2a74036033999cd060a7f577925d0ee4 100644 +index db7ab0255b482d4e1fd20a31cfec86a24546602a..1cc44592d0d854f17cf3d2f5a5e0c2ed76b2d025 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -419,6 +419,7 @@ set_sources_assignment_filter(sources_assignment_filter) diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index c2f7ac19d1c..5c4bffb9cc2 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 58838421c8a3cb995d3b41c59fac24523c57dafa..fb3715e80a24f7de149e7d7301e209a148c30d0f 100644 +index bed796ebe45e47af39bb3f27383cf23bc028adb3..7c0707454b7e3c435d793c1e300755f3d8bcb9c2 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index aad7ab2c68a..60bf95aee8a 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b8c4a1956 100644 +index e5b48fd4d4e431e9a54b73856214e9e48d248940..0f069fd5acb8db72ec89bd8e36dec6b8475acd69 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -189,6 +189,10 @@ if (!is_android && !is_mac) { +@@ -190,6 +190,10 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -13,7 +13,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b deps += [ ":chrome_dll", -@@ -288,6 +292,7 @@ if (!is_android && !is_mac) { +@@ -297,6 +301,7 @@ if (!is_android && !is_mac) { "//headless:headless_shell_lib", "//services/service_manager/embedder", ] @@ -21,7 +21,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b public_deps = [ ":xdg_mime", # Needs to be public for installer to consume files. -@@ -434,6 +439,7 @@ if (is_win) { +@@ -431,6 +436,7 @@ if (is_win) { "//third_party/wtl", "//ui/views", ] @@ -29,7 +29,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ldflags = [ "/DELAYLOAD:advapi32.dll", -@@ -568,6 +574,7 @@ if (is_win) { +@@ -566,6 +572,7 @@ if (is_win) { "//headless:headless_shell_child_lib", "//services/service_manager/embedder", ] @@ -37,7 +37,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ldflags = [ "/DELAYLOAD:comctl32.dll", -@@ -680,6 +687,11 @@ if (is_win) { +@@ -677,6 +684,11 @@ if (is_win) { ] } @@ -49,7 +49,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b mac_app_bundle("chrome_app") { output_name = chrome_product_full_name -@@ -713,6 +725,7 @@ if (is_win) { +@@ -710,6 +722,7 @@ if (is_win) { rebase_path("app/app.exports", root_build_dir) ] } } @@ -57,7 +57,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b compiled_action("chrome_app_strings") { tool = "//chrome/tools/build/mac:infoplist_strings_tool" -@@ -742,7 +755,7 @@ if (is_win) { +@@ -739,7 +752,7 @@ if (is_win) { args = [ "-b", @@ -66,7 +66,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b "-v", rebase_path(chrome_version_file, root_build_dir), "-g", -@@ -823,7 +836,7 @@ if (is_win) { +@@ -820,7 +833,7 @@ if (is_win) { # framework itself, that would cause a cyclical dependency. Instead, # this dependency directly copies the file into the framework's # resources directory. @@ -75,7 +75,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b } } -@@ -1222,6 +1235,7 @@ if (is_win) { +@@ -1247,6 +1260,7 @@ if (is_win) { "//services/service_manager/embedder", "//third_party/cld_3/src/src:cld_3", ] @@ -83,7 +83,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b if (is_component_build) { libs = [ "Carbon.framework" ] -@@ -1286,6 +1300,10 @@ if (is_win) { +@@ -1311,6 +1325,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -94,7 +94,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1446,6 +1464,7 @@ if (is_win) { +@@ -1475,6 +1493,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -102,7 +102,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b "//chrome/browser", "//chrome/common", "//components/gwp_asan/buildflags", -@@ -1519,13 +1538,14 @@ group("child_dependencies") { +@@ -1547,13 +1566,14 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -118,7 +118,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ] output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1598,6 +1618,7 @@ group("resources") { +@@ -1626,6 +1646,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -126,7 +126,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b ] } -@@ -1849,6 +1870,7 @@ if (is_android) { +@@ -1878,6 +1899,7 @@ if (is_android) { "//content/public/common:service_names", "//services/service_manager/embedder", ] diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 306c6ca5375..199ec6d00c2 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index e05d1f3aaf621bae4c2448a8dd9ee80a90b2321b..6f14cd915f02f2a05d0d78ad5fba93f7ae33267d 100644 +index e1504dfcaec5bc2d6a88b841353006903306bdaa..8d780cde76410d7e9a2f73e5fb3585c307110cd5 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=76 + MAJOR=77 MINOR=0 --BUILD=3809 --PATCH=62 +-BUILD=3860 +-PATCH=5 +BUILD=70 +PATCH=4 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 14f1ab03d5c..0d2102218db 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,13 +1,13 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 17311184c47823594b49ad07d41bd870efa7af17..611376d4d7c3bac30ecfbab8a786dc2fffd52fce 100644 +index 01d5593c76ee0982714456a49929caeecc0a9771..ab47048b6c28c51e6d79148dc65712e9042fedfd 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -42,7 +42,7 @@ if (dfmify_devtools) { - import("//chrome/android/features/devtools/devtools_module_tmpl.gni") - } +@@ -31,7 +31,7 @@ import("java_sources.gni") + import("static_initializers.gni") + import("trichrome.gni") --manifest_package = "org.chromium.chrome" -+declare_args() { manifest_package = "org.chromium.chrome" } - test_manifest_package = "org.chromium.chrome.tests" +-chrome_public_manifest_package = "org.chromium.chrome" ++declare_args() { chrome_public_manifest_package = "org.chromium.chrome" } + chrome_public_test_manifest_package = "org.chromium.chrome.tests" - chrome_public_jinja_variables = default_chrome_public_jinja_variables + + chrome_public_jinja_variables = diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 919d232c5fe..139aae27375 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 6bdd439f89a68e8b53bf077547ad04bc35414674..366524b92af5979ed4be1bac159cae6da8896a09 100644 +index a168b085348c218c2951964beb37e0a25d754836..ad5cf672b9548a4f9921c4bc3521a0c8111e998d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -182,7 +182,7 @@ import java.util.Locale; +@@ -174,7 +174,7 @@ import java.util.Locale; * are accessible via a chrome specific tab switching UI. */ public class ChromeTabbedActivity diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch deleted file mode 100644 index 6ea203beac6..00000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-search_engines-TemplateUrlService.java.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java -index 55c72cd215f525a17853cd63f79ecb8b537d4102..3bec2e2c5aedcbf631aadc058c2167c1641a626d 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java -@@ -11,6 +11,7 @@ import org.chromium.base.ThreadUtils; - import org.chromium.base.VisibleForTesting; - import org.chromium.base.annotations.CalledByNative; - import org.chromium.base.task.PostTask; -+import org.chromium.chrome.browser.search_engines.BraveTemplateUrlService; - import org.chromium.content_public.browser.UiThreadTaskTraits; - - import java.util.ArrayList; -@@ -49,7 +50,7 @@ public class TemplateUrlService { - public static TemplateUrlService getInstance() { - ThreadUtils.assertOnUiThread(); - if (sService == null) { -- sService = new TemplateUrlService(); -+ sService = new BraveTemplateUrlService(); - } - return sService; - } -@@ -59,7 +60,7 @@ public class TemplateUrlService { - private final ObserverList mObservers = - new ObserverList(); - -- private TemplateUrlService() { -+ protected TemplateUrlService() { - // Note that this technically leaks the native object, however, TemlateUrlService - // is a singleton that lives forever and there's no clean shutdown of Chrome on Android - mNativeTemplateUrlServiceAndroid = nativeInit(); diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch index 73b0b720e16..3c717850b9c 100644 --- a/patches/chrome-android-java_sources.gni.patch +++ b/patches/chrome-android-java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni -index 8aedf50897e9b40ca6b9617bb1a8ac766a6da16a..3ec678a94edda05c74640dcdbf63792a12ecc3dc 100644 +index ba374328abaf898aa5dd233f12673efb558c99ae..546ee1b26bbc68ca2c2d94aa42b93c836debac4f 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -15,6 +15,7 @@ import("//components/offline_pages/buildflags/features.gni") +@@ -17,6 +17,7 @@ import("//components/offline_pages/buildflags/features.gni") import("//device/vr/buildflags/buildflags.gni") chrome_java_sources += public_autofill_assistant_java_sources diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 8475bb01e1f..f22bad22d85 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index 590c4edcededad77172ae30e85b388b91d305b8e..ff494f3afd3dfaed475c89313116a45f64ffb565 100644 +index 5815a614f2947660d05cb2ace3d05f916de2081a..8a99c821c0949a77c712fe541f50467f06e5030a 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -186,6 +186,8 @@ grit("generated_resources") { @@ -20,10 +20,10 @@ index 590c4edcededad77172ae30e85b388b91d305b8e..ff494f3afd3dfaed475c89313116a45f defines = chrome_grit_defines output_dir = "$root_gen_dir/chrome" outputs = [ -@@ -348,6 +350,7 @@ static_library("test_support") { +@@ -347,6 +349,7 @@ static_library("test_support") { + "//components/gwp_asan/buildflags", "//components/nacl/common:buildflags", "//components/startup_metric_utils/browser:lib", - "//components/tracing", + "//components/unified_consent", "//content/public/app:both", "//content/public/common", diff --git a/patches/chrome-app-chrome_dll.rc.patch b/patches/chrome-app-chrome_dll.rc.patch index 02b7b7e2370..2581bf123ad 100644 --- a/patches/chrome-app-chrome_dll.rc.patch +++ b/patches/chrome-app-chrome_dll.rc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc -index d994493407e6dc5c640dd16ce488818800c09d14..90846e8502e2cda2fd3a3bad4749f9977c501b12 100644 +index 80a15b55d54f55ca13d6d79b3fd75d28ae0d647f..a0aa8fa83a4e93f7689a0ece2e6dbf9d10a4c175 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -164,6 +164,16 @@ END diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index a375f48fc99..383b9b811f8 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 4f9844f6f8546efe591e679c41c7cd3b43c371a8..89006c99c02315f0c439dbf244d5ae3ce5cb7a0b 100644 +index da0ae26e7a725211367c78df2c6704d35f9a0e40..e9418f2de9062f179758ac32cab3d794cf192ffe 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2142,6 +2142,7 @@ jumbo_split_static_library("browser") { +@@ -2177,6 +2177,7 @@ jumbo_split_static_library("browser") { "//ui/strings", "//ui/surface", "//ui/web_dialogs", diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index f40702e27e6..6ea3907f3e9 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 61bb2977bb7c9711465a6928b45f6a69be7f4080..c8f888c1423d2e53fc94bffc9db0ab51c86e0a4d 100644 +index 1672b7b09f38d06ea064b8dc21ea932b70775b01..636492d8f27d4435ac845bd8e02bc1555bccccec 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -254,14 +254,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -263,14 +263,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, diff --git a/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch b/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch index d7b0aaaf610..efb80285f29 100644 --- a/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch +++ b/patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc -index e3159144a0b7892e5580bfa910f2db97a81179a9..8ee42d9f6f7ac50c78a03e59aa2ba34e35dae725 100644 +index 7f4dd5ffd15a0ea17fb77d712897a86370da4266..52d8469ae70f38e7a3c714f4761d4172915af138 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc @@ -68,7 +68,12 @@ AutocompleteClassifierFactory::~AutocompleteClassifierFactory() { diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index a550a06d7d8..b58cc897751 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index 95a7bd8e8b581c6addec8b33880b2c03040f713a..b7037dd80a29bbd64a8ed66d4d01e585df589eed 100644 +index 8029837119bde2f4767659c25148f5761b6796a8..b51c2c65a2285326cea0c9b58fd23293808ba4c5 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -206,6 +206,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -196,6 +196,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index fe7f0778bd9..3e6544d1453 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 499af0b670a1060f81c2b1dda8812865aac29670..b9d5d5f72fcd3a319472cb226ec83ca4b62f0180 100644 +index 975b61fc2e7738ac7ab1e1d6319ea3e1367468f0..40fbce0f527c05354a7fd1c9af2891a145452c22 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -637,6 +637,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { - content::BrowserContext* browser_context); +@@ -646,6 +646,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { + virtual const ui::NativeTheme* GetWebTheme() const; // For testing. private: + friend class BraveContentBrowserClient; diff --git a/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch b/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch index c7b6e61e173..35cfb3a16de 100644 --- a/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch +++ b/patches/chrome-browser-content_settings-cookie_settings_factory.cc.patch @@ -1,17 +1,17 @@ diff --git a/chrome/browser/content_settings/cookie_settings_factory.cc b/chrome/browser/content_settings/cookie_settings_factory.cc -index 2bdf232aa502d4e94febb5ee9d62132c699b946b..32de4d66f4787c5684b53b8e814e40dee3712f8a 100644 +index 147835d8d7ec46e05df8e0f9b7285b5119461f60..2c577417f9327a35f7f869049169e5f7d2153b22 100644 --- a/chrome/browser/content_settings/cookie_settings_factory.cc +++ b/chrome/browser/content_settings/cookie_settings_factory.cc @@ -6,6 +6,7 @@ #include "base/logging.h" - #include "base/metrics/histogram_macros.h" + #include "base/metrics/histogram_functions.h" +#include "brave/components/content_settings/core/browser/brave_cookie_settings.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -@@ -68,7 +69,7 @@ CookieSettingsFactory::BuildServiceInstanceFor( - UMA_HISTOGRAM_BOOLEAN( +@@ -71,7 +72,7 @@ CookieSettingsFactory::BuildServiceInstanceFor( + base::UmaHistogramBoolean( "Privacy.DoNotTrackSetting", profile->GetPrefs()->GetBoolean(prefs::kEnableDoNotTrack)); - return new content_settings::CookieSettings( diff --git a/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch b/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch index 9e5c3471484..b6dee9a46cf 100644 --- a/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch +++ b/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc -index f521d5f7842bcd128772a9c8b57b464ffee312f5..1a9a1b0ebb01a0db607dd88e426166e176146c75 100644 +index 34fde937fea30840585b21c0623443f7dcb6c46a..50de09977491c7961ce3fc643f175d1e1e24a7f4 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc -@@ -283,6 +283,7 @@ bool TabSpecificContentSettings::IsContentBlocked( +@@ -253,6 +253,7 @@ bool TabSpecificContentSettings::IsContentBlocked( content_type == CONTENT_SETTINGS_TYPE_ADS || content_type == CONTENT_SETTINGS_TYPE_SOUND || content_type == CONTENT_SETTINGS_TYPE_CLIPBOARD_READ || @@ -10,7 +10,7 @@ index f521d5f7842bcd128772a9c8b57b464ffee312f5..1a9a1b0ebb01a0db607dd88e426166e1 content_type == CONTENT_SETTINGS_TYPE_SENSORS) { const auto& it = content_settings_status_.find(content_type); if (it != content_settings_status_.end()) -@@ -306,6 +307,7 @@ bool TabSpecificContentSettings::IsContentAllowed( +@@ -276,6 +277,7 @@ bool TabSpecificContentSettings::IsContentAllowed( content_type != CONTENT_SETTINGS_TYPE_PPAPI_BROKER && content_type != CONTENT_SETTINGS_TYPE_MIDI_SYSEX && content_type != CONTENT_SETTINGS_TYPE_CLIPBOARD_READ && diff --git a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch index 8faa4ced575..e2a2330a855 100644 --- a/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch +++ b/patches/chrome-browser-devtools-devtools_ui_bindings.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h -index f832069419217412657c1279712f821e6c036132..50fb5a5f2a6a3f0c910341115839f0d64737ec4d 100644 +index cc7e57e6c2e06dded26fce90dc22953c9785aae5..c535e148ea824e45506d37932e33ecc026e08d26 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.h +++ b/chrome/browser/devtools/devtools_ui_bindings.h @@ -89,6 +89,9 @@ class DevToolsUIBindings : public DevToolsEmbedderMessageDispatcher::Delegate, diff --git a/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch b/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch index 88d0c483ce1..f66e57e82f0 100644 --- a/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch +++ b/patches/chrome-browser-extensions-chrome_extensions_browser_client.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc -index 87a8ac4f1635d0f11067da7644987a2cff16aa06..4fc1deebd4ad047fa9f00efbd2d5490041b5d32e 100644 +index 37972b557b457ffd69215caf8d2616432fe7a3da..9be4fa73fe51417bc5e8ed88517089a6d6f6592c 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc @@ -9,6 +9,8 @@ @@ -11,7 +11,7 @@ index 87a8ac4f1635d0f11067da7644987a2cff16aa06..4fc1deebd4ad047fa9f00efbd2d54900 #include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" -@@ -91,11 +93,12 @@ bool ExtensionsDisabled(const base::CommandLine& command_line) { +@@ -92,11 +94,12 @@ bool ExtensionsDisabled(const base::CommandLine& command_line) { ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { AddAPIProvider(std::make_unique()); AddAPIProvider(std::make_unique()); diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch index 735baec7f9f..a78db28885c 100644 --- a/patches/chrome-browser-extensions-component_loader.h.patch +++ b/patches/chrome-browser-extensions-component_loader.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h -index 3f8b640092721536276e478549d8ad5940fe4964..5d7f0ba46efdf2871f333f0010e8e51ad20e6163 100644 +index 77b0a1e8952ece2cd9bb7ea511d7b90b8f8c9abf..d2585bfa2279b5c6e31110e548a0174a9981e892 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h -@@ -84,7 +84,7 @@ class ComponentLoader { +@@ -81,7 +81,7 @@ class ComponentLoader { // the loader will skip loading component extensions that weren't supposed to // be loaded unless we are in signed user session (ChromeOS). For all other // platforms this |skip_session_components| is expected to be unset. @@ -11,7 +11,7 @@ index 3f8b640092721536276e478549d8ad5940fe4964..5d7f0ba46efdf2871f333f0010e8e51a // Similar to above but adds the default component extensions for kiosk mode. void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components); -@@ -119,6 +119,7 @@ class ComponentLoader { +@@ -120,6 +120,7 @@ class ComponentLoader { } private: @@ -19,7 +19,7 @@ index 3f8b640092721536276e478549d8ad5940fe4964..5d7f0ba46efdf2871f333f0010e8e51a FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest); // Information about a registered component extension. -@@ -164,6 +165,7 @@ class ComponentLoader { +@@ -165,6 +166,7 @@ class ComponentLoader { void AddDefaultComponentExtensionsWithBackgroundPagesForKioskMode(); #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) diff --git a/patches/chrome-browser-extensions-extension_install_prompt.cc.patch b/patches/chrome-browser-extensions-extension_install_prompt.cc.patch index 1a3b9f05ac8..0d9f00fcce0 100644 --- a/patches/chrome-browser-extensions-extension_install_prompt.cc.patch +++ b/patches/chrome-browser-extensions-extension_install_prompt.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc -index f1ed057b1277648c9aa2cb208f92236062f9ecd6..848481f4fef9f03f19ee744d5c77fffca79bee4e 100644 +index c84fc509e52a7abd829c3dc5c4f6b821e5c32fa9..386fdf4f001177d9a779a632568fe821cbfe94db 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -13,6 +13,7 @@ @@ -10,7 +10,7 @@ index f1ed057b1277648c9aa2cb208f92236062f9ecd6..848481f4fef9f03f19ee744d5c77fffc #include "chrome/browser/extensions/extension_install_prompt_show_params.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/permissions_updater.h" -@@ -512,7 +513,7 @@ void ExtensionInstallPrompt::ShowDialog( +@@ -509,7 +510,7 @@ void ExtensionInstallPrompt::ShowDialog( const SkBitmap* icon, const ShowDialogCallback& show_dialog_callback) { ShowDialog(done_callback, extension, icon, diff --git a/patches/chrome-browser-extensions-extension_install_prompt.h.patch b/patches/chrome-browser-extensions-extension_install_prompt.h.patch index 314461cc7ca..754aebcb217 100644 --- a/patches/chrome-browser-extensions-extension_install_prompt.h.patch +++ b/patches/chrome-browser-extensions-extension_install_prompt.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h -index 44c0b01772fd3e2a1c1670eb077553e972e05e60..ddbf41e0c2a85293fe03249b9810932e02aa2c2b 100644 +index dcea843a6d7190d4e9e30d6ecce28028f18fd783..6f30d828db13b9f38f184499089d420cdbea4d4b 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h @@ -87,7 +87,7 @@ class ExtensionInstallPrompt { diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 4a7bd83501d..05ab72e7987 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index ab6c99a40a84961a61eea241a9dd346f8174eb48..dcdf09c4a5748032716fbc70bad7d12a15c7c566 100644 +index 0c051349bd1a862372dc975923e7fe5cc2129233..8bc5c167f712986694063d26c0dbd5cb5f7386e6 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -16,6 +16,7 @@ @@ -10,7 +10,7 @@ index ab6c99a40a84961a61eea241a9dd346f8174eb48..dcdf09c4a5748032716fbc70bad7d12a #include "chrome/browser/extensions/extension_management_constants.h" #include "chrome/browser/extensions/extension_management_internal.h" #include "chrome/browser/extensions/external_policy_loader.h" -@@ -626,7 +627,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -625,7 +626,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index 5b53f95cd84..02616f6c5c8 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index a3f16ad264fd2238a1b33685bfdea4d60a091a17..1848f745ea5413beab4fe2a5504ecd572cc2874c 100644 +index 2fa76ce8dd1b1fe2d678c116aa22d3e14f7e7038..45b199048a10f6127a375d7874d3aabd5224924b 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc -@@ -186,7 +186,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( +@@ -224,7 +224,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( // Always allow the hard-coded allowed schemes. for (size_t i = 0; i < base::size(kAllowedSchemes); ++i) { if (kAllowedSchemes[i] == scheme) diff --git a/patches/chrome-browser-importer-external_process_importer_client.cc.patch b/patches/chrome-browser-importer-external_process_importer_client.cc.patch index ce5f8940561..2bedb5eaee0 100644 --- a/patches/chrome-browser-importer-external_process_importer_client.cc.patch +++ b/patches/chrome-browser-importer-external_process_importer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc -index 7320911bb2c1e848eafe487f9b376df2177521e8..6e7278eb8fd6fc9fd2ad339192e4eb7cf7ba3964 100644 +index d6f6de319f3662dbd1d0b4bf469c8325aea127a9..dd7e12127a6339e1eff0da8307464eb0c256d615 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc -@@ -69,6 +69,12 @@ void ExternalProcessImporterClient::Start() { +@@ -67,6 +67,12 @@ void ExternalProcessImporterClient::Start() { localized_strings.try_emplace( IDS_BOOKMARK_BAR_FOLDER_NAME, l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME)); diff --git a/patches/chrome-browser-importer-external_process_importer_host.h.patch b/patches/chrome-browser-importer-external_process_importer_host.h.patch index 970610fed25..ef79ef5a5e4 100644 --- a/patches/chrome-browser-importer-external_process_importer_host.h.patch +++ b/patches/chrome-browser-importer-external_process_importer_host.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h -index 08c6f28746cc5f345114a942834db18f5c7a1d41..9b4ba999a26fb5600fce29eed80ad6f974e0a265 100644 +index f8bd5d50910b2a068b964a8377233bf5a25fe618..1af30b9cfc4aa7924864603ee0b10e995fb77ea7 100644 --- a/chrome/browser/importer/external_process_importer_host.h +++ b/chrome/browser/importer/external_process_importer_host.h @@ -72,10 +72,13 @@ class ExternalProcessImporterHost diff --git a/patches/chrome-browser-importer-importer_list.cc.patch b/patches/chrome-browser-importer-importer_list.cc.patch index db235f94664..8ccbcc00e61 100644 --- a/patches/chrome-browser-importer-importer_list.cc.patch +++ b/patches/chrome-browser-importer-importer_list.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc -index 71659dd4133d71a90276f364ca685e78533b8979..f33c4354a6e5f7d69ca347e737e272494d1b036e 100644 +index 57c0506feeb1318ed0ed77b47ffce4babfe0b8e1..bc7c6e04098780d12c9c55d676f587ea5b7e8937 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -29,6 +29,9 @@ diff --git a/patches/chrome-browser-io_thread.cc.patch b/patches/chrome-browser-io_thread.cc.patch deleted file mode 100644 index 26696070a93..00000000000 --- a/patches/chrome-browser-io_thread.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc -index 25cb1333363e32f3afe13239b40159dd3444e834..b6e8725370c9bc040b9f4b1ca3e5b61a7351144a 100644 ---- a/chrome/browser/io_thread.cc -+++ b/chrome/browser/io_thread.cc -@@ -237,6 +237,7 @@ net::URLRequestContextGetter* IOThread::system_url_request_context_getter() { - system_url_request_context_getter_ = - base::MakeRefCounted(this); - } else { -+ if (base::FeatureList::IsEnabled(network::features::kNetworkService)) - NOTREACHED(); - } - return system_url_request_context_getter_.get(); diff --git a/patches/chrome-browser-net-chrome_network_delegate.h.patch b/patches/chrome-browser-net-chrome_network_delegate.h.patch index ac229748afa..276e7aace49 100644 --- a/patches/chrome-browser-net-chrome_network_delegate.h.patch +++ b/patches/chrome-browser-net-chrome_network_delegate.h.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h -index 5286e342dec6199c2336622dc0f67eb11427300a..f29a144ad4e1311c3ebc38cfe1297c9113985bfe 100644 +index 12c8c497b87ba62f15e0737286467b9a492ae376..05f86e333337f795af8bc62af7c792ea0144c79b 100644 --- a/chrome/browser/net/chrome_network_delegate.h +++ b/chrome/browser/net/chrome_network_delegate.h -@@ -97,6 +97,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl { +@@ -27,6 +27,7 @@ class ChromeNetworkDelegate { + // with false brings back the original (production) behaviors. static void EnableAccessToAllFilesForTesting(bool enabled); - private: + friend class BraveNetworkDelegateBase; - // NetworkDelegate implementation. - int OnBeforeURLRequest(net::URLRequest* request, - net::CompletionOnceCallback callback, + DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate); + }; + diff --git a/patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch b/patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch deleted file mode 100644 index 6c6f0502836..00000000000 --- a/patches/chrome-browser-net-chrome_url_request_context_getter.cc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/chrome/browser/net/chrome_url_request_context_getter.cc b/chrome/browser/net/chrome_url_request_context_getter.cc -index a931ece03ee26647686419328b9884c2726468db..90d78c0576a8f8df12649ed6dd1a34c48caa4104 100644 ---- a/chrome/browser/net/chrome_url_request_context_getter.cc -+++ b/chrome/browser/net/chrome_url_request_context_getter.cc -@@ -5,7 +5,7 @@ - #include "chrome/browser/net/chrome_url_request_context_getter.h" - - #include -- -+#include "brave/components/brave_shields/browser/adblock_interceptor.h" - #include "base/bind.h" - #include "base/compiler_specific.h" - #include "base/macros.h" -@@ -50,6 +50,7 @@ class FactoryForMain : public ChromeURLRequestContextFactory { - : profile_io_data_(profile_io_data), - request_interceptors_(std::move(request_interceptors)) { - std::swap(protocol_handlers_, *protocol_handlers); -+ request_interceptors_.emplace_back(new brave_shields::AdBlockInterceptor); - } - - net::URLRequestContext* Create() override { -@@ -84,6 +85,7 @@ class FactoryForIsolatedApp : public ChromeURLRequestContextFactory { - network_context_request_(std::move(network_context_request)), - network_context_params_(std::move(network_context_params)) { - std::swap(protocol_handlers_, *protocol_handlers); -+ request_interceptors_.emplace_back(new brave_shields::AdBlockInterceptor); - } - - net::URLRequestContext* Create() override { diff --git a/patches/chrome-browser-net-net_error_tab_helper.cc.patch b/patches/chrome-browser-net-net_error_tab_helper.cc.patch index 71b8de4f9c5..a595064ee59 100644 --- a/patches/chrome-browser-net-net_error_tab_helper.cc.patch +++ b/patches/chrome-browser-net-net_error_tab_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc -index d39876436dd64faa0bae445c3e0ad1c666dbae17..88eb4e98bdb5a040e26c72f7c5eed9de8ef8bcc8 100644 +index f2dd356b43f396991446ab3a59067e8a44048014..c74fea87daf5b42be11275ee259ae01dfbb773b7 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc -@@ -234,6 +234,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { +@@ -233,6 +233,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { } bool NetErrorTabHelper::ProbesAllowed() const { diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch b/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch index 229365dace4..1a6c48cf89f 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.cc b/chrome/browser/notifications/notification_platform_bridge_linux.cc -index aa6d15f6ebbdcc6e70374a46ca9c11d4c1bff854..5c2bdec672a402edbc3602887fdad9e3cc0056a8 100644 +index 04a4ac46f01173b3a8bdb4ebab1eeea03cfd6c1b..a2a0e8a90a2a564611ffc6e8f8240a63cf597fe6 100644 --- a/chrome/browser/notifications/notification_platform_bridge_linux.cc +++ b/chrome/browser/notifications/notification_platform_bridge_linux.cc -@@ -632,6 +632,7 @@ class NotificationPlatformBridgeLinuxImpl +@@ -648,6 +648,7 @@ class NotificationPlatformBridgeLinuxImpl actions.push_back("Activate"); // Always add a settings button for web notifications. if (notification_type != NotificationHandler::Type::EXTENSION && diff --git a/patches/chrome-browser-permissions-permission_manager.cc.patch b/patches/chrome-browser-permissions-permission_manager.cc.patch index 20dddb1432a..4d4e07cb450 100644 --- a/patches/chrome-browser-permissions-permission_manager.cc.patch +++ b/patches/chrome-browser-permissions-permission_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc -index 3f612a3cf55ce07de9aa5aa29e94e2338377f90a..6f329e24de35557510651069a903853f34fbce42 100644 +index 9f535334da7e3ca1939e98a055ec93662a38b552..81f81e6d2b3dc359d262440dbd20cf995ba88c46 100644 --- a/chrome/browser/permissions/permission_manager.cc +++ b/chrome/browser/permissions/permission_manager.cc -@@ -88,7 +88,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { +@@ -89,7 +89,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { } // Helper method to convert PermissionType to ContentSettingType. @@ -11,9 +11,9 @@ index 3f612a3cf55ce07de9aa5aa29e94e2338377f90a..6f329e24de35557510651069a903853f switch (permission) { case PermissionType::MIDI: return CONTENT_SETTINGS_TYPE_MIDI; -@@ -132,6 +132,7 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { - case PermissionType::PERIODIC_BACKGROUND_SYNC: - return CONTENT_SETTINGS_TYPE_PERIODIC_BACKGROUND_SYNC; +@@ -137,6 +137,7 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { + case PermissionType::WAKE_LOCK_SYSTEM: + return CONTENT_SETTINGS_TYPE_WAKE_LOCK_SYSTEM; case PermissionType::NUM: + default: // This will hit the NOTREACHED below. diff --git a/patches/chrome-browser-permissions-permission_request.h.patch b/patches/chrome-browser-permissions-permission_request.h.patch index 62b46e3b140..81c655ef7f0 100644 --- a/patches/chrome-browser-permissions-permission_request.h.patch +++ b/patches/chrome-browser-permissions-permission_request.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/permissions/permission_request.h b/chrome/browser/permissions/permission_request.h -index 6daa247ce558241db33a1d1ae0187f14631cc842..dcbfa42bd87013619a7a54a2597487e479338ce3 100644 +index 6daa247ce558241db33a1d1ae0187f14631cc842..1bd4ae483d9803262a61fc7e6196848aa814ec54 100644 --- a/chrome/browser/permissions/permission_request.h +++ b/chrome/browser/permissions/permission_request.h @@ -45,6 +45,7 @@ enum class PermissionRequestType { diff --git a/patches/chrome-browser-permissions-permission_uma_util.cc.patch b/patches/chrome-browser-permissions-permission_uma_util.cc.patch index 625c907ed17..18bebf0040b 100644 --- a/patches/chrome-browser-permissions-permission_uma_util.cc.patch +++ b/patches/chrome-browser-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/permissions/permission_uma_util.cc b/chrome/browser/permissions/permission_uma_util.cc -index 97ae8e1ee0339d5714d3baef177a1e27ce219583..431c5256251904e83ed7c7a7245a39b4eef4f1db 100644 +index 50768c0a91bb5f29760e398ed9c6486a06334b49..18c8118777376ddd24e88ad38576be092e214ba0 100644 --- a/chrome/browser/permissions/permission_uma_util.cc +++ b/chrome/browser/permissions/permission_uma_util.cc @@ -65,7 +65,7 @@ namespace { diff --git a/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch b/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch index ca20e66cb67..02357bf63c9 100644 --- a/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch +++ b/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc -index 5c2a2d0adf1ca353d4ab8dd23475c9d6e6df3b55..dc8f62521ba5c78fcee7e79d028ee8ddc8964e7f 100644 +index 55801ac0fee766a5f46314137d4745ff8a1d7f24..9acdabbe23d440d7468cbc9ef3b1e589f74db12c 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.cc +++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc -@@ -52,7 +52,7 @@ class ProfileContentSettingObserver : public content_settings::Observer { +@@ -51,7 +51,7 @@ class ProfileContentSettingObserver : public content_settings::Observer { PluginService::GetInstance()->PurgePluginListCache(profile_, false); const GURL primary(primary_pattern.ToString()); diff --git a/patches/chrome-browser-plugins-plugins_resource_service.cc.patch b/patches/chrome-browser-plugins-plugins_resource_service.cc.patch index 407468e5925..3447f9bbea8 100644 --- a/patches/chrome-browser-plugins-plugins_resource_service.cc.patch +++ b/patches/chrome-browser-plugins-plugins_resource_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc -index d7c3801df3e8766b2124b4c73ec3a46631aa5d3b..d6d391d47a4b4540f4177034da6ee475100c78b0 100644 +index 85003dd6cb04d27820e182c75fd76169b269a7e1..f3facf8c650cda32fa59bca6735c897f1aede5ca 100644 --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc @@ -55,7 +55,7 @@ const int kStartResourceFetchDelayMs = 60 * 1000; diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 976faa7adf7..91f2984288e 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 50312cdb0324e3dad18c77c96e5e609bfb259541..ed0ab71e9e08494abb5016bcb4e1fce6f852ea24 100644 +index 5f8892f1797129b37691967ea55a219612ab10f2..1daed1517db2832f05491303c625a6cdd95590b8 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -658,6 +658,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -679,6 +679,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 42edd12f399..92b1243ba5d 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 71d736c9eaf3503e532d72c410f4d4dadff372cd..f278991246e40b894418cd05f9a5fb6fb192c5a5 100644 +index 28d3c597acc9e58bab439badb1d1dc9baa139048..4e4a3742f9133dcba49a2ec68a1181a345c5f63b 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; @@ -11,7 +11,7 @@ index 71d736c9eaf3503e532d72c410f4d4dadff372cd..f278991246e40b894418cd05f9a5fb6f user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); #if defined(OS_ANDROID) registry->RegisterStringPref( -@@ -244,7 +244,7 @@ bool Profile::IsGuestSession() const { +@@ -257,7 +257,7 @@ bool Profile::IsGuestSession() const { chromeos::switches::kGuestSession); return is_guest_session; #else diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index e04ed4a31c7..3f908f8e0c2 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 71619ca3d5271b0f813110dce0e5570b6eebdda7..a9c1f8ec99aafa581c7fc8261e470261323c6492 100644 +index 37b90f5d5676f3e332f397d56363d40a635d5a66..8c460ceaf4527ee5c05057c5e4b020ff6667ac20 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -34,6 +34,7 @@ @@ -10,7 +10,7 @@ index 71619ca3d5271b0f813110dce0e5570b6eebdda7..a9c1f8ec99aafa581c7fc8261e470261 #include "build/build_config.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/background_fetch/background_fetch_delegate_factory.h" -@@ -508,6 +509,9 @@ ProfileImpl::ProfileImpl( +@@ -507,6 +508,9 @@ ProfileImpl::ProfileImpl( LoadPrefsForNormalStartup(async_prefs); #endif diff --git a/patches/chrome-browser-profiles-profile_io_data.cc.patch b/patches/chrome-browser-profiles-profile_io_data.cc.patch index 87495c2e791..c687baa0c88 100644 --- a/patches/chrome-browser-profiles-profile_io_data.cc.patch +++ b/patches/chrome-browser-profiles-profile_io_data.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc -index a77de6f1abed2133190908db2fe3e417b05bc4f0..e67fcb11518b4d644425fe4275dd7aebb39e68a4 100644 +index 285f9e09a9020e8647fe363f7d3b0c867b1d26ea..55d7b1a32589936789a8ef7206e179ae756e2c2e 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -24,6 +24,7 @@ @@ -10,7 +10,7 @@ index a77de6f1abed2133190908db2fe3e417b05bc4f0..e67fcb11518b4d644425fe4275dd7aeb #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -@@ -639,6 +640,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { +@@ -417,6 +418,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { extensions::kExtensionScheme, #endif content::kChromeUIScheme, @@ -20,12 +20,3 @@ index a77de6f1abed2133190908db2fe3e417b05bc4f0..e67fcb11518b4d644425fe4275dd7aeb url::kDataScheme, #if defined(OS_CHROMEOS) content::kExternalFileScheme, -@@ -925,7 +929,7 @@ void ProfileIOData::Init( - std::make_unique(); - - std::unique_ptr chrome_network_delegate( -- new ChromeNetworkDelegate( -+ new BraveProfileNetworkDelegate( - #if BUILDFLAG(ENABLE_EXTENSIONS) - io_thread_globals->extension_event_router_forwarder.get())); - #else diff --git a/patches/chrome-browser-profiles-profile_manager.cc.patch b/patches/chrome-browser-profiles-profile_manager.cc.patch index 00d573f9369..c60c9299509 100644 --- a/patches/chrome-browser-profiles-profile_manager.cc.patch +++ b/patches/chrome-browser-profiles-profile_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc -index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa65625a7d1 100644 +index 8d1ed7b997cb17c90d3152090d37634bc34997bd..eb801040064374f92586fbce09700be659defc60 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1503,9 +1503,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( +@@ -1418,9 +1418,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( const base::FilePath last_used_profile_path = GetLastUsedProfileDir(user_data_dir_); const base::FilePath guest_profile_path = GetGuestProfilePath(); @@ -14,7 +14,7 @@ index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa6 last_used_profile != nullptr && !last_used_profile->IsLegacySupervised()) { FinishDeletingProfile(profile_dir, last_used_profile_path); -@@ -1518,6 +1520,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( +@@ -1433,6 +1435,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( base::FilePath cur_path = profile->GetPath(); if (cur_path != profile_dir && cur_path != guest_profile_path && @@ -22,7 +22,7 @@ index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa6 !profile->IsLegacySupervised() && !IsProfileDirectoryMarkedForDeletion(cur_path)) { OnNewActiveProfileLoaded(profile_dir, cur_path, std::move(callback), -@@ -1537,6 +1540,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( +@@ -1452,6 +1455,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( // legacy-supervised. if (cur_path != profile_dir && cur_path != guest_profile_path && @@ -30,7 +30,7 @@ index 4cce9ca9fbf1ded2c4b8334f8ff9be0d43e97803..7b39473be45be8530eb91c1389c96aa6 !entry->IsLegacySupervised() && !IsProfileDirectoryMarkedForDeletion(cur_path)) { fallback_profile_path = cur_path; -@@ -1894,6 +1898,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion( +@@ -1867,6 +1871,7 @@ void ProfileManager::ScheduleForcedEphemeralProfileForDeletion( base::FilePath entry_path = entry->GetPath(); if (entry_path == profile_dir || entry_path == GetGuestProfilePath() || diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index a2f14a3ab8c..fa4a11cd6c5 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 257e27caed9f6ef1dc984d5cdbae82c3d0daa427..ab13240fbb230326ecd102fa8f60aa5eb17bc4ff 100644 +index 985c64458bdf2c547a5b9286b448aaa2513b2109..a677df807effba3589b6a067ffc940432b064839 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -139,7 +139,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -141,7 +141,7 @@ class ProfileManager : public content::NotificationObserver, // Get the name of the last used profile, or if that's undefined, the default // profile. @@ -11,7 +11,7 @@ index 257e27caed9f6ef1dc984d5cdbae82c3d0daa427..ab13240fbb230326ecd102fa8f60aa5e // Get the Profiles which are currently open, i.e. have open browsers or were // open the last time Chrome was running. Profiles that fail to initialize are -@@ -220,7 +220,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -222,7 +222,7 @@ class ProfileManager : public content::NotificationObserver, // Initializes user prefs of |profile|. This includes profile name and // avatar values. @@ -20,12 +20,12 @@ index 257e27caed9f6ef1dc984d5cdbae82c3d0daa427..ab13240fbb230326ecd102fa8f60aa5e // Register and add testing profile to the ProfileManager. Use ONLY in tests. // This allows the creation of Profiles outside of the standard creation path -@@ -346,7 +346,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -349,7 +349,7 @@ class ProfileManager : public content::NotificationObserver, // Apply settings for profiles created by the system rather than users: The // (desktop) Guest User profile and (desktop) System Profile. - void SetNonPersonalProfilePrefs(Profile* profile); + virtual void SetNonPersonalProfilePrefs(Profile* profile); - // For ChromeOS, determines if profile should be otr. + // Determines if profile should be OTR. bool ShouldGoOffTheRecord(Profile* profile); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 2abc88ae0b7..08550316bb1 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 630436fb7b4ed95909bdc7c80da85b8ff524cd81..e4837ee01f811e74f0cca2353dea3826eff85f4a 100644 +index 99539e2b50fe22275d8b106a1e7319eda8d88beb..9125bee587d5a05bd93ad80c9d141680597a0afc 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1163,6 +1163,7 @@ void RenderViewContextMenu::AppendLinkItems() { +@@ -1169,6 +1169,7 @@ void RenderViewContextMenu::AppendLinkItems() { : IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD); AppendOpenInBookmarkAppLinkItems(); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 6c5577cb244..c6b9f6e9a73 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 824741727052dfd87f8f65df8bbb5adf4a9f1e2e..ea5b8370d907d7d991ae67d4f66f33d5ec4ef7c2 100644 +index 49728ebc43f14f2674dd700114f80dcbc3a2b174..7270522b3e6dd3c71a77f0cd37506a0bee8be424 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -114,6 +114,8 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { +@@ -115,6 +115,8 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch b/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch index 39ff82df906..8b0bff57b51 100644 --- a/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch +++ b/patches/chrome-browser-resources-bookmarks-bookmarks.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/bookmarks.html b/chrome/browser/resources/bookmarks/bookmarks.html -index b91e6202e695f7347963e1c0dbee0cea46622c62..47978779a4b4cf27b7715276fc068a6163d926df 100644 +index 077405e88cd2b5da78714c900d9d4e392981192e..0698a3fcee0f240fe9dc870292f2e4af7f4cd9d1 100644 --- a/chrome/browser/resources/bookmarks/bookmarks.html +++ b/chrome/browser/resources/bookmarks/bookmarks.html -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ height: var(--md-toolbar-height); } diff --git a/patches/chrome-browser-resources-bookmarks-toolbar.html.patch b/patches/chrome-browser-resources-bookmarks-toolbar.html.patch index 520934e3907..c2a8715fe24 100644 --- a/patches/chrome-browser-resources-bookmarks-toolbar.html.patch +++ b/patches/chrome-browser-resources-bookmarks-toolbar.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/toolbar.html b/chrome/browser/resources/bookmarks/toolbar.html -index 989db07d3c1f7a2ca97044590b04b02ebd86cb1a..cc5bb8387bd51505e7ea39fb4372a7a17b7d5594 100644 +index d008a5ae9a74c9c97d61dd3ec9540baa226d75b2..c430495b1a9501c3730a3a499663b202968c88f1 100644 --- a/chrome/browser/resources/bookmarks/toolbar.html +++ b/chrome/browser/resources/bookmarks/toolbar.html @@ -1,7 +1,7 @@ diff --git a/patches/chrome-browser-resources-downloads-downloads.html.patch b/patches/chrome-browser-resources-downloads-downloads.html.patch index bcbcf36b97d..ab14a6e1ede 100644 --- a/patches/chrome-browser-resources-downloads-downloads.html.patch +++ b/patches/chrome-browser-resources-downloads-downloads.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html -index 05a625d0f349264f13bd98fff32984db56aadd2c..1ad650ef5011f79ebf6591ade055338a51a791d1 100644 +index ad88272334d24e2f60327ae30ab1d412a42a6351..43b6993c81b82d814f900d9d06baf6082ba0dd98 100644 --- a/chrome/browser/resources/downloads/downloads.html +++ b/chrome/browser/resources/downloads/downloads.html -@@ -8,6 +8,7 @@ +@@ -7,6 +7,7 @@ $i18n{title} diff --git a/patches/chrome-browser-resources-downloads-manager.html.patch b/patches/chrome-browser-resources-downloads-manager.html.patch index 1a648da2119..f337da16a1d 100644 --- a/patches/chrome-browser-resources-downloads-manager.html.patch +++ b/patches/chrome-browser-resources-downloads-manager.html.patch @@ -1,13 +1,13 @@ diff --git a/chrome/browser/resources/downloads/manager.html b/chrome/browser/resources/downloads/manager.html -index 015710be621743fbc082460a4203b67d8d76372c..8cae2e6f282e558e087a3b60f0a9a84fe9bc1ba8 100644 +index 3415eceeeb53203260a6b9c1d20e96f38dd2c55e..f05a3eabcb4e3f3ba88678880de9eb101f505d70 100644 --- a/chrome/browser/resources/downloads/manager.html +++ b/chrome/browser/resources/downloads/manager.html -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@