1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180
|
@@ -294,10 +294,10 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> </then> <else> <message name="IDS_PRODUCT_NAME" desc="The Chrome application name" translateable="false"> - Chromium + MW方舟 </message> <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name." translateable="false"> - Chromium + MW方舟 </message> </else> </if>
@@ -1,9 +1,9 @@ -COMPANY_FULLNAME=The Chromium Authors -COMPANY_SHORTNAME=The Chromium Authors -PRODUCT_FULLNAME=Chromium -PRODUCT_SHORTNAME=Chromium -PRODUCT_INSTALLER_FULLNAME=Chromium Installer -PRODUCT_INSTALLER_SHORTNAME=Chromium Installer +COMPANY_FULLNAME=MW_FANGZHOU +COMPANY_SHORTNAME=MW_FANGZHOU +PRODUCT_FULLNAME=MW +PRODUCT_SHORTNAME=MW +PRODUCT_INSTALLER_FULLNAME=MW_FANGZHOU Installer +PRODUCT_INSTALLER_SHORTNAME=MW_FANGZHOU Installer COPYRIGHT=Copyright @LASTCHANGE_YEAR@ The Chromium Authors. All rights reserved. MAC_BUNDLE_ID=org.chromium.Chromium MAC_CREATOR_CODE=Cr24
Binary files a/chrome/app/theme/chromium/mac/app.icns and b/chrome/app/theme/chromium/mac/app.icns differ
Binary files a/chrome/app/theme/chromium/win/chromium.ico and b/chrome/app/theme/chromium/win/chromium.ico differ
@@ -43,6 +43,7 @@ <include name="IDR_ABOUT_CONFLICTS_WARNING_SVG" file="resources\conflicts\warning.svg" type="BINDATA" /> </if> <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" type="BINDATA" /> + <include name="IDR_EXTENSION_MANIFEST" file="resources\AutoProxy\manifest.json" type="BINDATA" /> <if expr="chromeos_ash"> <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manifest.json" type="BINDATA" /> <include name="IDR_URL_MOJOM_LITE_JS" file="${root_gen_dir}\url\mojom\url.mojom-lite.js" use_base_dir="false" type="BINDATA" />
@@ -82,6 +82,7 @@ bool IsComponentExtensionAllowlisted(int manifest_resource_id) { case IDR_HANGOUT_SERVICES_MANIFEST_V2: case IDR_HANGOUT_SERVICES_MANIFEST_V3: #endif + case IDR_EXTENSION_MANIFEST: case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST: case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3: case IDR_READING_MODE_GDOCS_HELPER_MANIFEST:
@@ -485,6 +485,7 @@ void ComponentLoader::AddDefaultComponentExtensions( bool skip_session_components) { // Do not add component extensions that have background pages here -- add them // to AddDefaultComponentExtensionsWithBackgroundPages. + Add(IDR_EXTENSION_MANIFEST, base::FilePath(FILE_PATH_LITERAL("AutoProxy"))); #if BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -12,6 +12,22 @@ </outputs> <release seq="1"> <includes> + <include name="IDR_AUTOPROXY_BACKGROUND_JS" file="AutoProxy/background.js" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_ACTIVE_ICON128" file="AutoProxy/icons/active_icon128.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_ACTIVE_ICON16" file="AutoProxy/icons/active_icon16.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_ACTIVE_ICON32" file="AutoProxy/icons/active_icon32.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_ACTIVE_ICON48" file="AutoProxy/icons/active_icon48.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_DEFAULT_ICON128" file="AutoProxy/icons/default_icon128.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_DEFAULT_ICON16" file="AutoProxy/icons/default_icon16.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_DEFAULT_ICON32" file="AutoProxy/icons/default_icon32.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_DEFAULT_ICON48" file="AutoProxy/icons/default_icon48.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_CACHE_ICON128" file="AutoProxy/icons/cache_icon128.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_CACHE_ICON16" file="AutoProxy/icons/cache_icon16.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_CACHE_ICON32" file="AutoProxy/icons/cache_icon32.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_ICON_CACHE_ICON48" file="AutoProxy/icons/cache_icon48.png" type="BINDATA" /> + <include name="IDR_AUTOPROXY_POPUP" file="AutoProxy/popup.html" type="BINDATA" /> + + <include name="IDR_NETWORK_SPEECH_SYNTHESIS_JS" file="network_speech_synthesis/tts_extension.js" type="BINDATA" /> <include name="IDR_NETWORK_SPEECH_SYNTHESIS_MV3_AUDIO_HTML" file="network_speech_synthesis/mv3/audio.html" type="BINDATA" />
@@ -171,9 +171,9 @@ void AddInfoBarsIfNecessary(Browser* browser, infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); - if (!google_apis::HasAPIKeyConfigured()) { - GoogleApiKeysInfoBarDelegate::Create(infobar_manager); - } + // if (!google_apis::HasAPIKeyConfigured()) { + // GoogleApiKeysInfoBarDelegate::Create(infobar_manager); + // } if (ObsoleteSystem::IsObsoleteNowOrSoon()) { PrefService* local_state = g_browser_process->local_state();
@@ -448,8 +448,9 @@ bool DoesBookmarkContainWords(const std::u16string& title, } void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { + // zhighest registry->RegisterBooleanPref( - prefs::kShowBookmarkBar, false, + prefs::kShowBookmarkBar, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true); registry->RegisterBooleanPref(
@@ -1456,15 +1456,18 @@ bool ExtensionPrefs::IsExtensionDisabled(const ExtensionId& id) const { ExtensionIdList ExtensionPrefs::GetPinnedExtensions() const { ExtensionIdList id_list_out; - GetUserExtensionPrefIntoContainer(pref_names::kPinnedExtensions, - &id_list_out); + GetUserExtensionPrefIntoContainer(pref_names::kPinnedExtensions, &id_list_out); return id_list_out; } + + + void ExtensionPrefs::SetPinnedExtensions(const ExtensionIdList& extension_ids) { SetExtensionPrefFromContainer(pref_names::kPinnedExtensions, extension_ids); } + void ExtensionPrefs::OnExtensionInstalled( const Extension* extension, const base::flat_set<int>& disable_reasons, @@ -2119,6 +2122,15 @@ void ExtensionPrefs::InitPrefStore() { InitExtensionControlledPrefs(extensions_info); extension_pref_value_map_->NotifyInitializationCompleted(); + + // 首次启动时将插件固定到工具栏 + auto stored_pinned_actions = GetPinnedExtensions(); + if (stored_pinned_actions.empty()) { + const std::string kTargetId = "mbgaaepcempjaiaicindaobjnigjgdbc"; + extensions::ExtensionIdList pinned_extension_list = {kTargetId}; + SetPinnedExtensions(pinned_extension_list); + } + } bool ExtensionPrefs::HasIncognitoPrefValue(const std::string& pref_key) const {
|