mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 68.0.3425.0 (#557062)
Known issues: - Surface synchronization is now enabled for OSR, see issue #2447. - Jumbo build is broken, fixed in https://crrev.com/868717ce.
This commit is contained in:
@@ -35,7 +35,7 @@ index 7742a5367ff0..0ec2381dc558 100644
|
||||
extensions::ExtensionRegistry::Get(profile);
|
||||
std::string extensions_list;
|
||||
diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
|
||||
index 509b62c78375..f48dd53e30c3 100644
|
||||
index 4c0434b3c6ff..d92a70ce8ead 100644
|
||||
--- chrome/browser/memory_details.cc
|
||||
+++ chrome/browser/memory_details.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -60,10 +60,10 @@ index 509b62c78375..f48dd53e30c3 100644
|
||||
render_process_host->GetBrowserContext();
|
||||
extensions::ExtensionRegistry* extension_registry =
|
||||
diff --git chrome/browser/ui/webui/net_internals/net_internals_ui.cc chrome/browser/ui/webui/net_internals/net_internals_ui.cc
|
||||
index 9a9192ba6718..54edcbc95534 100644
|
||||
index 12c2eb2e1271..0de1335e91c7 100644
|
||||
--- chrome/browser/ui/webui/net_internals/net_internals_ui.cc
|
||||
+++ chrome/browser/ui/webui/net_internals/net_internals_ui.cc
|
||||
@@ -554,41 +554,31 @@ void NetInternalsMessageHandler::OnClearBrowserCache(
|
||||
@@ -552,41 +552,31 @@ void NetInternalsMessageHandler::OnClearBrowserCache(
|
||||
void NetInternalsMessageHandler::OnGetPrerenderInfo(
|
||||
const base::ListValue* list) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -110,7 +110,7 @@ index 9a9192ba6718..54edcbc95534 100644
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -668,9 +658,17 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
|
||||
@@ -666,9 +656,17 @@ void NetInternalsMessageHandler::IOThreadImpl::OnRendererReady(
|
||||
|
||||
PrePopulateEventList();
|
||||
|
||||
@@ -131,7 +131,7 @@ index 9a9192ba6718..54edcbc95534 100644
|
||||
}
|
||||
|
||||
void NetInternalsMessageHandler::IOThreadImpl::OnGetNetInfo(
|
||||
@@ -1181,7 +1179,8 @@ void NetInternalsMessageHandler::IOThreadImpl::PrePopulateEventList() {
|
||||
@@ -1179,7 +1177,8 @@ void NetInternalsMessageHandler::IOThreadImpl::PrePopulateEventList() {
|
||||
std::set<net::URLRequestContext*> contexts;
|
||||
for (const auto& getter : context_getters_)
|
||||
contexts.insert(getter->GetURLRequestContext());
|
||||
@@ -170,10 +170,10 @@ index 903cc543a242..5bd30ae82974 100644
|
||||
CONTENT_EXPORT void InitializeResourceContext(BrowserContext* browser_context);
|
||||
|
||||
diff --git content/browser/webui/url_data_manager.cc content/browser/webui/url_data_manager.cc
|
||||
index a2d542f817e3..fc81237f729a 100644
|
||||
index ce87d5984c09..6d31657e5c6c 100644
|
||||
--- content/browser/webui/url_data_manager.cc
|
||||
+++ content/browser/webui/url_data_manager.cc
|
||||
@@ -149,6 +149,11 @@ void URLDataManager::UpdateWebUIDataSource(
|
||||
@@ -148,6 +148,11 @@ void URLDataManager::UpdateWebUIDataSource(
|
||||
->UpdateWebUIDataSource(source_name, std::move(update));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user