Commit d2f6519a authored by Timothy Pearson's avatar Timothy Pearson
Browse files

Update to Chromium 130.0.6723.58

# Add suggestions URL text field to the search engine editing dialog
# (chrome://settings/searchEngines).
Index: chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
Index: chromium-130.0.6723.44/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
+++ chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
--- chromium-130.0.6723.44.orig/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
+++ chromium-130.0.6723.44/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
@@ -22,6 +22,13 @@
error-message="$i18n{notValid}"
value="{{queryUrl_}}" on-focus="validate_" on-input="validate_">
......@@ -19,10 +19,10 @@ Index: chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_p
</div>
<div slot="button-container">
<cr-button class="cancel-button" on-click="cancel_" id="cancel"
Index: chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
Index: chromium-130.0.6723.44/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
+++ chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
--- chromium-130.0.6723.44.orig/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
+++ chromium-130.0.6723.44/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
@@ -36,6 +36,7 @@ export interface SettingsSearchEngineEdi
dialog: CrDialogElement,
keyword: CrInputElement,
......@@ -92,10 +92,10 @@ Index: chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_p
});
this.$.actionButton.disabled = !allValid;
}
Index: chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
Index: chromium-130.0.6723.44/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
+++ chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
--- chromium-130.0.6723.44.orig/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
+++ chromium-130.0.6723.44/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
@@ -35,6 +35,7 @@ export interface SearchEngine {
name: string;
shouldConfirmDeletion: boolean;
......@@ -127,10 +127,10 @@ Index: chromium-129.0.6668.58/chrome/browser/resources/settings/search_engines_p
]);
}
Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
.is_valid();
}
......@@ -171,10 +171,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/edit_search_engin
}
}
Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/edit_search_engine_controller.h
Index: chromium-130.0.6723.44/chrome/browser/ui/search_engines/edit_search_engine_controller.h
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/search_engines/edit_search_engine_controller.h
+++ chromium-129.0.6668.58/chrome/browser/ui/search_engines/edit_search_engine_controller.h
--- chromium-130.0.6723.44.orig/chrome/browser/ui/search_engines/edit_search_engine_controller.h
+++ chromium-130.0.6723.44/chrome/browser/ui/search_engines/edit_search_engine_controller.h
@@ -23,7 +23,8 @@ class EditSearchEngineControllerDelegate
virtual void OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
......@@ -204,10 +204,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/edit_search_engin
// Deletes an unused TemplateURL, if its add was cancelled and it's not
// already owned by the TemplateURLService.
Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/keyword_editor_controller.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/search_engines/keyword_editor_controller.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/search_engines/keyword_editor_controller.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -24,23 +24,27 @@ KeywordEditorController::KeywordEditorCo
KeywordEditorController::~KeywordEditorController() {
}
......@@ -259,10 +259,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/keyword_editor_co
base::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
}
Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/keyword_editor_controller.h
Index: chromium-130.0.6723.44/chrome/browser/ui/search_engines/keyword_editor_controller.h
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/search_engines/keyword_editor_controller.h
+++ chromium-129.0.6668.58/chrome/browser/ui/search_engines/keyword_editor_controller.h
--- chromium-130.0.6723.44.orig/chrome/browser/ui/search_engines/keyword_editor_controller.h
+++ chromium-130.0.6723.44/chrome/browser/ui/search_engines/keyword_editor_controller.h
@@ -33,14 +33,16 @@ class KeywordEditorController {
// model. Returns the index of the added URL.
int AddTemplateURL(const std::u16string& title,
......@@ -282,10 +282,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/keyword_editor_co
// Return true if the given |url| can be edited.
bool CanEdit(const TemplateURL* url) const;
Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/template_url_table_model.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/search_engines/template_url_table_model.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/search_engines/template_url_table_model.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -200,21 +200,25 @@ void TemplateURLTableModel::Remove(size_
void TemplateURLTableModel::Add(size_t index,
const std::u16string& short_name,
......@@ -327,10 +327,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/template_url_tabl
}
TemplateURL* TemplateURLTableModel::GetTemplateURL(size_t index) {
Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/template_url_table_model.h
Index: chromium-130.0.6723.44/chrome/browser/ui/search_engines/template_url_table_model.h
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/search_engines/template_url_table_model.h
+++ chromium-129.0.6668.58/chrome/browser/ui/search_engines/template_url_table_model.h
--- chromium-130.0.6723.44.orig/chrome/browser/ui/search_engines/template_url_table_model.h
+++ chromium-130.0.6723.44/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -61,13 +61,15 @@ class TemplateURLTableModel : public ui:
void Add(size_t index,
const std::u16string& short_name,
......@@ -349,10 +349,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/search_engines/template_url_tabl
// Reloads the icon at the specified index.
void ReloadIcon(size_t index);
Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_handler.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/webui/settings/search_engines_handler.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/webui/settings/search_engines_handler.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_handler.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/webui/settings/search_engines_handler.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -48,6 +48,7 @@ namespace {
const char kSearchEngineField[] = "searchEngine";
const char kKeywordField[] = "keyword";
......@@ -370,7 +370,7 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_ha
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
(template_url->starter_pack_id() > 0)));
GURL icon_url = template_url->favicon_url();
@@ -363,12 +366,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -358,12 +361,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
......@@ -388,7 +388,7 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_ha
edit_controller_.reset();
}
@@ -396,6 +401,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -391,6 +396,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
else if (field_name.compare(kQueryUrlField) == 0)
is_valid = edit_controller_->IsURLValid(field_value);
......@@ -397,7 +397,7 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_ha
else
NOTREACHED_IN_MIGRATION();
@@ -415,18 +422,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -410,18 +417,21 @@ void SearchEnginesHandler::HandleSearchE
if (!edit_controller_.get())
return;
......@@ -422,10 +422,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_ha
}
}
Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_handler.h
Index: chromium-130.0.6723.44/chrome/browser/ui/webui/settings/search_engines_handler.h
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/webui/settings/search_engines_handler.h
+++ chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_handler.h
--- chromium-130.0.6723.44.orig/chrome/browser/ui/webui/settings/search_engines_handler.h
+++ chromium-130.0.6723.44/chrome/browser/ui/webui/settings/search_engines_handler.h
@@ -41,7 +41,8 @@ class SearchEnginesHandler : public Sett
void OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
......@@ -447,11 +447,11 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/settings/search_engines_ha
bool CheckFieldValidity(const std::string& field_name,
const std::string& field_value);
Index: chromium-129.0.6668.58/components/search_engines/template_url_service.cc
Index: chromium-130.0.6723.44/components/search_engines/template_url_service.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/search_engines/template_url_service.cc
+++ chromium-129.0.6668.58/components/search_engines/template_url_service.cc
@@ -904,7 +904,8 @@ void TemplateURLService::IncrementUsageC
--- chromium-130.0.6723.44.orig/components/search_engines/template_url_service.cc
+++ chromium-130.0.6723.44/components/search_engines/template_url_service.cc
@@ -902,7 +902,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
......@@ -461,7 +461,7 @@ Index: chromium-129.0.6668.58/components/search_engines/template_url_service.cc
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -919,6 +920,7 @@ void TemplateURLService::ResetTemplateUR
@@ -917,6 +918,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
......@@ -469,10 +469,10 @@ Index: chromium-129.0.6668.58/components/search_engines/template_url_service.cc
Update(url, TemplateURL(data));
}
Index: chromium-129.0.6668.58/components/search_engines/template_url_service.h
Index: chromium-130.0.6723.44/components/search_engines/template_url_service.h
===================================================================
--- chromium-129.0.6668.58.orig/components/search_engines/template_url_service.h
+++ chromium-129.0.6668.58/components/search_engines/template_url_service.h
--- chromium-130.0.6723.44.orig/components/search_engines/template_url_service.h
+++ chromium-130.0.6723.44/components/search_engines/template_url_service.h
@@ -314,7 +314,8 @@ class TemplateURLService final : public
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
......
Index: chromium-129.0.6668.58/chrome/browser/about_flags.cc
Index: chromium-130.0.6723.44/chrome/browser/about_flags.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/about_flags.cc
+++ chromium-129.0.6668.58/chrome/browser/about_flags.cc
@@ -4215,7 +4215,13 @@ const FeatureEntry::FeatureVariation
--- chromium-130.0.6723.44.orig/chrome/browser/about_flags.cc
+++ chromium-130.0.6723.44/chrome/browser/about_flags.cc
@@ -4230,7 +4230,13 @@ const FeatureEntry::FeatureVariation
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.
......@@ -16,10 +16,10 @@ Index: chromium-129.0.6668.58/chrome/browser/about_flags.cc
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
#include "build/chromeos_buildflags.h"
Index: chromium-129.0.6668.58/chrome/browser/bromite_flag_choices.h
Index: chromium-130.0.6723.44/chrome/browser/bromite_flag_choices.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/bromite_flag_choices.h
+++ chromium-130.0.6723.44/chrome/browser/bromite_flag_choices.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2020 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
......@@ -28,10 +28,10 @@ Index: chromium-129.0.6668.58/chrome/browser/bromite_flag_choices.h
+#ifndef CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
+#define CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
+#endif // CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
Index: chromium-129.0.6668.58/chrome/browser/bromite_flag_entries.h
Index: chromium-130.0.6723.44/chrome/browser/bromite_flag_entries.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/bromite_flag_entries.h
+++ chromium-130.0.6723.44/chrome/browser/bromite_flag_entries.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2020 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
......@@ -40,10 +40,10 @@ Index: chromium-129.0.6668.58/chrome/browser/bromite_flag_entries.h
+#ifndef CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
+#define CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
+#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
Index: chromium-129.0.6668.58/chrome/browser/ungoogled_flag_choices.h
Index: chromium-130.0.6723.44/chrome/browser/ungoogled_flag_choices.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/ungoogled_flag_choices.h
+++ chromium-130.0.6723.44/chrome/browser/ungoogled_flag_choices.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2020 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
......@@ -52,10 +52,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ungoogled_flag_choices.h
+#ifndef CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
+#define CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
+#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
Index: chromium-129.0.6668.58/chrome/browser/ungoogled_flag_entries.h
Index: chromium-130.0.6723.44/chrome/browser/ungoogled_flag_entries.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/ungoogled_flag_entries.h
+++ chromium-130.0.6723.44/chrome/browser/ungoogled_flag_entries.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2020 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
......@@ -64,10 +64,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ungoogled_flag_entries.h
+#ifndef CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
+#define CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
+#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
Index: chromium-129.0.6668.58/chrome/browser/ungoogled_platform_flag_choices.h
Index: chromium-130.0.6723.44/chrome/browser/ungoogled_platform_flag_choices.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/ungoogled_platform_flag_choices.h
+++ chromium-130.0.6723.44/chrome/browser/ungoogled_platform_flag_choices.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2020 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
......@@ -76,10 +76,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ungoogled_platform_flag_choices.h
+#ifndef CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_CHOICES_H_
+#define CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_CHOICES_H_
+#endif // CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_CHOICES_H_
Index: chromium-129.0.6668.58/chrome/browser/ungoogled_platform_flag_entries.h
Index: chromium-130.0.6723.44/chrome/browser/ungoogled_platform_flag_entries.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/ungoogled_platform_flag_entries.h
+++ chromium-130.0.6723.44/chrome/browser/ungoogled_platform_flag_entries.h
@@ -0,0 +1,7 @@
+// Copyright (c) 2020 The ungoogled-chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
......
Index: chromium-129.0.6668.58/chrome/browser/ui/browser_ui_prefs.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/browser_ui_prefs.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/browser_ui_prefs.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/browser_ui_prefs.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/browser_ui_prefs.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/browser_ui_prefs.cc
@@ -109,7 +109,7 @@ void RegisterBrowserUserPrefs(user_prefs
false);
#endif
......
Index: chromium-129.0.6668.58/chrome/browser/media/webrtc/capture_policy_utils.cc
Index: chromium-130.0.6723.44/chrome/browser/media/webrtc/capture_policy_utils.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/media/webrtc/capture_policy_utils.cc
+++ chromium-129.0.6668.58/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -63,46 +63,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
--- chromium-130.0.6723.44.orig/chrome/browser/media/webrtc/capture_policy_utils.cc
+++ chromium-130.0.6723.44/chrome/browser/media/webrtc/capture_policy_utils.cc
@@ -64,46 +64,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
base::OnceCallback<void(bool)> callback,
content::BrowserContext* context,
bool is_multi_capture_allowed_for_any_origin_on_main_profile) {
......@@ -49,7 +49,7 @@ Index: chromium-129.0.6668.58/chrome/browser/media/webrtc/capture_policy_utils.c
}
void CheckAllScreensMediaAllowedForIwaResultReceived(
@@ -290,58 +251,13 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -291,58 +252,13 @@ void RegisterProfilePrefs(PrefRegistrySi
void CheckGetAllScreensMediaAllowedForAnyOrigin(
content::BrowserContext* context,
base::OnceCallback<void(bool)> callback) {
......
# Disables the dial registry's repeating discovery timer
# This caused unnecessary SSDP network spam
Index: chromium-129.0.6668.58/chrome/browser/media/router/discovery/dial/dial_registry.cc
Index: chromium-130.0.6723.44/chrome/browser/media/router/discovery/dial/dial_registry.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/media/router/discovery/dial/dial_registry.cc
+++ chromium-129.0.6668.58/chrome/browser/media/router/discovery/dial/dial_registry.cc
--- chromium-130.0.6723.44.orig/chrome/browser/media/router/discovery/dial/dial_registry.cc
+++ chromium-130.0.6723.44/chrome/browser/media/router/discovery/dial/dial_registry.cc
@@ -155,10 +155,6 @@ void DialRegistry::StartPeriodicDiscover
return;
......
# Disables file download quarantining
Index: chromium-129.0.6668.58/components/download/internal/common/base_file.cc
Index: chromium-130.0.6723.44/components/download/internal/common/base_file.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/download/internal/common/base_file.cc
+++ chromium-129.0.6668.58/components/download/internal/common/base_file.cc
--- chromium-130.0.6723.44.orig/components/download/internal/common/base_file.cc
+++ chromium-130.0.6723.44/components/download/internal/common/base_file.cc
@@ -28,7 +28,6 @@
#include "components/download/public/common/download_interrupt_reasons_utils.h"
#include "components/download/public/common/download_item.h"
......@@ -107,8 +107,8 @@ Index: chromium-129.0.6668.58/components/download/internal/common/base_file.cc
}
void BaseFile::AnnotateWithSourceInformation(
@@ -627,32 +542,8 @@ void BaseFile::AnnotateWithSourceInforma
const GURL& referrer_url,
@@ -628,32 +543,8 @@ void BaseFile::AnnotateWithSourceInforma
const std::optional<url::Origin>& request_initiator,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {
- GURL authority_url = GetEffectiveAuthorityURL(source_url, referrer_url);
......@@ -133,7 +133,7 @@ Index: chromium-129.0.6668.58/components/download/internal/common/base_file.cc
- authority_url, referrer_url));
-
- quarantine_service_->QuarantineFile(
- full_path_, authority_url, referrer_url, client_guid,
- full_path_, authority_url, referrer_url, request_initiator, client_guid,
- base::BindOnce(&BaseFile::OnFileQuarantined,
- weak_factory_.GetWeakPtr()));
- }
......@@ -142,10 +142,10 @@ Index: chromium-129.0.6668.58/components/download/internal/common/base_file.cc
}
} // namespace download
Index: chromium-129.0.6668.58/content/browser/BUILD.gn
Index: chromium-130.0.6723.44/content/browser/BUILD.gn
===================================================================
--- chromium-129.0.6668.58.orig/content/browser/BUILD.gn
+++ chromium-129.0.6668.58/content/browser/BUILD.gn
--- chromium-130.0.6723.44.orig/content/browser/BUILD.gn
+++ chromium-130.0.6723.44/content/browser/BUILD.gn
@@ -118,7 +118,6 @@ source_set("browser") {
"//components/payments/mojom",
"//components/power_monitor",
......@@ -154,10 +154,10 @@ Index: chromium-129.0.6668.58/content/browser/BUILD.gn
"//components/services/storage",
"//components/services/storage:filesystem_proxy_factory",
"//components/services/storage/dom_storage:local_storage_proto",
Index: chromium-129.0.6668.58/content/browser/file_system_access/file_system_access_safe_move_helper.cc
Index: chromium-130.0.6723.44/content/browser/file_system_access/file_system_access_safe_move_helper.cc
===================================================================
--- chromium-129.0.6668.58.orig/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ chromium-129.0.6668.58/content/browser/file_system_access/file_system_access_safe_move_helper.cc
--- chromium-130.0.6723.44.orig/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ chromium-130.0.6723.44/content/browser/file_system_access/file_system_access_safe_move_helper.cc
@@ -14,7 +14,6 @@
#include "base/thread_annotations.h"
#include "build/build_config.h"
......@@ -197,7 +197,7 @@ Index: chromium-129.0.6668.58/content/browser/file_system_access/file_system_acc
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -293,37 +278,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -293,40 +278,9 @@ void FileSystemAccessSafeMoveHelper::Did
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();
......@@ -206,6 +206,9 @@ Index: chromium-129.0.6668.58/content/browser/file_system_access/file_system_acc
- quarantine::mojom::Quarantine* raw_quarantine = quarantine_remote.get();
- raw_quarantine->QuarantineFile(
- target_url.path(), authority_url, referrer_url,
- // TODO(crbug.com/351165321): Consider propagating request_initiator
- // information here.
- /*request_initiator=*/std::nullopt,
- GetContentClient()
- ->browser()
- ->GetApplicationClientGUIDForQuarantineCheck(),
......@@ -235,10 +238,10 @@ Index: chromium-129.0.6668.58/content/browser/file_system_access/file_system_acc
quarantine::mojom::QuarantineFileResult result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
Index: chromium-129.0.6668.58/content/browser/file_system_access/file_system_access_safe_move_helper.h
Index: chromium-130.0.6723.44/content/browser/file_system_access/file_system_access_safe_move_helper.h
===================================================================
--- chromium-129.0.6668.58.orig/content/browser/file_system_access/file_system_access_safe_move_helper.h
+++ chromium-129.0.6668.58/content/browser/file_system_access/file_system_access_safe_move_helper.h
--- chromium-130.0.6723.44.orig/content/browser/file_system_access/file_system_access_safe_move_helper.h
+++ chromium-130.0.6723.44/content/browser/file_system_access/file_system_access_safe_move_helper.h
@@ -66,10 +66,8 @@ class CONTENT_EXPORT FileSystemAccessSaf
void DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
......@@ -250,10 +253,10 @@ Index: chromium-129.0.6668.58/content/browser/file_system_access/file_system_acc
quarantine::mojom::QuarantineFileResult result);
void ComputeHashForSourceFile(HashCallback callback);
Index: chromium-129.0.6668.58/content/browser/renderer_host/pepper/pepper_file_io_host.cc
Index: chromium-130.0.6723.44/content/browser/renderer_host/pepper/pepper_file_io_host.cc
===================================================================
--- chromium-129.0.6668.58.orig/content/browser/renderer_host/pepper/pepper_file_io_host.cc
+++ chromium-129.0.6668.58/content/browser/renderer_host/pepper/pepper_file_io_host.cc
--- chromium-130.0.6723.44.orig/content/browser/renderer_host/pepper/pepper_file_io_host.cc
+++ chromium-130.0.6723.44/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
......@@ -272,10 +275,10 @@ Index: chromium-129.0.6668.58/content/browser/renderer_host/pepper/pepper_file_i
void PepperFileIOHost::OnLocalFileQuarantined(
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
Index: chromium-129.0.6668.58/content/browser/renderer_host/pepper/pepper_file_io_host.h
Index: chromium-130.0.6723.44/content/browser/renderer_host/pepper/pepper_file_io_host.h
===================================================================
--- chromium-129.0.6668.58.orig/content/browser/renderer_host/pepper/pepper_file_io_host.h
+++ chromium-129.0.6668.58/content/browser/renderer_host/pepper/pepper_file_io_host.h
--- chromium-130.0.6723.44.orig/content/browser/renderer_host/pepper/pepper_file_io_host.h
+++ chromium-130.0.6723.44/content/browser/renderer_host/pepper/pepper_file_io_host.h
@@ -14,7 +14,6 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
......
# Disables omission of URL elements in Omnibox and status bubble
Index: chromium-129.0.6668.58/chrome/browser/ui/status_bubble.h
Index: chromium-130.0.6723.44/chrome/browser/ui/status_bubble.h
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/status_bubble.h
+++ chromium-129.0.6668.58/chrome/browser/ui/status_bubble.h
--- chromium-130.0.6723.44.orig/chrome/browser/ui/status_bubble.h
+++ chromium-130.0.6723.44/chrome/browser/ui/status_bubble.h
@@ -18,7 +18,7 @@ class GURL;
class StatusBubble {
public:
......@@ -13,10 +13,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/status_bubble.h
virtual ~StatusBubble() {}
Index: chromium-129.0.6668.58/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarMod
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
......
# Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled
# See this page for more information: https://mikewest.org/2012/02/chrome-connects-to-three-random-domains-at-startup
Index: chromium-129.0.6668.58/chrome/browser/intranet_redirect_detector.cc
Index: chromium-130.0.6723.44/chrome/browser/intranet_redirect_detector.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/intranet_redirect_detector.cc
+++ chromium-129.0.6668.58/chrome/browser/intranet_redirect_detector.cc
--- chromium-130.0.6723.44.orig/chrome/browser/intranet_redirect_detector.cc
+++ chromium-130.0.6723.44/chrome/browser/intranet_redirect_detector.cc
@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSle
simple_loaders_.clear();
resulting_origins_.clear();
......
Index: chromium-129.0.6668.58/components/optimization_guide/core/optimization_guide_features.cc
Index: chromium-130.0.6723.44/components/optimization_guide/core/optimization_guide_features.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/optimization_guide/core/optimization_guide_features.cc
+++ chromium-129.0.6668.58/components/optimization_guide/core/optimization_guide_features.cc
--- chromium-130.0.6723.44.orig/components/optimization_guide/core/optimization_guide_features.cc
+++ chromium-130.0.6723.44/components/optimization_guide/core/optimization_guide_features.cc
@@ -56,7 +56,7 @@ BASE_FEATURE(kOptimizationHints,
// Enables fetching from a remote Optimization Guide Service.
BASE_FEATURE(kRemoteOptimizationGuideFetching,
......
# Return blank values for WebGLDebugRendererInfo to remove a potential data
# leak while preventing potential website breakage
Index: chromium-129.0.6668.58/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
Index: chromium-130.0.6723.44/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
===================================================================
--- chromium-129.0.6668.58.orig/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ chromium-129.0.6668.58/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
--- chromium-130.0.6723.44.orig/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ chromium-130.0.6723.44/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3836,8 +3836,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
......
# Enable chrome://flags/#prefetch-privacy-changes by default
Index: chromium-129.0.6668.58/third_party/blink/common/features.cc
Index: chromium-130.0.6723.44/third_party/blink/common/features.cc
===================================================================
--- chromium-129.0.6668.58.orig/third_party/blink/common/features.cc
+++ chromium-129.0.6668.58/third_party/blink/common/features.cc
@@ -1835,7 +1835,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
--- chromium-130.0.6723.44.orig/third_party/blink/common/features.cc
+++ chromium-130.0.6723.44/third_party/blink/common/features.cc
@@ -1858,7 +1858,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",
......
# Add ability to always open dev context menu on reload button.
Index: chromium-129.0.6668.58/chrome/browser/ui/views/toolbar/reload_button.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/views/toolbar/reload_button.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/views/toolbar/reload_button.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/views/toolbar/reload_button.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/views/toolbar/reload_button.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -111,7 +111,7 @@ bool ReloadButton::GetMenuEnabled() cons
}
......
# Add more URL schemes allowed for saving
Index: chromium-129.0.6668.58/chrome/browser/ui/browser_commands.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/browser_commands.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/browser_commands.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/browser_commands.cc
@@ -559,11 +559,6 @@ int GetContentRestrictions(const Browser
--- chromium-130.0.6723.44.orig/chrome/browser/ui/browser_commands.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/browser_commands.cc
@@ -566,11 +566,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
......@@ -16,7 +16,7 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/browser_commands.cc
}
return content_restrictions;
}
@@ -1735,8 +1730,7 @@ bool CanSavePage(const Browser* browser)
@@ -1759,8 +1754,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}
......@@ -26,10 +26,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/browser_commands.cc
}
void Print(Browser* browser) {
Index: chromium-129.0.6668.58/components/offline_pages/core/offline_page_model.cc
Index: chromium-130.0.6723.44/components/offline_pages/core/offline_page_model.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/offline_pages/core/offline_page_model.cc
+++ chromium-129.0.6668.58/components/offline_pages/core/offline_page_model.cc
--- chromium-130.0.6723.44.orig/components/offline_pages/core/offline_page_model.cc
+++ chromium-130.0.6723.44/components/offline_pages/core/offline_page_model.cc
@@ -21,7 +21,7 @@ OfflinePageModel::SavePageParams::~SaveP
// static
......@@ -39,10 +39,10 @@ Index: chromium-129.0.6668.58/components/offline_pages/core/offline_page_model.c
}
OfflinePageModel::OfflinePageModel() = default;
Index: chromium-129.0.6668.58/content/common/url_schemes.cc
Index: chromium-130.0.6723.44/content/common/url_schemes.cc
===================================================================
--- chromium-129.0.6668.58.orig/content/common/url_schemes.cc
+++ chromium-129.0.6668.58/content/common/url_schemes.cc
--- chromium-130.0.6723.44.orig/content/common/url_schemes.cc
+++ chromium-130.0.6723.44/content/common/url_schemes.cc
@@ -24,13 +24,21 @@ namespace {
bool g_registered_url_schemes = false;
......@@ -66,10 +66,10 @@ Index: chromium-129.0.6668.58/content/common/url_schemes.cc
};
// These lists are lazily initialized below and are leaked on shutdown to
Index: chromium-129.0.6668.58/content/public/common/url_utils.cc
Index: chromium-130.0.6723.44/content/public/common/url_utils.cc
===================================================================
--- chromium-129.0.6668.58.orig/content/public/common/url_utils.cc
+++ chromium-129.0.6668.58/content/public/common/url_utils.cc
--- chromium-130.0.6723.44.orig/content/public/common/url_utils.cc
+++ chromium-130.0.6723.44/content/public/common/url_utils.cc
@@ -40,11 +40,7 @@ bool IsPdfInternalPluginAllowedOrigin(co
}
......
Index: chromium-129.0.6668.58/chrome/browser/ui/views/frame/tab_strip_region_view.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/views/frame/tab_strip_region_view.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -204,12 +204,10 @@ TabStripRegionView::TabStripRegionView(s
--- chromium-130.0.6723.44.orig/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -205,12 +205,10 @@ TabStripRegionView::TabStripRegionView(s
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
......@@ -15,11 +15,11 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/views/frame/tab_strip_region_vie
}
reserved_grab_handle_space_ =
Index: chromium-129.0.6668.58/chrome/browser/ui/views/tabs/tab_strip.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/views/tabs/tab_strip.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/views/tabs/tab_strip.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2069,8 +2069,6 @@ void TabStrip::NewTabButtonPressed(const
--- chromium-130.0.6723.44.orig/chrome/browser/ui/views/tabs/tab_strip.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2073,8 +2073,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
......@@ -28,7 +28,7 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/views/tabs/tab_strip.cc
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard)
<< "Clipboard instance is not available, cannot proceed with "
@@ -2081,7 +2079,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -2085,7 +2083,6 @@ void TabStrip::NewTabButtonPressed(const
if (!clipboard_text.empty()) {
controller_->CreateNewTabWithLocation(clipboard_text);
}
......
Index: chromium-129.0.6668.58/chrome/browser/chrome_browser_main.cc
Index: chromium-130.0.6723.44/chrome/browser/chrome_browser_main.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/chrome_browser_main.cc
+++ chromium-129.0.6668.58/chrome/browser/chrome_browser_main.cc
@@ -1102,6 +1102,7 @@ int ChromeBrowserMainParts::PreCreateThr
--- chromium-130.0.6723.44.orig/chrome/browser/chrome_browser_main.cc
+++ chromium-130.0.6723.44/chrome/browser/chrome_browser_main.cc
@@ -1115,6 +1115,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
......@@ -10,19 +10,19 @@ Index: chromium-129.0.6668.58/chrome/browser/chrome_browser_main.cc
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
Index: chromium-129.0.6668.58/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -58,6 +58,7 @@
--- chromium-130.0.6723.44.orig/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -49,6 +49,7 @@
#include "chrome/browser/ui/webui/policy/policy_ui.h"
#include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
#include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
+#include "chrome/browser/ui/webui/ungoogled_first_run.h"
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -745,6 +746,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/buildflags.h"
#include "chrome/common/chrome_features.h"
@@ -692,6 +693,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
}
......@@ -31,10 +31,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/chrome_web_ui_controller_f
return nullptr;
}
Index: chromium-129.0.6668.58/chrome/browser/ui/webui/ungoogled_first_run.h
Index: chromium-130.0.6723.44/chrome/browser/ui/webui/ungoogled_first_run.h
===================================================================
--- /dev/null
+++ chromium-129.0.6668.58/chrome/browser/ui/webui/ungoogled_first_run.h
+++ chromium-130.0.6723.44/chrome/browser/ui/webui/ungoogled_first_run.h
@@ -0,0 +1,137 @@
+#ifndef CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
+#define CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
......@@ -173,10 +173,10 @@ Index: chromium-129.0.6668.58/chrome/browser/ui/webui/ungoogled_first_run.h
+};
+
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
Index: chromium-129.0.6668.58/chrome/common/webui_url_constants.cc
Index: chromium-130.0.6723.44/chrome/common/webui_url_constants.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/common/webui_url_constants.cc
+++ chromium-129.0.6668.58/chrome/common/webui_url_constants.cc
--- chromium-130.0.6723.44.orig/chrome/common/webui_url_constants.cc
+++ chromium-130.0.6723.44/chrome/common/webui_url_constants.cc
@@ -75,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view
// These hosts will also be suggested by BuiltinProvider.
base::span<const base::cstring_view> ChromeURLHosts() {
......
# Fix building with enable_service_discovery=false and enable_mds=false
Index: chromium-129.0.6668.58/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
Index: chromium-130.0.6723.44/chrome/browser/extensions/api/BUILD.gn
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
+++ chromium-129.0.6668.58/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
--- chromium-130.0.6723.44.orig/chrome/browser/extensions/api/BUILD.gn
+++ chromium-130.0.6723.44/chrome/browser/extensions/api/BUILD.gn
@@ -34,7 +34,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/downloads_internal",
"//chrome/browser/extensions/api/experimental_ai_data",
"//chrome/browser/extensions/api/font_settings",
- "//chrome/browser/extensions/api/mdns",
"//chrome/browser/extensions/api/module",
"//chrome/browser/extensions/api/networking_private",
"//chrome/browser/extensions/api/omnibox",
Index: chromium-130.0.6723.44/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
===================================================================
--- chromium-130.0.6723.44.orig/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
+++ chromium-130.0.6723.44/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
@@ -40,37 +40,22 @@ DnsSdDeviceLister::DnsSdDeviceLister(
DnsSdDeviceLister::~DnsSdDeviceLister() {}
......
Index: chromium-129.0.6668.58/components/dom_distiller/core/css/distilledpage.css
Index: chromium-130.0.6723.44/components/dom_distiller/core/css/distilledpage.css
===================================================================
--- chromium-129.0.6668.58.orig/components/dom_distiller/core/css/distilledpage.css
+++ chromium-129.0.6668.58/components/dom_distiller/core/css/distilledpage.css
--- chromium-130.0.6723.44.orig/components/dom_distiller/core/css/distilledpage.css
+++ chromium-130.0.6723.44/components/dom_distiller/core/css/distilledpage.css
@@ -28,6 +28,11 @@
box-sizing: border-box;
}
......
Index: chromium-129.0.6668.58/components/flags_ui/flags_state.cc
Index: chromium-130.0.6723.44/components/flags_ui/flags_state.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/flags_ui/flags_state.cc
+++ chromium-129.0.6668.58/components/flags_ui/flags_state.cc
--- chromium-130.0.6723.44.orig/components/flags_ui/flags_state.cc
+++ chromium-130.0.6723.44/components/flags_ui/flags_state.cc
@@ -30,6 +30,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
......
# Disables Site search Starter Pack
# Adds DDG to the default search engines.
#
Index: chromium-129.0.6668.58/components/omnibox/common/omnibox_features.cc
Index: chromium-130.0.6723.44/components/omnibox/common/omnibox_features.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/omnibox/common/omnibox_features.cc
+++ chromium-129.0.6668.58/components/omnibox/common/omnibox_features.cc
@@ -522,7 +522,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
--- chromium-130.0.6723.44.orig/components/omnibox/common/omnibox_features.cc
+++ chromium-130.0.6723.44/components/omnibox/common/omnibox_features.cc
@@ -511,7 +511,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",
......@@ -14,10 +14,10 @@ Index: chromium-129.0.6668.58/components/omnibox/common/omnibox_features.cc
// Enables an informational IPH message at the bottom of the Omnibox directing
// users to certain starter pack engines.
Index: chromium-129.0.6668.58/components/search_engines/search_engine_countries-inc.cc
Index: chromium-130.0.6723.44/components/search_engines/search_engine_countries-inc.cc
===================================================================
--- chromium-129.0.6668.58.orig/components/search_engines/search_engine_countries-inc.cc
+++ chromium-129.0.6668.58/components/search_engines/search_engine_countries-inc.cc
--- chromium-130.0.6723.44.orig/components/search_engines/search_engine_countries-inc.cc
+++ chromium-130.0.6723.44/components/search_engines/search_engine_countries-inc.cc
@@ -41,6 +41,7 @@ constexpr EngineAndTier engines_default[
{SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing},
......
# Remove the "--disable-setuid-sandbox" command line flag as a bad flag
Index: chromium-129.0.6668.58/chrome/browser/ui/startup/bad_flags_prompt.cc
Index: chromium-130.0.6723.44/chrome/browser/ui/startup/bad_flags_prompt.cc
===================================================================
--- chromium-129.0.6668.58.orig/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ chromium-129.0.6668.58/chrome/browser/ui/startup/bad_flags_prompt.cc
--- chromium-130.0.6723.44.orig/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ chromium-130.0.6723.44/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -75,7 +75,6 @@ const char* const kBadFlags[] = {
// These flags disable sandbox-related security.
sandbox::policy::switches::kDisableGpuSandbox,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment