Closed PR

build/config/ios/Module-Info.plist

@@ -5,13 +5,13 @@
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
+  <string>BrowserX</string>
   <key>CFBundleIdentifier</key>
   <string>${IOS_BUNDLE_ID_PREFIX}.${MODULE_BUNDLE_ID:rfc1034identifier}</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
+  <string>BrowserX</string>
   <key>CFBundlePackageType</key>
   <string>BNDL</string>
   <key>CFBundleShortVersionString</key>

chrome/updater/branding.gni

@@ -16,10 +16,10 @@ if (is_chrome_branded) {
   mac_browser_bundle_identifier = "com.google.Chrome"
 } else {
   updater_company_full_name = "Chromium Authors"
-  updater_company_short_name = "Chromium"
+  updater_company_short_name = "BrowserX"
   updater_product_full_name = "ChromiumUpdater"
-  browser_name = "Chromium"
-  browser_product_name = "Chromium"
+  browser_name = "BrowserX"
+  browser_product_name = "BrowserX"
   updater_copyright =
       "Copyright 2020 The Chromium Authors. All rights reserved."
   mac_updater_bundle_identifier = "org.chromium.ChromiumUpdater"

components/search_engines/prepopulated_engines.json

@@ -112,22 +112,13 @@
       "id": 101
     },
 
-    "google": {
-      "name": "Google",
-      "keyword": "google.com",
-      "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
-      "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:prefetchSource}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
-      "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
-      "image_url": "{google:baseSearchByImageURL}upload",
-      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}",
-      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
-      "alternate_urls": [
-        "{google:baseURL}#q={searchTerms}",
-        "{google:baseURL}search#q={searchTerms}",
-        "{google:baseURL}webhp#q={searchTerms}",
-        "{google:baseURL}s#q={searchTerms}",
-        "{google:baseURL}s?q={searchTerms}"
-      ],
+      "google": {
+      "name": "DuckDuckGo",
+      "keyword": "duckduckgo.com",
+      "favicon_url": "https://duckduckgo.com/favicon.ico",
+      "search_url":"https://duckduckgo.com/?q={searchTerms}",
+      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
+      "new_tab_url": "https://duckduckgo.com/chrome_newtab",
       "type": "SEARCH_ENGINE_GOOGLE",
       "id": 1
     },

components/search_engines/search_engine_utils.cc

@@ -35,22 +35,22 @@ SearchEngineType GetEngineType(const GURL& url) {
   // incoming URL's host is "[*.]google.<TLD>".
   if (google_util::IsGoogleHostname(url.host(),
                                     google_util::DISALLOW_SUBDOMAIN))
-    return TemplateURLPrepopulateData::google.type;
+    return SEARCH_ENGINE_DUCKDUCKGO; //TemplateURLPrepopulateData::google.type;
 
   // Now check the rest of the prepopulate data.
   for (size_t i = 0; i < TemplateURLPrepopulateData::kAllEnginesLength; ++i) {
     // First check the main search URL.
     if (SameDomain(
             url, GURL(TemplateURLPrepopulateData::kAllEngines[i]->search_url)))
-      return TemplateURLPrepopulateData::kAllEngines[i]->type;
+      return SEARCH_ENGINE_DUCKDUCKGO; //TemplateURLPrepopulateData::kAllEngines[i]->type;
 
     // Then check the alternate URLs.
     for (size_t j = 0;
          j < TemplateURLPrepopulateData::kAllEngines[i]->alternate_urls_size;
          ++j) {
       if (SameDomain(url, GURL(TemplateURLPrepopulateData::kAllEngines[i]
                                    ->alternate_urls[j])))
-        return TemplateURLPrepopulateData::kAllEngines[i]->type;
+        return SEARCH_ENGINE_DUCKDUCKGO; //TemplateURLPrepopulateData::kAllEngines[i]->type;
     }
   }
 

ios/build/chrome_build.gni

@@ -112,7 +112,7 @@ if (is_chrome_branded) {
   url_unsecure_scheme = "googlechrome"
   url_x_callback_scheme = "googlechrome-x-callback"
 } else {
-  chromium_short_name = "Chromium"
+  chromium_short_name = "BrowserX"
   url_channel_scheme = "chromium-dev"
   url_secure_scheme = "chromiums"
   url_ssoauth_scheme = "$ios_app_bundle_id_prefix.sso.chromium"

ios/chrome/app/resources/Info.plist

@@ -24,7 +24,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>BrowserX</string>
 	<key>CFBundleIcons</key>
 	<dict>
 		<key>CFBundlePrimaryIcon</key>

ios/chrome/app/resources/LaunchScreen.xib

@@ -18,31 +18,39 @@
                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchscreen_app_logo" translatesAutoresizingMaskIntoConstraints="NO" id="K7H-Iv-QNk">
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchscreen_app_logo" translatesAutoresizingMaskIntoConstraints="NO" id="K7H-Iv-QNk">
                         <rect key="frame" x="128" y="369" width="158" height="158"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="lessThanOrEqual" constant="192" id="Ybu-iB-Ad4"/>
                             <constraint firstAttribute="height" relation="lessThanOrEqual" constant="192" id="gGV-z8-zNx"/>
                             <constraint firstAttribute="width" secondItem="K7H-Iv-QNk" secondAttribute="height" multiplier="1:1" id="ion-RZ-6NS"/>
                         </constraints>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchscreen_brand_name" translatesAutoresizingMaskIntoConstraints="NO" id="bAU-qs-X5w">
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchscreen_brand_name" translatesAutoresizingMaskIntoConstraints="NO" id="bAU-qs-X5w">
                         <rect key="frame" x="153.5" y="807" width="107" height="35"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="107" id="0Mf-i7-mvo"/>
                             <constraint firstAttribute="height" constant="35" id="7Gs-G7-OR2"/>
                         </constraints>
                     </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BrowserX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzl-yT-hZb">
+                        <rect key="frame" x="136.5" y="427.5" width="141" height="41"/>
+                        <fontDescription key="fontDescription" style="UICTFontTextStyleTitle0"/>
+                        <color key="textColor" red="0.9394512773" green="0.2508294284" blue="0.2487185895" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <color key="backgroundColor" name="background_color"/>
                 <constraints>
                     <constraint firstItem="K7H-Iv-QNk" firstAttribute="width" secondItem="tRS-Cx-RH3" secondAttribute="width" multiplier="0.381966" id="3hJ-Yo-1Tg"/>
                     <constraint firstItem="K7H-Iv-QNk" firstAttribute="height" secondItem="tRS-Cx-RH3" secondAttribute="height" multiplier="0.381966" id="962-tL-cOd"/>
+                    <constraint firstItem="vzl-yT-hZb" firstAttribute="centerY" secondItem="tRS-Cx-RH3" secondAttribute="centerY" id="DoZ-SJ-CyF"/>
                     <constraint firstItem="K7H-Iv-QNk" firstAttribute="centerY" secondItem="tRS-Cx-RH3" secondAttribute="centerY" id="N7G-n6-9nU">
                         <variation key="heightClass=compact" constant="-10"/>
                     </constraint>
                     <constraint firstItem="K7H-Iv-QNk" firstAttribute="centerX" secondItem="tRS-Cx-RH3" secondAttribute="centerX" id="V5t-fF-KbQ"/>
                     <constraint firstItem="bAU-qs-X5w" firstAttribute="centerX" secondItem="K7H-Iv-QNk" secondAttribute="centerX" id="f8n-OV-luE"/>
+                    <constraint firstItem="vzl-yT-hZb" firstAttribute="centerX" secondItem="tRS-Cx-RH3" secondAttribute="centerX" id="og1-dI-sw7"/>
                     <constraint firstAttribute="bottomMargin" secondItem="bAU-qs-X5w" secondAttribute="bottom" constant="20" id="p2z-ft-dzH"/>
                 </constraints>
                 <variation key="default">

ios/chrome/app/strings/ios_chromium_strings.grd

@@ -191,7 +191,7 @@ locale.  The strings in this file are specific to iOS.
         Use Chromium to Open Links
       </message>
       <message name="IDS_IOS_DEFAULT_BROWSER_TITLE_CTA_EXPERIMENT_SWITCH" desc="Title of the default browser promotion modal. [iOS only]">
-        Switch to Chromium
+        Switch to BrowserX
       </message>
       <message name="IDS_IOS_DEFAULT_BROWSER_DESCRIPTION" desc="Description of the default browser promotion modal. [iOS only]">
         To make Chromium your default browser, open Settings. Tap Default Browser App, and then select Chromium.
@@ -221,10 +221,10 @@ locale.  The strings in this file are specific to iOS.
         Chromium uses Face ID to ensure authorized access to your passwords.
       </message>
       <message name="IDS_IOS_FIRSTRUN_AGREE_TO_TERMS" desc="Label containing a link to the Terms of Service, displayed in the first run flow. [Length: 117em] [iOS only]">
-        By using Chromium, you agree to the <ph name="BEGIN_LINK_TOS">BEGIN_LINK_TOS</ph>Terms of Service<ph name="END_LINK_TOS">END_LINK_TOS</ph>.
+        By using BrowserX, you agree to the <ph name="BEGIN_LINK_TOS">BEGIN_LINK_TOS</ph>Terms of Service<ph name="END_LINK_TOS">END_LINK_TOS</ph>.
       </message>
       <message name="IDS_IOS_FIRSTRUN_NEW_OPT_IN_LABEL" desc="User metrics opt-in label [Length: 80em] [iOS only]">
-        Help make Chromium better by sending usage statistics and crash reports to Google.
+        Help make BrowserX better by sending usage statistics and crash reports to Google.
       </message>
       <message name="IDS_IOS_FIRSTRUN_WELCOME_TO_CHROME" desc="Title on the Welcome to Chromium screen presented to the user on First Run. [iOS only]">
         Welcome to Chromium

ios/web_view/shell/shell_view_controller.m

@@ -754,7 +754,7 @@ - (BOOL)textFieldShouldReturn:(UITextField*)field {
         [enteredText stringByAddingPercentEncodingWithAllowedCharacters:
                          [NSCharacterSet URLQueryAllowedCharacterSet]];
     enteredText = [NSString
-        stringWithFormat:@"https://www.google.com/search?q=%@", enteredText];
+        stringWithFormat:@"https://www.duckduckgo.com/?q=%@", enteredText];
     URL = [NSURL URLWithString:enteredText];
   }
   NSURLRequest* request = [NSURLRequest requestWithURL:URL];