1 files changed, 60 insertions, 56 deletions

diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
index 1b30554..9ff8cfa 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
@@ -1,8 +1,8 @@
 # Add suggestions URL text field to the search engine editing dialog
 # (chrome://settings/searchEngines).
 
---- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
-+++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
+--- chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html.orig
++++ chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html
 @@ -20,6 +20,13 @@
              value="{{queryUrl_}}" on-focus="validate_" on-input="validate_"
              disabled$="[[model.urlLocked]]">
@@ -17,9 +17,9 @@
        </div>
        <div slot="button-container">
          <cr-button class="cancel-button" on-click="cancel_" id="cancel">
---- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
-+++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
-@@ -28,6 +28,7 @@ export interface SettingsSearchEngineEdi
+--- chrome/browser/resources/settings/search_engines_page/search_engine_dialog.ts.orig
++++ chrome/browser/resources/settings/search_engines_page/search_engine_dialog.ts
+@@ -26,6 +26,7 @@ interface SettingsSearchEngineDialogElem
      dialog: CrDialogElement,
      keyword: CrInputElement,
      queryUrl: CrInputElement,
@@ -27,23 +27,23 @@
      searchEngine: CrInputElement,
    };
  }
-@@ -56,6 +57,7 @@ export class SettingsSearchEngineEditDia
+@@ -54,6 +55,7 @@ class SettingsSearchEngineDialogElement
        searchEngine_: String,
        keyword_: String,
        queryUrl_: String,
 +      suggestionsUrl_: String,
        dialogTitle_: String,
-       keywordFieldLabel_: String,
        actionButtonText_: String,
-@@ -72,6 +74,7 @@ export class SettingsSearchEngineEditDia
+     };
+@@ -63,6 +65,7 @@ class SettingsSearchEngineDialogElement
    private searchEngine_: string;
    private keyword_: string;
    private queryUrl_: string;
 +  private suggestionsUrl_: string;
    private dialogTitle_: string;
-   private keywordFieldLabel_: string;
    private actionButtonText_: string;
-@@ -103,6 +106,7 @@ export class SettingsSearchEngineEditDia
+   private browserProxy_: SearchEnginesBrowserProxy =
+@@ -92,6 +95,7 @@ class SettingsSearchEngineDialogElement
        this.searchEngine_ = this.model.name;
        this.keyword_ = this.model.keyword;
        this.queryUrl_ = this.model.url;
@@ -51,7 +51,7 @@
      } else {
        this.dialogTitle_ =
            loadTimeData.getString('searchEnginesAddSearchEngine');
-@@ -142,8 +146,12 @@ export class SettingsSearchEngineEditDia
+@@ -127,8 +131,12 @@ class SettingsSearchEngineDialogElement
        }
      }
  
@@ -66,7 +66,7 @@
    }
  
    private cancel_() {
-@@ -152,7 +160,8 @@ export class SettingsSearchEngineEditDia
+@@ -137,7 +145,8 @@ class SettingsSearchEngineDialogElement
  
    private onActionButtonTap_() {
      this.browserProxy_.searchEngineEditCompleted(
@@ -76,7 +76,7 @@
      this.$.dialog.close();
    }
  
-@@ -180,9 +189,11 @@ export class SettingsSearchEngineEditDia
+@@ -165,9 +174,11 @@ class SettingsSearchEngineDialogElement
  
    private updateActionButtonState_() {
      const allValid = [
@@ -90,17 +90,17 @@
      });
      this.$.actionButton.disabled = !allValid;
    }
---- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
-+++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
-@@ -31,6 +31,7 @@ export type SearchEngine = {
+--- chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts.orig
++++ chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
+@@ -30,6 +30,7 @@ export type SearchEngine = {
+   modelIndex: number,
    name: string,
-   shouldConfirmDeletion: boolean,
    url: string,
 +  suggestionsUrl: string,
    urlLocked: boolean,
  };
  
-@@ -73,7 +74,7 @@ export interface SearchEnginesBrowserPro
+@@ -53,7 +54,7 @@ export interface SearchEnginesBrowserPro
    searchEngineEditCancelled(): void;
  
    searchEngineEditCompleted(
@@ -109,7 +109,7 @@
  
    getSearchEnginesList(): Promise<SearchEnginesInfo>;
  
-@@ -114,11 +115,12 @@ export class SearchEnginesBrowserProxyIm
+@@ -84,11 +85,12 @@ export class SearchEnginesBrowserProxyIm
    }
  
    searchEngineEditCompleted(
@@ -123,8 +123,8 @@
      ]);
    }
  
---- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
-+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+--- chrome/browser/ui/search_engines/edit_search_engine_controller.cc.orig
++++ chrome/browser/ui/search_engines/edit_search_engine_controller.cc
 @@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
        .is_valid();
  }
@@ -165,8 +165,8 @@
    }
  }
  
---- a/chrome/browser/ui/search_engines/edit_search_engine_controller.h
-+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.h
+--- chrome/browser/ui/search_engines/edit_search_engine_controller.h.orig
++++ 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,
@@ -196,8 +196,8 @@
  
    // Deletes an unused TemplateURL, if its add was cancelled and it's not
    // already owned by the TemplateURLService.
---- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
-+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+--- chrome/browser/ui/search_engines/keyword_editor_controller.cc.orig
++++ chrome/browser/ui/search_engines/keyword_editor_controller.cc
 @@ -21,23 +21,27 @@ KeywordEditorController::KeywordEditorCo
  KeywordEditorController::~KeywordEditorController() {
  }
@@ -249,8 +249,8 @@
  
    base::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
  }
---- a/chrome/browser/ui/search_engines/keyword_editor_controller.h
-+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.h
+--- chrome/browser/ui/search_engines/keyword_editor_controller.h.orig
++++ chrome/browser/ui/search_engines/keyword_editor_controller.h
 @@ -29,14 +29,16 @@ class KeywordEditorController {
    // model.  Returns the index of the added URL.
    int AddTemplateURL(const std::u16string& title,
@@ -270,9 +270,9 @@
  
    // Return true if the given |url| can be edited.
    bool CanEdit(const TemplateURL* url) const;
---- a/chrome/browser/ui/search_engines/template_url_table_model.cc
-+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
-@@ -108,21 +108,25 @@ void TemplateURLTableModel::Remove(int i
+--- chrome/browser/ui/search_engines/template_url_table_model.cc.orig
++++ chrome/browser/ui/search_engines/template_url_table_model.cc
+@@ -109,21 +109,25 @@ void TemplateURLTableModel::Remove(int i
  void TemplateURLTableModel::Add(int index,
                                  const std::u16string& short_name,
                                  const std::u16string& keyword,
@@ -303,7 +303,7 @@
    DCHECK(index >= 0 && index <= RowCount());
    DCHECK(!url.empty());
    TemplateURL* template_url = GetTemplateURL(index);
-@@ -131,7 +135,8 @@ void TemplateURLTableModel::ModifyTempla
+@@ -132,7 +136,8 @@ void TemplateURLTableModel::ModifyTempla
    DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
           template_url->SupportsReplacement(
               template_url_service_->search_terms_data()));
@@ -313,9 +313,9 @@
  }
  
  TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) {
---- a/chrome/browser/ui/search_engines/template_url_table_model.h
-+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
-@@ -53,13 +53,15 @@ class TemplateURLTableModel : public ui:
+--- chrome/browser/ui/search_engines/template_url_table_model.h.orig
++++ chrome/browser/ui/search_engines/template_url_table_model.h
+@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui:
    void Add(int index,
             const std::u16string& short_name,
             const std::u16string& keyword,
@@ -333,8 +333,8 @@
  
    // Reloads the icon at the specified index.
    void ReloadIcon(int index);
---- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
-+++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
+--- chrome/browser/ui/webui/settings/search_engines_handler.cc.orig
++++ chrome/browser/ui/webui/settings/search_engines_handler.cc
 @@ -37,6 +37,7 @@ namespace {
  const char kSearchEngineField[] = "searchEngine";
  const char kKeywordField[] = "keyword";
@@ -345,12 +345,12 @@
  const int kNewSearchEngineIndex = -1;
 @@ -212,6 +213,9 @@ SearchEnginesHandler::CreateDictionaryFo
    Profile* profile = Profile::FromWebUI(web_ui());
-   dict->SetStringKey(
+   dict->SetString(
        "url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
-+  dict->SetStringKey("suggestionsUrl",
++  dict->SetString("suggestionsUrl",
 +                  template_url->suggestions_url_ref().DisplayURL(
 +                      UIThreadSearchTermsData()));
-   dict->SetBoolKey("urlLocked", template_url->prepopulate_id() > 0);
+   dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
    GURL icon_url = template_url->favicon_url();
    if (icon_url.is_valid())
 @@ -325,12 +329,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -371,7 +371,7 @@
  
    edit_controller_.reset();
  }
-@@ -358,6 +364,8 @@ bool SearchEnginesHandler::CheckFieldVal
+@@ -361,6 +367,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);
@@ -380,11 +380,15 @@
    else
      NOTREACHED();
  
-@@ -379,14 +387,17 @@ void SearchEnginesHandler::HandleSearchE
-   const std::string& search_engine = args[0].GetString();
-   const std::string& keyword = args[1].GetString();
-   const std::string& query_url = args[2].GetString();
-+  const std::string& suggestions_url = args[3].GetString();
+@@ -382,17 +390,21 @@ void SearchEnginesHandler::HandleSearchE
+   std::string search_engine;
+   std::string keyword;
+   std::string query_url;
++  std::string suggestions_url;
+   CHECK(args->GetString(0, &search_engine));
+   CHECK(args->GetString(1, &keyword));
+   CHECK(args->GetString(2, &query_url));
++  CHECK(args->GetString(3, &suggestions_url));
  
    // Recheck validity. It's possible to get here with invalid input if e.g. the
    // user calls the right JS functions directly from the web inspector.
@@ -400,9 +404,9 @@
    }
  }
  
---- a/chrome/browser/ui/webui/settings/search_engines_handler.h
-+++ b/chrome/browser/ui/webui/settings/search_engines_handler.h
-@@ -45,7 +45,8 @@ class SearchEnginesHandler : public Sett
+--- chrome/browser/ui/webui/settings/search_engines_handler.h.orig
++++ chrome/browser/ui/webui/settings/search_engines_handler.h
+@@ -50,7 +50,8 @@ class SearchEnginesHandler : public Sett
    void OnEditedKeyword(TemplateURL* template_url,
                         const std::u16string& title,
                         const std::u16string& keyword,
@@ -412,9 +416,9 @@
  
    // SettingsPageUIHandler implementation.
    void RegisterMessages() override;
-@@ -77,8 +78,8 @@ class SearchEnginesHandler : public Sett
+@@ -82,8 +83,8 @@ class SearchEnginesHandler : public Sett
    // to WebUI. Called from WebUI.
-   void HandleValidateSearchEngineInput(base::Value::ConstListView args);
+   void HandleValidateSearchEngineInput(const base::ListValue* args);
  
 -  // Checks whether the given user input field (searchEngine, keyword, queryUrl)
 -  // is populated with a valid value.
@@ -423,9 +427,9 @@
    bool CheckFieldValidity(const std::string& field_name,
                            const std::string& field_value);
  
---- a/components/search_engines/template_url_service.cc
-+++ b/components/search_engines/template_url_service.cc
-@@ -643,7 +643,8 @@ void TemplateURLService::IncrementUsageC
+--- components/search_engines/template_url_service.cc.orig
++++ components/search_engines/template_url_service.cc
+@@ -641,7 +641,8 @@ void TemplateURLService::IncrementUsageC
  void TemplateURLService::ResetTemplateURL(TemplateURL* url,
                                            const std::u16string& title,
                                            const std::u16string& keyword,
@@ -435,7 +439,7 @@
    DCHECK(!IsCreatedByExtension(url));
    DCHECK(!keyword.empty());
    DCHECK(!search_url.empty());
-@@ -658,6 +659,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR
    data.safe_for_autoreplace = false;
    data.last_modified = clock_->Now();
    data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -443,8 +447,8 @@
  
    Update(url, TemplateURL(data));
  }
---- a/components/search_engines/template_url_service.h
-+++ b/components/search_engines/template_url_service.h
+--- components/search_engines/template_url_service.h.orig
++++ components/search_engines/template_url_service.h
 @@ -253,7 +253,8 @@ class TemplateURLService : public WebDat
    void ResetTemplateURL(TemplateURL* url,
                          const std::u16string& title,