mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Update to Chromium version 92.0.4515.0 (#885287)
This commit is contained in:
		| @@ -1,5 +1,5 @@ | ||||
| diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn | ||||
| index 94e40ecd52276..597810f96ba53 100644 | ||||
| index adadb4264e6b7..b7c910f035fe6 100644 | ||||
| --- chrome/browser/ui/BUILD.gn | ||||
| +++ chrome/browser/ui/BUILD.gn | ||||
| @@ -12,6 +12,7 @@ import("//build/config/features.gni") | ||||
| @@ -10,7 +10,7 @@ index 94e40ecd52276..597810f96ba53 100644 | ||||
|  import("//chrome/browser/buildflags.gni") | ||||
|  import("//chrome/common/features.gni") | ||||
|  import("//chromeos/assistant/assistant.gni") | ||||
| @@ -335,6 +336,10 @@ static_library("ui") { | ||||
| @@ -329,6 +330,10 @@ static_library("ui") { | ||||
|      "//build/config/compiler:wexit_time_destructors", | ||||
|    ] | ||||
|   | ||||
| @@ -21,7 +21,7 @@ index 94e40ecd52276..597810f96ba53 100644 | ||||
|    # Since browser and browser_ui actually depend on each other, | ||||
|    # we must omit the dependency from browser_ui to browser. | ||||
|    # However, this means browser_ui and browser should more or less | ||||
| @@ -357,6 +362,7 @@ static_library("ui") { | ||||
| @@ -351,6 +356,7 @@ static_library("ui") { | ||||
|      "//build:branding_buildflags", | ||||
|      "//build:chromeos_buildflags", | ||||
|      "//cc/paint", | ||||
| @@ -29,16 +29,16 @@ index 94e40ecd52276..597810f96ba53 100644 | ||||
|      "//chrome:extra_resources", | ||||
|      "//chrome:resources", | ||||
|      "//chrome:strings", | ||||
| @@ -1609,6 +1615,7 @@ static_library("ui") { | ||||
|        "//components/page_load_metrics/browser", | ||||
|        "//components/performance_manager:site_data_proto", | ||||
| @@ -4774,6 +4780,7 @@ static_library("ui") { | ||||
|    if (enable_basic_printing) { | ||||
|      deps += [ | ||||
|        "//components/printing/browser", | ||||
| +      "//components/printing/common:mojo_interfaces", | ||||
|        "//components/profile_metrics", | ||||
|        "//components/reading_list/features:flags", | ||||
|        "//components/safe_browsing/core/common:safe_browsing_policy_handler", | ||||
|        "//printing", | ||||
|      ] | ||||
|      if (use_cups) { | ||||
| diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc | ||||
| index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
| index fcd1f66b3a7a4..4f135460de918 100644 | ||||
| --- chrome/browser/ui/webui/net_export_ui.cc | ||||
| +++ chrome/browser/ui/webui/net_export_ui.cc | ||||
| @@ -21,6 +21,7 @@ | ||||
| @@ -60,7 +60,7 @@ index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
|  #if defined(OS_ANDROID) | ||||
|  #include "chrome/browser/android/intent_helper.h" | ||||
|  #endif | ||||
| @@ -136,6 +141,13 @@ class NetExportMessageHandler | ||||
| @@ -137,6 +142,13 @@ class NetExportMessageHandler | ||||
|    // NetLog file. | ||||
|    void ShowSelectFileDialog(const base::FilePath& default_path); | ||||
|   | ||||
| @@ -74,7 +74,7 @@ index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
|    // Cached pointer to SystemNetworkContextManager's NetExportFileWriter. | ||||
|    net_log::NetExportFileWriter* file_writer_; | ||||
|   | ||||
| @@ -230,6 +242,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) { | ||||
| @@ -232,6 +244,13 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) { | ||||
|    if (UsingMobileUI()) { | ||||
|      StartNetLog(base::FilePath()); | ||||
|    } else { | ||||
| @@ -88,7 +88,7 @@ index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
|      base::FilePath initial_dir = last_save_dir.Pointer()->empty() ? | ||||
|          DownloadPrefs::FromBrowserContext( | ||||
|              web_ui()->GetWebContents()->GetBrowserContext())->DownloadPath() : | ||||
| @@ -246,6 +265,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) { | ||||
| @@ -248,6 +267,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) { | ||||
|    std::unique_ptr<base::DictionaryValue> ui_thread_polled_data( | ||||
|        new base::DictionaryValue()); | ||||
|   | ||||
| @@ -96,7 +96,7 @@ index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
|    Profile* profile = Profile::FromWebUI(web_ui()); | ||||
|    SetIfNotNull(ui_thread_polled_data.get(), "prerenderInfo", | ||||
|                 chrome_browser_net::GetPrerenderInfo(profile)); | ||||
| @@ -255,6 +275,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) { | ||||
| @@ -257,6 +277,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) { | ||||
|    SetIfNotNull(ui_thread_polled_data.get(), "serviceProviders", | ||||
|                 chrome_browser_net::GetWindowsServiceProviders()); | ||||
|  #endif | ||||
| @@ -104,7 +104,7 @@ index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
|   | ||||
|    file_writer_->StopNetLog(std::move(ui_thread_polled_data)); | ||||
|  } | ||||
| @@ -372,6 +393,42 @@ void NetExportMessageHandler::ShowSelectFileDialog( | ||||
| @@ -373,6 +394,42 @@ void NetExportMessageHandler::ShowSelectFileDialog( | ||||
|        &file_type_info, 0, base::FilePath::StringType(), owning_window, nullptr); | ||||
|  } | ||||
|   | ||||
| @@ -129,8 +129,8 @@ index a12ad7b5e7eb6..9dba0f6642313 100644 | ||||
| +  params.accept_types.push_back(CefString(initial_path.Extension())); | ||||
| + | ||||
| +  cef_browser->RunFileChooser( | ||||
| +      params, base::Bind(&NetExportMessageHandler::SaveAsDialogDismissed, | ||||
| +                         weak_ptr_factory_.GetWeakPtr())); | ||||
| +      params, base::BindOnce(&NetExportMessageHandler::SaveAsDialogDismissed, | ||||
| +                             weak_ptr_factory_.GetWeakPtr())); | ||||
| +} | ||||
| + | ||||
| +void NetExportMessageHandler::SaveAsDialogDismissed( | ||||
|   | ||||
		Reference in New Issue
	
	Block a user