diff --git a/.gitignore b/.gitignore
index b786188bc..928c0a70f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .idea/
 build/
 dist/
+venv/
 *.log
 __pycache__/
 *.pyc
@@ -16,3 +17,5 @@ unittests/GPUCache/
 unittests/blob_storage/
 unittests/webrtc_event_logs/
 .DS_Store
+MediaDeviceSalts
+MediaDeviceSalts-journal
diff --git a/Authors b/Authors
index b44b24e68..181289824 100644
--- a/Authors
+++ b/Authors
@@ -20,3 +20,4 @@ Contributors:
     nobodyguy <https://github.com/nobodyguy>
     Elliot Woods <https://github.com/elliotwoods>
     Bryan Koroleski <https://github.com/bryan-koroleski-fivestars>
+    Ted Lin <https://github.com/linesight>
diff --git a/README.md b/README.md
index 4ff688b09..eee95cffe 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
 Command to install with pip:
 
 ```
-pip install cefpython3==66.1
+pip install cefpython3==123.0
 ```
 
 Hosted at [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3). On Linux pip 8.1+ is required.
@@ -55,7 +55,7 @@ Below is a table with supported platforms, python versions and architectures.
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
+Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 / 3.10 / 3.11 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
 Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
 Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
@@ -87,7 +87,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
   [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22)
 - To search documentation use GitHub "This repository" search
   at the top. To narrow results to documentation only select
-  "Markdown" in the side pane.
+  "Markdown" in the right pane.
 
 ## Support development
 
@@ -195,7 +195,6 @@ at this moment.
  * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object
  * [Request](api/Request.md#request-class) class
  * [Response](api/Response.md#response-object) object
- * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object
  * [WebRequest](api/WebRequest.md#webrequest-class) class
  * [WindowInfo](api/WindowInfo.md#windowinfo-class) class
  * [WindowUtils](api/WindowUtils.md#windowutils-class) class
@@ -204,6 +203,7 @@ at this moment.
 #### Client handlers (interfaces)
 
  * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface)
+ * [CookieAccessFilter](api/CookieAccessFilter.md#cookieaccessfilter-interface)
  * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface)
  * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
  * [FocusHandler](api/FocusHandler.md#focushandler-interface)
@@ -230,7 +230,6 @@ at this moment.
   * [_OnAccessibilityTreeChange](api/AccessibilityHandler.md#_onaccessibilitytreechange)
   * [_OnAccessibilityLocationChange](api/AccessibilityHandler.md#_onaccessibilitylocationchange)
 * [Application settings](api/ApplicationSettings.md#application-settings)
-  * [accept_language_list](api/ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](api/ApplicationSettings.md#app_user_model_id)
   * [auto_zooming](api/ApplicationSettings.md#auto_zooming)
   * [background_color](api/ApplicationSettings.md#background_color)
@@ -241,7 +240,6 @@ at this moment.
   * [downloads_enabled](api/ApplicationSettings.md#downloads_enabled)
   * [external_message_pump](api/ApplicationSettings.md#external_message_pump)
   * [framework_dir_path](api/ApplicationSettings.md#framework_dir_path)
-  * [ignore_certificate_errors](api/ApplicationSettings.md#ignore_certificate_errors)
   * [javascript_flags](api/ApplicationSettings.md#javascript_flags)
   * [locale](api/ApplicationSettings.md#locale)
   * [locales_dir_path](api/ApplicationSettings.md#locales_dir_path)
@@ -249,19 +247,15 @@ at this moment.
   * [log_file](api/ApplicationSettings.md#log_file)
   * [log_severity](api/ApplicationSettings.md#log_severity)
   * [multi_threaded_message_loop](api/ApplicationSettings.md#multi_threaded_message_loop)
-  * [net_security_expiration_enabled](api/ApplicationSettings.md#net_security_expiration_enabled)
   * [pack_loading_disabled](api/ApplicationSettings.md#pack_loading_disabled)
   * [persist_session_cookies](api/ApplicationSettings.md#persist_session_cookies)
   * [persist_user_preferences](api/ApplicationSettings.md#persist_user_preferences)
-  * [product_version](api/ApplicationSettings.md#product_version)
   * [remote_debugging_port](api/ApplicationSettings.md#remote_debugging_port)
   * [resources_dir_path](api/ApplicationSettings.md#resources_dir_path)
-  * [single_process](api/ApplicationSettings.md#single_process)
   * [string_encoding](api/ApplicationSettings.md#string_encoding)
   * [uncaught_exception_stack_size](api/ApplicationSettings.md#uncaught_exception_stack_size)
   * [unique_request_context_per_browser](api/ApplicationSettings.md#unique_request_context_per_browser)
   * [user_agent](api/ApplicationSettings.md#user_agent)
-  * [user_data_path](api/ApplicationSettings.md#user_data_path)
   * [windowless_rendering_enabled](api/ApplicationSettings.md#windowless_rendering_enabled)
 * [Browser (object)](api/Browser.md#browser-object)
   * [AddWordToDictionary](api/Browser.md#addwordtodictionary)
@@ -308,7 +302,6 @@ at this moment.
   * [Invalidate](api/Browser.md#invalidate)
   * [IsFullscreen](api/Browser.md#isfullscreen)
   * [IsLoading](api/Browser.md#isloading)
-  * [IsMouseCursorChangeDisabled](api/Browser.md#ismousecursorchangedisabled)
   * [IsPopup](api/Browser.md#ispopup)
   * [IsWindowRenderingDisabled](api/Browser.md#iswindowrenderingdisabled)
   * [LoadUrl](api/Browser.md#loadurl)
@@ -326,13 +319,11 @@ at this moment.
   * [SendMouseClickEvent](api/Browser.md#sendmouseclickevent)
   * [SendMouseMoveEvent](api/Browser.md#sendmousemoveevent)
   * [SendMouseWheelEvent](api/Browser.md#sendmousewheelevent)
-  * [SendFocusEvent](api/Browser.md#sendfocusevent)
   * [SendCaptureLostEvent](api/Browser.md#sendcapturelostevent)
   * [SetAccessibilityState](api/Browser.md#setaccessibilitystate)
   * [SetClientCallback](api/Browser.md#setclientcallback)
   * [SetClientHandler](api/Browser.md#setclienthandler)
   * [SetFocus](api/Browser.md#setfocus)
-  * [SetMouseCursorChangeDisabled](api/Browser.md#setmousecursorchangedisabled)
   * [SetJavascriptBindings](api/Browser.md#setjavascriptbindings)
   * [SetUserData](api/Browser.md#setuserdata)
   * [SetZoomLevel](api/Browser.md#setzoomlevel)
@@ -346,27 +337,21 @@ at this moment.
   * [WasHidden](api/Browser.md#washidden)
 * [Browser settings](api/BrowserSettings.md#browser-settings)
   * [Font settings](api/BrowserSettings.md#font-settings)
-  * [accept_language_list](api/BrowserSettings.md#accept_language_list)
-  * [application_cache_disabled](api/BrowserSettings.md#application_cache_disabled)
   * [background_color](api/BrowserSettings.md#background_color)
   * [databases_disabled](api/BrowserSettings.md#databases_disabled)
   * [default_encoding](api/BrowserSettings.md#default_encoding)
   * [dom_paste_disabled](api/BrowserSettings.md#dom_paste_disabled)
-  * [file_access_from_file_urls_allowed](api/BrowserSettings.md#file_access_from_file_urls_allowed)
   * [inherit_client_handlers_for_popups](api/BrowserSettings.md#inherit_client_handlers_for_popups)
   * [image_load_disabled](api/BrowserSettings.md#image_load_disabled)
   * [javascript_disabled](api/BrowserSettings.md#javascript_disabled)
   * [javascript_close_windows_disallowed](api/BrowserSettings.md#javascript_close_windows_disallowed)
   * [javascript_access_clipboard_disallowed](api/BrowserSettings.md#javascript_access_clipboard_disallowed)
   * [local_storage_disabled](api/BrowserSettings.md#local_storage_disabled)
-  * [plugins_disabled](api/BrowserSettings.md#plugins_disabled)
   * [remote_fonts](api/BrowserSettings.md#remote_fonts)
   * [shrink_standalone_images_to_fit](api/BrowserSettings.md#shrink_standalone_images_to_fit)
   * [tab_to_links_disabled](api/BrowserSettings.md#tab_to_links_disabled)
   * [text_area_resize_disabled](api/BrowserSettings.md#text_area_resize_disabled)
-  * [universal_access_from_file_urls_allowed](api/BrowserSettings.md#universal_access_from_file_urls_allowed)
   * [user_style_sheet_location](api/BrowserSettings.md#user_style_sheet_location)
-  * [web_security_disabled](api/BrowserSettings.md#web_security_disabled)
   * [webgl_disabled](api/BrowserSettings.md#webgl_disabled)
   * [windowless_frame_rate](api/BrowserSettings.md#windowless_frame_rate)
 * [Callback (object)](api/Callback.md#callback-object)
@@ -427,9 +412,6 @@ at this moment.
   * [GetExpires](api/Cookie.md#getexpires)
 * [CookieManager (class)](api/CookieManager.md#cookiemanager-class)
   * [GetGlobalManager](api/CookieManager.md#getglobalmanager)
-  * [GetBlockingManager](api/CookieManager.md#getblockingmanager)
-  * [CreateManager](api/CookieManager.md#createmanager)
-  * [SetSupportedSchemes](api/CookieManager.md#setsupportedschemes)
   * [VisitAllCookies](api/CookieManager.md#visitallcookies)
   * [VisitUrlCookies](api/CookieManager.md#visiturlcookies)
   * [SetCookie](api/CookieManager.md#setcookie)
@@ -449,7 +431,6 @@ at this moment.
 * [DownloadHandler](api/DownloadHandler.md#downloadhandler)
 * [DpiAware (class)](api/DpiAware.md#dpiaware-class)
   * [CalculateWindowSize](api/DpiAware.md#calculatewindowsize)
-  * [EnableHighDpiSupport](api/DpiAware.md#enablehighdpisupport)
   * [GetSystemDpi](api/DpiAware.md#getsystemdpi)
   * [IsProcessDpiAware](api/DpiAware.md#isprocessdpiaware)
   * [SetProcessDpiAware](api/DpiAware.md#setprocessdpiaware)
@@ -616,10 +597,7 @@ at this moment.
   * [GetResourceType](api/Request.md#getresourcetype)
   * [GetTransitionType](api/Request.md#gettransitiontype)
 * [RequestHandler (interface)](api/RequestHandler.md#requesthandler-interface)
-  * [CanGetCookies](api/RequestHandler.md#cangetcookies)
-  * [CanSetCookie](api/RequestHandler.md#cansetcookie)
   * [GetAuthCredentials](api/RequestHandler.md#getauthcredentials)
-  * [GetCookieManager](api/RequestHandler.md#getcookiemanager)
   * [GetResourceHandler](api/RequestHandler.md#getresourcehandler)
   * [OnBeforeBrowse](api/RequestHandler.md#onbeforebrowse)
   * [_OnBeforePluginLoad](api/RequestHandler.md#_onbeforepluginload)
@@ -657,11 +635,6 @@ at this moment.
   * [OnContextCreated](api/V8ContextHandler.md#oncontextcreated)
   * [OnContextReleased](api/V8ContextHandler.md#oncontextreleased)
 * [Virtual Key codes](api/VirtualKey.md#virtual-key-codes)
-* [WebPluginInfo (object)](api/WebPluginInfo.md#webplugininfo-object)
-  * [GetName](api/WebPluginInfo.md#getname)
-  * [GetPath](api/WebPluginInfo.md#getpath)
-  * [GetVersion](api/WebPluginInfo.md#getversion)
-  * [GetDescription](api/WebPluginInfo.md#getdescription)
 * [WebRequest (class)](api/WebRequest.md#webrequest-class)
   * [Create](api/WebRequest.md#create)
   * [GetRequest](api/WebRequest.md#getrequest)
diff --git a/api/API-categories.md b/api/API-categories.md
index d1d7320e8..024694cd6 100644
--- a/api/API-categories.md
+++ b/api/API-categories.md
@@ -30,7 +30,6 @@
  * [PaintBuffer](PaintBuffer.md#paintbuffer-object) object
  * [Request](Request.md#request-class) class
  * [Response](Response.md#response-object) object
- * [WebPluginInfo](WebPluginInfo.md#webplugininfo-object) object
  * [WebRequest](WebRequest.md#webrequest-class) class
  * [WindowInfo](WindowInfo.md#windowinfo-class) class
  * [WindowUtils](WindowUtils.md#windowutils-class) class
diff --git a/api/API-index.md b/api/API-index.md
index 9535cb5b7..3e5143e07 100644
--- a/api/API-index.md
+++ b/api/API-index.md
@@ -6,7 +6,6 @@
   * [_OnAccessibilityTreeChange](AccessibilityHandler.md#_onaccessibilitytreechange)
   * [_OnAccessibilityLocationChange](AccessibilityHandler.md#_onaccessibilitylocationchange)
 * [Application settings](ApplicationSettings.md#application-settings)
-  * [accept_language_list](ApplicationSettings.md#accept_language_list)
   * [app_user_model_id](ApplicationSettings.md#app_user_model_id)
   * [auto_zooming](ApplicationSettings.md#auto_zooming)
   * [background_color](ApplicationSettings.md#background_color)
@@ -17,7 +16,6 @@
   * [downloads_enabled](ApplicationSettings.md#downloads_enabled)
   * [external_message_pump](ApplicationSettings.md#external_message_pump)
   * [framework_dir_path](ApplicationSettings.md#framework_dir_path)
-  * [ignore_certificate_errors](ApplicationSettings.md#ignore_certificate_errors)
   * [javascript_flags](ApplicationSettings.md#javascript_flags)
   * [locale](ApplicationSettings.md#locale)
   * [locales_dir_path](ApplicationSettings.md#locales_dir_path)
@@ -25,19 +23,15 @@
   * [log_file](ApplicationSettings.md#log_file)
   * [log_severity](ApplicationSettings.md#log_severity)
   * [multi_threaded_message_loop](ApplicationSettings.md#multi_threaded_message_loop)
-  * [net_security_expiration_enabled](ApplicationSettings.md#net_security_expiration_enabled)
   * [pack_loading_disabled](ApplicationSettings.md#pack_loading_disabled)
   * [persist_session_cookies](ApplicationSettings.md#persist_session_cookies)
   * [persist_user_preferences](ApplicationSettings.md#persist_user_preferences)
-  * [product_version](ApplicationSettings.md#product_version)
   * [remote_debugging_port](ApplicationSettings.md#remote_debugging_port)
   * [resources_dir_path](ApplicationSettings.md#resources_dir_path)
-  * [single_process](ApplicationSettings.md#single_process)
   * [string_encoding](ApplicationSettings.md#string_encoding)
   * [uncaught_exception_stack_size](ApplicationSettings.md#uncaught_exception_stack_size)
   * [unique_request_context_per_browser](ApplicationSettings.md#unique_request_context_per_browser)
   * [user_agent](ApplicationSettings.md#user_agent)
-  * [user_data_path](ApplicationSettings.md#user_data_path)
   * [windowless_rendering_enabled](ApplicationSettings.md#windowless_rendering_enabled)
 * [Browser (object)](Browser.md#browser-object)
   * [AddWordToDictionary](Browser.md#addwordtodictionary)
@@ -84,7 +78,6 @@
   * [Invalidate](Browser.md#invalidate)
   * [IsFullscreen](Browser.md#isfullscreen)
   * [IsLoading](Browser.md#isloading)
-  * [IsMouseCursorChangeDisabled](Browser.md#ismousecursorchangedisabled)
   * [IsPopup](Browser.md#ispopup)
   * [IsWindowRenderingDisabled](Browser.md#iswindowrenderingdisabled)
   * [LoadUrl](Browser.md#loadurl)
@@ -102,13 +95,11 @@
   * [SendMouseClickEvent](Browser.md#sendmouseclickevent)
   * [SendMouseMoveEvent](Browser.md#sendmousemoveevent)
   * [SendMouseWheelEvent](Browser.md#sendmousewheelevent)
-  * [SendFocusEvent](Browser.md#sendfocusevent)
   * [SendCaptureLostEvent](Browser.md#sendcapturelostevent)
   * [SetAccessibilityState](Browser.md#setaccessibilitystate)
   * [SetClientCallback](Browser.md#setclientcallback)
   * [SetClientHandler](Browser.md#setclienthandler)
   * [SetFocus](Browser.md#setfocus)
-  * [SetMouseCursorChangeDisabled](Browser.md#setmousecursorchangedisabled)
   * [SetJavascriptBindings](Browser.md#setjavascriptbindings)
   * [SetUserData](Browser.md#setuserdata)
   * [SetZoomLevel](Browser.md#setzoomlevel)
@@ -122,27 +113,21 @@
   * [WasHidden](Browser.md#washidden)
 * [Browser settings](BrowserSettings.md#browser-settings)
   * [Font settings](BrowserSettings.md#font-settings)
-  * [accept_language_list](BrowserSettings.md#accept_language_list)
-  * [application_cache_disabled](BrowserSettings.md#application_cache_disabled)
   * [background_color](BrowserSettings.md#background_color)
   * [databases_disabled](BrowserSettings.md#databases_disabled)
   * [default_encoding](BrowserSettings.md#default_encoding)
   * [dom_paste_disabled](BrowserSettings.md#dom_paste_disabled)
-  * [file_access_from_file_urls_allowed](BrowserSettings.md#file_access_from_file_urls_allowed)
   * [inherit_client_handlers_for_popups](BrowserSettings.md#inherit_client_handlers_for_popups)
   * [image_load_disabled](BrowserSettings.md#image_load_disabled)
   * [javascript_disabled](BrowserSettings.md#javascript_disabled)
   * [javascript_close_windows_disallowed](BrowserSettings.md#javascript_close_windows_disallowed)
   * [javascript_access_clipboard_disallowed](BrowserSettings.md#javascript_access_clipboard_disallowed)
   * [local_storage_disabled](BrowserSettings.md#local_storage_disabled)
-  * [plugins_disabled](BrowserSettings.md#plugins_disabled)
   * [remote_fonts](BrowserSettings.md#remote_fonts)
   * [shrink_standalone_images_to_fit](BrowserSettings.md#shrink_standalone_images_to_fit)
   * [tab_to_links_disabled](BrowserSettings.md#tab_to_links_disabled)
   * [text_area_resize_disabled](BrowserSettings.md#text_area_resize_disabled)
-  * [universal_access_from_file_urls_allowed](BrowserSettings.md#universal_access_from_file_urls_allowed)
   * [user_style_sheet_location](BrowserSettings.md#user_style_sheet_location)
-  * [web_security_disabled](BrowserSettings.md#web_security_disabled)
   * [webgl_disabled](BrowserSettings.md#webgl_disabled)
   * [windowless_frame_rate](BrowserSettings.md#windowless_frame_rate)
 * [Callback (object)](Callback.md#callback-object)
@@ -203,9 +188,6 @@
   * [GetExpires](Cookie.md#getexpires)
 * [CookieManager (class)](CookieManager.md#cookiemanager-class)
   * [GetGlobalManager](CookieManager.md#getglobalmanager)
-  * [GetBlockingManager](CookieManager.md#getblockingmanager)
-  * [CreateManager](CookieManager.md#createmanager)
-  * [SetSupportedSchemes](CookieManager.md#setsupportedschemes)
   * [VisitAllCookies](CookieManager.md#visitallcookies)
   * [VisitUrlCookies](CookieManager.md#visiturlcookies)
   * [SetCookie](CookieManager.md#setcookie)
@@ -225,7 +207,6 @@
 * [DownloadHandler](DownloadHandler.md#downloadhandler)
 * [DpiAware (class)](DpiAware.md#dpiaware-class)
   * [CalculateWindowSize](DpiAware.md#calculatewindowsize)
-  * [EnableHighDpiSupport](DpiAware.md#enablehighdpisupport)
   * [GetSystemDpi](DpiAware.md#getsystemdpi)
   * [IsProcessDpiAware](DpiAware.md#isprocessdpiaware)
   * [SetProcessDpiAware](DpiAware.md#setprocessdpiaware)
@@ -392,13 +373,9 @@
   * [GetResourceType](Request.md#getresourcetype)
   * [GetTransitionType](Request.md#gettransitiontype)
 * [RequestHandler (interface)](RequestHandler.md#requesthandler-interface)
-  * [CanGetCookies](RequestHandler.md#cangetcookies)
-  * [CanSetCookie](RequestHandler.md#cansetcookie)
   * [GetAuthCredentials](RequestHandler.md#getauthcredentials)
-  * [GetCookieManager](RequestHandler.md#getcookiemanager)
   * [GetResourceHandler](RequestHandler.md#getresourcehandler)
   * [OnBeforeBrowse](RequestHandler.md#onbeforebrowse)
-  * [_OnBeforePluginLoad](RequestHandler.md#_onbeforepluginload)
   * [OnBeforeResourceLoad](RequestHandler.md#onbeforeresourceload)
   * [_OnCertificateError](RequestHandler.md#_oncertificateerror)
   * [OnQuotaRequest](RequestHandler.md#onquotarequest)
@@ -433,11 +410,6 @@
   * [OnContextCreated](V8ContextHandler.md#oncontextcreated)
   * [OnContextReleased](V8ContextHandler.md#oncontextreleased)
 * [Virtual Key codes](VirtualKey.md#virtual-key-codes)
-* [WebPluginInfo (object)](WebPluginInfo.md#webplugininfo-object)
-  * [GetName](WebPluginInfo.md#getname)
-  * [GetPath](WebPluginInfo.md#getpath)
-  * [GetVersion](WebPluginInfo.md#getversion)
-  * [GetDescription](WebPluginInfo.md#getdescription)
 * [WebRequest (class)](WebRequest.md#webrequest-class)
   * [Create](WebRequest.md#create)
   * [GetRequest](WebRequest.md#getrequest)
diff --git a/api/ApplicationSettings.md b/api/ApplicationSettings.md
index a9ad20f1b..3d8daa2b3 100644
--- a/api/ApplicationSettings.md
+++ b/api/ApplicationSettings.md
@@ -7,7 +7,6 @@
 Table of contents:
 * [Introduction](#introduction)
 * [Settings](#settings)
-  * [accept_language_list](#accept_language_list)
   * [app_user_model_id](#app_user_model_id)
   * [auto_zooming](#auto_zooming)
   * [background_color](#background_color)
@@ -18,7 +17,6 @@ Table of contents:
   * [downloads_enabled](#downloads_enabled)
   * [external_message_pump](#external_message_pump)
   * [framework_dir_path](#framework_dir_path)
-  * [ignore_certificate_errors](#ignore_certificate_errors)
   * [javascript_flags](#javascript_flags)
   * [locale](#locale)
   * [locales_dir_path](#locales_dir_path)
@@ -26,19 +24,15 @@ Table of contents:
   * [log_file](#log_file)
   * [log_severity](#log_severity)
   * [multi_threaded_message_loop](#multi_threaded_message_loop)
-  * [net_security_expiration_enabled](#net_security_expiration_enabled)
   * [pack_loading_disabled](#pack_loading_disabled)
   * [persist_session_cookies](#persist_session_cookies)
   * [persist_user_preferences](#persist_user_preferences)
-  * [product_version](#product_version)
   * [remote_debugging_port](#remote_debugging_port)
   * [resources_dir_path](#resources_dir_path)
-  * [single_process](#single_process)
   * [string_encoding](#string_encoding)
   * [uncaught_exception_stack_size](#uncaught_exception_stack_size)
   * [unique_request_context_per_browser](#unique_request_context_per_browser)
   * [user_agent](#user_agent)
-  * [user_data_path](#user_data_path)
   * [windowless_rendering_enabled](#windowless_rendering_enabled)
 
 
@@ -57,18 +51,6 @@ to Chromium Preferences.
 ## Settings
 
 
-### accept_language_list
-
-(string)
-Comma delimited ordered list of language codes without any
-whitespace that
-will be used in the "Accept-Language" HTTP header. May be overridden on a
-per-browser basis using the CefBrowserSettings.accept_language_list value.
-If both values are empty then "en-US,en" will be used. Can be overridden
-for individual CefRequestContext instances via the
-CefRequestContextSettings.accept_language_list value.
-
-
 ### app_user_model_id
 
 This is setting is applied only on Windows.
@@ -231,40 +213,6 @@ the "framework-dir-path" command-line switch.
 See also [Issue #304](../../../issues/304).
 
 
-### ignore_certificate_errors
-
-(bool)
-Set to true (1) to ignore errors related to invalid SSL certificates.  
-Enabling this setting can lead to potential security vulnerabilities like  
-"man in the middle" attacks. Applications that load content from the  
-internet should not enable this setting. Also configurable using the  
-"ignore-certificate-errors" [command-line switch](CommandLineSwitches.md).
-Can be overridden for individual CefRequestContext instances via the
-CefRequestContextSettings.ignore_certificate_errors value.
-
-__IMPORTANT__: This option not only ignores all certificate errors,
-but it also enables caching of content due to custom patch being
-applied (read more in "NOTE ON CACHING" further down). If you don't
-want this caching feature of insecure content then alternatively you
-can ignore certificate errors using the
-RequestHandler.[_OnCertificateError()](#_oncertificateerror)
-callback. Note that disk caching is enabled only when the "cache_path"
-option is set.
-
-__NOTE ON CACHING__: Chromium by default disallows caching of
-content when there is certificate error. There is a issue125.patch
-in the patches/ directory that can be enabled when doing a custom
-CEF build. This patch changes the caching behavior on sites with SSL
-certificate errors when used with this setting. This patch can be
-applied Chromium sources to allow for caching even when there is
-certificate error, but only when the "ignore_certificate_errors"
-option is set to True.
-When it's set to False then the Chromium's caching behavior does not
-change. Enabling caching with certificate errors is useful on local
-private networks that use self-signed SSL certificates. See the
-referenced CEF topic in [Issue #125](../../../issues/125) for more details.
-
-
 ### javascript_flags
 
 (string)
@@ -424,15 +372,6 @@ the module directory on Windows/Linux or the app bundle Resources directory
 on Mac OS X. Also configurable using the --resources-dir-path switch.
 
 
-### single_process
-
-(bool)
-Set to true (1) to use a single process for the browser and renderer. This  
-run mode is not officially supported by Chromium and is less stable than  
-the multi-process default. Also configurable using the "single-process"  
-[command-line switch](CommandLineSwitches.md).
-
-
 ### string_encoding
 
 (string)
@@ -473,8 +412,7 @@ set `unique_request_context_per_browser` to True.
 
 In upstream CEF each request context may have separate settings like
 cache_path, persist_session_cookies, persist_user_preferences,
-ignore_certificate_errors, enable_net_security_expiration,
-accept_language_list. Such functionality wasn't yet exposed in CEF Python.
+enable_net_security_expiration. Such functionality wasn't yet exposed in CEF Python.
 
 
 ### user_agent
@@ -485,17 +423,6 @@ default User-Agent string will be used. Also configurable using the
 "user-agent" [command-line switch](CommandLineSwitches.md).
 
 
-### user_data_path
-
-(string)
-The location where user data such as spell checking dictionary files will
-be stored on disk. If empty then the default platform-specific user data
-directory will be used (`"~/.cef_user_data"` directory on Linux,
-`"~/Library/Application Support/CEF/User Data"` directory on Mac OS X,
-`"Local Settings\Application Data\CEF\User Data"` directory under the user
-profile directory on Windows).
-
-
 ### windowless_rendering_enabled
 
 (bool)
diff --git a/api/Browser.md b/api/Browser.md
index b34b90e2f..6e7ef9dba 100644
--- a/api/Browser.md
+++ b/api/Browser.md
@@ -63,7 +63,6 @@ Table of contents:
   * [Invalidate](#invalidate)
   * [IsFullscreen](#isfullscreen)
   * [IsLoading](#isloading)
-  * [IsMouseCursorChangeDisabled](#ismousecursorchangedisabled)
   * [IsPopup](#ispopup)
   * [IsWindowRenderingDisabled](#iswindowrenderingdisabled)
   * [LoadUrl](#loadurl)
@@ -81,13 +80,11 @@ Table of contents:
   * [SendMouseClickEvent](#sendmouseclickevent)
   * [SendMouseMoveEvent](#sendmousemoveevent)
   * [SendMouseWheelEvent](#sendmousewheelevent)
-  * [SendFocusEvent](#sendfocusevent)
   * [SendCaptureLostEvent](#sendcapturelostevent)
   * [SetAccessibilityState](#setaccessibilitystate)
   * [SetClientCallback](#setclientcallback)
   * [SetClientHandler](#setclienthandler)
   * [SetFocus](#setfocus)
-  * [SetMouseCursorChangeDisabled](#setmousecursorchangedisabled)
   * [SetJavascriptBindings](#setjavascriptbindings)
   * [SetUserData](#setuserdata)
   * [SetZoomLevel](#setzoomlevel)
@@ -659,17 +656,6 @@ Available only in CEF 3. Not yet implemented.
 Returns true if the browser is currently loading.
 
 
-### IsMouseCursorChangeDisabled
-
-| | |
-| --- | --- |
-| __Return__ | bool |
-
-Available only in CEF 3.
-
-Returns true if mouse cursor change is disabled.
-
-
 ### IsPopup
 
 | | |
@@ -894,16 +880,6 @@ flags see SendMouseClickEvent().
 Send a mouse wheel event to the browser. The |x| and |y| coordinates are relative to the upper-left corner of the view. The |deltaX| and |deltaY| values represent the movement delta in the X and Y directions respectively. In order to scroll inside select popups with window rendering disabled [RenderHandler](RenderHandler.md).GetScreenPoint() should be implemented properly. For a list of modifiers flags see SendMouseClickEvent().
 
 
-### SendFocusEvent
-
-| Parameter | Type |
-| --- | --- |
-| setFocus | bool |
-| __Return__ | void |
-
-Send a focus event to the browser.
-
-
 ### SendCaptureLostEvent
 
 | | |
@@ -988,16 +964,6 @@ LifespanHandler etc.
 Set whether the browser is focused.
 
 
-### SetMouseCursorChangeDisabled
-
-| Parameter | Type |
-| --- | --- |
-| disabled | bool |
-| __Return__ | void |
-
-Set whether mouse cursor change is disabled.
-
-
 ### SetJavascriptBindings
 
 | Parameter | Type |
diff --git a/api/BrowserSettings.md b/api/BrowserSettings.md
index ed2b2e50d..ae806824d 100644
--- a/api/BrowserSettings.md
+++ b/api/BrowserSettings.md
@@ -8,27 +8,21 @@ Table of contents:
 * [Introduction](#introduction)
 * [Settings](#settings)
   * [Font settings](#font-settings)
-  * [accept_language_list](#accept_language_list)
-  * [application_cache_disabled](#application_cache_disabled)
   * [background_color](#background_color)
   * [databases_disabled](#databases_disabled)
   * [default_encoding](#default_encoding)
   * [dom_paste_disabled](#dom_paste_disabled)
-  * [file_access_from_file_urls_allowed](#file_access_from_file_urls_allowed)
   * [inherit_client_handlers_for_popups](#inherit_client_handlers_for_popups)
   * [image_load_disabled](#image_load_disabled)
   * [javascript_disabled](#javascript_disabled)
   * [javascript_close_windows_disallowed](#javascript_close_windows_disallowed)
   * [javascript_access_clipboard_disallowed](#javascript_access_clipboard_disallowed)
   * [local_storage_disabled](#local_storage_disabled)
-  * [plugins_disabled](#plugins_disabled)
   * [remote_fonts](#remote_fonts)
   * [shrink_standalone_images_to_fit](#shrink_standalone_images_to_fit)
   * [tab_to_links_disabled](#tab_to_links_disabled)
   * [text_area_resize_disabled](#text_area_resize_disabled)
-  * [universal_access_from_file_urls_allowed](#universal_access_from_file_urls_allowed)
   * [user_style_sheet_location](#user_style_sheet_location)
-  * [web_security_disabled](#web_security_disabled)
   * [webgl_disabled](#webgl_disabled)
   * [windowless_frame_rate](#windowless_frame_rate)
 
@@ -60,20 +54,6 @@ In some cases, the default values of settings that are suggested by its name may
 * minimum_logical_font_size (int)
 
 
-### accept_language_list
-
-(string)
-Comma delimited ordered list of language codes without any whitespace that
-will be used in the "Accept-Language" HTTP header. May be set globally
-using the CefBrowserSettings.accept_language_list value. If both values are
-empty then "en-US,en" will be used.
-
-
-### application_cache_disabled
-
-(bool) Controls whether the application cache can be used. Also configurable using the --disable-application-cache switch.
-
-
 ### background_color
 
 (int)
@@ -106,11 +86,6 @@ in a known order. Equivalent to the `SkColor` type in Chromium.
 (bool) Controls whether DOM pasting is supported in the editor via `execCommand("paste")`. The |javascript_access_clipboard_disallowed| setting must also be set (to true or false). Also configurable using the --disable-javascript-dom-paste switch.
 
 
-### file_access_from_file_urls_allowed
-
-(bool) Controls whether file URLs will have access to other file URLs. Also configurable using the --allow-access-from-files switch. Other similar switches are: --allow-file-access and --allow-file-access-from-files.
-
-
 ### inherit_client_handlers_for_popups
 
 
@@ -155,11 +130,6 @@ switch.
 (bool) Controls whether local storage can be used. Also configurable using the --disable-local-storage switch.
 
 
-### plugins_disabled
-
-(bool) Controls whether any plugins will be loaded. Also configurable using the --disable-plugins switch.
-
-
 ### remote_fonts
 
 (bool) Controls the loading of fonts from remote sources. Also configurable using the --disable-remote-fonts switch.
@@ -180,11 +150,6 @@ switch.
 (bool) Controls whether text areas can be resized. Also configurable using the --disable-text-area-resize switch.
 
 
-### universal_access_from_file_urls_allowed
-
-(bool) Controls whether file URLs will have access to all URLs. Also configurable using the --allow-universal-access-from-files switch. Other similar switches are --allow-file-access and --allow-file-access-from-files.
-
-
 ### user_style_sheet_location
 
 (string) Location of the user style sheet that will be used for all pages. This must be a data URL of the form `data:text/css;charset=utf-8;base64,content` where "content" is the base64 encoded contents of the CSS file. Also configurable using the "user-style-sheet-location" command-line switch.
@@ -192,11 +157,6 @@ switch.
 This setting was removed in Chrome 33. Soon it will be removed from cefpython as well.
 
 
-### web_security_disabled
-
-(bool) Controls whether web security restrictions (same-origin policy) will be enforced. Disabling this setting is not recommend as it will allow risky security behavior such as cross-site scripting (XSS). Also configurable using the --disable-web-security switch.
-
-
 ### webgl_disabled
 
 (bool) Controls whether WebGL can be used. Note that WebGL requires hardware support and may not work on all systems even when enabled. Also configurable using the --disable-webgl switch.
diff --git a/api/CookieAccessFilter.md b/api/CookieAccessFilter.md
new file mode 100644
index 000000000..d2ac4292c
--- /dev/null
+++ b/api/CookieAccessFilter.md
@@ -0,0 +1,45 @@
+[API categories](API-categories.md) | [API index](API-index.md)
+
+
+# CookieAccessFilter (interface)
+
+
+
+Table of contents:
+* [Callbacks](#callbacks)
+  * [CanSendCookie](#cansendcookie)
+  * [CanSaveCookie](#cansavecookie)
+
+
+## Callbacks
+
+
+### CanSendCookie
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| frame | [Frame](Frame.md) |
+| request | [Request](Request.md) |
+| cookie | [Cookie](Cookie.md) |
+| __Return__ | bool |
+
+Called on the IO thread before a resource is sent. Browser and frame values represent
+the source of the request. Return true if the specified cookie can be sent with the
+request or false otherwise.
+
+### CanSaveCookie
+
+| Parameter | Type |
+| --- | --- |
+| browser | [Browser](Browser.md) |
+| frame | [Frame](Frame.md) |
+| request | [Request](Request.md) |
+| response | [Response](Response.md) |
+| cookie | [Cookie](Cookie.md) |
+| __Return__ | bool |
+
+Called on the IO thread after a resource response is received. Browser and frame values
+represent the source of the request. Return true if the specified cookie returned with
+the response can be saved or false otherwise.
+
diff --git a/api/CookieManager.md b/api/CookieManager.md
index b0d06a911..c947a3f47 100644
--- a/api/CookieManager.md
+++ b/api/CookieManager.md
@@ -18,9 +18,6 @@ also have an OnComplete callback.
 Table of contents:
 * [Methods](#methods)
   * [GetGlobalManager](#getglobalmanager)
-  * [GetBlockingManager](#getblockingmanager)
-  * [CreateManager](#createmanager)
-  * [SetSupportedSchemes](#setsupportedschemes)
   * [VisitAllCookies](#visitallcookies)
   * [VisitUrlCookies](#visiturlcookies)
   * [SetCookie](#setcookie)
@@ -49,52 +46,6 @@ Description from upstream CEF:
 > calling CefRequestContext::GetGlobalContext()->GetDefaultCookieManager()
 
 
-### GetBlockingManager
-
-| | |
-| --- | --- |
-| __Return__ | [CookieManager](CookieManager.md) |
-
-Description from upstream CEF:
-> Returns a cookie manager that neither stores nor retrieves cookies. All
-> usage of cookies will be blocked including cookies accessed via the network
-> (request/response headers), via JavaScript (document.cookie), and via
-> CefCookieManager methods. No cookies will be displayed in DevTools. If you
-> wish to only block cookies sent via the network use the CefRequestHandler
-> CanGetCookies and CanSetCookie methods instead.
-
-
-### CreateManager
-
-| Parameter | Type |
-| --- | --- |
-| path | string |
-| persistSessionCookies=False | bool |
-| __Return__ | [CookieManager](CookieManager.md) |
-
-Creates a new cookie manager. Otherwise, data will be stored at the
-specified |path|. To persist session cookies (cookies without an expiry
-date or validity interval) set |persistSessionCookies|
-to true. If using global manager then see the [ApplicationSettings](ApplicationSettings.md).`persist_session_cookies`
-option. Session cookies are generally intended to be transient and most
-Web browsers do not persist them. Returns None if creation fails.
-
-You can have a separate cookie manager for each browser,
-see [RequestHandler](RequestHandler.md).GetCookieManager().
-
-
-### SetSupportedSchemes
-
-| Parameter | Type |
-| --- | --- |
-| schemes | list |
-| __Return__ | void |
-
-Set the schemes supported by this manager. The default schemes ("http",
-"https", "ws" and "wss") will always be supported. Must be called before
-any cookies are accessed.
-
-
 ### VisitAllCookies
 
 | Parameter | Type |
diff --git a/api/DpiAware.md b/api/DpiAware.md
index 5a335b216..77bb91b73 100644
--- a/api/DpiAware.md
+++ b/api/DpiAware.md
@@ -12,19 +12,14 @@ Table of contents:
 * [Introduction](#introduction)
 * [Static methods](#static-methods)
   * [CalculateWindowSize](#calculatewindowsize)
-  * [EnableHighDpiSupport](#enablehighdpisupport)
   * [GetSystemDpi](#getsystemdpi)
   * [IsProcessDpiAware](#isprocessdpiaware)
-  * [SetProcessDpiAware](#setprocessdpiaware)
   * [Scale](#scale)
 
 
 
 ## Introduction
 
-By default if DPI awareness is not enabled in application, then OS performs display scaling. That causes text to look blurry on high DPI displays. To resolve this you have to
- call `cef.DpiAware.EnableHighDpiSupport` method. High DPI support is available only on Windows.
-
 Enabling High DPI support in app can be done by embedding a DPI awareness xml manifest in both main executable and subprocess executable (see [Issue #112](../issues/112) comment #2), or by calling the `cef.DpiAware.EnableHighDpiSupport` method.
 
 ## Static methods
@@ -46,21 +41,6 @@ OS DPI settings. For 800/600 with Win7 DPI settings
 being set to "Larger 150%" will return 1200/900.
 
 
-### EnableHighDpiSupport
-
-| | |
-| --- | --- |
-| __Return__ | void |
-
-Calling this function will set current process and subprocesses
-to be DPI aware.
-
-Description from upstream CEF:
-> Call during process startup to enable High-DPI support on Windows 7 or newer.
-> Older versions of Windows should be left DPI-unaware because they do not
-> support DirectWrite and GDI fonts are kerned very badly.
-
-
 ### GetSystemDpi
 
 | | |
@@ -105,19 +85,6 @@ To check whether OS display scaling on high DPI settings was disabled. DPI aware
 On Win8 this will return True if DPI awareness is set to either "System DPI aware" or "Per monitor DPI aware".
 
 
-### SetProcessDpiAware
-
-| | |
-| --- | --- |
-| __Return__ | void |
-
-Calling this method is deprecated, call instead `EnableHighDpiSupport()`.
-See [Issue #358](../../../issues/358) for how the behavior changed in
-latest CEF. This method now internally calls `EnableHighDpiSupport()`.
-
-Enables DPI awareness for the running process. Embedding a DPI manifest in .exe is the prefered way, as it gives more reliable results, otherwise some display bugs may appear (discussed in the "Introduction" section on this page).
-
-
 ### Scale
 
 | Parameter | Type |
diff --git a/api/LifespanHandler.md b/api/LifespanHandler.md
index 1794d62d7..3edd4e677 100644
--- a/api/LifespanHandler.md
+++ b/api/LifespanHandler.md
@@ -82,42 +82,48 @@ additional usage information.
 | window_info_out | list[[WindowInfo](WindowInfo.md)] |
 | client | None |
 | browser_settings_out | list[[BrowserSettings](BrowserSettings.md)] |
+| extra_info_out | dict |
 | no_javascript_access_out | list[bool] |
 | __Return__ | bool |
 
 Description from upstream CEF:
 > Called on the UI thread before a new popup browser is created. The
-> |browser| and |frame| values represent the source of the popup request. The
-> |target_url| and |target_frame_name| values indicate where the popup
-> browser should navigate and may be empty if not specified with the request.
-> The |target_disposition| value indicates where the user intended to open
-> the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
-> be true if the popup was opened via explicit user gesture (e.g. clicking a
-> link) or false if the popup opened automatically (e.g. via the
-> DomContentLoaded event). The |popup_features| structure contains additional
+> |browser| and |frame| values represent the source of the popup request.
+> The |target_url| and |target_frame_name| values indicate where the popup
+> browser should navigate and may be empty if not specified with the
+> request. The |target_disposition| value indicates where the user intended
+> to open the popup (e.g. current tab, new tab, etc). The |user_gesture|
+> value will be true if the popup was opened via explicit user gesture (e.g.
+> clicking a link) or false if the popup opened automatically (e.g. via the
+> DomContentLoaded event). The |popupFeatures| structure contains additional
 > information about the requested popup window. To allow creation of the
-> popup browser optionally modify |windowInfo|, |client|, |browserSettings| and
+> popup browser optionally modify |windowInfo|, |client|, |settings| and
 > |no_javascript_access| and return false. To cancel creation of the popup
-> browser return true. The |client| and |settings| values will default to the
-> source browser's values. If the |no_javascript_access| value is set to
+> browser return true. The |client| and |settings| values will default to
+> the source browser's values. If the |no_javascript_access| value is set to
 > false the new browser will not be scriptable and may not be hosted in the
 > same renderer process as the source browser. Any modifications to
-> |window_info| will be ignored if the parent browser is wrapped in a
+> |windowInfo| will be ignored if the parent browser is wrapped in a
 > CefBrowserView. Popup browser creation will be canceled if the parent
-> browser is destroyed before the popup browser creation completes (indicated
-> by a call to OnAfterCreated for the popup browser).
+> browser is destroyed before the popup browser creation completes
+> (indicated by a call to OnAfterCreated for the popup browser). The
+> |extra_info| parameter provides an opportunity to specify extra
+> information specific to the created popup browser that will be passed to
+> CefRenderProcessHandler::OnBrowserCreated() in the render process.
 
 `WindowOpenDisposition` constants in the cefpython module:
-* WOD_UNKNOWN,
-* WOD_CURRENT_TAB,
-* WOD_SINGLETON_TAB,
-* WOD_NEW_FOREGROUND_TAB,
-* WOD_NEW_BACKGROUND_TAB,
-* WOD_NEW_POPUP,
-* WOD_NEW_WINDOW,
-* WOD_SAVE_TO_DISK,
-* WOD_OFF_THE_RECORD,
-* WOD_IGNORE_ACTION
+* CEF_WOD_UNKNOWN,
+* CEF_WOD_CURRENT_TAB,
+* CEF_WOD_SINGLETON_TAB,
+* CEF_WOD_NEW_FOREGROUND_TAB,
+* CEF_WOD_NEW_BACKGROUND_TAB,
+* CEF_WOD_NEW_POPUP,
+* CEF_WOD_NEW_WINDOW,
+* CEF_WOD_SAVE_TO_DISK,
+* CEF_WOD_OFF_THE_RECORD,
+* CEF_WOD_IGNORE_ACTION,
+* CEF_WOD_SWITCH_TO_TAB,
+* CEF_WOD_NEW_PICTURE_IN_PICTURE
 
 Note that if you return True and create the popup window yourself, then
 the popup window and parent window will not be able to script each other.
diff --git a/api/RequestHandler.md b/api/RequestHandler.md
index f1ef8bf72..28c2dc22b 100644
--- a/api/RequestHandler.md
+++ b/api/RequestHandler.md
@@ -16,13 +16,9 @@ Available in upstream CEF, but not yet exposed to CEF Python:
 
 Table of contents:
 * [Callbacks](#callbacks)
-  * [CanGetCookies](#cangetcookies)
-  * [CanSetCookie](#cansetcookie)
   * [GetAuthCredentials](#getauthcredentials)
-  * [GetCookieManager](#getcookiemanager)
   * [GetResourceHandler](#getresourcehandler)
   * [OnBeforeBrowse](#onbeforebrowse)
-  * [_OnBeforePluginLoad](#_onbeforepluginload)
   * [OnBeforeResourceLoad](#onbeforeresourceload)
   * [_OnCertificateError](#_oncertificateerror)
   * [OnQuotaRequest](#onquotarequest)
@@ -36,39 +32,6 @@ Table of contents:
 ## Callbacks
 
 
-### CanGetCookies
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| frame | [Frame](Frame.md) |
-| request | [Request](Request.md) |
-| __Return__ | bool |
-
-Description from upstream CEF:
-> Called on the IO thread before sending a network request with a "Cookie"
-> request header. Return true to allow cookies to be included in the network
-> request or false to block cookies. The |request| object should not be
-> modified in this callback.
-
-
-### CanSetCookie
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| frame | [Frame](Frame.md) |
-| request | [Request](Request.md) |
-| cookie | [Cookie](Cookie.md) |
-| __Return__ | bool |
-
-Description from upstream CEF:
-> Called on the IO thread when receiving a network request with a
-> "Set-Cookie" response header value represented by |cookie|. Return true to
-> allow the cookie to be stored or false to block the cookie. The |request|
-> object should not be modified in this callback.
-
-
 ### GetAuthCredentials
 
 | Parameter | Type |
@@ -106,44 +69,6 @@ Example implementations:
   [[3]](https://github.com/cztomczak/cefpython/blob/cefpython31/cefpython/http_authentication_win.pyx).
 
 
-### GetCookieManager
-
-| Parameter | Type |
-| --- | --- |
-| browser | None or [Browser](Browser.md) |
-| main_url | string |
-| __Return__ | [CookieManager](CookieManager.md) |
-
-Called on the IO thread to retrieve the cookie manager. |main_url|
-is the URL of the top-level frame. Cookies managers can be unique
-per browser or shared across multiple browsers. The global cookie
-manager will be used if this method returns None.
-
-**IMPORTANT**: In some cases this callback is not called due to a
-race condition. See Issue [#429](../../../issues/429) for details.
-
-To successfully implement separate cookie manager per browser session,
-you have to set ApplicationSettings.`unique_request_context_per_browser`
-to True. Otherwise the browser param passed to this callback will
-always be the same first browser that was created using
-[cefpython](cefpython.md).`CreateBrowserSync`.
-
-**NOTE**: If implementing custom cookie managers you will encounter
-problems similar to [Issue #365](../../../issues/365) ("Cookies not
-flushed to disk when closing app immediately"). To resolve
-it you have to call CookieManager.[FlushStore](CookieManager.md#flushstore)
-method when closing associated browser.
-
-Popup browsers created javascript's window.open share the same
-renderer process and request context. If you want to have separate
-cookie managers for popups created using window.open then you have
-to implement the LifespanHandler.`OnBeforePopup` callback. Return
-True in that callback to cancel popup creation and instead create
-the window on your own and embed browser in it.
-The `CreateAnotherBrowser` function from the old v31 wxpython
-example does that.
-
-
 ### GetResourceHandler
 
 | Parameter | Type |
@@ -190,48 +115,6 @@ Description from upstream CEF:
 > navigated automatically (e.g. via the DomContentLoaded event).
 
 
-### _OnBeforePluginLoad
-
-| Parameter | Type |
-| --- | --- |
-| browser | [Browser](Browser.md) |
-| mime_type | string |
-| plugin_url | string |
-| is_main_frame | bool |
-| top_origin_url | string |
-| plugin_info | [WebPluginInfo](WebPluginInfo.md) |
-| __Return__ | bool |
-
-Description from upstream CEF:
-> Called on multiple browser process threads before a plugin instance is
-> loaded. |mime_type| is the mime type of the plugin that will be loaded.
-> |plugin_url| is the content URL that the plugin will load and may be empty.
-> |is_main_frame| will be true if the plugin is being loaded in the main
-> (top-level) frame, |top_origin_url| is the URL for the top-level frame that
-> contains the plugin when loading a specific plugin instance or empty when
-> building the initial list of enabled plugins for 'navigator.plugins'
-> JavaScript state. |plugin_info| includes additional information about the
-> plugin that will be loaded. |plugin_policy| is the recommended policy.
-> Modify |plugin_policy| and return true to change the policy. Return false
-> to use the recommended policy. The default plugin policy can be set at
-> runtime using the `--plugin-policy=[allow|detect|block]` command-line flag.
-> Decisions to mark a plugin as disabled by setting |plugin_policy| to
-> PLUGIN_POLICY_DISABLED may be cached when |top_origin_url| is empty. To
-> purge the plugin list cache and potentially trigger new calls to this
-> method call CefRequestContext::PurgePluginListCache.
-
-Return True to block loading of the plugin.
-
-This callback will be executed during browser creation, thus you must
-call [cefpython](cefpython.md).SetGlobalClientCallback() to use it.
-The callback name was prefixed with "`_`" to distinguish this special
-behavior.
-
-Plugins are loaded on demand, only when website requires it.
-This callback is called every time the page tries to load a plugin
-(perhaps even multiple times per plugin).
-
-
 ### OnBeforeResourceLoad
 
 | Parameter | Type |
diff --git a/api/WebPluginInfo.md b/api/WebPluginInfo.md
deleted file mode 100644
index ad4396d35..000000000
--- a/api/WebPluginInfo.md
+++ /dev/null
@@ -1,63 +0,0 @@
-[API categories](API-categories.md) | [API index](API-index.md)
-
-
-# WebPluginInfo (object)
-
-See also [RequestHandler](RequestHandler.md)._OnBeforePluginLoad().
-
-Web Plugin API available in upstream CEF, but not yet exposed in CEF Python
-(see src/include/cef_web_plugin.h):
-
-* CefRegisterCdmCallback
-* CefRegisterWidevineCdm
-* CefIsWebPluginUnstable
-* CefRegisterWebPluginCrash
-* CefUnregisterInternalWebPlugin
-* CefRefreshWebPlugins
-* CefVisitWebPluginInfo
-
-
-Table of contents:
-* [Methods](#methods)
-  * [GetName](#getname)
-  * [GetPath](#getpath)
-  * [GetVersion](#getversion)
-  * [GetDescription](#getdescription)
-
-## Methods
-
-
-### GetName
-
-| | |
-| --- | --- |
-| __Return__ | string |
-
-Returns the plugin name (i.e. Flash).
-
-
-### GetPath
-
-| | |
-| --- | --- |
-| __Return__ | string |
-
-Returns the plugin file path (DLL/bundle/library).
-
-
-### GetVersion
-
-| | |
-| --- | --- |
-| __Return__ | string |
-
-Returns the version of the plugin (may be OS-specific).
-
-
-### GetDescription
-
-| | |
-| --- | --- |
-| __Return__ | string |
-
-Returns a description of the plugin from the version information.
diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
index 9ca4d6e99..6ff602f80 100644
--- a/docs/Build-instructions.md
+++ b/docs/Build-instructions.md
@@ -9,13 +9,12 @@ Table of contents:
   * [Linux](#linux)
   * [Mac](#mac)
   * [All platforms](#all-platforms)
-* [Build using prebuilt CEF binaries and libraries](#build-using-prebuilt-cef-binaries-and-libraries)
 * [Build using CEF binaries from Spotify Automated Builds](#build-using-cef-binaries-from-spotify-automated-builds)
 * [Build upstream CEF from sources](#build-upstream-cef-from-sources)
   * [Building old unsupported version of Chromium](#building-old-unsupported-version-of-chromium)
   * [Possible errors](#possible-errors)
 * [Build CEF manually](#build-cef-manually)
-* [CEF Automated Builds (Spotify and Adobe)](#cef-automated-builds-spotify-and-adobe)
+* [CEF Automated Builds (Spotify)](#cef-automated-builds-spotify)
 * [Notes](#notes)
 * [How to patch mini tutorial](#how-to-patch-mini-tutorial)
 
@@ -48,13 +47,13 @@ Before you can build CEF Python or CEF you must satisfy
 
 ## Quick build instructions for Windows
 
-Complete steps for building CEF Python v50+ with Python 2.7 using
+Complete steps for building CEF Python v123+ with Python 3 using
 prebuilt binaries and libraries from GitHub Releases.
 
 When cloning repository you should checkout a stable branch which
 are named "cefpythonXX" where XX is Chromium version number.
 
-1) Tested and works fine on Windows 7 64-bit
+1) Tested and works fine on Windows 11 64-bit
 
 2) Download [ninja](https://github.com/ninja-build/ninja) 1.7.2 or later
    and add it to PATH.
@@ -235,37 +234,6 @@ requirements common for all platforms.
   cefpython version to avoid issues.
 
 
-## Build using prebuilt CEF binaries and libraries
-
-When cloning repository you should checkout a stable branch which
-are named "cefpythonXX" where XX is Chromium version number.
-
-1) Clone cefpython, checkout for example "cefpython57" branch
-   that includes Chromium v57, then create a build/ directory and enter it:
-```
-git clone https://github.com/cztomczak/cefpython.git
-cd cefpython/
-git checkout cefpython57
-mkdir build/
-cd build/
-```
-
-2) Download binaries and libraries from
-   [GH releases](https://github.com/cztomczak/cefpython/tags)
-   tagged eg. 'v57-upstream' when building v57. The version
-   of the binaries must match exactly the CEF version from
-   the "cefpython/src/version/" directory (look for CEF_VERSION
-   constant in .h file).
-
-3) Extract the downloaded archive eg. "cef55_3.2883.1553.g80bd606_win32.zip"
-   in the "build/" directory (using "extract here" option)
-
-4) Run the build.py tool (xx.x is version number):
-```
-python ../tools/build.py xx.x
-```
-
-
 ## Build using CEF binaries from Spotify Automated Builds
 
 When cloning repository you should checkout a stable branch which
@@ -281,7 +249,7 @@ mkdir build/
 cd build/
 ```
 
-2) Download CEF binaries from [Spotify Automated Builds](http://opensource.spotify.com/cefbuilds/index.html).
+2) Download CEF binaries from [Spotify Automated Builds](https://cef-builds.spotifycdn.com/index.html).
    The version of the binaries must match exactly the CEF version
    from the "cefpython/src/version/" directory (look for CEF_VERSION
    constant in .h file).
@@ -421,17 +389,14 @@ Note that CEF patches must be applied in the "download_dir/chromium/src/cef/"
 directory, not in the "download_dir/cef/" directory.
 
 
-## CEF Automated Builds (Spotify and Adobe)
+## CEF Automated Builds (Spotify)
 
 There are two sites that provide automated CEF builds:
-* Spotify - http://opensource.spotify.com/cefbuilds/index.html
+* Spotify - https://cef-builds.spotifycdn.com/index.html
   * This is the new build system
   * Since June 2016 all builds are without tcmalloc, see
     [cefpython/#73](https://github.com/cztomczak/cefpython/issues/73)
     and [cef/#1827](https://bitbucket.org/chromiumembedded/cef/issues/1827)
-* Adobe - https://cefbuilds.com/
-  * This is the old build system. Not tested whether it builds without
-    tcmalloc.
 
 
 ## Notes
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
index 5ad3d4384..8f63a4529 100644
--- a/docs/Migration-guide.md
+++ b/docs/Migration-guide.md
@@ -52,6 +52,14 @@ Table of contents:
 * [v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loop-qt-wxpython)
 * [v66.1+ Navigation urls passed to CreateBrowserSync or LoadUrl methods need to be encoded by app code](#v661-navigation-urls-passed-to-createbrowsersync-or-loadurl-methods-need-to-be-encoded-by-app-code)
 * [v67+ Do not call the 'WindowUtils.OnSize' function](#v67-do-not-call-the-windowutilsonsize-function)
+* [v123+ cef_types changed](#v123-cef_types-changed)
+* [v123+ Windows dpiaware change](#v123-windows-dpiaware-change)
+* [v123+ plugin support is removed](#v123-plugin-support-is-removed)
+* [v123+ cookie related code is changed](#v123-cookie-related-code-is-changed)
+* [v123+ LifeSpan Handler callback](#v123-lifespan-handler-callback)
+* [v123+ BrowserSettings options removed](#v123-browsersettings-options-removed)
+* [v123+ Browser's function `SendProcessMessage` is removed](#v123-browsers-function-sendprocessmessage-is-removed)
+* [v123+ Response's function `GetHeader` is renamed to `GetHeaderByName`](#v123-responses-function-getheader-is-renamed-to-getheaderbyname)
 
 
 ## v49+ Distribution packages
@@ -505,4 +513,74 @@ This function can sometimes cause app hanging during window resize.
 Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize)
 function. Except when you use the `pywin32.py` example, in such case
 `WindowUtils.OnSize` must be called.
-See [Issue #464](../../../issues/464) for more details.
\ No newline at end of file
+See [Issue #464](../../../issues/464) for more details.
+
+## v123+ cef_types changed
+
+cef_types removed:
+- WOD_UNKNOWN,
+- WOD_CURRENT_TAB,
+- WOD_SINGLETON_TAB,
+- WOD_NEW_FOREGROUND_TAB,
+- WOD_NEW_BACKGROUND_TAB,
+- WOD_NEW_POPUP,
+- WOD_NEW_WINDOW,
+- WOD_SAVE_TO_DISK,
+- WOD_OFF_THE_RECORD,
+- WOD_IGNORE_ACTION
+- TID_FILE
+
+cef_types added:
+- CEF_WOD_UNKNOWN,
+- CEF_WOD_CURRENT_TAB,
+- CEF_WOD_SINGLETON_TAB,
+- CEF_WOD_NEW_FOREGROUND_TAB,
+- CEF_WOD_NEW_BACKGROUND_TAB,
+- CEF_WOD_NEW_POPUP,
+- CEF_WOD_NEW_WINDOW,
+- CEF_WOD_SAVE_TO_DISK,
+- CEF_WOD_OFF_THE_RECORD,
+- CEF_WOD_IGNORE_ACTION
+
+## v123+ Windows dpiaware change
+
+Per https://github.com/chromiumembedded/cef/issues/3452 windows high-dpi support is now enabled
+You shouldn't normally need to use DpiAware class 
+
+## v123+ plugin support is removed
+
+As cef has removed plugin support https://github.com/chromiumembedded/cef/commit/28c7f040016a0271ec2612cc5021599fb55a1054
+previous popular plugin such as flash, pdf would no longer work
+`OnBeforePluginLoad` handler is removed
+
+## v123+ cookie related code is changed
+
+- removed `CanGetCookies`
+- removed `CanSetCookie`
+- added `CanSendCookie`
+- added `CanSaveCookie`
+
+## v123+ LifeSpan Handler callback
+`OnBeforePopup` callback function params adds extra `extra_info`
+
+## v123+ BrowserSettings options removed
+
+The following options were removed from BrowserSettings:
+- accept_language_list
+- product_version
+- net_security_expiration_enabled
+- single_process
+- author_and_user_styles_disabled
+- ignore_certificate_errors
+- user_data_path
+- application_cache_disabled
+- plugins_disabled
+- universal_access_from_file_urls_allowed
+- file_access_from_file_urls_allowed
+- web_security_disabled
+
+## v123+ Browser's function `SendProcessMessage` is removed
+
+## v123+ Response's function `GetHeader` is renamed to `GetHeaderByName`
+
+## v123+ CookieManager's `GetBlockingManager`, `CreateManager` and `SetSupportedSchemes` functions are removed
\ No newline at end of file
diff --git a/examples/hello_world.py b/examples/hello_world.py
index 789f4666e..5968c6542 100644
--- a/examples/hello_world.py
+++ b/examples/hello_world.py
@@ -11,6 +11,7 @@
 from cefpython3 import cefpython as cef
 import platform
 import sys
+from pkg_resources import parse_version
 
 
 def main():
@@ -31,7 +32,7 @@ def check_versions():
     print("[hello_world.py] Python {ver} {arch}".format(
            ver=platform.python_version(),
            arch=platform.architecture()[0]))
-    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("57.0"), "CEF Python v57.0+ required to run this"
 
 
 if __name__ == '__main__':
diff --git a/examples/pysdl2.py b/examples/pysdl2.py
index 97f9293dc..dfce311d2 100644
--- a/examples/pysdl2.py
+++ b/examples/pysdl2.py
@@ -127,6 +127,11 @@ def main():
         dest='renderer',
         choices=['software', 'hardware']
     )
+    parser.add_argument(
+        '--debug',
+        help='debug app',
+        action='store_true'
+    )
     args = parser.parse_args()
     logLevel = logging.INFO
     if args.verbose:
@@ -135,7 +140,7 @@ def main():
         format='[%(filename)s %(levelname)s]: %(message)s',
         level=logLevel
     )
-    logging.info("Using PySDL2 %s" % sdl2.__version__)
+    logging.info("Using PySDL2 %s", sdl2.__version__)
     version = sdl2.SDL_version()
     sdl2.SDL_GetVersion(version)
     logging.info(
@@ -224,7 +229,7 @@ def main():
     browser.SetClientHandler(renderHandler)
     # Must call WasResized at least once to let know CEF that
     # viewport size is available and that OnPaint may be called.
-    browser.SendFocusEvent(True)
+    browser.SetFocus(True)
     browser.WasResized()
 
     # Begin the main rendering loop
diff --git a/examples/pywin32.py b/examples/pywin32.py
index bf8d2b9be..0ca8f7482 100644
--- a/examples/pywin32.py
+++ b/examples/pywin32.py
@@ -16,6 +16,7 @@
 from cefpython3 import cefpython as cef
 
 import distutils.sysconfig
+from pkg_resources import parse_version
 import math
 import os
 import platform
@@ -108,7 +109,7 @@ def check_versions():
         pywin32_version = fp.read().strip()
     print("[pywin32.py] pywin32 {ver}".format(ver=pywin32_version))
 
-    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("57.0"), "CEF Python v57.0+ required to run this"
 
 
 def create_browser(window_info, settings, url):
diff --git a/examples/qt.py b/examples/qt.py
index efb1b381f..d359dcd81 100644
--- a/examples/qt.py
+++ b/examples/qt.py
@@ -18,10 +18,12 @@
 import os
 import platform
 import sys
+from pkg_resources import parse_version
 
 # GLOBALS
 PYQT4 = False
 PYQT5 = False
+PYQT6 = False
 PYSIDE = False
 PYSIDE2 = False
 
@@ -39,6 +41,14 @@
     from PyQt5.QtCore import *
     # noinspection PyUnresolvedReferences
     from PyQt5.QtWidgets import *
+elif "pyqt6" in sys.argv:
+    PYQT6 = True
+    # noinspection PyUnresolvedReferences
+    from PyQt6.QtGui import *
+    # noinspection PyUnresolvedReferences
+    from PyQt6.QtCore import *
+    # noinspection PyUnresolvedReferences
+    from PyQt6.QtWidgets import *
 elif "pyside" in sys.argv:
     PYSIDE = True
     # noinspection PyUnresolvedReferences
@@ -65,6 +75,7 @@
     print("USAGE:")
     print("  qt.py pyqt4")
     print("  qt.py pyqt5")
+    print("  qt.py pyqt6")
     print("  qt.py pyside")
     print("  qt.py pyside2")
     sys.exit(1)
@@ -104,7 +115,10 @@ def main():
     main_window.show()
     main_window.activateWindow()
     main_window.raise_()
-    app.exec_()
+    if PYQT6:
+        app.exec()
+    else:
+        app.exec_()
     if not cef.GetAppSetting("external_message_pump"):
         app.stopTimer()
     del main_window  # Just to be safe, similarly to "del app"
@@ -116,7 +130,7 @@ def check_versions():
     print("[qt.py] CEF Python {ver}".format(ver=cef.__version__))
     print("[qt.py] Python {ver} {arch}".format(
             ver=platform.python_version(), arch=platform.architecture()[0]))
-    if PYQT4 or PYQT5:
+    if PYQT4 or PYQT5 or PYQT6:
         print("[qt.py] PyQt {v1} (qt {v2})".format(
               v1=PYQT_VERSION_STR, v2=qVersion()))
     elif PYSIDE:
@@ -126,7 +140,7 @@ def check_versions():
         print("[qt.py] PySide2 {v1} (qt {v2})".format(
               v1=PySide2.__version__, v2=QtCore.__version__))
     # CEF Python version requirement
-    assert cef.__version__ >= "55.4", "CEF Python v55.4+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("55.4"), "CEF Python v55.4+ required to run this"
 
 
 class MainWindow(QMainWindow):
@@ -142,11 +156,16 @@ def __init__(self):
             self.setWindowTitle("PyQt4 example")
         elif PYQT5:
             self.setWindowTitle("PyQt5 example")
+        elif PYQT6:
+            self.setWindowTitle("PyQt6 example")
         elif PYSIDE:
             self.setWindowTitle("PySide example")
         elif PYSIDE2:
             self.setWindowTitle("PySide2 example")
-        self.setFocusPolicy(Qt.StrongFocus)
+        if PYQT6:
+            self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
+        else:
+            self.setFocusPolicy(Qt.StrongFocus)
         self.setupLayout()
 
     def setupLayout(self):
@@ -167,7 +186,7 @@ def setupLayout(self):
         frame.setLayout(layout)
         self.setCentralWidget(frame)
 
-        if (PYSIDE2 or PYQT5) and WINDOWS:
+        if (PYSIDE2 or PYQT5 or PYQT6) and WINDOWS:
             # On Windows with PyQt5 main window must be shown first
             # before CEF browser is embedded, otherwise window is
             # not resized and application hangs during resize.
diff --git a/examples/screenshot.py b/examples/screenshot.py
index 5ca8d4913..f494c0013 100644
--- a/examples/screenshot.py
+++ b/examples/screenshot.py
@@ -36,6 +36,7 @@
 """
 
 from cefpython3 import cefpython as cef
+from pkg_resources import parse_version
 import os
 import platform
 import subprocess
@@ -99,7 +100,7 @@ def check_versions():
            ver=platform.python_version(),
            arch=platform.architecture()[0]))
     print("[screenshot.py] Pillow {ver}".format(ver=PILLOW_VERSION))
-    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("57.0"), "CEF Python v57.0+ required to run this"
 
 
 def command_line_arguments():
@@ -139,9 +140,10 @@ def create_browser(settings):
     browser = cef.CreateBrowserSync(window_info=window_info,
                                     settings=settings,
                                     url=URL)
+    print('created browser ', browser)
     browser.SetClientHandler(LoadHandler())
     browser.SetClientHandler(RenderHandler())
-    browser.SendFocusEvent(True)
+    browser.SetFocus(True)
     # You must call WasResized at least once to let know CEF that
     # viewport size is available and that OnPaint may be called.
     browser.WasResized()
diff --git a/examples/snippets/network_cookies.py b/examples/snippets/network_cookies.py
index c3631cff5..a4504be25 100644
--- a/examples/snippets/network_cookies.py
+++ b/examples/snippets/network_cookies.py
@@ -1,5 +1,5 @@
 """
-Implement RequestHandler.CanGetCookies and CanSetCookie
+Implement RequestHandler.CanSendCookie and CanSaveCookie
 to block or allow cookies over network requests.
 """
 
@@ -22,23 +22,23 @@ def __init__(self):
         self.getcount = 0
         self.setcount = 0
 
-    def CanGetCookies(self, frame, request, **_):
+    def CanSendCookie(self, browser, frame, request, cookie):
         # There are multiple iframes on that website, let's log
         # cookies only for the main frame.
         if frame.IsMain():
             self.getcount += 1
-            print("-- CanGetCookies #"+str(self.getcount))
+            print("-- CanSendCookie #"+str(self.getcount))
             print("url="+request.GetUrl()[0:80])
             print("")
         # Return True to allow reading cookies or False to block
         return True
 
-    def CanSetCookie(self, frame, request, cookie, **_):
+    def CanSaveCookie(self, browser, frame, request, response, cookie):
         # There are multiple iframes on that website, let's log
         # cookies only for the main frame.
         if frame.IsMain():
             self.setcount += 1
-            print("-- CanSetCookie @"+str(self.setcount))
+            print("-- CanSaveCookie @"+str(self.setcount))
             print("url="+request.GetUrl()[0:80])
             print("Name="+cookie.GetName())
             print("Value="+cookie.GetValue())
@@ -48,4 +48,4 @@ def CanSetCookie(self, frame, request, cookie, **_):
 
 
 if __name__ == '__main__':
-    main()
+    main()
\ No newline at end of file
diff --git a/examples/snippets/ondomready.py b/examples/snippets/ondomready.py
index 8775129c7..1ca1fcf0b 100644
--- a/examples/snippets/ondomready.py
+++ b/examples/snippets/ondomready.py
@@ -8,7 +8,7 @@
 
 def main():
     cef.Initialize()
-    browser = cef.CreateBrowserSync(url="https://www.google.com/",
+    browser = cef.CreateBrowserSync(url="https://example.com/",
                                     window_title="_OnDomReady event")
     load_handler = LoadHandler(browser)
     browser.SetClientHandler(load_handler)
diff --git a/examples/tkinter_.py b/examples/tkinter_.py
index 327f171fb..63b75bbbb 100644
--- a/examples/tkinter_.py
+++ b/examples/tkinter_.py
@@ -26,6 +26,7 @@
 import os
 import platform
 import logging as _logging
+from pkg_resources import parse_version
 
 # Fix for PyCharm hints warnings
 WindowUtils = cef.WindowUtils()
@@ -53,7 +54,7 @@ def main():
     logger.info("Python {ver} {arch}".format(
             ver=platform.python_version(), arch=platform.architecture()[0]))
     logger.info("Tk {ver}".format(ver=tk.Tcl().eval('info patchlevel')))
-    assert cef.__version__ >= "55.3", "CEF Python v55.3+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("55.3"), "CEF Python v55.3+ required to run this"
     sys.excepthook = cef.ExceptHook  # To shutdown all CEF processes on error
     # Tk must be initialized before CEF otherwise fatal error (Issue #306)
     root = tk.Tk()
diff --git a/examples/tutorial.py b/examples/tutorial.py
index 860bbe12c..d02059d43 100644
--- a/examples/tutorial.py
+++ b/examples/tutorial.py
@@ -6,6 +6,7 @@
 import platform
 import sys
 import threading
+from pkg_resources import parse_version
 
 # HTML code. Browser will navigate to a Data uri created
 # from this html code.
@@ -85,7 +86,7 @@ def check_versions():
     print("[tutorial.py] Python {ver} {arch}".format(
            ver=platform.python_version(),
            arch=platform.architecture()[0]))
-    assert cef.__version__ >= "57.0", "CEF Python v57.0+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("57.0"), "CEF Python v57.0+ required to run this"
 
 
 def html_to_data_uri(html, js_callback=None):
@@ -188,6 +189,7 @@ def __init__(self, browser):
 
     def test_multiple_callbacks(self, js_callback):
         """Test both javascript and python callbacks."""
+        print('in test_multiple_callbacks')
         js_print(self.browser, "Python", "test_multiple_callbacks",
                  "Called from Javascript. Will call Javascript callback now.")
 
diff --git a/examples/wxpython.py b/examples/wxpython.py
index 92dd7d834..df1391ed7 100644
--- a/examples/wxpython.py
+++ b/examples/wxpython.py
@@ -12,6 +12,7 @@
 import platform
 import sys
 import os
+from pkg_resources import parse_version
 
 # Platforms
 WINDOWS = (platform.system() == "Windows")
@@ -47,9 +48,6 @@ def main():
         # the same time. This is an incorrect approach
         # and only a temporary fix.
         settings["external_message_pump"] = True
-    if WINDOWS:
-        # noinspection PyUnresolvedReferences, PyArgumentList
-        cef.DpiAware.EnableHighDpiSupport()
     cef.Initialize(settings=settings)
     app = CefApp(False)
     app.MainLoop()
@@ -65,7 +63,7 @@ def check_versions():
             ver=platform.python_version(), arch=platform.architecture()[0]))
     print("[wxpython.py] wxPython {ver}".format(ver=wx.version()))
     # CEF Python version requirement
-    assert cef.__version__ >= "66.0", "CEF Python v66.0+ required to run this"
+    assert parse_version(cef.__version__) >= parse_version("66.0"), "CEF Python v66.0+ required to run this"
 
 
 def scale_window_size_for_high_dpi(width, height):
diff --git a/src/browser.pyx b/src/browser.pyx
index c8cba03ad..e734e5995 100644
--- a/src/browser.pyx
+++ b/src/browser.pyx
@@ -5,6 +5,8 @@
 include "cefpython.pyx"
 
 cimport cef_types
+from libc.stdint cimport uint32_t, int64_t
+from libcpp cimport nullptr
 from cef_types cimport cef_state_t
 IF UNAME_SYSNAME == "Linux":
     cimport x11
@@ -59,7 +61,7 @@ cdef PyBrowser GetPyBrowser(CefRefPtr[CefBrowser] cefBrowser,
 
     global g_pyBrowsers
 
-    if <void*>cefBrowser == NULL or not cefBrowser.get():
+    if not cefBrowser or not cefBrowser.get():
         raise Exception("{caller}: CefBrowser reference is NULL"
                         .format(caller=callerIdStr))
 
@@ -148,7 +150,7 @@ cdef void RemovePyBrowser(int browserId) except *:
         # noinspection PyUnresolvedReferences
         Debug("del g_pyBrowsers[%s]" % browserId)
         pyBrowser = g_pyBrowsers[browserId]
-        pyBrowser.cefBrowser.Assign(NULL)
+        pyBrowser.cefBrowser.Assign(nullptr)
         del pyBrowser
         del g_pyBrowsers[browserId]
         g_unreferenced_browsers.append(browserId)
@@ -207,7 +209,7 @@ cdef class PyBrowser:
     cdef void* imageBuffer
 
     cdef CefRefPtr[CefBrowser] GetCefBrowser(self) except *:
-        if <void*>self.cefBrowser != NULL and self.cefBrowser.get():
+        if self.cefBrowser and self.cefBrowser.get():
             return self.cefBrowser
         raise Exception("PyBrowser.GetCefBrowser() failed: CefBrowser "
                         "was destroyed")
@@ -215,7 +217,7 @@ cdef class PyBrowser:
     cdef CefRefPtr[CefBrowserHost] GetCefBrowserHost(self) except *:
         cdef CefRefPtr[CefBrowserHost] cefBrowserHost = (
                 self.GetCefBrowser().get().GetHost())
-        if <void*>cefBrowserHost != NULL and cefBrowserHost.get():
+        if cefBrowserHost and cefBrowserHost.get():
             return cefBrowserHost
         raise Exception("PyBrowser.GetCefBrowserHost() failed: this "
                         "method can only be called in the browser "
@@ -246,9 +248,9 @@ cdef class PyBrowser:
             self.allowedClientCallbacks += ["OnBeforeResourceLoad",
                     "OnResourceRedirect", "GetAuthCredentials",
                     "OnQuotaRequest", "OnProtocolExecution",
-                    "GetResourceHandler",
-                    "OnBeforeBrowse", "OnRendererProcessTerminated",
-                    "OnPluginCrashed", "CanGetCookies", "CanSetCookie"]
+                    "GetResourceHandler", "OnBeforeBrowse", 
+                    "OnRendererProcessTerminated",
+                    "CanSendCookie", "CanSaveCookie"]
             # RequestContextHandler
             self.allowedClientCallbacks += ["GetCookieManager"]
             # LoadHandler
@@ -394,9 +396,9 @@ cdef class PyBrowser:
         # If using GetCookieManager to implement custom cookie managers
         # then flushing of cookies would need to be handled manually.
         self.GetCefBrowserHost().get().GetRequestContext().get() \
-                .GetDefaultCookieManager(
-                        <CefRefPtr[CefCompletionCallback]?>NULL) \
-                .get().FlushStore(<CefRefPtr[CefCompletionCallback]?>NULL)
+                .GetCookieManager(
+                        <CefRefPtr[CefCompletionCallback]?>nullptr) \
+                .get().FlushStore(<CefRefPtr[CefCompletionCallback]?>nullptr)
 
         cdef int browserId = self.GetCefBrowser().get().GetIdentifier()
         self.GetCefBrowserHost().get().CloseBrowser(bool(forceClose))
@@ -413,12 +415,12 @@ cdef class PyBrowser:
             py_string scriptUrl="", int startLine=1):
         self.GetMainFrame().ExecuteJavascript(jsCode, scriptUrl, startLine)
 
-    cpdef py_void Find(self, int searchId, py_string searchText,
+    cpdef py_void Find(self, py_string searchText,
                        py_bool forward, py_bool matchCase,
                        py_bool findNext):
         cdef CefString cefSearchText
         PyToCefString(searchText, cefSearchText)
-        self.GetCefBrowserHost().get().Find(searchId, cefSearchText,
+        self.GetCefBrowserHost().get().Find(cefSearchText,
                 bool(forward), bool(matchCase), bool(findNext))
 
     cpdef PyFrame GetFocusedFrame(self):
@@ -426,16 +428,18 @@ cdef class PyBrowser:
                 "Browser.GetFocusedFrame() may only be called on UI thread")
         return GetPyFrame(self.GetCefBrowser().get().GetFocusedFrame())
 
-    cpdef PyFrame GetFrame(self, py_string name):
+    cpdef PyFrame GetFrameByName(self, py_string name):
         assert IsThread(TID_UI), (
-                "Browser.GetFrame() may only be called on the UI thread")
+                "Browser.GetFrameByName() may only be called on the UI thread")
         cdef CefString cefName
         PyToCefString(name, cefName)
-        return GetPyFrame(self.GetCefBrowser().get().GetFrame(cefName))
+        return GetPyFrame(self.GetCefBrowser().get().GetFrameByName(cefName))
 
-    cpdef object GetFrameByIdentifier(self, object identifier):
-        return GetPyFrame(self.GetCefBrowser().get().GetFrame(
-                <int64>identifier))
+    cpdef object GetFrameByIdentifier(self, py_string identifier):
+        cdef CefString cefIdentifier
+        PyToCefString(identifier, cefIdentifier)
+        return GetPyFrame(self.GetCefBrowser().get().GetFrameByIdentifier(
+                cefIdentifier))
 
     cpdef list GetFrameNames(self):
         assert IsThread(TID_UI), (
@@ -456,7 +460,7 @@ cdef class PyBrowser:
         cdef PyFrame frame
         cdef list frames = []
         for name in names:
-            frame = self.GetFrame(name)
+            frame = self.GetFrameByName(name)
             frames.append(frame)
         return frames
 
@@ -581,7 +585,7 @@ cdef class PyBrowser:
         cdef CefBrowserSettings settings
         cdef CefPoint inspect_element_at
         self.GetCefBrowserHost().get().ShowDevTools(
-                window_info, <CefRefPtr[CefClient]?>NULL, settings,
+                window_info, <CefRefPtr[CefClient]?>nullptr, settings,
                 inspect_element_at)
 
     cpdef py_void StopLoad(self):
@@ -654,7 +658,7 @@ cdef class PyBrowser:
                     right = monitorInfo.rcMonitor.right
                     bottom = monitorInfo.rcMonitor.bottom
                     # noinspection PyUnresolvedReferences
-                    SetWindowPos(hwnd, NULL,
+                    SetWindowPos(hwnd, nullptr,
                             left, top, right-left, bottom-top,
                             SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED)
             else:
@@ -664,7 +668,7 @@ cdef class PyBrowser:
                 if not for_metro:
                     (left, top, right, bottom) = self.windowRect
                     # noinspection PyUnresolvedReferences
-                    SetWindowPos(hwnd, NULL,
+                    SetWindowPos(hwnd, nullptr,
                             int(left), int(top),
                             int(right-left), int(bottom-top),
                             SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED)
@@ -679,7 +683,7 @@ cdef class PyBrowser:
         if "type" in pyEvent:
             cefEvent.type = int(pyEvent["type"])
         if "modifiers" in pyEvent:
-            cefEvent.modifiers = <uint32>pyEvent["modifiers"]
+            cefEvent.modifiers = <uint32_t>pyEvent["modifiers"]
         # Always set CefKeyEvent.windows_key_code in SendKeyEvent, even on
         # Linux. When sending key event for 'backspace' on Linux and setting
         # "native_key_code", "character", "unmodified_character" it doesn't
@@ -728,8 +732,9 @@ cdef class PyBrowser:
         self.GetCefBrowserHost().get().SendMouseWheelEvent(mouseEvent,
                 deltaX, deltaY)
 
+    # for backward compatibility
     cpdef py_void SendFocusEvent(self, py_bool setFocus):
-        self.GetCefBrowserHost().get().SendFocusEvent(bool(setFocus))
+        self.GetCefBrowserHost().get().SetFocus(setFocus)
 
     cpdef py_void SendCaptureLostEvent(self):
         self.GetCefBrowserHost().get().SendCaptureLostEvent()
@@ -738,13 +743,6 @@ cdef class PyBrowser:
         self.GetCefBrowserHost().get().StartDownload(PyToCefStringValue(
                 url))
 
-    cpdef py_void SetMouseCursorChangeDisabled(self, py_bool disabled):
-        self.GetCefBrowserHost().get().SetMouseCursorChangeDisabled(
-                bool(disabled))
-
-    cpdef py_bool IsMouseCursorChangeDisabled(self):
-        return self.GetCefBrowserHost().get().IsMouseCursorChangeDisabled()
-
     cpdef py_bool TryCloseBrowser(self):
         return self.GetCefBrowserHost().get().TryCloseBrowser()
 
@@ -757,35 +755,12 @@ cdef class PyBrowser:
     cpdef py_void NotifyScreenInfoChanged(self):
         self.GetCefBrowserHost().get().NotifyScreenInfoChanged()
 
-    cdef void SendProcessMessage(self, cef_process_id_t targetProcess,
-            object frameId, py_string messageName, list pyArguments
-            ) except *:
-        cdef CefRefPtr[CefProcessMessage] message = \
-                CefProcessMessage_Create(PyToCefStringValue(messageName))
-        # This does not work, no idea why, the CEF implementation
-        # seems not to allow it, both Assign() and swap() do not work:
-        # | message.get().GetArgumentList().Assign(arguments.get())
-        # | message.get().GetArgumentList().swap(arguments)
-        cdef CefRefPtr[CefListValue] messageArguments = \
-                message.get().GetArgumentList()
-        PyListToExistingCefListValue(self.GetIdentifier(), frameId,
-                pyArguments, messageArguments)
-        Debug("SendProcessMessage(): message=%s, arguments size=%d" % (
-                messageName,
-                message.get().GetArgumentList().get().GetSize()))
-        cdef cpp_bool success = \
-                self.GetCefBrowser().get().SendProcessMessage(
-                        targetProcess, message)
-        if not success:
-            raise Exception("Browser.SendProcessMessage() failed: "\
-                    "messageName=%s" % messageName)
-
     # -------------------------------------------------------------------------
     # OSR drag & drop
     # -------------------------------------------------------------------------
 
     cpdef py_void DragTargetDragEnter(self, DragData drag_data, int x, int y,
-                                      uint32 allowed_ops):
+                                      uint32_t allowed_ops):
         cdef CefMouseEvent mouse_event
         mouse_event.x = x
         mouse_event.y = y
@@ -793,7 +768,7 @@ cdef class PyBrowser:
                 drag_data.cef_drag_data, mouse_event,
                 <cef_types.cef_drag_operations_mask_t>allowed_ops)
 
-    cpdef py_void DragTargetDragOver(self, int x, int y, uint32 allowed_ops):
+    cpdef py_void DragTargetDragOver(self, int x, int y, uint32_t allowed_ops):
         cdef CefMouseEvent mouse_event
         mouse_event.x = x
         mouse_event.y = y
@@ -809,7 +784,7 @@ cdef class PyBrowser:
         mouse_event.y = y
         self.GetCefBrowserHost().get().DragTargetDrop(mouse_event)
 
-    cpdef py_void DragSourceEndedAt(self, int x, int y, uint32 operation):
+    cpdef py_void DragSourceEndedAt(self, int x, int y, uint32_t operation):
         self.GetCefBrowserHost().get().DragSourceEndedAt(
                 x, y, <cef_types.cef_drag_operations_mask_t>operation)
 
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
index c3b1e1a13..27502f973 100644
--- a/src/cefpython.pyx
+++ b/src/cefpython.pyx
@@ -193,6 +193,8 @@ from libcpp.string cimport string as cpp_string
 # noinspection PyUnresolvedReferences
 from wstring cimport wstring as cpp_wstring
 # noinspection PyUnresolvedReferences
+from libcpp.memory cimport unique_ptr
+# noinspection PyUnresolvedReferences
 from libc.string cimport strlen
 # noinspection PyUnresolvedReferences
 from libc.string cimport memcpy
@@ -250,16 +252,12 @@ from cef_types cimport (
     CefSettings, CefBrowserSettings, CefRect, CefSize, CefPoint,
     CefKeyEvent, CefMouseEvent, CefScreenInfo,
     PathKey, PK_DIR_EXE, PK_DIR_MODULE,
-    int32, uint32, int64, uint64,
     cef_log_severity_t,
 )
 
 # noinspection PyUnresolvedReferences
 from cef_ptr cimport CefRefPtr
 
-# noinspection PyUnresolvedReferences
-from cef_scoped_ptr cimport scoped_ptr
-
 from cef_task cimport *
 from cef_platform cimport *
 from cef_app cimport *
@@ -273,7 +271,6 @@ from cef_time cimport *
 from cef_values cimport *
 from cefpython_app cimport *
 from cef_process_message cimport *
-from cef_web_plugin cimport *
 from cef_request_handler cimport *
 from cef_request cimport *
 from cef_cookie cimport *
@@ -321,7 +318,7 @@ g_browser_settings = {}
 # noinspection PyUnresolvedReferences
 cdef CefRefPtr[CefRequestContext] g_shared_request_context
 
-cdef scoped_ptr[MainMessageLoopExternalPump] g_external_message_pump
+cdef unique_ptr[MainMessageLoopExternalPump] g_external_message_pump
 
 cdef py_bool g_MessageLoop_called = False
 cdef py_bool g_MessageLoopWork_called = False
@@ -358,7 +355,6 @@ include "window_info.pyx"
 include "process_message_utils.pyx"
 include "javascript_callback.pyx"
 include "python_callback.pyx"
-include "web_plugin_info.pyx"
 include "request.pyx"
 include "cookie.pyx"
 include "string_visitor.pyx"
@@ -376,6 +372,7 @@ include "image.pyx"
 # Handlers
 include "handlers/accessibility_handler.pyx"
 include "handlers/browser_process_handler.pyx"
+include "handlers/cookie_access_filter.pyx"
 include "handlers/display_handler.pyx"
 include "handlers/focus_handler.pyx"
 include "handlers/javascript_dialog_handler.pyx"
@@ -581,8 +578,6 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
     # ------------------------------------------------------------------------
     if not "multi_threaded_message_loop" in application_settings:
         application_settings["multi_threaded_message_loop"] = False
-    if not "single_process" in application_settings:
-        application_settings["single_process"] = False
     # ------------------------------------------------------------------------
 
     # ------------------------------------------------------------------------
@@ -593,7 +588,6 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
     if not application_settings["cache_path"]:
         g_commandLineSwitches["disable-gpu-shader-disk-cache"] = ""
 
-
     cdef CefRefPtr[CefApp] cefApp = <CefRefPtr[CefApp]?>new CefPythonApp()
 
     IF UNAME_SYSNAME == "Windows":
@@ -625,10 +619,10 @@ def Initialize(applicationSettings=None, commandLineSwitches=None, **kwargs):
     if GetAppSetting("external_message_pump")\
             and not g_external_message_pump.get():
         Debug("Create external message pump")
+        global g_external_message_pump
         # Using .reset() here to assign new instance was causing
         # MainMessageLoopExternalPump destructor to be called. Strange.
-        g_external_message_pump.Assign(
-                MainMessageLoopExternalPump.Create())
+        g_external_message_pump = MainMessageLoopExternalPump.Create()
 
     Debug("CefInitialize()")
     cdef cpp_bool ret
@@ -761,14 +755,16 @@ def CreateBrowserSync(windowInfo=None,
     else:
         cefRequestContext.Assign(g_shared_request_context.get())
 
+    cdef CefRefPtr[CefDictionaryValue] extra_info
+
     # CEF browser creation.
     with nogil:
         cefBrowser = cef_browser_static.CreateBrowserSync(
                 cefWindowInfo, <CefRefPtr[CefClient]?>clientHandler,
-                cefNavigateUrl, cefBrowserSettings,
+                cefNavigateUrl, cefBrowserSettings, extra_info,
                 cefRequestContext)
 
-    if <void*>cefBrowser == NULL or not cefBrowser.get():
+    if not cefBrowser or not cefBrowser.get():
         Debug("CefBrowser::CreateBrowserSync() failed")
         return None
     else:
@@ -971,7 +967,7 @@ cpdef py_void SetGlobalClientCallback(py_string name, object callback):
     # Accept both with and without a prefix.
     if name.startswith("_"):
         name = name[1:]
-    if name in ["OnCertificateError", "OnBeforePluginLoad", "OnAfterCreated",
+    if name in ["OnCertificateError", "OnAfterCreated",
                 "OnAccessibilityTreeChange", "OnAccessibilityLocationChange"]:
         g_globalClientCallbacks[name] = callback
     else:
diff --git a/src/cefpython3.wx/chromectrl.py b/src/cefpython3.wx/chromectrl.py
index cf06f82a2..0c0129d31 100644
--- a/src/cefpython3.wx/chromectrl.py
+++ b/src/cefpython3.wx/chromectrl.py
@@ -160,9 +160,6 @@ def __init__(self, parent, url="", useTimer=True,
         if not browserSettings:
             browserSettings = {}
 
-        # Disable plugins:
-        # | browserSettings["plugins_disabled"] = True
-
         self.browser = cefpython.CreateBrowserSync(windowInfo,
                 browserSettings=browserSettings, navigateUrl=url)
 
diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile
index 25e645ff7..84472c744 100644
--- a/src/client_handler/Makefile
+++ b/src/client_handler/Makefile
@@ -23,7 +23,7 @@ SRC = client_handler.cpp cookie_visitor.cpp resource_handler.cpp \
 	download_handler.cpp focus_handler.cpp js_dialog_handler.cpp \
 	keyboard_handler.cpp lifespan_handler.cpp load_handler.cpp \
 	render_handler.cpp request_handler.cpp dialog_handler.cpp \
-	cef_log.cpp accessibility_handler.cpp \
+	cef_log.cpp accessibility_handler.cpp cookie_access_filter.cpp \
 	$(SRC_MORE)
 
 OBJ = $(filter %.o, $(SRC:.cpp=.o) $(SRC:.mm=.o))
diff --git a/src/client_handler/client_handler.cpp b/src/client_handler/client_handler.cpp
index daf9a4e59..02190eaa1 100644
--- a/src/client_handler/client_handler.cpp
+++ b/src/client_handler/client_handler.cpp
@@ -27,6 +27,7 @@
 
 bool ClientHandler::OnProcessMessageReceived(
                                         CefRefPtr<CefBrowser> browser,
+                                        CefRefPtr<CefFrame> frame,
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message)
 {
@@ -34,16 +35,14 @@ bool ClientHandler::OnProcessMessageReceived(
     if (source_process != PID_RENDERER) {
         return false;
     }
-    std::string messageName = message->GetName().ToString();
+    const std::string& messageName = message->GetName();
     std::string logMessage = "[Browser process] OnProcessMessageReceived(): ";
     logMessage.append(messageName.c_str());
     LOG(INFO) << logMessage.c_str();
     if (messageName == "OnContextCreated") {
         CefRefPtr<CefListValue> arguments = message->GetArgumentList();
-        if (arguments->GetSize() == 1 && arguments->GetType(0) == VTYPE_INT) {
-            int64 frameId = arguments->GetInt(0);
-            CefRefPtr<CefFrame> frame = browser->GetFrame(frameId);
-            if (!frame.get()) {
+        if (arguments->GetSize() == 1 && arguments->GetType(0) == VTYPE_STRING) {
+           if (!frame.get()) {
                 // Frame was already destroyed while IPC messaging was
                 // executing. Issue #431. User callback will not be
                 // executed in such case.
@@ -60,9 +59,9 @@ bool ClientHandler::OnProcessMessageReceived(
         CefRefPtr<CefListValue> arguments = message->GetArgumentList();
         if (arguments->GetSize() == 2 \
                 && arguments->GetType(0) == VTYPE_INT \
-                && arguments->GetType(1) == VTYPE_INT) {
+                && arguments->GetType(1) == VTYPE_STRING) {
             int browserId = arguments->GetInt(0);
-            int64 frameId = arguments->GetInt(1);
+            CefString frameId = arguments->GetString(1);
             // Even if frame was alrady destroyed (Issue #431) you still
             // want to call V8ContextHandler_OnContextReleased as it releases
             // some resources. Thus passing IDs instead of actual
@@ -79,12 +78,12 @@ bool ClientHandler::OnProcessMessageReceived(
         CefRefPtr<CefListValue> arguments = message->GetArgumentList();
         if (arguments->GetSize() == 3
                     // frameId
-                    && arguments->GetType(0) == VTYPE_INT
+                    && arguments->GetType(0) == VTYPE_STRING
                     // functionName
                     && arguments->GetType(1) == VTYPE_STRING
                     // functionArguments
                     && arguments->GetType(2) == VTYPE_LIST) {
-            int64 frameId = arguments->GetInt(0);
+            CefString frameId = arguments->GetString(0);
             CefString functionName = arguments->GetString(1);
             CefRefPtr<CefListValue> functionArguments = arguments->GetList(2);
             // Even if frame was already destroyed (Issue #431) you still
diff --git a/src/client_handler/client_handler.h b/src/client_handler/client_handler.h
index 3e9e3917b..e52d0b50c 100644
--- a/src/client_handler/client_handler.h
+++ b/src/client_handler/client_handler.h
@@ -87,6 +87,7 @@ class ClientHandler : public CefClient,
     }
 
     bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+                                  CefRefPtr<CefFrame> frame,
                                   CefProcessId source_process,
                                   CefRefPtr<CefProcessMessage> message
                                   ) override;
diff --git a/src/client_handler/cookie_access_filter.cpp b/src/client_handler/cookie_access_filter.cpp
new file mode 100644
index 000000000..6eaeb70bf
--- /dev/null
+++ b/src/client_handler/cookie_access_filter.cpp
@@ -0,0 +1,24 @@
+// Copyright (c) 2018 CEF Python, see the Authors file.
+// All rights reserved. Licensed under BSD 3-clause license.
+// Project website: https://github.com/cztomczak/cefpython
+
+#include "cookie_access_filter.h"
+#include "common/cefpython_public_api.h"
+
+
+bool CookieAccessFilter::CanSendCookie(CefRefPtr<CefBrowser> browser,
+                                       CefRefPtr<CefFrame> frame,
+                                       CefRefPtr<CefRequest> request,
+                                       const CefCookie& cookie) {
+    REQUIRE_IO_THREAD();
+    return CookieAccessFilter_CanSendCookie(browser, frame, request, cookie);
+}
+
+bool CookieAccessFilter::CanSaveCookie(CefRefPtr<CefBrowser> browser,
+                                       CefRefPtr<CefFrame> frame,
+                                       CefRefPtr<CefRequest> request,
+                                       CefRefPtr<CefResponse> response,
+                                       const CefCookie& cookie) {
+    REQUIRE_IO_THREAD();
+    return CookieAccessFilter_CanSaveCookie(browser, frame, request, response, cookie);
+}
diff --git a/src/client_handler/cookie_access_filter.h b/src/client_handler/cookie_access_filter.h
new file mode 100644
index 000000000..4d0c57c9c
--- /dev/null
+++ b/src/client_handler/cookie_access_filter.h
@@ -0,0 +1,27 @@
+// Copyright (c) 2018 CEF Python, see the Authors file.
+// All rights reserved. Licensed under BSD 3-clause license.
+// Project website: https://github.com/cztomczak/cefpython
+
+#include "common/cefpython_public_api.h"
+#include "include/cef_resource_request_handler.h"
+
+
+class CookieAccessFilter : public CefCookieAccessFilter
+{
+public:
+    CookieAccessFilter(){}
+    virtual ~CookieAccessFilter(){}
+
+    virtual bool CanSendCookie(CefRefPtr<CefBrowser> browser,
+                               CefRefPtr<CefFrame> frame,
+                               CefRefPtr<CefRequest> request,
+                               const CefCookie& cookie) override;
+    virtual bool CanSaveCookie(CefRefPtr<CefBrowser> browser,
+                              CefRefPtr<CefFrame> frame,
+                              CefRefPtr<CefRequest> request,
+                              CefRefPtr<CefResponse> response,
+                              const CefCookie& cookie) override;
+
+private:
+    IMPLEMENT_REFCOUNTING(CookieAccessFilter);
+};
diff --git a/src/client_handler/cookie_visitor.h b/src/client_handler/cookie_visitor.h
index 54c2b53fd..0b990baca 100644
--- a/src/client_handler/cookie_visitor.h
+++ b/src/client_handler/cookie_visitor.h
@@ -24,7 +24,7 @@ class CookieVisitor : public CefCookieVisitor
             int count,
             int total,
             bool& deleteCookie
-            ) OVERRIDE;
+            ) override;
     
 protected:
   IMPLEMENT_REFCOUNTING(CookieVisitor);
diff --git a/src/client_handler/dialog_handler.cpp b/src/client_handler/dialog_handler.cpp
index ab90de9b6..6946e4f65 100644
--- a/src/client_handler/dialog_handler.cpp
+++ b/src/client_handler/dialog_handler.cpp
@@ -19,7 +19,6 @@ bool DialogHandler::OnFileDialog(CefRefPtr<CefBrowser> browser,
                                  const CefString& title,
                                  const CefString& default_file_path,
                                  const std::vector<CefString>& accept_filters,
-                                 int selected_accept_filter,
                                  CefRefPtr<CefFileDialogCallback> callback)
 {
 #if defined(OS_LINUX)
@@ -28,7 +27,6 @@ bool DialogHandler::OnFileDialog(CefRefPtr<CefBrowser> browser,
                                          title,
                                          default_file_path,
                                          accept_filters,
-                                         selected_accept_filter,
                                          callback);
 #else
     return false;
diff --git a/src/client_handler/dialog_handler.h b/src/client_handler/dialog_handler.h
index 21d79a60d..2cea565f6 100644
--- a/src/client_handler/dialog_handler.h
+++ b/src/client_handler/dialog_handler.h
@@ -23,7 +23,6 @@ class DialogHandler : public CefDialogHandler
                       const CefString& title,
                       const CefString& default_file_path,
                       const std::vector<CefString>& accept_filters,
-                      int selected_accept_filter,
                       CefRefPtr<CefFileDialogCallback> callback)
                       override;
 
diff --git a/src/client_handler/display_handler.cpp b/src/client_handler/display_handler.cpp
index b00bf6a51..573549e26 100644
--- a/src/client_handler/display_handler.cpp
+++ b/src/client_handler/display_handler.cpp
@@ -59,4 +59,13 @@ void DisplayHandler::OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
                                              double progress) {
     REQUIRE_UI_THREAD();
     return DisplayHandler_OnLoadingProgressChange(browser, progress);
+}
+
+bool DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser> browser,
+                                   CefCursorHandle cursor,
+                                   cef_cursor_type_t type,
+                                   const CefCursorInfo& custom_cursor_info)
+{
+    REQUIRE_UI_THREAD();
+    return DisplayHandler_OnCursorChange(browser, cursor);
 }
\ No newline at end of file
diff --git a/src/client_handler/display_handler.h b/src/client_handler/display_handler.h
index a281713d9..382bceeaa 100644
--- a/src/client_handler/display_handler.h
+++ b/src/client_handler/display_handler.h
@@ -38,6 +38,12 @@ class DisplayHandler : public CefDisplayHandler
 
     void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
                                  double progress) override;
+    
+    bool OnCursorChange(CefRefPtr<CefBrowser> browser,
+                    CefCursorHandle cursor,
+                    cef_cursor_type_t type,
+                    const CefCursorInfo& custom_cursor_info
+                    ) override;
 
 private:
     IMPLEMENT_REFCOUNTING(DisplayHandler);
diff --git a/src/client_handler/dpi_aware.cpp b/src/client_handler/dpi_aware.cpp
index 48e2a13f7..9ee258d65 100644
--- a/src/client_handler/dpi_aware.cpp
+++ b/src/client_handler/dpi_aware.cpp
@@ -11,6 +11,7 @@
 #include "include/wrapper/cef_closure_task.h"
 #include "include/base/cef_bind.h"
 #include "include/base/cef_logging.h"
+#include "include/base/cef_callback.h"
 
 const int DEFAULT_DPIX = 96;
 
@@ -219,7 +220,7 @@ void SetBrowserDpiSettings(CefRefPtr<CefBrowser> cefBrowser,
     CefPostDelayedTask(
             TID_UI,
             CefCreateClosureTask(
-                    base::Bind(&SetBrowserDpiSettings,
+                    base::BindOnce(&SetBrowserDpiSettings,
                                cefBrowser, autoZooming)
             ),
             50
diff --git a/src/client_handler/lifespan_handler.cpp b/src/client_handler/lifespan_handler.cpp
index b4d7d52f6..d9d6010d6 100644
--- a/src/client_handler/lifespan_handler.cpp
+++ b/src/client_handler/lifespan_handler.cpp
@@ -19,6 +19,7 @@ bool LifespanHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser,
                                     CefWindowInfo& windowInfo,
                                     CefRefPtr<CefClient>& client,
                                     CefBrowserSettings& settings,
+                                    CefRefPtr<CefDictionaryValue>& extra_info,
                                     bool* no_javascript_access)
 {
     REQUIRE_UI_THREAD();
@@ -27,7 +28,7 @@ bool LifespanHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser,
     return LifespanHandler_OnBeforePopup(browser, frame, target_url,
                         target_frame_name, target_disposition, user_gesture,
                         popupFeaturesNotImpl, windowInfo, client, settings,
-                        no_javascript_access);
+                        extra_info, no_javascript_access);
 }
 
 
diff --git a/src/client_handler/lifespan_handler.h b/src/client_handler/lifespan_handler.h
index 91244eff9..6b38d7dda 100644
--- a/src/client_handler/lifespan_handler.h
+++ b/src/client_handler/lifespan_handler.h
@@ -24,6 +24,7 @@ class LifespanHandler : public CefLifeSpanHandler
                        CefWindowInfo& windowInfo,
                        CefRefPtr<CefClient>& client,
                        CefBrowserSettings& settings,
+                       CefRefPtr<CefDictionaryValue>& extra_info,
                        bool* no_javascript_access) override;
     void OnAfterCreated(CefRefPtr<CefBrowser> browser) override;
     bool DoClose(CefRefPtr<CefBrowser> browser) override;
diff --git a/src/client_handler/render_handler.cpp b/src/client_handler/render_handler.cpp
index cf45d15ee..1935a3baf 100644
--- a/src/client_handler/render_handler.cpp
+++ b/src/client_handler/render_handler.cpp
@@ -13,11 +13,11 @@ bool RenderHandler::GetRootScreenRect(CefRefPtr<CefBrowser> browser,
 }
 
 
-bool RenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,
+void RenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser,
                                 CefRect& rect)
 {
     REQUIRE_UI_THREAD();
-    return RenderHandler_GetViewRect(browser, rect);
+    RenderHandler_GetViewRect(browser, rect);
 }
 
 
@@ -69,16 +69,6 @@ void RenderHandler::OnPaint(CefRefPtr<CefBrowser> browser,
 }
 
 
-void RenderHandler::OnCursorChange(CefRefPtr<CefBrowser> browser,
-                                   CefCursorHandle cursor,
-                                   CursorType type,
-                                   const CefCursorInfo& custom_cursor_info)
-{
-    REQUIRE_UI_THREAD();
-    RenderHandler_OnCursorChange(browser, cursor);
-}
-
-
 void RenderHandler::OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser,
                                           double x,
                                           double y)
diff --git a/src/client_handler/render_handler.h b/src/client_handler/render_handler.h
index 75eee86c5..c87c52354 100644
--- a/src/client_handler/render_handler.h
+++ b/src/client_handler/render_handler.h
@@ -22,7 +22,7 @@ class RenderHandler : public CefRenderHandler,
     bool GetRootScreenRect(CefRefPtr<CefBrowser> browser,
                            CefRect& rect) override;
 
-    bool GetViewRect(CefRefPtr<CefBrowser> browser,
+    void GetViewRect(CefRefPtr<CefBrowser> browser,
                      CefRect& rect) override;
 
     bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
@@ -46,12 +46,6 @@ class RenderHandler : public CefRenderHandler,
                  const void* buffer,
                  int width, int height) override;
 
-    void OnCursorChange(CefRefPtr<CefBrowser> browser,
-                        CefCursorHandle cursor,
-                        CursorType type,
-                        const CefCursorInfo& custom_cursor_info
-                        ) override;
-
     void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser,
                                double x,
                                double y) override;
diff --git a/src/client_handler/request_context_handler.cpp b/src/client_handler/request_context_handler.cpp
deleted file mode 100644
index bf816cf51..000000000
--- a/src/client_handler/request_context_handler.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2013 CEF Python, see the Authors file.
-// All rights reserved. Licensed under BSD 3-clause license.
-// Project website: https://github.com/cztomczak/cefpython
-
-#include "request_context_handler.h"
-#include "common/cefpython_public_api.h"
-
-// --------------------------------------------------------------------------
-// CefRequestContextHandler
-// --------------------------------------------------------------------------
-
-CefRefPtr<CefCookieManager> RequestContextHandler::GetCookieManager() {
-    REQUIRE_IO_THREAD();
-    if (browser_.get()) {
-        return RequestHandler_GetCookieManager(browser_,
-            browser_->GetMainFrame()->GetURL());
-    } else {
-        CefString mainUrl;
-        return RequestHandler_GetCookieManager(browser_, mainUrl);
-    }    
-    // Default: return NULL.
-}
-
-bool RequestContextHandler::OnBeforePluginLoad(
-                        const CefString& mime_type,
-                        const CefString& plugin_url,
-                        bool is_main_frame,
-                        const CefString& top_origin_url,
-                        CefRefPtr<CefWebPluginInfo> plugin_info,
-                        PluginPolicy* plugin_policy) {
-    // Called on multiple threads
-    return RequestHandler_OnBeforePluginLoad(browser_,
-                                             mime_type,
-                                             plugin_url,
-                                             is_main_frame,
-                                             top_origin_url,
-                                             plugin_info,
-                                             plugin_policy);
-}
diff --git a/src/client_handler/request_context_handler.h b/src/client_handler/request_context_handler.h
index b8bf25f3a..6c4e3218d 100644
--- a/src/client_handler/request_context_handler.h
+++ b/src/client_handler/request_context_handler.h
@@ -10,12 +10,14 @@
 
 #include "common/cefpython_public_api.h"
 
+#include "include/cef_request_context_handler.h"
+#include "include/base/cef_callback.h"
+
 class RequestContextHandler :
         public CefRequestContextHandler
 {
 private:
     CefRefPtr<CefBrowser> browser_;
-    typedef cef_plugin_policy_t PluginPolicy;
 
 public:
     // Browser may be NULL when instantiated from cefpython.CreateBrowserSync.
@@ -29,14 +31,6 @@ class RequestContextHandler :
         browser_ = browser;
     }
 
-    virtual CefRefPtr<CefCookieManager> GetCookieManager() OVERRIDE;
-    virtual bool OnBeforePluginLoad(const CefString& mime_type,
-                                  const CefString& plugin_url,
-                                  bool is_main_frame,
-                                  const CefString& top_origin_url,
-                                  CefRefPtr<CefWebPluginInfo> plugin_info,
-                                  PluginPolicy* plugin_policy) OVERRIDE;
-
 private:
     IMPLEMENT_REFCOUNTING(RequestContextHandler);
 };
diff --git a/src/client_handler/request_handler.cpp b/src/client_handler/request_handler.cpp
index 5227b8921..a070a9b72 100644
--- a/src/client_handler/request_handler.cpp
+++ b/src/client_handler/request_handler.cpp
@@ -4,6 +4,7 @@
 
 #include "request_handler.h"
 #include "include/base/cef_logging.h"
+#include "include/base/cef_callback.h"
 
 
 bool RequestHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
@@ -22,7 +23,7 @@ ReturnValue RequestHandler::OnBeforeResourceLoad(
                                         CefRefPtr<CefBrowser> browser,
                                         CefRefPtr<CefFrame> frame,
                                         CefRefPtr<CefRequest> request,
-                                        CefRefPtr<CefRequestCallback> callback)
+                                        CefRefPtr<CefCallback> callback)
 {
     REQUIRE_IO_THREAD();
     bool retval = RequestHandler_OnBeforeResourceLoad(browser, frame, request);
@@ -73,8 +74,8 @@ bool RequestHandler::GetAuthCredentials(CefRefPtr<CefBrowser> browser,
 
 bool RequestHandler::OnQuotaRequest(CefRefPtr<CefBrowser> browser,
                                     const CefString& origin_url,
-                                    int64 new_size,
-                                    CefRefPtr<CefRequestCallback> callback) {
+                                    int64_t new_size,
+                                    CefRefPtr<CefCallback> callback) {
     REQUIRE_IO_THREAD();
     return RequestHandler_OnQuotaRequest(browser, origin_url, new_size,
                                          callback);
@@ -94,7 +95,7 @@ bool RequestHandler::OnCertificateError(
                                   cef_errorcode_t cert_error,
                                   const CefString& request_url,
                                   CefRefPtr<CefSSLInfo> ssl_info, // not used
-                                  CefRefPtr<CefRequestCallback> callback)
+                                  CefRefPtr<CefCallback> callback)
 {
     REQUIRE_UI_THREAD();
     return RequestHandler_OnCertificateError(cert_error, request_url,
@@ -109,26 +110,3 @@ void RequestHandler::OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
     LOG(ERROR) << "[Browser process] OnRenderProcessTerminated()";
     RequestHandler_OnRendererProcessTerminated(browser, status);
 }
-
-
-void RequestHandler::OnPluginCrashed(CefRefPtr<CefBrowser> browser,
-                                     const CefString& plugin_path)
-{
-    REQUIRE_UI_THREAD();
-    RequestHandler_OnPluginCrashed(browser, plugin_path);
-}
-
-bool RequestHandler::CanGetCookies(CefRefPtr<CefBrowser> browser,
-                                   CefRefPtr<CefFrame> frame,
-                                   CefRefPtr<CefRequest> request) {
-    REQUIRE_IO_THREAD();
-    return RequestHandler_CanGetCookies(browser, frame, request);
-}
-
-bool RequestHandler::CanSetCookie(CefRefPtr<CefBrowser> browser,
-                                  CefRefPtr<CefFrame> frame,
-                                  CefRefPtr<CefRequest> request,
-                                  const CefCookie& cookie) {
-    REQUIRE_IO_THREAD();
-    return RequestHandler_CanSetCookie(browser, frame, request, cookie);
-}
diff --git a/src/client_handler/request_handler.h b/src/client_handler/request_handler.h
index 7e5e0e6c3..6ce8cde66 100644
--- a/src/client_handler/request_handler.h
+++ b/src/client_handler/request_handler.h
@@ -4,11 +4,14 @@
 
 #include "common/cefpython_public_api.h"
 #include "include/cef_request_handler.h"
+#include "include/base/cef_callback.h"
+#include "cookie_access_filter.h"
 
 typedef cef_return_value_t ReturnValue;
 
 
-class RequestHandler : public CefRequestHandler
+class RequestHandler : public CefRequestHandler,
+                       public CookieAccessFilter
 {
 public:
     RequestHandler(){}
@@ -23,19 +26,19 @@ class RequestHandler : public CefRequestHandler
     ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
                                      CefRefPtr<CefFrame> frame,
                                      CefRefPtr<CefRequest> request,
-                                     CefRefPtr<CefRequestCallback> callback
-                                     ) override;
+                                     CefRefPtr<CefCallback> callback
+                                     ) ;
 
     CefRefPtr<CefResourceHandler> GetResourceHandler(
                                       CefRefPtr<CefBrowser> browser,
                                       CefRefPtr<CefFrame> frame,
-                                      CefRefPtr<CefRequest> request) override;
+                                      CefRefPtr<CefRequest> request) ;
 
     void OnResourceRedirect(CefRefPtr<CefBrowser> browser,
                             CefRefPtr<CefFrame> frame,
                             CefRefPtr<CefRequest> request,
                             CefRefPtr<CefResponse> response,
-                            CefString& new_url) override;
+                            CefString& new_url) ;
 
     bool GetAuthCredentials(CefRefPtr<CefBrowser> browser,
                             CefRefPtr<CefFrame> frame,
@@ -44,38 +47,26 @@ class RequestHandler : public CefRequestHandler
                             int port,
                             const CefString& realm,
                             const CefString& scheme,
-                            CefRefPtr<CefAuthCallback> callback) override;
+                            CefRefPtr<CefAuthCallback> callback) ;
 
     bool OnQuotaRequest(CefRefPtr<CefBrowser> browser,
                         const CefString& origin_url,
-                        int64 new_size,
-                        CefRefPtr<CefRequestCallback> callback) override;
+                        int64_t new_size,
+                        CefRefPtr<CefCallback> callback) ;
 
     void OnProtocolExecution(CefRefPtr<CefBrowser> browser,
                              const CefString& url,
-                             bool& allow_os_execution) override;
+                             bool& allow_os_execution) ;
 
     bool OnCertificateError(CefRefPtr<CefBrowser> browser,
                             cef_errorcode_t cert_error,
                             const CefString& request_url,
                             CefRefPtr<CefSSLInfo> ssl_info,
-                            CefRefPtr<CefRequestCallback> callback) override;
+                            CefRefPtr<CefCallback> callback) override;
 
     void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
                                    cef_termination_status_t status) override;
 
-    void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
-                         const CefString& plugin_path) override;
-
-    bool CanGetCookies(CefRefPtr<CefBrowser> browser,
-                       CefRefPtr<CefFrame> frame,
-                       CefRefPtr<CefRequest> request) override;
-
-    bool CanSetCookie(CefRefPtr<CefBrowser> browser,
-                      CefRefPtr<CefFrame> frame,
-                      CefRefPtr<CefRequest> request,
-                      const CefCookie& cookie) override;
-
 private:
     IMPLEMENT_REFCOUNTING(RequestHandler);
 };
diff --git a/src/client_handler/resource_handler.cpp b/src/client_handler/resource_handler.cpp
index 963575928..08d2565a0 100644
--- a/src/client_handler/resource_handler.cpp
+++ b/src/client_handler/resource_handler.cpp
@@ -12,7 +12,7 @@ bool ResourceHandler::ProcessRequest(CefRefPtr<CefRequest> request,
 }
 
 void ResourceHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,
-                              int64& response_length,
+                              int64_t& response_length,
                               CefString& redirectUrl) {
     REQUIRE_IO_THREAD();
     ResourceHandler_GetResponseHeaders(resourceHandlerId_, response,
@@ -28,16 +28,6 @@ bool ResourceHandler::ReadResponse(void* data_out,
             bytes_to_read, bytes_read, callback);
 }
 
-bool ResourceHandler::CanGetCookie(const CefCookie& cookie) {
-    REQUIRE_IO_THREAD();
-    return ResourceHandler_CanGetCookie(resourceHandlerId_, cookie);
-}
-
-bool ResourceHandler::CanSetCookie(const CefCookie& cookie) {
-    REQUIRE_IO_THREAD();
-    return ResourceHandler_CanSetCookie(resourceHandlerId_, cookie);
-}
-
 void ResourceHandler::Cancel() {
     REQUIRE_IO_THREAD();
     return ResourceHandler_Cancel(resourceHandlerId_);
diff --git a/src/client_handler/resource_handler.h b/src/client_handler/resource_handler.h
index 3bf5e41f6..fc81264ad 100644
--- a/src/client_handler/resource_handler.h
+++ b/src/client_handler/resource_handler.h
@@ -23,7 +23,7 @@ class ResourceHandler : public CefResourceHandler
                               CefRefPtr<CefCallback> callback) override;
 
   virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
-                                  int64& response_length,
+                                  int64_t& response_length,
                                   CefString& redirectUrl) override;
 
   virtual bool ReadResponse(void* data_out,
@@ -31,11 +31,7 @@ class ResourceHandler : public CefResourceHandler
                             int& bytes_read,
                             CefRefPtr<CefCallback> callback) override;
 
-  virtual bool CanGetCookie(const CefCookie& cookie) override;
-
-  virtual bool CanSetCookie(const CefCookie& cookie) override;
-
-  virtual void Cancel() OVERRIDE;
+  virtual void Cancel() override;
     
 private:
   IMPLEMENT_REFCOUNTING(ResourceHandler);
diff --git a/src/client_handler/string_visitor.h b/src/client_handler/string_visitor.h
index 3765442c5..c36cf40f6 100644
--- a/src/client_handler/string_visitor.h
+++ b/src/client_handler/string_visitor.h
@@ -21,7 +21,7 @@ class StringVisitor : public CefStringVisitor
 
     virtual void Visit(
             const CefString& string
-            ) OVERRIDE;
+            ) override;
     
 protected:
   IMPLEMENT_REFCOUNTING(StringVisitor);
diff --git a/src/client_handler/task.cpp b/src/client_handler/task.cpp
index ec032a2d6..62a9fcbff 100644
--- a/src/client_handler/task.cpp
+++ b/src/client_handler/task.cpp
@@ -5,21 +5,22 @@
 #include "task.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "include/base/cef_bind.h"
+#include "include/base/cef_callback.h"
 
 void PostTaskWrapper(int threadId, int taskId) {
     CefPostTask(
             static_cast<CefThreadId>(threadId),
-            CefCreateClosureTask(base::Bind(
+            CefCreateClosureTask(base::BindOnce(
                     &PyTaskRunnable,
                     taskId
             ))
     );
 }
 
-void PostDelayedTaskWrapper(int threadId, int64 delay_ms, int taskId) {
+void PostDelayedTaskWrapper(int threadId, int64_t delay_ms, int taskId) {
     CefPostDelayedTask(
             static_cast<CefThreadId>(threadId),
-            CefCreateClosureTask(base::Bind(
+            CefCreateClosureTask(base::BindOnce(
                     &PyTaskRunnable,
                     taskId
             )),
@@ -33,7 +34,7 @@ CefRefPtr<CefTask> CreateTask_SetCookie(
         const CefCookie& cookie,
         CefRefPtr<CefSetCookieCallback> callback)
 {
-    return CefCreateClosureTask(base::Bind(
+    return CefCreateClosureTask(base::BindOnce(
             base::IgnoreResult(&CefCookieManager::SetCookie), obj,
             url,
             cookie,
@@ -47,7 +48,7 @@ CefRefPtr<CefTask> CreateTask_DeleteCookies(
         const CefString& cookie_name,
         CefRefPtr<CefDeleteCookiesCallback> callback)
 {
-    return CefCreateClosureTask(base::Bind(
+    return CefCreateClosureTask(base::BindOnce(
             base::IgnoreResult(&CefCookieManager::DeleteCookies), obj,
             url,
             cookie_name,
diff --git a/src/client_handler/task.h b/src/client_handler/task.h
index 1839d9e32..a7d8c5b38 100644
--- a/src/client_handler/task.h
+++ b/src/client_handler/task.h
@@ -9,7 +9,7 @@
 #include "include/cef_task.h"
 
 void PostTaskWrapper(int threadId, int taskId);
-void PostDelayedTaskWrapper(int threadId, int64 delay_ms, int taskId);
+void PostDelayedTaskWrapper(int threadId, int64_t delay_ms, int taskId);
 
 CefRefPtr<CefTask> CreateTask_SetCookie(
         CefCookieManager* obj,
diff --git a/src/client_handler/web_request_client.cpp b/src/client_handler/web_request_client.cpp
index 965de919b..509a72eda 100644
--- a/src/client_handler/web_request_client.cpp
+++ b/src/client_handler/web_request_client.cpp
@@ -9,14 +9,14 @@ void WebRequestClient::OnRequestComplete(CefRefPtr<CefURLRequest> request) {
 }
 
 void WebRequestClient::OnUploadProgress(CefRefPtr<CefURLRequest> request,
-                            int64 current,
-                            int64 total) {
+                            int64_t current,
+                            int64_t total) {
     WebRequestClient_OnUploadProgress(webRequestId_, request, current, total);
 }
 
 void WebRequestClient::OnDownloadProgress(CefRefPtr<CefURLRequest> request,
-                              int64 current,
-                              int64 total) {
+                              int64_t current,
+                              int64_t total) {
     WebRequestClient_OnDownloadProgress(webRequestId_, request, current,
             total);
 }
diff --git a/src/client_handler/web_request_client.h b/src/client_handler/web_request_client.h
index 8b815a968..8f5bce96a 100644
--- a/src/client_handler/web_request_client.h
+++ b/src/client_handler/web_request_client.h
@@ -20,26 +20,26 @@ class WebRequestClient : public CefURLRequestClient
     }    
     virtual ~WebRequestClient(){}
 
-    virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) OVERRIDE;
+    virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) override;
 
     virtual void OnUploadProgress(CefRefPtr<CefURLRequest> request,
-                                int64 current,
-                                int64 total) OVERRIDE;
+                                int64_t current,
+                                int64_t total) override;
 
     virtual void OnDownloadProgress(CefRefPtr<CefURLRequest> request,
-                                  int64 current,
-                                  int64 total) OVERRIDE;
+                                  int64_t current,
+                                  int64_t total) override;
 
     virtual void OnDownloadData(CefRefPtr<CefURLRequest> request,
                               const void* data,
-                              size_t data_length) OVERRIDE;
+                              size_t data_length) override;
 
     virtual bool GetAuthCredentials(bool isProxy,
                                   const CefString& host,
                                   int port,
                                   const CefString& realm,
                                   const CefString& scheme,
-                                  CefRefPtr<CefAuthCallback> callback) OVERRIDE;
+                                  CefRefPtr<CefAuthCallback> callback) override;
 
 protected:
   IMPLEMENT_REFCOUNTING(WebRequestClient);
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
index c796388e6..84552489c 100644
--- a/src/common/cefpython_public_api.h
+++ b/src/common/cefpython_public_api.h
@@ -50,6 +50,10 @@
 #include "../../build/build_cefpython/cefpython_py38_fixed.h"
 #elif PY_MINOR_VERSION == 9
 #include "../../build/build_cefpython/cefpython_py39_fixed.h"
+#elif PY_MINOR_VERSION == 10
+#include "../../build/build_cefpython/cefpython_py310_fixed.h"
+#elif PY_MINOR_VERSION == 11
+#include "../../build/build_cefpython/cefpython_py311_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/src/cookie.pyx b/src/cookie.pyx
index 6d90144b0..d776923ef 100644
--- a/src/cookie.pyx
+++ b/src/cookie.pyx
@@ -167,16 +167,16 @@ cdef class Cookie:
         return self.cefCookie.httponly
 
     cpdef py_void SetCreation(self, object creation):
-        DatetimeToCefTimeT(creation, self.cefCookie.creation)
+        DatetimeToCefBasetimeT(creation, self.cefCookie.creation)
 
     cpdef object GetCreation(self):
-        return CefTimeTToDatetime(self.cefCookie.creation)
+        return CefBasetimeTToDatetime(self.cefCookie.creation)
 
     cpdef py_void SetLastAccess(self, object lastAccess):
-        DatetimeToCefTimeT(lastAccess, self.cefCookie.last_access)
+        DatetimeToCefBasetimeT(lastAccess, self.cefCookie.last_access)
 
     cpdef object GetLastAccess(self):
-        return CefTimeTToDatetime(self.cefCookie.last_access)
+        return CefBasetimeTToDatetime(self.cefCookie.last_access)
 
     cpdef py_void SetHasExpires(self, py_bool hasExpires):
         self.cefCookie.has_expires = bool(hasExpires)
@@ -185,10 +185,10 @@ cdef class Cookie:
         return self.cefCookie.has_expires
 
     cpdef py_void SetExpires(self, object expires):
-        DatetimeToCefTimeT(expires, self.cefCookie.expires)
+        DatetimeToCefBasetimeT(expires, self.cefCookie.expires)
 
     cpdef object GetExpires(self):
-        return CefTimeTToDatetime(self.cefCookie.expires)
+        return CefBasetimeTToDatetime(self.cefCookie.expires)
 
 # ------------------------------------------------------------------------------
 # CookieManager
@@ -204,37 +204,10 @@ class CookieManager(object):
         cdef CefRefPtr[CefCookieManager] cefCookieManager
         if not g_globalCookieManager:
             cefCookieManager = CefCookieManager_GetGlobalManager(
-                    <CefRefPtr[CefCompletionCallback]?>NULL)
+                    <CefRefPtr[CefCompletionCallback]?>nullptr)
             g_globalCookieManager = CreatePyCookieManager(cefCookieManager)
         return g_globalCookieManager
 
-    @classmethod
-    def GetBlockingManager(cls):
-        return CreatePyCookieManager(CefCookieManager_GetBlockingManager())
-
-    @classmethod
-    def CreateManager(cls, py_string path,
-                      py_bool persist_session_cookies=False):
-        """
-        Create a new cookie manager.
-        :param path:
-        :type path: str
-        :param persist_session_cookies:
-        :type path: bool
-        :return: CookieManager object
-        :rtype: CookieManager
-        """
-        # When PyCharm generates a stub for the cefpython module
-        # it doesn't use the above docstring for code inspections.
-        # No idea why.
-        cdef CefRefPtr[CefCookieManager] cefCookieManager
-        cefCookieManager = CefCookieManager_CreateManager(
-                PyToCefStringValue(path), bool(persist_session_cookies),
-                <CefRefPtr[CefCompletionCallback]?>NULL)
-        if <void*>cefCookieManager != NULL and cefCookieManager.get():
-            return CreatePyCookieManager(cefCookieManager)
-        return None
-
 # ------------------------------------------------------------------------------
 # PyCookieManager
 # ------------------------------------------------------------------------------
@@ -248,13 +221,6 @@ cdef PyCookieManager CreatePyCookieManager(
 cdef class PyCookieManager:
     cdef CefRefPtr[CefCookieManager] cefCookieManager
 
-    cpdef py_void SetSupportedSchemes(self, list schemes):
-        cdef cpp_vector[CefString] schemesVector
-        for scheme in schemes:
-            schemesVector.push_back(PyToCefStringValue(scheme))
-        self.cefCookieManager.get().SetSupportedSchemes(schemesVector,
-                <CefRefPtr[CefCompletionCallback]?>NULL)
-
     cdef py_void ValidateUserCookieVisitor(self, object userCookieVisitor):
         if userCookieVisitor and hasattr(userCookieVisitor, "Visit") and (
                 callable(getattr(userCookieVisitor, "Visit"))):
@@ -287,23 +253,17 @@ cdef class PyCookieManager:
         CefPostTask(TID_IO, CreateTask_SetCookie(
                 self.cefCookieManager.get(),
                 PyToCefStringValue(url), cookie.cefCookie,
-                <CefRefPtr[CefSetCookieCallback]?>NULL))
+                <CefRefPtr[CefSetCookieCallback]?>nullptr))
 
     cpdef py_void DeleteCookies(self, py_string url, py_string cookie_name):
         CefPostTask(TID_IO, CreateTask_DeleteCookies(
                 self.cefCookieManager.get(),
                 PyToCefStringValue(url), PyToCefStringValue(cookie_name),
-                <CefRefPtr[CefDeleteCookiesCallback]?>NULL))
-
-    cpdef py_bool SetStoragePath(self, py_string path, 
-            py_bool persistSessionCookies=False):
-        return self.cefCookieManager.get().SetStoragePath(
-                PyToCefStringValue(path), bool(persistSessionCookies),
-                <CefRefPtr[CefCompletionCallback]?>NULL)
+                <CefRefPtr[CefDeleteCookiesCallback]?>nullptr))
 
     cpdef py_bool FlushStore(self, callback=None):
         return self.cefCookieManager.get().FlushStore(
-                <CefRefPtr[CefCompletionCallback]?>NULL)
+                <CefRefPtr[CefCompletionCallback]?>nullptr)
 
 
 # ------------------------------------------------------------------------------
diff --git a/src/dpi_aware_win.pyx b/src/dpi_aware_win.pyx
index a7fc345fa..98e7702c8 100644
--- a/src/dpi_aware_win.pyx
+++ b/src/dpi_aware_win.pyx
@@ -61,10 +61,5 @@ class DpiAware:
     @classmethod
     def SetProcessDpiAware(cls):
         """Deprecated."""
-        DpiAware.EnableHighDpiSupport()
+        pass
 
-    @classmethod
-    def EnableHighDpiSupport(cls):
-        # This CEF function sets process to be DPI aware. This
-        # CEF func is also called in subprocesses.
-        CefEnableHighDPISupport()
diff --git a/src/extern/cef/cef_app.pxd b/src/extern/cef/cef_app.pxd
index ef270f1fc..1715c0cfd 100644
--- a/src/extern/cef/cef_app.pxd
+++ b/src/extern/cef/cef_app.pxd
@@ -23,8 +23,6 @@ cdef extern from "include/cef_app.h":
     cdef cppclass CefApp:
         pass
 
-    cdef void CefEnableHighDPISupport() nogil
-
     cdef int CefExecuteProcess(CefMainArgs& args,
                                CefRefPtr[CefApp] application,
                                void* windows_sandbox_info
diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd
index da209d5c3..a34259e5e 100644
--- a/src/extern/cef/cef_browser.pxd
+++ b/src/extern/cef/cef_browser.pxd
@@ -9,9 +9,10 @@ from cef_string cimport CefString
 from cef_client cimport CefClient
 from libcpp cimport bool as cpp_bool
 from libcpp.vector cimport vector as cpp_vector
+from libc.stdint cimport int64_t
 from cef_frame cimport CefFrame
 cimport cef_types
-from cef_types cimport int64, cef_state_t, CefSize
+from cef_types cimport cef_state_t, CefSize
 from cef_types cimport CefBrowserSettings, CefPoint
 from cef_drag_data cimport CefDragData
 from cef_types cimport CefMouseEvent
@@ -38,8 +39,6 @@ cdef extern from "include/cef_browser.h":
         double GetZoomLevel()
         void SetZoomLevel(double zoomLevel)
         void StartDownload(const CefString& url)
-        void SetMouseCursorChangeDisabled(cpp_bool disabled)
-        cpp_bool IsMouseCursorChangeDisabled()
         cpp_bool IsWindowRenderingDisabled()
         void WasResized()
         void WasHidden(cpp_bool hidden)
@@ -54,7 +53,6 @@ cdef extern from "include/cef_browser.h":
                 cpp_bool mouseLeave)
         void SendMouseWheelEvent(cef_types.CefMouseEvent, int deltaX,
                 int deltaY)
-        void SendFocusEvent(cpp_bool setFocus)
         void SendCaptureLostEvent()
 
         void ShowDevTools(const CefWindowInfo& windowInfo,
@@ -66,7 +64,7 @@ cdef extern from "include/cef_browser.h":
 
         CefRefPtr[CefRequestContext] GetRequestContext()
 
-        void Find(int identifier, const CefString& searchText, cpp_bool forward,
+        void Find(const CefString& searchText, cpp_bool forward,
                 cpp_bool matchCase, cpp_bool findNext)
         void StopFinding(cpp_bool clearSelection)
         void Print()
@@ -100,8 +98,8 @@ cdef extern from "include/cef_browser.h":
         cpp_bool CanGoBack()
         cpp_bool CanGoForward()
         CefRefPtr[CefFrame] GetFocusedFrame()
-        CefRefPtr[CefFrame] GetFrame(CefString& name)
-        CefRefPtr[CefFrame] GetFrame(int64 identifier)
+        CefRefPtr[CefFrame] GetFrameByName(CefString& name)
+        CefRefPtr[CefFrame] GetFrameByIdentifier(CefString& identifier)
         void GetFrameNames(cpp_vector[CefString]& names)
         CefRefPtr[CefFrame] GetMainFrame()
         void GoBack()
@@ -113,5 +111,3 @@ cdef extern from "include/cef_browser.h":
         void StopLoad()
         cpp_bool IsLoading()
         int GetIdentifier()
-        cpp_bool SendProcessMessage(CefProcessId target_process,
-                                    CefRefPtr[CefProcessMessage] message)
diff --git a/src/extern/cef/cef_browser_static.pxd b/src/extern/cef/cef_browser_static.pxd
index 17b1a283d..fafa76aac 100644
--- a/src/extern/cef/cef_browser_static.pxd
+++ b/src/extern/cef/cef_browser_static.pxd
@@ -14,6 +14,7 @@ ELIF UNAME_SYSNAME == "Darwin":
 # noinspection PyUnresolvedReferences
 from cef_client cimport CefClient
 from cef_types cimport CefBrowserSettings
+from cef_values cimport CefDictionaryValue
 # noinspection PyUnresolvedReferences
 from cef_request_context cimport CefRequestContext
 # noinspection PyUnresolvedReferences
@@ -28,4 +29,5 @@ cdef extern from "include/cef_browser.h" namespace "CefBrowserHost":
         CefRefPtr[CefClient],
         CefString&,
         CefBrowserSettings&,
+        CefRefPtr[CefDictionaryValue],
         CefRefPtr[CefRequestContext]) nogil
diff --git a/src/extern/cef/cef_cookie.pxd b/src/extern/cef/cef_cookie.pxd
index c113aea9a..4cc20a238 100644
--- a/src/extern/cef/cef_cookie.pxd
+++ b/src/extern/cef/cef_cookie.pxd
@@ -10,8 +10,9 @@ from cef_string cimport CefString
 from cef_ptr cimport CefRefPtr
 # noinspection PyUnresolvedReferences
 from cef_callback cimport CefCompletionCallback
+from cef_time cimport cef_basetime_t
 
-cdef extern from "include/cef_cookie.h":
+cdef extern from "include/internal/cef_types.h":
     ctypedef struct CefCookie:
         cef_string_t name
         cef_string_t value
@@ -19,28 +20,18 @@ cdef extern from "include/cef_cookie.h":
         cef_string_t path
         cpp_bool secure
         cpp_bool httponly
-        cef_time_t creation
-        cef_time_t last_access
+        cef_basetime_t creation
+        cef_basetime_t last_access
         cpp_bool has_expires
-        cef_time_t expires
+        cef_basetime_t expires
+
 
+cdef extern from "include/cef_cookie.h":
     cdef CefRefPtr[CefCookieManager] CefCookieManager_GetGlobalManager \
             "CefCookieManager::GetGlobalManager"(
                 CefRefPtr[CefCompletionCallback] callback)
 
-    cdef CefRefPtr[CefCookieManager] CefCookieManager_GetBlockingManager \
-            "CefCookieManager::GetBlockingManager"()
-
-
-    cdef CefRefPtr[CefCookieManager] CefCookieManager_CreateManager \
-            "CefCookieManager::CreateManager"(
-                const CefString& path,
-                cpp_bool persist_session_cookies,
-                CefRefPtr[CefCompletionCallback] callback)
-
     cdef cppclass CefCookieManager:
-        void SetSupportedSchemes(const cpp_vector[CefString]& schemes,
-                                 CefRefPtr[CefCompletionCallback] callback)
         cpp_bool VisitAllCookies(CefRefPtr[CefCookieVisitor] visitor)
         cpp_bool VisitUrlCookies(const CefString& url, 
                                  cpp_bool includeHttpOnly,
@@ -50,9 +41,6 @@ cdef extern from "include/cef_cookie.h":
         cpp_bool DeleteCookies(const CefString& url,
                                const CefString& cookie_name,
                                CefRefPtr[CefDeleteCookiesCallback] callback)
-        cpp_bool SetStoragePath(const CefString& path,
-                                cpp_bool persist_session_cookies,
-                                CefRefPtr[CefCompletionCallback] callback)
         cpp_bool FlushStore(CefRefPtr[CefCompletionCallback] callback)
 
     cdef cppclass CefCookieVisitor:
diff --git a/src/extern/cef/cef_frame.pxd b/src/extern/cef/cef_frame.pxd
index 28cdceee2..54efdd373 100644
--- a/src/extern/cef/cef_frame.pxd
+++ b/src/extern/cef/cef_frame.pxd
@@ -4,12 +4,12 @@
 
 include "compile_time_constants.pxi"
 
-from cef_types cimport int64
 from cef_string cimport CefString
 from libcpp cimport bool as cpp_bool
 from cef_ptr cimport CefRefPtr
 from cef_browser cimport CefBrowser
 from cef_string_visitor cimport CefStringVisitor
+from cef_process_message cimport CefProcessMessage, CefProcessId
 
 cdef extern from "include/cef_frame.h":
 
@@ -17,7 +17,7 @@ cdef extern from "include/cef_frame.h":
       cpp_bool IsValid()
       void ExecuteJavaScript(CefString& jsCode, CefString& scriptUrl, int startLine)
       CefString GetURL()
-      int64 GetIdentifier()
+      CefString GetIdentifier()
       cpp_bool IsMain()
       void LoadURL(CefString& url)
       void Undo()
@@ -35,3 +35,5 @@ cdef extern from "include/cef_frame.h":
       CefString GetName()
       CefRefPtr[CefFrame] GetParent()
       CefRefPtr[CefBrowser] GetBrowser()
+      cpp_bool SendProcessMessage(CefProcessId target_process,
+                                  CefRefPtr[CefProcessMessage] message)
diff --git a/src/extern/cef/cef_ptr.pxd b/src/extern/cef/cef_ptr.pxd
index c5d9877cf..31bf22e44 100644
--- a/src/extern/cef/cef_ptr.pxd
+++ b/src/extern/cef/cef_ptr.pxd
@@ -1,6 +1,7 @@
 # Copyright (c) 2012 CEF Python, see the Authors file.
 # All rights reserved. Licensed under BSD 3-clause license.
 # Project website: https://github.com/cztomczak/cefpython
+from libcpp cimport nullptr_t, bool
 
 cdef extern from "include/internal/cef_ptr.h":
     cdef cppclass CefRefPtr[T]:
@@ -14,4 +15,7 @@ cdef extern from "include/internal/cef_ptr.h":
         # noinspection PyUnresolvedReferences
         void swap(CefRefPtr[T]& r)
         # noinspection PyUnresolvedReferences
+        CefRefPtr[T]& Assign "operator="(nullptr_t)
         CefRefPtr[T]& Assign "operator="(T* p)
+        bool operator bool()
+        bool operator!()
diff --git a/src/extern/cef/cef_request.pxd b/src/extern/cef/cef_request.pxd
index e7bd336d0..0ec425ae3 100644
--- a/src/extern/cef/cef_request.pxd
+++ b/src/extern/cef/cef_request.pxd
@@ -53,6 +53,7 @@ cdef extern from "include/cef_request.h":
     # noinspection PyUnresolvedReferences
     ctypedef cef_postdataelement_type_t ElementType
 
+    @staticmethod
     cdef CefRefPtr[CefPostDataElement] CefPostDataElement_Create \
             "CefPostDataElement::Create"()
     cdef cppclass CefPostDataElement:
diff --git a/src/extern/cef/cef_request_context.pxd b/src/extern/cef/cef_request_context.pxd
index 116741749..1107cb6fc 100644
--- a/src/extern/cef/cef_request_context.pxd
+++ b/src/extern/cef/cef_request_context.pxd
@@ -16,5 +16,5 @@ cdef extern from "include/cef_request_context.h":
         CefRefPtr[CefRequestContext] CreateContext(
                 CefRefPtr[CefRequestContext] other,
                 CefRefPtr[CefRequestContextHandler] handler)
-        CefRefPtr[CefCookieManager] GetDefaultCookieManager(
+        CefRefPtr[CefCookieManager] GetCookieManager(
                 CefRefPtr[CefCompletionCallback] callback)
diff --git a/src/extern/cef/cef_request_handler.pxd b/src/extern/cef/cef_request_handler.pxd
index 96a7d88c6..a6e320488 100644
--- a/src/extern/cef/cef_request_handler.pxd
+++ b/src/extern/cef/cef_request_handler.pxd
@@ -11,7 +11,3 @@ cdef extern from "include/cef_auth_callback.h":
                       const CefString& password)
         void Cancel()
 
-cdef extern from "include/cef_request_handler.h":
-    cdef cppclass CefRequestCallback:
-        void Continue(cpp_bool allow)
-        void Cancel()
diff --git a/src/extern/cef/cef_resource_request_handler.pxd b/src/extern/cef/cef_resource_request_handler.pxd
new file mode 100644
index 000000000..1087d55bf
--- /dev/null
+++ b/src/extern/cef/cef_resource_request_handler.pxd
@@ -0,0 +1,9 @@
+# Copyright (c) 2013 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+cdef extern from "include/cef_resource_request_handler.h":
+    cdef cppclass CefResourceRequestHandler:
+        pass
+    cdef cppclass CefCookieAccessFilter:
+        pass
\ No newline at end of file
diff --git a/src/extern/cef/cef_response.pxd b/src/extern/cef/cef_response.pxd
index ef6729f12..9c08a0ec1 100644
--- a/src/extern/cef/cef_response.pxd
+++ b/src/extern/cef/cef_response.pxd
@@ -21,6 +21,6 @@ cdef extern from "include/cef_response.h":
         void SetStatusText(CefString& statusText)
         CefString GetMimeType()
         void SetMimeType(CefString& mimeType)
-        CefString GetHeader(CefString& name)
+        CefString GetHeaderByName(CefString& name)
         void GetHeaderMap(CefResponseHeaderMap& headerMap)
         void SetHeaderMap(CefResponseHeaderMap& headerMap)
diff --git a/src/extern/cef/cef_scoped_ptr.pxd b/src/extern/cef/cef_scoped_ptr.pxd
deleted file mode 100644
index 2e770a5b9..000000000
--- a/src/extern/cef/cef_scoped_ptr.pxd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2016 CEF Python, see the Authors file.
-# All rights reserved. Licensed under BSD 3-clause license.
-# Project website: https://github.com/cztomczak/cefpython
-
-cdef extern from "include/base/cef_scoped_ptr.h":
-    cdef cppclass scoped_ptr[T]:
-        scoped_ptr()
-        # noinspection PyUnresolvedReferences
-        scoped_ptr(T* p)
-        # noinspection PyUnresolvedReferences
-        void reset()
-        # noinspection PyUnresolvedReferences
-        void reset(T* p)
-        # noinspection PyUnresolvedReferences
-        T* get()
-        # noinspection PyUnresolvedReferences
-        scoped_ptr[T]& Assign "operator="(scoped_ptr[T] p)
diff --git a/src/extern/cef/cef_task.pxd b/src/extern/cef/cef_task.pxd
index fbc0181e0..c7dfcdf02 100644
--- a/src/extern/cef/cef_task.pxd
+++ b/src/extern/cef/cef_task.pxd
@@ -3,9 +3,9 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 from libcpp cimport bool as cpp_bool
+from libc.stdint cimport int64_t
 # noinspection PyUnresolvedReferences
 cimport cef_types
-from cef_types cimport int64
 from cef_ptr cimport CefRefPtr
 
 cdef extern from "include/cef_task.h":
@@ -16,7 +16,7 @@ cdef extern from "include/cef_task.h":
                               CefRefPtr[CefTask] task)
     cdef cpp_bool CefPostDelayedTask(CefThreadId threadId,
                                      CefRefPtr[CefTask] task,
-                                     int64 delay_ms)
+                                     int64_t delay_ms)
     
     cdef cppclass CefTask:
         pass
diff --git a/src/extern/cef/cef_time.pxd b/src/extern/cef/cef_time.pxd
index cdbdc639f..55efa42da 100644
--- a/src/extern/cef/cef_time.pxd
+++ b/src/extern/cef/cef_time.pxd
@@ -3,6 +3,7 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 from ctime cimport time_t
+from libc.stdint cimport int64_t
 
 cdef extern from "include/internal/cef_time.h":
     ctypedef struct cef_time_t:
@@ -15,6 +16,9 @@ cdef extern from "include/internal/cef_time.h":
         int second
         int millisecond
 
+    ctypedef struct cef_basetime_t:
+        int64_t val
+
 cdef extern from "include/internal/cef_types.h":
     cdef cppclass CefTime:
         CefTime()
diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd
index 6bd21ba46..d17248b9a 100644
--- a/src/extern/cef/cef_types.pxd
+++ b/src/extern/cef/cef_types.pxd
@@ -15,26 +15,15 @@ from libc.limits cimport UINT_MAX
 
 cdef extern from "include/internal/cef_types.h":
 
-    # noinspection PyUnresolvedReferences
-    ctypedef int32_t int32
-    # noinspection PyUnresolvedReferences
-    ctypedef uint32_t uint32
-    # noinspection PyUnresolvedReferences
-    ctypedef int64_t int64
-    # noinspection PyUnresolvedReferences
-    ctypedef uint64_t uint64
-
     IF UNAME_SYSNAME == "Windows":
         # noinspection PyUnresolvedReferences
-        ctypedef wchar_t char16
+        ctypedef wchar_t char16_t
     ELSE:
-        ctypedef unsigned short char16
+        ctypedef unsigned short char16_t
 
-    ctypedef uint32 cef_color_t
+    ctypedef uint32_t cef_color_t
 
     ctypedef struct CefSettings:
-        cef_string_t accept_language_list
-        int single_process
         cef_string_t browser_subprocess_path
         int command_line_args_disabled
         cef_string_t cache_path
@@ -53,17 +42,14 @@ cdef extern from "include/internal/cef_types.h":
         int remote_debugging_port
         int uncaught_exception_stack_size
         int context_safety_implementation # Not exposed.
-        int ignore_certificate_errors
         cef_color_t background_color
         int persist_user_preferences
-        cef_string_t user_data_path
         int windowless_rendering_enabled
         int no_sandbox
         int external_message_pump
         cef_string_t framework_dir_path
 
     ctypedef struct CefBrowserSettings:
-        cef_string_t accept_language_list
         cef_color_t background_color
         cef_string_t standard_font_family
         cef_string_t fixed_font_family
@@ -191,12 +177,12 @@ cdef extern from "include/internal/cef_types.h":
         KEYEVENT_CHAR
     ctypedef struct _cef_key_event_t:
         cef_key_event_type_t type
-        uint32 modifiers
+        uint32_t modifiers
         int windows_key_code
         int native_key_code
         int is_system_key
-        char16 character
-        char16 unmodified_character
+        char16_t character
+        char16_t unmodified_character
         cpp_bool focus_on_editable_field
     ctypedef _cef_key_event_t CefKeyEvent
     ctypedef enum cef_event_flags_t:
@@ -287,7 +273,7 @@ cdef extern from "include/internal/cef_types.h":
     ctypedef struct cef_mouse_event_t:
         int x
         int y
-        uint32 modifiers
+        uint32_t modifiers
     ctypedef cef_mouse_event_t CefMouseEvent
 
     # RenderHandler > GetScreenInfo():
@@ -323,16 +309,18 @@ cdef extern from "include/internal/cef_types.h":
     # LifespanHandler and RequestHandler
 
     ctypedef enum cef_window_open_disposition_t:
-        WOD_UNKNOWN,
-        WOD_CURRENT_TAB,
-        WOD_SINGLETON_TAB,
-        WOD_NEW_FOREGROUND_TAB,
-        WOD_NEW_BACKGROUND_TAB,
-        WOD_NEW_POPUP,
-        WOD_NEW_WINDOW,
-        WOD_SAVE_TO_DISK,
-        WOD_OFF_THE_RECORD,
-        WOD_IGNORE_ACTION
+        CEF_WOD_UNKNOWN,
+        CEF_WOD_CURRENT_TAB,
+        CEF_WOD_SINGLETON_TAB,
+        CEF_WOD_NEW_FOREGROUND_TAB,
+        CEF_WOD_NEW_BACKGROUND_TAB,
+        CEF_WOD_NEW_POPUP,
+        CEF_WOD_NEW_WINDOW,
+        CEF_WOD_SAVE_TO_DISK,
+        CEF_WOD_OFF_THE_RECORD,
+        CEF_WOD_IGNORE_ACTION,
+        CEF_WOD_SWITCH_TO_TAB,
+        CEF_WOD_NEW_PICTURE_IN_PICTURE
     ctypedef cef_window_open_disposition_t WindowOpenDisposition
 
     ctypedef enum cef_path_key_t:
@@ -347,12 +335,6 @@ cdef extern from "include/internal/cef_types.h":
         PK_DIR_RESOURCES,
     ctypedef cef_path_key_t PathKey
 
-    ctypedef enum cef_plugin_policy_t:
-        PLUGIN_POLICY_ALLOW,
-        PLUGIN_POLICY_DETECT_IMPORTANT,
-        PLUGIN_POLICY_BLOCK,
-        PLUGIN_POLICY_DISABLE,
-
     # Drag & drop
 
     ctypedef enum cef_drag_operations_mask_t:
diff --git a/src/extern/cef/cef_values.pxd b/src/extern/cef/cef_values.pxd
index 3210432b4..249c2ae53 100644
--- a/src/extern/cef/cef_values.pxd
+++ b/src/extern/cef/cef_values.pxd
@@ -9,6 +9,7 @@ from libcpp.vector cimport vector
 from cef_types cimport cef_value_type_t
 
 cdef extern from "include/cef_values.h":
+    @staticmethod
     cdef CefRefPtr[CefBinaryValue] CefBinaryValue_Create \
         "CefBinaryValue::Create"(const void* data, size_t data_size)
 
@@ -31,7 +32,8 @@ cdef extern from "include/cef_values.h":
         CefRefPtr[CefBinaryValue] Copy()
         size_t GetSize()
         size_t GetData(void* buffer_, size_t buffer_size, size_t data_offset)
-        
+    
+    @staticmethod    
     cdef CefRefPtr[CefDictionaryValue] CefDictionaryValue_Create \
         "CefDictionaryValue::Create"()
 
diff --git a/src/extern/cef/cef_web_plugin.pxd b/src/extern/cef/cef_web_plugin.pxd
deleted file mode 100644
index 25d33fa9d..000000000
--- a/src/extern/cef/cef_web_plugin.pxd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2013 CEF Python, see the Authors file.
-# All rights reserved. Licensed under BSD 3-clause license.
-# Project website: https://github.com/cztomczak/cefpython
-
-from cef_string cimport CefString
-
-# CEF 3 only.
-
-cdef extern from "include/cef_web_plugin.h":
-    cdef cppclass CefWebPluginInfo:
-        CefString GetName()
-        CefString GetPath()
-        CefString GetVersion()
-        CefString GetDescription()
diff --git a/src/extern/cef/cef_win.pxd b/src/extern/cef/cef_win.pxd
index 5e341b75b..e6844e58c 100644
--- a/src/extern/cef/cef_win.pxd
+++ b/src/extern/cef/cef_win.pxd
@@ -5,9 +5,10 @@
 include "compile_time_constants.pxi"
 
 # noinspection PyUnresolvedReferences
-from windows cimport HWND, RECT, HINSTANCE, HCURSOR
+from windows cimport HWND, HINSTANCE, HCURSOR
 from cef_string cimport CefString
 from libcpp cimport bool as cpp_bool
+from cef_types cimport CefRect
 
 cdef extern from "include/internal/cef_win.h":
 
@@ -18,7 +19,7 @@ cdef extern from "include/internal/cef_win.h":
 
     cdef cppclass CefWindowInfo:
         void SetAsChild(CefWindowHandle parent,
-                        RECT windowRect)
+                        const CefRect windowRect)
         void SetAsPopup(CefWindowHandle parent,
                         const CefString& windowName)
         void SetAsWindowless(CefWindowHandle parent)
diff --git a/src/extern/main_message_loop.pxd b/src/extern/main_message_loop.pxd
index 486f309af..af05e1100 100644
--- a/src/extern/main_message_loop.pxd
+++ b/src/extern/main_message_loop.pxd
@@ -2,11 +2,11 @@
 # All rights reserved. Licensed under BSD 3-clause license.
 # Project website: https://github.com/cztomczak/cefpython
 
-from cef_scoped_ptr cimport scoped_ptr
+from libcpp.memory cimport unique_ptr
 
 cdef extern from \
         "subprocess/main_message_loop/main_message_loop_external_pump.h":
 
     cdef cppclass MainMessageLoopExternalPump:
         @staticmethod
-        scoped_ptr[MainMessageLoopExternalPump] Create()
+        unique_ptr[MainMessageLoopExternalPump] Create()
diff --git a/src/extern/task.pxd b/src/extern/task.pxd
index 14f2777b4..3c883ad95 100644
--- a/src/extern/task.pxd
+++ b/src/extern/task.pxd
@@ -11,13 +11,13 @@ from cef_cookie cimport CefCookie, CefCookieManager
 from cef_cookie cimport CefSetCookieCallback, CefDeleteCookiesCallback
 # noinspection PyUnresolvedReferences
 from libcpp cimport bool as cpp_bool
-from cef_types cimport int64
+from libc.stdint cimport int64_t
 
 
 cdef extern from "client_handler/task.h":
 
     void PostTaskWrapper(int threadId, int taskId) nogil
-    void PostDelayedTaskWrapper(int threadId, int64 delay_ms, int taskId) nogil
+    void PostDelayedTaskWrapper(int threadId, int64_t delay_ms, int taskId) nogil
 
     cdef CefRefPtr[CefTask] CreateTask_SetCookie(
             CefCookieManager* obj,
diff --git a/src/frame.pyx b/src/frame.pyx
index 812e4b3c9..493d30948 100644
--- a/src/frame.pyx
+++ b/src/frame.pyx
@@ -11,11 +11,11 @@ cdef dict g_pyFrames = {}
 # it shouldn't be kept global anymore.
 cdef list g_unreferenced_frames = []  # [str unique identifier, ..]
 
-cdef object GetUniqueFrameId(int browserId, object frameId):
-    return str(browserId) +"#"+ str(frameId)
+cdef str GetUniqueFrameId(int browserId, py_string frameId):
+    return str(browserId) +"#"+ frameId
 
-cdef PyFrame GetPyFrameById(int browserId, object frameId):
-    cdef object uniqueFrameId = GetUniqueFrameId(browserId, frameId)
+cdef PyFrame GetPyFrameById(int browserId, py_string frameId):
+    cdef str uniqueFrameId = GetUniqueFrameId(browserId, frameId)
     if uniqueFrameId in g_pyFrames:
         return g_pyFrames[uniqueFrameId]
     return None
@@ -23,23 +23,23 @@ cdef PyFrame GetPyFrameById(int browserId, object frameId):
 cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
     global g_pyFrames
 
-    if <void*>cefFrame == NULL or not cefFrame.get():
+    if not cefFrame or not cefFrame.get():
         raise Exception("GetPyFrame(): CefFrame reference is NULL")
 
     cdef PyFrame pyFrame
-    cdef object frameId = cefFrame.get().GetIdentifier()  # int64
+    cdef CefString frameId = cefFrame.get().GetIdentifier()
     cdef int browserId = cefFrame.get().GetBrowser().get().GetIdentifier()
-    assert (frameId and browserId), "frameId or browserId empty"
-    cdef object uniqueFrameId = GetUniqueFrameId(browserId, frameId)
+    assert (not frameId.empty() and browserId), "frameId or browserId empty"
+    cdef str uniqueFrameId = GetUniqueFrameId(browserId, CefToPyString(frameId))
 
-    if frameId < 0:
+    if frameId.empty():
         # Underlying frame does not yet exist. In such case PyFrame
         # is not stored in g_pyFrames since frameId is invalid.
         # However even though frame is not supposed to exist, you
         # can still call CefFrame.ExecuteFunction and it works fine
         # in tutorial.py example.
         Debug("GetPyFrame(): underlying frame does not yet exist:"
-              " browserId = {0}, frameId = {1}".format(browserId, frameId))
+              " browserId = {0}, frameId = {1}".format(browserId, CefToPyString(frameId)))
     else:
         if uniqueFrameId in g_pyFrames:
             return g_pyFrames[uniqueFrameId]
@@ -56,11 +56,11 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
         del g_pyFrames[uFid]
     # ----
 
-    pyFrame = PyFrame(browserId, frameId)
+    pyFrame = PyFrame(browserId, CefToPyString(frameId))
     pyFrame.cefFrame = cefFrame
 
     if uniqueFrameId in g_unreferenced_frames \
-            or frameId < 0 \
+            or frameId.empty() \
             or browserId in g_unreferenced_browsers \
             or browserId in g_closed_browsers:
         # Browser was already globally unreferenced in OnBeforeClose,
@@ -77,19 +77,19 @@ cdef PyFrame GetPyFrame(CefRefPtr[CefFrame] cefFrame):
         # SIDE EFFECT: two calls to GetPyFrame for the same frame object
         #              may return two different PyFrame objects. Compare
         #              frame objects always using GetIdentifier().
-        Debug("GetPyFrame(): create new PyFrame, frameId=%s" % frameId)
+        Debug("GetPyFrame(): create new PyFrame, frameId=%s" % CefToPyString(frameId))
         g_pyFrames[uniqueFrameId] = pyFrame
     return pyFrame
 
-cdef void RemovePyFrame(int browserId, object frameId) except *:
+cdef void RemovePyFrame(int browserId, str frameId) except *:
     # Called from V8ContextHandler_OnContextReleased().
     global g_pyFrames
     cdef PyFrame pyFrame
-    cdef object uniqueFrameId = GetUniqueFrameId(browserId, frameId)
+    cdef str uniqueFrameId = GetUniqueFrameId(browserId, frameId)
     if uniqueFrameId in g_pyFrames:
         Debug("del g_pyFrames[%s]" % uniqueFrameId)
         pyFrame = g_pyFrames[uniqueFrameId]
-        pyFrame.cefFrame.Assign(NULL)
+        pyFrame.cefFrame.Assign(nullptr)
         del pyFrame
         del g_pyFrames[uniqueFrameId]
         g_unreferenced_frames.append(uniqueFrameId)
@@ -109,7 +109,7 @@ cdef void RemovePyFramesForBrowser(int browserId) except *:
     for uniqueFrameId in toRemove:
         Debug("del g_pyFrames[%s]" % uniqueFrameId)
         pyFrame = g_pyFrames[uniqueFrameId]
-        pyFrame.cefFrame.Assign(NULL)
+        pyFrame.cefFrame.Assign(nullptr)
         del pyFrame
         del g_pyFrames[uniqueFrameId]
         g_unreferenced_frames.append(uniqueFrameId)
@@ -119,22 +119,22 @@ cdef void RemovePyFramesForBrowser(int browserId) except *:
 cdef class PyFrame:
     cdef CefRefPtr[CefFrame] cefFrame
     cdef int browserId
-    cdef object frameId
+    cdef str frameId
 
     cdef CefRefPtr[CefFrame] GetCefFrame(self) except *:
         # Do not call IsValid() here, if the frame does not exist
         # then no big deal, no reason to crash the application.
         # The CEF calls will fail, but they also won't cause crash.
-        if <void*>self.cefFrame != NULL and self.cefFrame.get():
+        if self.cefFrame and self.cefFrame.get():
             return self.cefFrame
         raise Exception("PyFrame.GetCefFrame() failed: CefFrame was destroyed")
 
-    def __init__(self, int browserId, int frameId):
+    def __init__(self, int browserId, py_string frameId):
         self.browserId = browserId
         self.frameId = frameId
 
     cpdef py_bool IsValid(self):
-        if <void*>self.cefFrame != NULL and self.cefFrame.get() \
+        if self.cefFrame and self.cefFrame.get() \
                 and self.cefFrame.get().IsValid():
             return True
         return False
@@ -168,7 +168,7 @@ cdef class PyFrame:
         self.GetCefFrame().get().ExecuteJavaScript(PyToCefStringValue(jsCode),
                 PyToCefStringValue(scriptUrl), startLine)
 
-    cpdef object GetIdentifier(self):
+    cpdef str GetIdentifier(self):
         # It is better to save browser and frame identifiers during
         # browser instantiation. When freeing PyBrowser and PyFrame
         # we need these identifiers. CefFrame and CefBrowser may already
@@ -203,13 +203,6 @@ cdef class PyFrame:
     cpdef py_bool IsMain(self):
         return self.GetCefFrame().get().IsMain()
 
-    cpdef py_void LoadString(self, py_string value, py_string url):
-        cdef CefString cefValue
-        cdef CefString cefUrl
-        PyToCefString(value, cefValue)
-        PyToCefString(url, cefUrl)
-        self.GetCefFrame().get().LoadString(cefValue, cefUrl)
-
     cpdef py_void LoadUrl(self, py_string url):
         cdef CefString cefUrl
         PyToCefString(url, cefUrl)
@@ -229,3 +222,25 @@ cdef class PyFrame:
 
     cpdef py_void ViewSource(self):
         self.GetCefFrame().get().ViewSource()
+
+    cpdef py_void SendProcessMessage(self, cef_process_id_t targetProcess,
+            py_string frameId, py_string messageName, list pyArguments
+            ) :
+        cdef CefRefPtr[CefProcessMessage] message = \
+                CefProcessMessage_Create(PyToCefStringValue(messageName))
+        # This does not work, no idea why, the CEF implementation
+        # seems not to allow it, both Assign() and swap() do not work:
+        # | message.get().GetArgumentList().Assign(arguments.get())
+        # | message.get().GetArgumentList().swap(arguments)
+        cdef CefRefPtr[CefListValue] messageArguments = \
+                message.get().GetArgumentList()
+        PyListToExistingCefListValue(self.GetBrowserIdentifier(), 
+                frameId,
+                pyArguments, messageArguments)
+        Debug("SendProcessMessage(): message=%s, arguments size=%d" % (
+                messageName,
+                message.get().GetArgumentList().get().GetSize()))
+
+        self.GetCefFrame().get().SendProcessMessage(targetProcess, message)
+
+
diff --git a/src/handlers/cookie_access_filter.pyx b/src/handlers/cookie_access_filter.pyx
new file mode 100644
index 000000000..55c4918f6
--- /dev/null
+++ b/src/handlers/cookie_access_filter.pyx
@@ -0,0 +1,87 @@
+# Copyright (c) 2018 CEF Python, see the Authors file.
+# All rights reserved. Licensed under BSD 3-clause license.
+# Project website: https://github.com/cztomczak/cefpython
+
+include "../cefpython.pyx"
+include "../browser.pyx"
+include "../frame.pyx"
+include "../process_message_utils.pyx"
+
+cdef public cpp_bool CookieAccessFilter_CanSendCookie(
+            CefRefPtr[CefBrowser] cef_browser,
+            CefRefPtr[CefFrame] cef_frame,
+            CefRefPtr[CefRequest] cef_request,
+            const CefCookie& cef_cookie
+            ) except * with gil:
+    cdef PyBrowser browser
+    cdef PyFrame frame
+    cdef PyRequest request
+    cdef PyCookie cookie
+    cdef object callback
+    cdef py_bool retval
+    try:
+        Debug("CookieAccessFilter_CanSendCookie")
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cef_browser):
+            return False
+
+        browser = GetPyBrowser(cef_browser, "CanSendCookie")
+        frame = GetPyFrame(cef_frame)
+        request = CreatePyRequest(cef_request)
+        cookie = CreatePyCookie(cef_cookie)
+        callback = browser.GetClientCallback("CanSendCookie")
+        if callback:
+            retval = callback(
+                    browser=browser,
+                    frame=frame,
+                    request=request,
+                    cookie=cookie)
+            return bool(retval)
+        else:
+            # Return True by default
+            return True
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
+
+cdef public cpp_bool CookieAccessFilter_CanSaveCookie(
+            CefRefPtr[CefBrowser] cef_browser,
+            CefRefPtr[CefFrame] cef_frame,
+            CefRefPtr[CefRequest] cef_request,
+            CefRefPtr[CefResponse] cef_response,
+            const CefCookie& cef_cookie
+            ) except * with gil:
+    cdef PyBrowser browser
+    cdef PyFrame frame
+    cdef PyRequest request
+    cdef PyResponse response
+    cdef PyCookie cookie
+    cdef object callback
+    cdef py_bool retval
+    try:
+        # Issue #455: CefRequestHandler callbacks still executed after
+        # browser was closed.
+        if IsBrowserClosed(cef_browser):
+            return False
+
+        browser = GetPyBrowser(cef_browser, "CanSaveCookie")
+        frame = GetPyFrame(cef_frame)
+        request = CreatePyRequest(cef_request)
+        response = CreatePyResponse(cef_response)
+        cookie = CreatePyCookie(cef_cookie)
+        callback = browser.GetClientCallback("CanSaveCookie")
+        if callback:
+            retval = callback(
+                    browser=browser,
+                    frame=frame,
+                    request=request,
+                    response=response,
+                    cookie=cookie)
+            return bool(retval)
+        else:
+            # Return True by default
+            return True
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/src/handlers/display_handler.pyx b/src/handlers/display_handler.pyx
index 7d66d00f7..f729a7dee 100644
--- a/src/handlers/display_handler.pyx
+++ b/src/handlers/display_handler.pyx
@@ -143,3 +143,23 @@ cdef public void DisplayHandler_OnLoadingProgressChange(
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
+
+cdef public cpp_bool DisplayHandler_OnCursorChange(
+        CefRefPtr[CefBrowser] cefBrowser,
+        CefCursorHandle cursor
+        ) except * with gil:
+    cdef PyBrowser pyBrowser
+    try:
+        pyBrowser = GetPyBrowser(cefBrowser, "OnCursorChange")
+        callback = pyBrowser.GetClientCallback("OnCursorChange")
+        if callback:
+            ret = callback(browser=pyBrowser, cursor=<uintptr_t>cursor)
+            if ret:
+                return True
+            else:
+                return False
+        else:
+            return False
+    except:
+        (exc_type, exc_value, exc_trace) = sys.exc_info()
+        sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/src/handlers/lifespan_handler.pyx b/src/handlers/lifespan_handler.pyx
index bfe22bd11..7c354881b 100644
--- a/src/handlers/lifespan_handler.pyx
+++ b/src/handlers/lifespan_handler.pyx
@@ -11,16 +11,16 @@ from cef_types cimport WindowOpenDisposition
 cimport cef_types
 
 # WindowOpenDisposition
-WOD_UNKNOWN = cef_types.WOD_UNKNOWN
-WOD_CURRENT_TAB = cef_types.WOD_CURRENT_TAB
-WOD_SINGLETON_TAB = cef_types.WOD_SINGLETON_TAB
-WOD_NEW_FOREGROUND_TAB = cef_types.WOD_NEW_FOREGROUND_TAB
-WOD_NEW_BACKGROUND_TAB = cef_types.WOD_NEW_BACKGROUND_TAB
-WOD_NEW_POPUP = cef_types.WOD_NEW_POPUP
-WOD_NEW_WINDOW = cef_types.WOD_NEW_WINDOW
-WOD_SAVE_TO_DISK = cef_types.WOD_SAVE_TO_DISK
-WOD_OFF_THE_RECORD = cef_types.WOD_OFF_THE_RECORD
-WOD_IGNORE_ACTION = cef_types.WOD_IGNORE_ACTION
+CEF_WOD_UNKNOWN = cef_types.CEF_WOD_UNKNOWN
+CEF_WOD_CURRENT_TAB = cef_types.CEF_WOD_CURRENT_TAB
+CEF_WOD_SINGLETON_TAB = cef_types.CEF_WOD_SINGLETON_TAB
+CEF_WOD_NEW_FOREGROUND_TAB = cef_types.CEF_WOD_NEW_FOREGROUND_TAB
+CEF_WOD_NEW_BACKGROUND_TAB = cef_types.CEF_WOD_NEW_BACKGROUND_TAB
+CEF_WOD_NEW_POPUP = cef_types.CEF_WOD_NEW_POPUP
+CEF_WOD_NEW_WINDOW = cef_types.CEF_WOD_NEW_WINDOW
+CEF_WOD_SAVE_TO_DISK = cef_types.CEF_WOD_SAVE_TO_DISK
+CEF_WOD_OFF_THE_RECORD = cef_types.CEF_WOD_OFF_THE_RECORD
+CEF_WOD_IGNORE_ACTION = cef_types.CEF_WOD_IGNORE_ACTION
 
 
 cdef public cpp_bool LifespanHandler_OnBeforePopup(
@@ -34,6 +34,7 @@ cdef public cpp_bool LifespanHandler_OnBeforePopup(
         CefWindowInfo& windowInfo,
         CefRefPtr[CefClient]& client,
         CefBrowserSettings& settings,
+        CefRefPtr[CefDictionaryValue]& extra_info,
         cpp_bool* noJavascriptAccess
         ) except * with gil:
     # Empty place-holders: popupFeatures, client.
@@ -133,13 +134,13 @@ cdef public void LifespanHandler_OnBeforeClose(
         # GetCookieManager to implement custom cookie managers then
         # flushing of cookies would need to be handled manually.
         cefBrowser.get().GetHost().get().GetRequestContext().get() \
-                .GetDefaultCookieManager(
-                        <CefRefPtr[CefCompletionCallback]?>NULL) \
-                .get().FlushStore(<CefRefPtr[CefCompletionCallback]?>NULL)
+                .GetCookieManager(
+                        <CefRefPtr[CefCompletionCallback]?>nullptr) \
+                .get().FlushStore(<CefRefPtr[CefCompletionCallback]?>nullptr)
 
         browserId = pyBrowser.GetIdentifier()
-        pyBrowser.cefBrowser.Assign(NULL)
-        cefBrowser.Assign(NULL)
+        pyBrowser.cefBrowser.Assign(nullptr)
+        cefBrowser.Assign(nullptr)
         del pyBrowser
 
         RemovePythonCallbacksForBrowser(browserId)
diff --git a/src/handlers/render_handler.pyx b/src/handlers/render_handler.pyx
index a8ad49124..a282c8893 100644
--- a/src/handlers/render_handler.pyx
+++ b/src/handlers/render_handler.pyx
@@ -7,6 +7,7 @@ include "../browser.pyx"
 include "../string_utils.pyx"
 
 cimport cef_types
+from libc.stdint cimport uint32_t
 from cef_types cimport CefRange
 
 # cef_paint_element_type_t, PaintElementType
@@ -73,7 +74,13 @@ cdef public cpp_bool RenderHandler_GetViewRect(
             else:
                 return False
         else:
-            return False
+            # without a default cefRect, pysdl2 example will fail
+            # the value is inspired by https://github.com/obsproject/obs-browser/blob/master/browser-client.cpp#L280
+            cefRect.x = 0
+            cefRect.y = 0
+            cefRect.width = 16
+            cefRect.height = 16
+            return True
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
@@ -219,20 +226,6 @@ cdef public void RenderHandler_OnPaint(
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
-cdef public void RenderHandler_OnCursorChange(
-        CefRefPtr[CefBrowser] cefBrowser,
-        CefCursorHandle cursor
-        ) except * with gil:
-    cdef PyBrowser pyBrowser
-    try:
-        pyBrowser = GetPyBrowser(cefBrowser, "OnCursorChange")
-        callback = pyBrowser.GetClientCallback("OnCursorChange")
-        if callback:
-            callback(browser=pyBrowser, cursor=<uintptr_t>cursor)
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
 cdef public void RenderHandler_OnScrollOffsetChanged(
         CefRefPtr[CefBrowser] cefBrowser
         ) except * with gil:
@@ -249,7 +242,7 @@ cdef public void RenderHandler_OnScrollOffsetChanged(
 cdef public cpp_bool RenderHandler_StartDragging(
         CefRefPtr[CefBrowser] cef_browser,
         CefRefPtr[CefDragData] cef_drag_data,
-        uint32 allowed_ops,
+        uint32_t allowed_ops,
         int x, int y
         ) except * with gil:
     cdef PyBrowser browser
@@ -278,7 +271,7 @@ cdef public cpp_bool RenderHandler_StartDragging(
 
 cdef public void RenderHandler_UpdateDragCursor(
         CefRefPtr[CefBrowser] cef_browser,
-        uint32 operation,
+        uint32_t operation,
         ) except * with gil:
     cdef PyBrowser browser
     try:
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
index 866942bfd..17f52acd7 100644
--- a/src/handlers/request_handler.pyx
+++ b/src/handlers/request_handler.pyx
@@ -8,6 +8,7 @@ include "../cookie.pyx"
 
 # cef_termination_status_t
 cimport cef_types
+from libc.stdint cimport int64_t
 TS_ABNORMAL_TERMINATION = cef_types.TS_ABNORMAL_TERMINATION
 TS_PROCESS_WAS_KILLED = cef_types.TS_PROCESS_WAS_KILLED
 TS_PROCESS_CRASHED = cef_types.TS_PROCESS_CRASHED
@@ -37,16 +38,16 @@ cdef class PyAuthCallback:
 # -----------------------------------------------------------------------------
 
 cdef PyRequestCallback CreatePyRequestCallback(
-        CefRefPtr[CefRequestCallback] cefCallback):
+        CefRefPtr[CefCallback] cefCallback):
     cdef PyRequestCallback pyCallback = PyRequestCallback()
     pyCallback.cefCallback = cefCallback
     return pyCallback
 
 cdef class PyRequestCallback:
-    cdef CefRefPtr[CefRequestCallback] cefCallback
+    cdef CefRefPtr[CefCallback] cefCallback
 
-    cpdef py_void Continue(self, py_bool allow):
-        self.cefCallback.get().Continue(bool(allow))
+    cpdef py_void Continue(self):
+        self.cefCallback.get().Continue()
 
     cpdef py_void Cancel(self):
         self.cefCallback.get().Cancel()
@@ -140,7 +141,7 @@ cdef public CefRefPtr[CefResourceHandler] RequestHandler_GetResourceHandler(
         # Issue #455: CefRequestHandler callbacks still executed after
         # browser was closed.
         if IsBrowserClosed(cefBrowser):
-            return <CefRefPtr[CefResourceHandler]>NULL
+            return <CefRefPtr[CefResourceHandler]>nullptr
 
         pyBrowser = GetPyBrowser(cefBrowser, "GetResourceHandler")
         pyFrame = GetPyFrame(cefFrame)
@@ -154,9 +155,9 @@ cdef public CefRefPtr[CefResourceHandler] RequestHandler_GetResourceHandler(
             if returnValue:
                 return CreateResourceHandler(returnValue)
             else:
-                return <CefRefPtr[CefResourceHandler]>NULL
+                return <CefRefPtr[CefResourceHandler]>nullptr
         else:
-            return <CefRefPtr[CefResourceHandler]>NULL
+            return <CefRefPtr[CefResourceHandler]>nullptr
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
@@ -279,8 +280,8 @@ cdef public cpp_bool RequestHandler_GetAuthCredentials(
 cdef public cpp_bool RequestHandler_OnQuotaRequest(
         CefRefPtr[CefBrowser] cefBrowser,
         const CefString& cefOriginUrl,
-        int64 newSize,
-        CefRefPtr[CefRequestCallback] cefRequestCallback
+        int64_t newSize,
+        CefRefPtr[CefCallback] cefCallback
         ) except * with gil:
     cdef PyBrowser pyBrowser
     cdef py_string pyOriginUrl
@@ -300,7 +301,7 @@ cdef public cpp_bool RequestHandler_OnQuotaRequest(
                     browser=pyBrowser,
                     origin_url=pyOriginUrl,
                     new_size=newSize,
-                    callback=CreatePyRequestCallback(cefRequestCallback))
+                    callback=CreatePyRequestCallback(cefCallback))
             return bool(returnValue)
         else:
             return False
@@ -309,49 +310,6 @@ cdef public cpp_bool RequestHandler_OnQuotaRequest(
         sys.excepthook(exc_type, exc_value, exc_trace)
 
 
-cdef public CefRefPtr[CefCookieManager] RequestHandler_GetCookieManager(
-        CefRefPtr[CefBrowser] cefBrowser,
-        const CefString& cefMainUrl
-        ) except * with gil:
-    # In CEF the GetCookieManager callback belongs to 
-    # CefRequestContextHandler.
-    # In an exceptional case the browser parameter may be None
-    # due to limitation in CEF API. No workaround as of now.
-    cdef PyBrowser pyBrowser
-    cdef str pyMainUrl
-    cdef object clientCallback
-    cdef PyCookieManager returnValue
-    try:
-        # Issue #429: in some cases due to a race condition the browser
-        # may be NULL.
-        if not cefBrowser.get():
-            return <CefRefPtr[CefCookieManager]>NULL
-
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(cefBrowser):
-            return <CefRefPtr[CefCookieManager]>NULL
-
-        pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
-        pyMainUrl = CefToPyString(cefMainUrl)
-        clientCallback = pyBrowser.GetClientCallback("GetCookieManager")
-        if clientCallback:
-            returnValue = clientCallback(
-                    browser=pyBrowser,
-                    main_url=pyMainUrl)
-            if returnValue:
-                if isinstance(returnValue, PyCookieManager):
-                    return returnValue.cefCookieManager
-                else:
-                    raise Exception("Expected a CookieManager object")
-            return <CefRefPtr[CefCookieManager]>NULL
-        else:
-            return <CefRefPtr[CefCookieManager]>NULL
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
-
 cdef public void RequestHandler_OnProtocolExecution(
         CefRefPtr[CefBrowser] cefBrowser,
         const CefString& cefUrl,
@@ -388,60 +346,10 @@ cdef public void RequestHandler_OnProtocolExecution(
         sys.excepthook(exc_type, exc_value, exc_trace)
 
 
-cdef public cpp_bool RequestHandler_OnBeforePluginLoad(
-        CefRefPtr[CefBrowser] browser,
-        const CefString& mime_type,
-        const CefString& plugin_url,
-        cpp_bool is_main_frame,
-        const CefString& top_origin_url,
-        CefRefPtr[CefWebPluginInfo] plugin_info,
-        cef_types.cef_plugin_policy_t* plugin_policy
-        ) except * with gil:
-    cdef PyBrowser pyBrowser
-    cdef PyWebPluginInfo pyInfo
-    cdef py_bool returnValue
-    cdef object clientCallback
-    try:
-        # OnBeforePluginLoad is called from RequestContexthandler.
-        # The Browser object might not be available, because it is
-        # being set synchronously during CreateBrowserSync, after
-        # Browser is created. From testing it always works, however
-        # better be safe.
-        if not browser.get():
-            Debug("WARNING: RequestHandler_OnBeforePluginLoad() failed,"
-                  " Browser object is not available")
-            return False
-
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(browser):
-            return False
-
-        py_browser = GetPyBrowser(browser, "OnBeforePluginLoad")
-        py_plugin_info = CreatePyWebPluginInfo(plugin_info)
-        clientCallback = GetGlobalClientCallback("OnBeforePluginLoad")
-        if clientCallback:
-            returnValue = clientCallback(
-                    browser=py_browser,
-                    mime_type=CefToPyString(mime_type),
-                    plugin_url=CefToPyString(plugin_url),
-                    is_main_frame=bool(is_main_frame),
-                    top_origin_url=CefToPyString(top_origin_url),
-                    plugin_info=py_plugin_info)
-            if returnValue:
-                plugin_policy[0] = cef_types.PLUGIN_POLICY_DISABLE
-            return bool(returnValue)
-        else:
-            return False
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
-
 cdef public cpp_bool RequestHandler_OnCertificateError(
         int certError,
         const CefString& cefRequestUrl,
-        CefRefPtr[CefRequestCallback] cefCertCallback
+        CefRefPtr[CefCallback] cefCertCallback
         ) except * with gil:
     cdef py_bool returnValue
     cdef object clientCallback
@@ -485,103 +393,3 @@ cdef public void RequestHandler_OnRendererProcessTerminated(
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
-
-
-cdef public void RequestHandler_OnPluginCrashed(
-        CefRefPtr[CefBrowser] cefBrowser,
-        const CefString& cefPluginPath
-        ) except * with gil:
-    # TODO: plugin may crash during browser creation. Let this callback 
-    # to be set either through  cefpython.SetGlobalClientCallback()
-    # or PyBrowser.SetClientCallback(). Modify the 
-    # PyBrowser.GetClientCallback() implementation to return a global 
-    # callback first if set.
-    cdef PyBrowser pyBrowser
-    cdef object clientCallback
-    try:
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(cefBrowser):
-            return
-
-        pyBrowser = GetPyBrowser(cefBrowser, "OnPluginCrashed")
-        clientCallback = pyBrowser.GetClientCallback("OnPluginCrashed")
-        if clientCallback:
-            clientCallback(
-                    browser=pyBrowser,
-                    plugin_path=CefToPyString(cefPluginPath))
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
-
-cdef public cpp_bool RequestHandler_CanGetCookies(
-        CefRefPtr[CefBrowser] cef_browser,
-        CefRefPtr[CefFrame] cef_frame,
-        CefRefPtr[CefRequest] cef_request
-        ) except * with gil:
-    cdef PyBrowser browser
-    cdef PyFrame frame
-    cdef PyRequest request
-    cdef object callback
-    cdef py_bool retval
-    try:
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(cef_browser):
-            return False
-
-        browser = GetPyBrowser(cef_browser, "CanGetCookies")
-        frame = GetPyFrame(cef_frame)
-        request = CreatePyRequest(cef_request)
-        callback = browser.GetClientCallback("CanGetCookies")
-        if callback:
-            retval = callback(
-                    browser=browser,
-                    frame=frame,
-                    request=request)
-            return bool(retval)
-        else:
-            # Return True by default
-            return True
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
-
-cdef public cpp_bool RequestHandler_CanSetCookie(
-        CefRefPtr[CefBrowser] cef_browser,
-        CefRefPtr[CefFrame] cef_frame,
-        CefRefPtr[CefRequest] cef_request,
-        const CefCookie& cef_cookie
-        ) except * with gil:
-    cdef PyBrowser browser
-    cdef PyFrame frame
-    cdef PyRequest request
-    cdef PyCookie cookie
-    cdef object callback
-    cdef py_bool retval
-    try:
-        # Issue #455: CefRequestHandler callbacks still executed after
-        # browser was closed.
-        if IsBrowserClosed(cef_browser):
-            return False
-
-        browser = GetPyBrowser(cef_browser, "CanSetCookie")
-        frame = GetPyFrame(cef_frame)
-        request = CreatePyRequest(cef_request)
-        cookie = CreatePyCookie(cef_cookie)
-        callback = browser.GetClientCallback("CanSetCookie")
-        if callback:
-            retval = callback(
-                    browser=browser,
-                    frame=frame,
-                    request=request,
-                    cookie=cookie)
-            return bool(retval)
-        else:
-            # Return True by default
-            return True
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/src/handlers/resource_handler.pyx b/src/handlers/resource_handler.pyx
index 1c379f192..695c57e63 100644
--- a/src/handlers/resource_handler.pyx
+++ b/src/handlers/resource_handler.pyx
@@ -3,7 +3,7 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 include "../cefpython.pyx"
-
+from libc.stdint cimport int64_t
 import weakref
 
 # -----------------------------------------------------------------------------
@@ -21,7 +21,7 @@ cdef int g_userResourceHandlerMaxId = 0
 
 cdef py_void ValidateUserResourceHandler(object userResourceHandler):
     cdef list methods = ["ProcessRequest", "GetResponseHeaders",
-            "ReadResponse", "CanGetCookie", "CanSetCookie", "Cancel"]
+            "ReadResponse", "Cancel"]
     for method in methods:
         if userResourceHandler and hasattr(userResourceHandler, method)\
                 and callable(getattr(userResourceHandler, method)):
@@ -102,7 +102,7 @@ cdef public cpp_bool ResourceHandler_ProcessRequest(
 cdef public void ResourceHandler_GetResponseHeaders(
         int resourceHandlerId,
         CefRefPtr[CefResponse] cefResponse,
-        int64& cefResponseLength,
+        int64_t& cefResponseLength,
         CefString& cefRedirectUrl
         ) except * with gil:
     cdef PyResourceHandler pyResourceHandler
@@ -122,7 +122,7 @@ cdef public void ResourceHandler_GetResponseHeaders(
             if userCallback:
                 returnValue = userCallback(pyResponse, responseLengthOut,
                         redirectUrlOut)
-                (&cefResponseLength)[0] = <int64>responseLengthOut[0]
+                (&cefResponseLength)[0] = <int64_t>responseLengthOut[0]
                 if redirectUrlOut[0]:
                     PyToCefString(redirectUrlOut[0], cefRedirectUrl)
                 return
@@ -182,50 +182,6 @@ cdef public cpp_bool ResourceHandler_ReadResponse(
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
 
-cdef public cpp_bool ResourceHandler_CanGetCookie(
-        int resourceHandlerId,
-        const CefCookie& cefCookie
-        ) except * with gil:
-    cdef PyResourceHandler pyResourceHandler
-    cdef object userCallback
-    cdef py_bool returnValue
-    cdef PyCookie pyCookie
-    try:
-        assert IsThread(TID_IO), "Must be called on the IO thread"
-        pyResourceHandler = GetPyResourceHandler(resourceHandlerId)
-        pyCookie = CreatePyCookie(cefCookie)
-        if pyResourceHandler:
-            userCallback = pyResourceHandler.GetCallback("CanGetCookie")
-            if userCallback:
-                returnValue = userCallback(cookie=pyCookie)
-                return bool(returnValue)
-        return False
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
-cdef public cpp_bool ResourceHandler_CanSetCookie(
-        int resourceHandlerId,
-        const CefCookie& cefCookie
-        ) except * with gil:
-    cdef PyResourceHandler pyResourceHandler
-    cdef object userCallback
-    cdef py_bool returnValue
-    cdef PyCookie pyCookie
-    try:
-        assert IsThread(TID_IO), "Must be called on the IO thread"
-        pyResourceHandler = GetPyResourceHandler(resourceHandlerId)
-        pyCookie = CreatePyCookie(cefCookie)
-        if pyResourceHandler:
-            userCallback = pyResourceHandler.GetCallback("CanSetCookie")
-            if userCallback:
-                returnValue = userCallback(cookie=pyCookie)
-                return bool(returnValue)
-        return False
-    except:
-        (exc_type, exc_value, exc_trace) = sys.exc_info()
-        sys.excepthook(exc_type, exc_value, exc_trace)
-
 cdef public void ResourceHandler_Cancel(
         int resourceHandlerId
         ) except * with gil:
diff --git a/src/handlers/v8context_handler.pyx b/src/handlers/v8context_handler.pyx
index fccdad562..2766d9a5f 100644
--- a/src/handlers/v8context_handler.pyx
+++ b/src/handlers/v8context_handler.pyx
@@ -11,6 +11,7 @@
 include "../cefpython.pyx"
 include "../browser.pyx"
 include "../frame.pyx"
+from libc.stdint cimport int64_t
 
 cdef public void V8ContextHandler_OnContextCreated(
         CefRefPtr[CefBrowser] cefBrowser,
@@ -20,7 +21,6 @@ cdef public void V8ContextHandler_OnContextCreated(
     cdef PyFrame pyFrame
     cdef object clientCallback
     try:
-        Debug("V8ContextHandler_OnContextCreated()")
         pyBrowser = GetPyBrowser(cefBrowser, "OnContextCreated")
         pyBrowser.SetUserData("__v8ContextCreated", True)
         pyFrame = GetPyFrame(cefFrame)
@@ -34,7 +34,7 @@ cdef public void V8ContextHandler_OnContextCreated(
 
 cdef public void V8ContextHandler_OnContextReleased(
         int browserId,
-        int64 frameId
+        CefString frameId
         ) except * with gil:
     cdef PyBrowser pyBrowser
     cdef PyFrame pyFrame
@@ -53,16 +53,16 @@ cdef public void V8ContextHandler_OnContextReleased(
         if not pyBrowser:
             Debug("OnContextReleased: Browser doesn't exist anymore, id={id}"
                   .format(id=str(browserId)))
-            RemovePyFrame(browserId, frameId)
+            RemovePyFrame(browserId, CefToPyString(frameId))
             return
-        pyFrame = GetPyFrameById(browserId, frameId)
+        pyFrame = GetPyFrameById(browserId, CefToPyString(frameId))
         # Frame may already be destroyed while IPC messaging was executing
         # (Issue #431).
         if pyFrame:
             clientCallback = pyBrowser.GetClientCallback("OnContextReleased")
             if clientCallback:
                 clientCallback(browser=pyBrowser, frame=pyFrame)
-        RemovePyFrame(browserId, frameId)
+        RemovePyFrame(browserId, CefToPyString(frameId))
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
diff --git a/src/handlers/v8function_handler.pyx b/src/handlers/v8function_handler.pyx
index ee73619f8..8121674af 100644
--- a/src/handlers/v8function_handler.pyx
+++ b/src/handlers/v8function_handler.pyx
@@ -8,7 +8,7 @@ include "../frame.pyx"
 
 cdef public void V8FunctionHandler_Execute(
         CefRefPtr[CefBrowser] cefBrowser,
-        int64 frameId,
+        CefString& frameId,
         CefString& cefFuncName,
         CefRefPtr[CefListValue] cefFuncArgs
         ) except * with gil:
@@ -22,7 +22,7 @@ cdef public void V8FunctionHandler_Execute(
     cdef py_string errorMessage
     try:
         pyBrowser = GetPyBrowser(cefBrowser, "V8FunctionHandler_Execute")
-        cefFrame = cefBrowser.get().GetFrame(frameId)
+        cefFrame = cefBrowser.get().GetFrameByName(frameId)
         if cefFrame.get():
             pyFrame = GetPyFrame(cefFrame)
         else:
diff --git a/src/include/base/cef_atomic_flag.h b/src/include/base/cef_atomic_flag.h
new file mode 100644
index 000000000..3a2fdbc1d
--- /dev/null
+++ b/src/include/base/cef_atomic_flag.h
@@ -0,0 +1,97 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
+#define CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
+#pragma once
+
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/synchronization/atomic_flag.h"
+
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include <stdint.h>
+
+#include <atomic>
+
+#include "include/base/cef_thread_checker.h"
+
+namespace base {
+
+///
+/// A flag that can safely be set from one thread and read from other threads.
+///
+/// This class IS NOT intended for synchronization between threads.
+///
+class AtomicFlag {
+ public:
+  AtomicFlag();
+
+  AtomicFlag(const AtomicFlag&) = delete;
+  AtomicFlag& operator=(const AtomicFlag&) = delete;
+
+  ~AtomicFlag();
+
+  ///
+  /// Set the flag. Must always be called from the same thread.
+  ///
+  void Set();
+
+  ///
+  /// Returns true iff the flag was set. If this returns true, the current
+  /// thread is guaranteed to be synchronized with all memory operations on the
+  /// thread which invoked Set() up until at least the first call to Set() on
+  /// it.
+  ///
+  bool IsSet() const {
+    // Inline here: this has a measurable performance impact on base::WeakPtr.
+    return flag_.load(std::memory_order_acquire) != 0;
+  }
+
+  ///
+  /// Resets the flag. Be careful when using this: callers might not expect
+  /// IsSet() to return false after returning true once.
+  ///
+  void UnsafeResetForTesting();
+
+ private:
+  std::atomic<uint_fast8_t> flag_{0};
+  base::ThreadChecker set_thread_checker_;
+};
+
+}  // namespace base
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_ATOMIC_FLAG_H_
diff --git a/src/include/base/cef_atomic_ref_count.h b/src/include/base/cef_atomic_ref_count.h
index 4d6777970..38e8f93b7 100644
--- a/src/include/base/cef_atomic_ref_count.h
+++ b/src/include/base/cef_atomic_ref_count.h
@@ -43,120 +43,78 @@
 // When building CEF include the Chromium header directly.
 #include "base/atomic_ref_count.h"
 
-// Used when declaring a base::AtomicRefCount value. This is an object type with
-// Chromium headers.
-#define ATOMIC_DECLARATION (0)
-
-// Maintaining compatibility with AtompicRefCount* functions that were removed
-// from Chromium in http://crrev.com/ee96d561.
-namespace base {
-
-// Increment a reference count by 1.
-inline void AtomicRefCountInc(volatile AtomicRefCount* ptr) {
-  const_cast<AtomicRefCount*>(ptr)->Increment();
-}
-
-// Decrement a reference count by 1 and return whether the result is non-zero.
-// Insert barriers to ensure that state written before the reference count
-// became zero will be visible to a thread that has just made the count zero.
-inline bool AtomicRefCountDec(volatile AtomicRefCount* ptr) {
-  return const_cast<AtomicRefCount*>(ptr)->Decrement();
-}
-
-// Return whether the reference count is one.  If the reference count is used
-// in the conventional way, a refrerence count of 1 implies that the current
-// thread owns the reference and no other thread shares it.  This call performs
-// the test for a reference count of one, and performs the memory barrier
-// needed for the owning thread to act on the object, knowing that it has
-// exclusive access to the object.
-inline bool AtomicRefCountIsOne(volatile AtomicRefCount* ptr) {
-  return const_cast<AtomicRefCount*>(ptr)->IsOne();
-}
-
-// Return whether the reference count is zero.  With conventional object
-// referencing counting, the object will be destroyed, so the reference count
-// should never be zero.  Hence this is generally used for a debug check.
-inline bool AtomicRefCountIsZero(volatile AtomicRefCount* ptr) {
-  return const_cast<AtomicRefCount*>(ptr)->IsZero();
-}
-
-}  // namespace base
-
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include "include/base/cef_atomicops.h"
-
-// Annotations are not currently supported.
-#define ANNOTATE_HAPPENS_BEFORE(obj) /* empty */
-#define ANNOTATE_HAPPENS_AFTER(obj)  /* empty */
-
-// Used when declaring a base::AtomicRefCount value. This is an integer/ptr type
-// with CEF headers.
-#define ATOMIC_DECLARATION = 0
+#include <atomic>
 
 namespace base {
 
-typedef subtle::Atomic32 AtomicRefCount;
-
-// Increment a reference count by "increment", which must exceed 0.
-inline void AtomicRefCountIncN(volatile AtomicRefCount* ptr,
-                               AtomicRefCount increment) {
-  subtle::NoBarrier_AtomicIncrement(ptr, increment);
-}
-
-// Decrement a reference count by "decrement", which must exceed 0,
-// and return whether the result is non-zero.
-// Insert barriers to ensure that state written before the reference count
-// became zero will be visible to a thread that has just made the count zero.
-inline bool AtomicRefCountDecN(volatile AtomicRefCount* ptr,
-                               AtomicRefCount decrement) {
-  ANNOTATE_HAPPENS_BEFORE(ptr);
-  bool res = (subtle::Barrier_AtomicIncrement(ptr, -decrement) != 0);
-  if (!res) {
-    ANNOTATE_HAPPENS_AFTER(ptr);
+class AtomicRefCount {
+ public:
+  constexpr AtomicRefCount() : ref_count_(0) {}
+  explicit constexpr AtomicRefCount(int initial_value)
+      : ref_count_(initial_value) {}
+
+  ///
+  /// Increment a reference count.
+  /// Returns the previous value of the count.
+  ///
+  int Increment() { return Increment(1); }
+
+  ///
+  /// Increment a reference count by "increment", which must exceed 0.
+  /// Returns the previous value of the count.
+  ///
+  int Increment(int increment) {
+    return ref_count_.fetch_add(increment, std::memory_order_relaxed);
+  }
+
+  ///
+  /// Decrement a reference count, and return whether the result is non-zero.
+  /// Insert barriers to ensure that state written before the reference count
+  /// became zero will be visible to a thread that has just made the count zero.
+  ///
+  bool Decrement() {
+    // TODO(jbroman): Technically this doesn't need to be an acquire operation
+    // unless the result is 1 (i.e., the ref count did indeed reach zero).
+    // However, there are toolchain issues that make that not work as well at
+    // present (notably TSAN doesn't like it).
+    return ref_count_.fetch_sub(1, std::memory_order_acq_rel) != 1;
   }
-  return res;
-}
-
-// Increment a reference count by 1.
-inline void AtomicRefCountInc(volatile AtomicRefCount* ptr) {
-  base::AtomicRefCountIncN(ptr, 1);
-}
-
-// Decrement a reference count by 1 and return whether the result is non-zero.
-// Insert barriers to ensure that state written before the reference count
-// became zero will be visible to a thread that has just made the count zero.
-inline bool AtomicRefCountDec(volatile AtomicRefCount* ptr) {
-  return base::AtomicRefCountDecN(ptr, 1);
-}
-
-// Return whether the reference count is one.  If the reference count is used
-// in the conventional way, a refrerence count of 1 implies that the current
-// thread owns the reference and no other thread shares it.  This call performs
-// the test for a reference count of one, and performs the memory barrier
-// needed for the owning thread to act on the object, knowing that it has
-// exclusive access to the object.
-inline bool AtomicRefCountIsOne(volatile AtomicRefCount* ptr) {
-  bool res = (subtle::Acquire_Load(ptr) == 1);
-  if (res) {
-    ANNOTATE_HAPPENS_AFTER(ptr);
+
+  ///
+  /// Return whether the reference count is one.  If the reference count is used
+  /// in the conventional way, a refrerence count of 1 implies that the current
+  /// thread owns the reference and no other thread shares it.  This call
+  /// performs the test for a reference count of one, and performs the memory
+  /// barrier needed for the owning thread to act on the object, knowing that it
+  /// has exclusive access to the object.
+  ///
+  bool IsOne() const { return ref_count_.load(std::memory_order_acquire) == 1; }
+
+  ///
+  /// Return whether the reference count is zero.  With conventional object
+  /// referencing counting, the object will be destroyed, so the reference count
+  /// should never be zero.  Hence this is generally used for a debug check.
+  ///
+  bool IsZero() const {
+    return ref_count_.load(std::memory_order_acquire) == 0;
   }
-  return res;
-}
-
-// Return whether the reference count is zero.  With conventional object
-// referencing counting, the object will be destroyed, so the reference count
-// should never be zero.  Hence this is generally used for a debug check.
-inline bool AtomicRefCountIsZero(volatile AtomicRefCount* ptr) {
-  bool res = (subtle::Acquire_Load(ptr) == 0);
-  if (res) {
-    ANNOTATE_HAPPENS_AFTER(ptr);
+
+  ///
+  /// Returns the current reference count (with no barriers). This is subtle,
+  /// and should be used only for debugging.
+  ///
+  int SubtleRefCountForDebug() const {
+    return ref_count_.load(std::memory_order_relaxed);
   }
-  return res;
-}
+
+ private:
+  std::atomic_int ref_count_;
+};
 
 }  // namespace base
 
diff --git a/src/include/base/cef_atomicops.h b/src/include/base/cef_atomicops.h
deleted file mode 100644
index 96aebabf8..000000000
--- a/src/include/base/cef_atomicops.h
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// For atomic operations on reference counts, see cef_atomic_ref_count.h.
-
-// The routines exported by this module are subtle.  If you use them, even if
-// you get the code right, it will depend on careful reasoning about atomicity
-// and memory ordering; it will be less readable, and harder to maintain.  If
-// you plan to use these routines, you should have a good reason, such as solid
-// evidence that performance would otherwise suffer, or there being no
-// alternative.  You should assume only properties explicitly guaranteed by the
-// specifications in this file.  You are almost certainly _not_ writing code
-// just for the x86; if you assume x86 semantics, x86 hardware bugs and
-// implementations on other archtectures will cause your code to break.  If you
-// do not know what you are doing, avoid these routines, and use a Mutex.
-//
-// It is incorrect to make direct assignments to/from an atomic variable.
-// You should use one of the Load or Store routines.  The NoBarrier
-// versions are provided when no barriers are needed:
-//   NoBarrier_Store()
-//   NoBarrier_Load()
-// Although there are currently no compiler enforcement, you are encouraged
-// to use these.
-//
-
-#ifndef CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_
-#define CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_
-#pragma once
-
-#if defined(BASE_ATOMICOPS_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/atomicops.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <stdint.h>
-
-#include "include/base/cef_build.h"
-
-#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS)
-// windows.h #defines this (only on x64). This causes problems because the
-// public API also uses MemoryBarrier at the public name for this fence. So, on
-// X64, undef it, and call its documented
-// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx)
-// implementation directly.
-#undef MemoryBarrier
-#endif
-
-namespace base {
-namespace subtle {
-
-typedef int32_t Atomic32;
-#ifdef ARCH_CPU_64_BITS
-// We need to be able to go between Atomic64 and AtomicWord implicitly.  This
-// means Atomic64 and AtomicWord should be the same type on 64-bit.
-#if defined(__ILP32__) || defined(OS_NACL)
-// NaCl's intptr_t is not actually 64-bits on 64-bit!
-// http://code.google.com/p/nativeclient/issues/detail?id=1162
-typedef int64_t Atomic64;
-#else
-typedef intptr_t Atomic64;
-#endif
-#endif
-
-// Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
-// Atomic64 routines below, depending on your architecture.
-typedef intptr_t AtomicWord;
-
-// Atomically execute:
-//      result = *ptr;
-//      if (*ptr == old_value)
-//        *ptr = new_value;
-//      return result;
-//
-// I.e., replace "*ptr" with "new_value" if "*ptr" used to be "old_value".
-// Always return the old value of "*ptr"
-//
-// This routine implies no memory barriers.
-Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                  Atomic32 old_value,
-                                  Atomic32 new_value);
-
-// Atomically store new_value into *ptr, returning the previous value held in
-// *ptr.  This routine implies no memory barriers.
-Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, Atomic32 new_value);
-
-// Atomically increment *ptr by "increment".  Returns the new value of
-// *ptr with the increment applied.  This routine implies no memory barriers.
-Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
-
-Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment);
-
-// These following lower-level operations are typically useful only to people
-// implementing higher-level synchronization operations like spinlocks,
-// mutexes, and condition-variables.  They combine CompareAndSwap(), a load, or
-// a store with appropriate memory-ordering instructions.  "Acquire" operations
-// ensure that no later memory access can be reordered ahead of the operation.
-// "Release" operations ensure that no previous memory access can be reordered
-// after the operation.  "Barrier" operations have both "Acquire" and "Release"
-// semantics.   A MemoryBarrier() has "Barrier" semantics, but does no memory
-// access.
-Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                Atomic32 old_value,
-                                Atomic32 new_value);
-Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                Atomic32 old_value,
-                                Atomic32 new_value);
-
-void MemoryBarrier();
-void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value);
-void Acquire_Store(volatile Atomic32* ptr, Atomic32 value);
-void Release_Store(volatile Atomic32* ptr, Atomic32 value);
-
-Atomic32 NoBarrier_Load(volatile const Atomic32* ptr);
-Atomic32 Acquire_Load(volatile const Atomic32* ptr);
-Atomic32 Release_Load(volatile const Atomic32* ptr);
-
-// 64-bit atomic operations (only available on 64-bit processors).
-#ifdef ARCH_CPU_64_BITS
-Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                  Atomic64 old_value,
-                                  Atomic64 new_value);
-Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, Atomic64 new_value);
-Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
-Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment);
-
-Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                Atomic64 old_value,
-                                Atomic64 new_value);
-Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                Atomic64 old_value,
-                                Atomic64 new_value);
-void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value);
-void Acquire_Store(volatile Atomic64* ptr, Atomic64 value);
-void Release_Store(volatile Atomic64* ptr, Atomic64 value);
-Atomic64 NoBarrier_Load(volatile const Atomic64* ptr);
-Atomic64 Acquire_Load(volatile const Atomic64* ptr);
-Atomic64 Release_Load(volatile const Atomic64* ptr);
-#endif  // ARCH_CPU_64_BITS
-
-}  // namespace subtle
-}  // namespace base
-
-// Include our platform specific implementation.
-#if defined(OS_WIN) && defined(COMPILER_MSVC) && defined(ARCH_CPU_X86_FAMILY)
-#include "include/base/internal/cef_atomicops_x86_msvc.h"
-#elif defined(OS_MACOSX)
-#include "include/base/internal/cef_atomicops_mac.h"
-#elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
-#include "include/base/internal/cef_atomicops_x86_gcc.h"
-#elif defined(COMPILER_GCC) && defined(__ARM_ARCH)
-#include "include/base/internal/cef_atomicops_arm_gcc.h"
-#else
-#error "Atomic operations are not supported on your platform"
-#endif
-
-// On some platforms we need additional declarations to make
-// AtomicWord compatible with our other Atomic* types.
-#if defined(OS_MACOSX) || defined(OS_OPENBSD)
-#include "include/base/internal/cef_atomicops_atomicword_compat.h"
-#endif
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_ATOMICOPS_H_
diff --git a/src/include/base/cef_auto_reset.h b/src/include/base/cef_auto_reset.h
new file mode 100644
index 000000000..be3a05da5
--- /dev/null
+++ b/src/include/base/cef_auto_reset.h
@@ -0,0 +1,90 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// base::AutoReset<> is useful for setting a variable to a new value only within
+// a particular scope. An base::AutoReset<> object resets a variable to its
+// original value upon destruction, making it an alternative to writing
+// "var = false;" or "var = old_val;" at all of a block's exit points.
+//
+// This should be obvious, but note that an base::AutoReset<> instance should
+// have a shorter lifetime than its scoped_variable, to prevent invalid memory
+// writes when the base::AutoReset<> object is destroyed.
+
+#ifndef CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
+#define CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
+#pragma once
+
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/auto_reset.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include <utility>
+
+namespace base {
+
+template <typename T>
+class AutoReset {
+ public:
+  template <typename U>
+  AutoReset(T* scoped_variable, U&& new_value)
+      : scoped_variable_(scoped_variable),
+        original_value_(
+            std::exchange(*scoped_variable_, std::forward<U>(new_value))) {}
+
+  AutoReset(AutoReset&& other)
+      : scoped_variable_(std::exchange(other.scoped_variable_, nullptr)),
+        original_value_(std::move(other.original_value_)) {}
+
+  AutoReset& operator=(AutoReset&& rhs) {
+    scoped_variable_ = std::exchange(rhs.scoped_variable_, nullptr);
+    original_value_ = std::move(rhs.original_value_);
+    return *this;
+  }
+
+  ~AutoReset() {
+    if (scoped_variable_) {
+      *scoped_variable_ = std::move(original_value_);
+    }
+  }
+
+ private:
+  T* scoped_variable_;
+  T original_value_;
+};
+
+}  // namespace base
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_AUTO_RESET_H_
diff --git a/src/include/base/cef_bind.h b/src/include/base/cef_bind.h
index 77c9c5573..e879b5694 100644
--- a/src/include/base/cef_bind.h
+++ b/src/include/base/cef_bind.h
@@ -28,546 +28,361 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+///
+/// \file
+/// base::BindOnce() and base::BindRepeating() are helpers for creating
+/// base::OnceCallback and base::RepeatingCallback objects respectively.
+///
+/// For a runnable object of n-arity, the base::Bind*() family allows partial
+/// application of the first m arguments. The remaining n - m arguments must be
+/// passed when invoking the callback with Run().
+///
+/// <pre>
+///   // The first argument is bound at callback creation; the remaining
+///   // two must be passed when calling Run() on the callback object.
+///   base::OnceCallback<long(int, long)> cb = base::BindOnce(
+///       [](short x, int y, long z) { return x * y * z; }, 42);
+/// </pre>
+///
+/// When binding to a method, the receiver object must also be specified at
+/// callback creation time. When Run() is invoked, the method will be invoked on
+/// the specified receiver object.
+///
+/// <pre>
+///   class C : public base::RefCounted<C> { void F(); };
+///   auto instance = base::MakeRefCounted<C>();
+///   auto cb = base::BindOnce(&C::F, instance);
+///   std::move(cb).Run();  // Identical to instance->F()
+/// </pre>
+///
+/// See https://chromium.googlesource.com/chromium/src/+/lkgr/docs/callback.md
+/// for the full documentation.
+///
+
+// Implementation notes
+//
+// If you're reading the implementation, before proceeding further, you should
+// read the top comment of base/internal/cef_bind_internal.h for a definition
+// of common terms and concepts.
+
 #ifndef CEF_INCLUDE_BASE_CEF_BIND_H_
 #define CEF_INCLUDE_BASE_CEF_BIND_H_
 #pragma once
 
-#if defined(BASE_BIND_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/bind.h"
+#include "base/functional/bind.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
+#include <functional>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+#include "include/base/cef_build.h"
+#include "include/base/cef_compiler_specific.h"
 #include "include/base/internal/cef_bind_internal.h"
-#include "include/base/internal/cef_callback_internal.h"
 
-// -----------------------------------------------------------------------------
-// Usage documentation
-// -----------------------------------------------------------------------------
-//
-// See base/cef_callback.h for documentation.
-//
-//
-// -----------------------------------------------------------------------------
-// Implementation notes
-// -----------------------------------------------------------------------------
-//
-// If you're reading the implementation, before proceeding further, you should
-// read the top comment of base/bind_internal.h for a definition of common
-// terms and concepts.
-//
-// RETURN TYPES
-//
-// Though Bind()'s result is meant to be stored in a Callback<> type, it
-// cannot actually return the exact type without requiring a large amount
-// of extra template specializations. The problem is that in order to
-// discern the correct specialization of Callback<>, Bind would need to
-// unwrap the function signature to determine the signature's arity, and
-// whether or not it is a method.
-//
-// Each unique combination of (arity, function_type, num_prebound) where
-// function_type is one of {function, method, const_method} would require
-// one specialization.  We eventually have to do a similar number of
-// specializations anyways in the implementation (see the Invoker<>,
-// classes).  However, it is avoidable in Bind if we return the result
-// via an indirection like we do below.
-//
-// TODO(ajwong): We might be able to avoid this now, but need to test.
-//
-// It is possible to move most of the COMPILE_ASSERT asserts into BindState<>,
-// but it feels a little nicer to have the asserts here so people do not
-// need to crack open bind_internal.h.  On the other hand, it makes Bind()
-// harder to read.
+#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
+#include "include/base/internal/cef_scoped_block_mac.h"
+#endif
 
 namespace base {
 
-template <typename Functor>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void()>::UnboundRunType>
-Bind(Functor functor) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  typedef cef_internal::BindState<RunnableType, RunType, void()> BindState;
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor)));
+///
+/// Bind as OnceCallback.
+///
+template <typename Functor, typename... Args>
+inline OnceCallback<cef_internal::MakeUnboundRunType<Functor, Args...>>
+BindOnce(Functor&& functor, Args&&... args) {
+  static_assert(!cef_internal::IsOnceCallback<std::decay_t<Functor>>() ||
+                    (std::is_rvalue_reference<Functor&&>() &&
+                     !std::is_const<std::remove_reference_t<Functor>>()),
+                "BindOnce requires non-const rvalue for OnceCallback binding."
+                " I.e.: base::BindOnce(std::move(callback)).");
+  static_assert(
+      std::conjunction<cef_internal::AssertBindArgIsNotBasePassed<
+          std::decay_t<Args>>...>::value,
+      "Use std::move() instead of base::Passed() with base::BindOnce()");
+
+  return cef_internal::BindImpl<OnceCallback>(std::forward<Functor>(functor),
+                                              std::forward<Args>(args)...);
 }
 
-template <typename Functor, typename P1>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor, const P1& p1) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
-
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
-
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType)>
-      BindState;
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1));
+///
+/// Bind as RepeatingCallback.
+///
+template <typename Functor, typename... Args>
+inline RepeatingCallback<cef_internal::MakeUnboundRunType<Functor, Args...>>
+BindRepeating(Functor&& functor, Args&&... args) {
+  static_assert(
+      !cef_internal::IsOnceCallback<std::decay_t<Functor>>(),
+      "BindRepeating cannot bind OnceCallback. Use BindOnce with std::move().");
+
+  return cef_internal::BindImpl<RepeatingCallback>(
+      std::forward<Functor>(functor), std::forward<Args>(args)...);
 }
 
-template <typename Functor, typename P1, typename P2>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-         typename cef_internal::CallbackParamTraits<P2>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor, const P1& p1, const P2& p2) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
-
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
-
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
-                 p2_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-           typename cef_internal::CallbackParamTraits<P2>::StorageType)>
-      BindState;
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1, p2));
+///
+/// Special cases for binding to a base::Callback without extra bound arguments.
+/// We CHECK() the validity of callback to guard against null pointers
+/// accidentally ending up in posted tasks, causing hard-to-debug crashes.
+///
+template <typename Signature>
+OnceCallback<Signature> BindOnce(OnceCallback<Signature> callback) {
+  CHECK(callback);
+  return callback;
 }
 
-template <typename Functor, typename P1, typename P2, typename P3>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-         typename cef_internal::CallbackParamTraits<P2>::StorageType,
-         typename cef_internal::CallbackParamTraits<P3>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
-
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
-
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
-                 p2_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
-                 p3_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-           typename cef_internal::CallbackParamTraits<P2>::StorageType,
-           typename cef_internal::CallbackParamTraits<P3>::StorageType)>
-      BindState;
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3));
+template <typename Signature>
+OnceCallback<Signature> BindOnce(RepeatingCallback<Signature> callback) {
+  CHECK(callback);
+  return callback;
 }
 
-template <typename Functor, typename P1, typename P2, typename P3, typename P4>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-         typename cef_internal::CallbackParamTraits<P2>::StorageType,
-         typename cef_internal::CallbackParamTraits<P3>::StorageType,
-         typename cef_internal::CallbackParamTraits<P4>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
-
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
-
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
-                 p2_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
-                 p3_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
-                 p4_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-           typename cef_internal::CallbackParamTraits<P2>::StorageType,
-           typename cef_internal::CallbackParamTraits<P3>::StorageType,
-           typename cef_internal::CallbackParamTraits<P4>::StorageType)>
-      BindState;
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4));
+template <typename Signature>
+RepeatingCallback<Signature> BindRepeating(
+    RepeatingCallback<Signature> callback) {
+  CHECK(callback);
+  return callback;
 }
 
-template <typename Functor,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4,
-          typename P5>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-         typename cef_internal::CallbackParamTraits<P2>::StorageType,
-         typename cef_internal::CallbackParamTraits<P3>::StorageType,
-         typename cef_internal::CallbackParamTraits<P4>::StorageType,
-         typename cef_internal::CallbackParamTraits<P5>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor,
-     const P1& p1,
-     const P2& p2,
-     const P3& p3,
-     const P4& p4,
-     const P5& p5) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
-
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
-
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
-                 p2_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
-                 p3_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
-                 p4_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
-                 p5_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-           typename cef_internal::CallbackParamTraits<P2>::StorageType,
-           typename cef_internal::CallbackParamTraits<P3>::StorageType,
-           typename cef_internal::CallbackParamTraits<P4>::StorageType,
-           typename cef_internal::CallbackParamTraits<P5>::StorageType)>
-      BindState;
-
-  return Callback<typename BindState::UnboundRunType>(
-      new BindState(cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5));
+///
+/// Unretained() allows binding a non-refcounted class, and to disable
+/// refcounting on arguments that are refcounted objects.
+///
+/// EXAMPLE OF Unretained():
+///
+/// <pre>
+///   class Foo {
+///    public:
+///     void func() { cout << "Foo:f" << endl; }
+///   };
+///
+///   // In some function somewhere.
+///   Foo foo;
+///   OnceClosure foo_callback =
+///       BindOnce(&Foo::func, Unretained(&foo));
+///   std::move(foo_callback).Run();  // Prints "Foo:f".
+/// </pre>
+///
+/// Without the Unretained() wrapper on |&foo|, the above call would fail
+/// to compile because Foo does not support the AddRef() and Release() methods.
+///
+template <typename T>
+inline cef_internal::UnretainedWrapper<T> Unretained(T* o) {
+  return cef_internal::UnretainedWrapper<T>(o);
 }
 
-template <typename Functor,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4,
-          typename P5,
-          typename P6>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-         typename cef_internal::CallbackParamTraits<P2>::StorageType,
-         typename cef_internal::CallbackParamTraits<P3>::StorageType,
-         typename cef_internal::CallbackParamTraits<P4>::StorageType,
-         typename cef_internal::CallbackParamTraits<P5>::StorageType,
-         typename cef_internal::CallbackParamTraits<P6>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor,
-     const P1& p1,
-     const P2& p2,
-     const P3& p3,
-     const P4& p4,
-     const P5& p5,
-     const P6& p6) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
-
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
-
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A6Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
-
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
-                 p2_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
-                 p3_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
-                 p4_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
-                 p5_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
-                 p6_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-           typename cef_internal::CallbackParamTraits<P2>::StorageType,
-           typename cef_internal::CallbackParamTraits<P3>::StorageType,
-           typename cef_internal::CallbackParamTraits<P4>::StorageType,
-           typename cef_internal::CallbackParamTraits<P5>::StorageType,
-           typename cef_internal::CallbackParamTraits<P6>::StorageType)>
-      BindState;
+///
+/// RetainedRef() accepts a ref counted object and retains a reference to it.
+/// When the callback is called, the object is passed as a raw pointer.
+///
+/// EXAMPLE OF RetainedRef():
+///
+/// <pre>
+///    void foo(RefCountedBytes* bytes) {}
+///
+///    scoped_refptr<RefCountedBytes> bytes = ...;
+///    OnceClosure callback = BindOnce(&foo, base::RetainedRef(bytes));
+///    std::move(callback).Run();
+/// </pre>
+///
+/// Without RetainedRef, the scoped_refptr would try to implicitly convert to
+/// a raw pointer and fail compilation:
+///
+/// <pre>
+///    OnceClosure callback = BindOnce(&foo, bytes); // ERROR!
+/// </pre>
+///
+template <typename T>
+inline cef_internal::RetainedRefWrapper<T> RetainedRef(T* o) {
+  return cef_internal::RetainedRefWrapper<T>(o);
+}
+template <typename T>
+inline cef_internal::RetainedRefWrapper<T> RetainedRef(scoped_refptr<T> o) {
+  return cef_internal::RetainedRefWrapper<T>(std::move(o));
+}
 
-  return Callback<typename BindState::UnboundRunType>(new BindState(
-      cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6));
+///
+/// Owned() transfers ownership of an object to the callback resulting from
+/// bind; the object will be deleted when the callback is deleted.
+///
+/// EXAMPLE OF Owned():
+///
+/// <pre>
+///   void foo(int* arg) { cout << *arg << endl }
+///
+///   int* pn = new int(1);
+///   RepeatingClosure foo_callback = BindRepeating(&foo, Owned(pn));
+///
+///   foo_callback.Run();  // Prints "1"
+///   foo_callback.Run();  // Prints "1"
+///   *pn = 2;
+///   foo_callback.Run();  // Prints "2"
+///
+///   foo_callback.Reset();  // |pn| is deleted.  Also will happen when
+///                          // |foo_callback| goes out of scope.
+/// </pre>
+///
+/// Without Owned(), someone would have to know to delete |pn| when the last
+/// reference to the callback is deleted.
+///
+template <typename T>
+inline cef_internal::OwnedWrapper<T> Owned(T* o) {
+  return cef_internal::OwnedWrapper<T>(o);
 }
 
-template <typename Functor,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4,
-          typename P5,
-          typename P6,
-          typename P7>
-base::Callback<typename cef_internal::BindState<
-    typename cef_internal::FunctorTraits<Functor>::RunnableType,
-    typename cef_internal::FunctorTraits<Functor>::RunType,
-    void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-         typename cef_internal::CallbackParamTraits<P2>::StorageType,
-         typename cef_internal::CallbackParamTraits<P3>::StorageType,
-         typename cef_internal::CallbackParamTraits<P4>::StorageType,
-         typename cef_internal::CallbackParamTraits<P5>::StorageType,
-         typename cef_internal::CallbackParamTraits<P6>::StorageType,
-         typename cef_internal::CallbackParamTraits<P7>::StorageType)>::
-                   UnboundRunType>
-Bind(Functor functor,
-     const P1& p1,
-     const P2& p2,
-     const P3& p3,
-     const P4& p4,
-     const P5& p5,
-     const P6& p6,
-     const P7& p7) {
-  // Typedefs for how to store and run the functor.
-  typedef
-      typename cef_internal::FunctorTraits<Functor>::RunnableType RunnableType;
-  typedef typename cef_internal::FunctorTraits<Functor>::RunType RunType;
+template <typename T, typename Deleter>
+inline cef_internal::OwnedWrapper<T, Deleter> Owned(
+    std::unique_ptr<T, Deleter>&& ptr) {
+  return cef_internal::OwnedWrapper<T, Deleter>(std::move(ptr));
+}
 
-  // Use RunnableType::RunType instead of RunType above because our
-  // checks should below for bound references need to know what the actual
-  // functor is going to interpret the argument as.
-  typedef cef_internal::FunctionTraits<typename RunnableType::RunType>
-      BoundFunctorTraits;
+///
+/// OwnedRef() stores an object in the callback resulting from
+/// bind and passes a reference to the object to the bound function.
+///
+/// EXAMPLE OF OwnedRef():
+///
+/// <pre>
+///   void foo(int& arg) { cout << ++arg << endl }
+///
+///   int counter = 0;
+///   RepeatingClosure foo_callback = BindRepeating(&foo, OwnedRef(counter));
+///
+///   foo_callback.Run();  // Prints "1"
+///   foo_callback.Run();  // Prints "2"
+///   foo_callback.Run();  // Prints "3"
+///
+///   cout << counter;     // Prints "0", OwnedRef creates a copy of counter.
+/// </pre>
+///
+///  Supports OnceCallbacks as well, useful to pass placeholder arguments:
+///
+/// <pre>
+///   void bar(int& ignore, const std::string& s) { cout << s << endl }
+///
+///   OnceClosure bar_callback = BindOnce(&bar, OwnedRef(0), "Hello");
+///
+///   std::move(bar_callback).Run(); // Prints "Hello"
+/// </pre>
+///
+/// Without OwnedRef() it would not be possible to pass a mutable reference to
+/// an object owned by the callback.
+///
+template <typename T>
+cef_internal::OwnedRefWrapper<std::decay_t<T>> OwnedRef(T&& t) {
+  return cef_internal::OwnedRefWrapper<std::decay_t<T>>(std::forward<T>(t));
+}
 
-  // Do not allow binding a non-const reference parameter. Non-const reference
-  // parameters are disallowed by the Google style guide.  Also, binding a
-  // non-const reference parameter can make for subtle bugs because the
-  // invoked function will receive a reference to the stored copy of the
-  // argument and not the original.
-  COMPILE_ASSERT(
-      !(is_non_const_reference<typename BoundFunctorTraits::A1Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A2Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A3Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A4Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A5Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A6Type>::value ||
-        is_non_const_reference<typename BoundFunctorTraits::A7Type>::value),
-      do_not_bind_functions_with_nonconst_ref);
+///
+/// Passed() is for transferring movable-but-not-copyable types (eg. unique_ptr)
+/// through a RepeatingCallback. Logically, this signifies a destructive
+/// transfer of the state of the argument into the target function. Invoking
+/// RepeatingCallback::Run() twice on a callback that was created with a
+/// Passed() argument will CHECK() because the first invocation would have
+/// already transferred ownership to the target function.
+///
+/// Note that Passed() is not necessary with BindOnce(), as std::move() does the
+/// same thing. Avoid Passed() in favor of std::move() with BindOnce().
+///
+/// EXAMPLE OF Passed():
+///
+/// <pre>
+///   void TakesOwnership(std::unique_ptr<Foo> arg) { }
+///   std::unique_ptr<Foo> CreateFoo() { return std::make_unique<Foo>();
+///   }
+///
+///   auto f = std::make_unique<Foo>();
+///
+///   // |cb| is given ownership of Foo(). |f| is now NULL.
+///   // You can use std::move(f) in place of &f, but it's more verbose.
+///   RepeatingClosure cb = BindRepeating(&TakesOwnership, Passed(&f));
+///
+///   // Run was never called so |cb| still owns Foo() and deletes
+///   // it on Reset().
+///   cb.Reset();
+///
+///   // |cb| is given a new Foo created by CreateFoo().
+///   cb = BindRepeating(&TakesOwnership, Passed(CreateFoo()));
+///
+///   // |arg| in TakesOwnership() is given ownership of Foo(). |cb|
+///   // no longer owns Foo() and, if reset, would not delete Foo().
+///   cb.Run();  // Foo() is now transferred to |arg| and deleted.
+///   cb.Run();  // This CHECK()s since Foo() already been used once.
+/// </pre>
+///
+/// We offer 2 syntaxes for calling Passed(). The first takes an rvalue and is
+/// best suited for use with the return value of a function or other temporary
+/// rvalues. The second takes a pointer to the scoper and is just syntactic
+/// sugar to avoid having to write Passed(std::move(scoper)).
+///
+/// Both versions of Passed() prevent T from being an lvalue reference. The
+/// first via use of enable_if, and the second takes a T* which will not bind to
+/// T&.
+///
+template <typename T,
+          std::enable_if_t<!std::is_lvalue_reference<T>::value>* = nullptr>
+inline cef_internal::PassedWrapper<T> Passed(T&& scoper) {
+  return cef_internal::PassedWrapper<T>(std::move(scoper));
+}
+template <typename T>
+inline cef_internal::PassedWrapper<T> Passed(T* scoper) {
+  return cef_internal::PassedWrapper<T>(std::move(*scoper));
+}
 
-  // For methods, we need to be careful for parameter 1.  We do not require
-  // a scoped_refptr because BindState<> itself takes care of AddRef() for
-  // methods. We also disallow binding of an array as the method's target
-  // object.
-  COMPILE_ASSERT(cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !cef_internal::NeedsScopedRefptrButGetsRawPtr<P1>::value,
-                 p1_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::HasIsMethodTag<RunnableType>::value ||
-                     !is_array<P1>::value,
-                 first_bound_argument_to_method_cannot_be_array);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P2>::value,
-                 p2_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P3>::value,
-                 p3_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P4>::value,
-                 p4_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P5>::value,
-                 p5_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P6>::value,
-                 p6_is_refcounted_type_and_needs_scoped_refptr);
-  COMPILE_ASSERT(!cef_internal::NeedsScopedRefptrButGetsRawPtr<P7>::value,
-                 p7_is_refcounted_type_and_needs_scoped_refptr);
-  typedef cef_internal::BindState<
-      RunnableType, RunType,
-      void(typename cef_internal::CallbackParamTraits<P1>::StorageType,
-           typename cef_internal::CallbackParamTraits<P2>::StorageType,
-           typename cef_internal::CallbackParamTraits<P3>::StorageType,
-           typename cef_internal::CallbackParamTraits<P4>::StorageType,
-           typename cef_internal::CallbackParamTraits<P5>::StorageType,
-           typename cef_internal::CallbackParamTraits<P6>::StorageType,
-           typename cef_internal::CallbackParamTraits<P7>::StorageType)>
-      BindState;
+///
+/// IgnoreResult() is used to adapt a function or callback with a return type to
+/// one with a void return. This is most useful if you have a function with,
+/// say, a pesky ignorable bool return that you want to use with PostTask or
+/// something else that expect a callback with a void return.
+///
+/// EXAMPLE OF IgnoreResult():
+///
+/// <pre>
+///   int DoSomething(int arg) { cout << arg << endl; }
+///
+///   // Assign to a callback with a void return type.
+///   OnceCallback<void(int)> cb = BindOnce(IgnoreResult(&DoSomething));
+///   std::move(cb).Run(1);  // Prints "1".
+///
+///   // Prints "2" on |ml|.
+///   ml->PostTask(FROM_HERE, BindOnce(IgnoreResult(&DoSomething), 2);
+/// </pre>
+///
+template <typename T>
+inline cef_internal::IgnoreResultHelper<T> IgnoreResult(T data) {
+  return cef_internal::IgnoreResultHelper<T>(std::move(data));
+}
 
-  return Callback<typename BindState::UnboundRunType>(new BindState(
-      cef_internal::MakeRunnable(functor), p1, p2, p3, p4, p5, p6, p7));
+#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
+
+///
+/// RetainBlock() is used to adapt an Objective-C block when Automated Reference
+/// Counting (ARC) is disabled. This is unnecessary when ARC is enabled, as the
+/// BindOnce and BindRepeating already support blocks then.
+///
+/// EXAMPLE OF RetainBlock():
+///
+/// <pre>
+///   // Wrap the block and bind it to a callback.
+///   OnceCallback<void(int)> cb =
+///       BindOnce(RetainBlock(^(int n) { NSLog(@"%d", n); }));
+///   std::move(cb).Run(1);  // Logs "1".
+/// </pre>
+///
+template <typename R, typename... Args>
+base::mac::ScopedBlock<R (^)(Args...)> RetainBlock(R (^block)(Args...)) {
+  return base::mac::ScopedBlock<R (^)(Args...)>(block,
+                                                base::scoped_policy::RETAIN);
 }
 
+#endif  // defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
+
 }  // namespace base
 
 #endif  // !USING_CHROMIUM_INCLUDES
diff --git a/src/include/base/cef_bind_helpers.h b/src/include/base/cef_bind_helpers.h
deleted file mode 100644
index 2b4798b2c..000000000
--- a/src/include/base/cef_bind_helpers.h
+++ /dev/null
@@ -1,579 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This defines a set of argument wrappers and related factory methods that
-// can be used specify the refcounting and reference semantics of arguments
-// that are bound by the Bind() function in base/bind.h.
-//
-// It also defines a set of simple functions and utilities that people want
-// when using Callback<> and Bind().
-//
-//
-// ARGUMENT BINDING WRAPPERS
-//
-// The wrapper functions are base::Unretained(), base::Owned(), base::Passed(),
-// base::ConstRef(), and base::IgnoreResult().
-//
-// Unretained() allows Bind() to bind a non-refcounted class, and to disable
-// refcounting on arguments that are refcounted objects.
-//
-// Owned() transfers ownership of an object to the Callback resulting from
-// bind; the object will be deleted when the Callback is deleted.
-//
-// Passed() is for transferring movable-but-not-copyable types (eg. scoped_ptr)
-// through a Callback. Logically, this signifies a destructive transfer of
-// the state of the argument into the target function.  Invoking
-// Callback::Run() twice on a Callback that was created with a Passed()
-// argument will CHECK() because the first invocation would have already
-// transferred ownership to the target function.
-//
-// ConstRef() allows binding a constant reference to an argument rather
-// than a copy.
-//
-// IgnoreResult() is used to adapt a function or Callback with a return type to
-// one with a void return. This is most useful if you have a function with,
-// say, a pesky ignorable bool return that you want to use with PostTask or
-// something else that expect a Callback with a void return.
-//
-// EXAMPLE OF Unretained():
-//
-//   class Foo {
-//    public:
-//     void func() { cout << "Foo:f" << endl; }
-//   };
-//
-//   // In some function somewhere.
-//   Foo foo;
-//   Closure foo_callback =
-//       Bind(&Foo::func, Unretained(&foo));
-//   foo_callback.Run();  // Prints "Foo:f".
-//
-// Without the Unretained() wrapper on |&foo|, the above call would fail
-// to compile because Foo does not support the AddRef() and Release() methods.
-//
-//
-// EXAMPLE OF Owned():
-//
-//   void foo(int* arg) { cout << *arg << endl }
-//
-//   int* pn = new int(1);
-//   Closure foo_callback = Bind(&foo, Owned(pn));
-//
-//   foo_callback.Run();  // Prints "1"
-//   foo_callback.Run();  // Prints "1"
-//   *n = 2;
-//   foo_callback.Run();  // Prints "2"
-//
-//   foo_callback.Reset();  // |pn| is deleted.  Also will happen when
-//                          // |foo_callback| goes out of scope.
-//
-// Without Owned(), someone would have to know to delete |pn| when the last
-// reference to the Callback is deleted.
-//
-//
-// EXAMPLE OF ConstRef():
-//
-//   void foo(int arg) { cout << arg << endl }
-//
-//   int n = 1;
-//   Closure no_ref = Bind(&foo, n);
-//   Closure has_ref = Bind(&foo, ConstRef(n));
-//
-//   no_ref.Run();  // Prints "1"
-//   has_ref.Run();  // Prints "1"
-//
-//   n = 2;
-//   no_ref.Run();  // Prints "1"
-//   has_ref.Run();  // Prints "2"
-//
-// Note that because ConstRef() takes a reference on |n|, |n| must outlive all
-// its bound callbacks.
-//
-//
-// EXAMPLE OF IgnoreResult():
-//
-//   int DoSomething(int arg) { cout << arg << endl; }
-//
-//   // Assign to a Callback with a void return type.
-//   Callback<void(int)> cb = Bind(IgnoreResult(&DoSomething));
-//   cb->Run(1);  // Prints "1".
-//
-//   // Prints "1" on |ml|.
-//   ml->PostTask(FROM_HERE, Bind(IgnoreResult(&DoSomething), 1);
-//
-//
-// EXAMPLE OF Passed():
-//
-//   void TakesOwnership(scoped_ptr<Foo> arg) { }
-//   scoped_ptr<Foo> CreateFoo() { return scoped_ptr<Foo>(new Foo()); }
-//
-//   scoped_ptr<Foo> f(new Foo());
-//
-//   // |cb| is given ownership of Foo(). |f| is now NULL.
-//   // You can use f.Pass() in place of &f, but it's more verbose.
-//   Closure cb = Bind(&TakesOwnership, Passed(&f));
-//
-//   // Run was never called so |cb| still owns Foo() and deletes
-//   // it on Reset().
-//   cb.Reset();
-//
-//   // |cb| is given a new Foo created by CreateFoo().
-//   cb = Bind(&TakesOwnership, Passed(CreateFoo()));
-//
-//   // |arg| in TakesOwnership() is given ownership of Foo(). |cb|
-//   // no longer owns Foo() and, if reset, would not delete Foo().
-//   cb.Run();  // Foo() is now transferred to |arg| and deleted.
-//   cb.Run();  // This CHECK()s since Foo() already been used once.
-//
-// Passed() is particularly useful with PostTask() when you are transferring
-// ownership of an argument into a task, but don't necessarily know if the
-// task will always be executed. This can happen if the task is cancellable
-// or if it is posted to a MessageLoopProxy.
-//
-//
-// SIMPLE FUNCTIONS AND UTILITIES.
-//
-//   DoNothing() - Useful for creating a Closure that does nothing when called.
-//   DeletePointer<T>() - Useful for creating a Closure that will delete a
-//                        pointer when invoked. Only use this when necessary.
-//                        In most cases MessageLoop::DeleteSoon() is a better
-//                        fit.
-
-#ifndef CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_
-#define CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_
-#pragma once
-
-#if defined(BASE_BIND_HELPERS_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/bind_helpers.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include "include/base/cef_basictypes.h"
-#include "include/base/cef_callback.h"
-#include "include/base/cef_template_util.h"
-#include "include/base/cef_weak_ptr.h"
-
-namespace base {
-namespace cef_internal {
-
-// Use the Substitution Failure Is Not An Error (SFINAE) trick to inspect T
-// for the existence of AddRef() and Release() functions of the correct
-// signature.
-//
-// http://en.wikipedia.org/wiki/Substitution_failure_is_not_an_error
-// http://stackoverflow.com/questions/257288/is-it-possible-to-write-a-c-template-to-check-for-a-functions-existence
-// http://stackoverflow.com/questions/4358584/sfinae-approach-comparison
-// http://stackoverflow.com/questions/1966362/sfinae-to-check-for-inherited-member-functions
-//
-// The last link in particular show the method used below.
-//
-// For SFINAE to work with inherited methods, we need to pull some extra tricks
-// with multiple inheritance.  In the more standard formulation, the overloads
-// of Check would be:
-//
-//   template <typename C>
-//   Yes NotTheCheckWeWant(Helper<&C::TargetFunc>*);
-//
-//   template <typename C>
-//   No NotTheCheckWeWant(...);
-//
-//   static const bool value = sizeof(NotTheCheckWeWant<T>(0)) == sizeof(Yes);
-//
-// The problem here is that template resolution will not match
-// C::TargetFunc if TargetFunc does not exist directly in C.  That is, if
-// TargetFunc in inherited from an ancestor, &C::TargetFunc will not match,
-// |value| will be false.  This formulation only checks for whether or
-// not TargetFunc exist directly in the class being introspected.
-//
-// To get around this, we play a dirty trick with multiple inheritance.
-// First, We create a class BaseMixin that declares each function that we
-// want to probe for.  Then we create a class Base that inherits from both T
-// (the class we wish to probe) and BaseMixin.  Note that the function
-// signature in BaseMixin does not need to match the signature of the function
-// we are probing for; thus it's easiest to just use void(void).
-//
-// Now, if TargetFunc exists somewhere in T, then &Base::TargetFunc has an
-// ambiguous resolution between BaseMixin and T.  This lets us write the
-// following:
-//
-//   template <typename C>
-//   No GoodCheck(Helper<&C::TargetFunc>*);
-//
-//   template <typename C>
-//   Yes GoodCheck(...);
-//
-//   static const bool value = sizeof(GoodCheck<Base>(0)) == sizeof(Yes);
-//
-// Notice here that the variadic version of GoodCheck() returns Yes here
-// instead of No like the previous one. Also notice that we calculate |value|
-// by specializing GoodCheck() on Base instead of T.
-//
-// We've reversed the roles of the variadic, and Helper overloads.
-// GoodCheck(Helper<&C::TargetFunc>*), when C = Base, fails to be a valid
-// substitution if T::TargetFunc exists. Thus GoodCheck<Base>(0) will resolve
-// to the variadic version if T has TargetFunc.  If T::TargetFunc does not
-// exist, then &C::TargetFunc is not ambiguous, and the overload resolution
-// will prefer GoodCheck(Helper<&C::TargetFunc>*).
-//
-// This method of SFINAE will correctly probe for inherited names, but it cannot
-// typecheck those names.  It's still a good enough sanity check though.
-//
-// Works on gcc-4.2, gcc-4.4, and Visual Studio 2008.
-//
-// TODO(ajwong): Move to ref_counted.h or template_util.h when we've vetted
-// this works well.
-//
-// TODO(ajwong): Make this check for Release() as well.
-// See http://crbug.com/82038.
-template <typename T>
-class SupportsAddRefAndRelease {
-  typedef char Yes[1];
-  typedef char No[2];
-
-  struct BaseMixin {
-    void AddRef();
-  };
-
-// MSVC warns when you try to use Base if T has a private destructor, the
-// common pattern for refcounted types. It does this even though no attempt to
-// instantiate Base is made.  We disable the warning for this definition.
-#if defined(OS_WIN)
-#pragma warning(push)
-#pragma warning(disable : 4624)
-#endif
-  struct Base : public T, public BaseMixin {};
-#if defined(OS_WIN)
-#pragma warning(pop)
-#endif
-
-  template <void (BaseMixin::*)(void)>
-  struct Helper {};
-
-  template <typename C>
-  static No& Check(Helper<&C::AddRef>*);
-
-  template <typename>
-  static Yes& Check(...);
-
- public:
-  static const bool value = sizeof(Check<Base>(0)) == sizeof(Yes);
-};
-
-// Helpers to assert that arguments of a recounted type are bound with a
-// scoped_refptr.
-template <bool IsClasstype, typename T>
-struct UnsafeBindtoRefCountedArgHelper : false_type {};
-
-template <typename T>
-struct UnsafeBindtoRefCountedArgHelper<true, T>
-    : integral_constant<bool, SupportsAddRefAndRelease<T>::value> {};
-
-template <typename T>
-struct UnsafeBindtoRefCountedArg : false_type {};
-
-template <typename T>
-struct UnsafeBindtoRefCountedArg<T*>
-    : UnsafeBindtoRefCountedArgHelper<is_class<T>::value, T> {};
-
-template <typename T>
-class HasIsMethodTag {
-  typedef char Yes[1];
-  typedef char No[2];
-
-  template <typename U>
-  static Yes& Check(typename U::IsMethod*);
-
-  template <typename U>
-  static No& Check(...);
-
- public:
-  static const bool value = sizeof(Check<T>(0)) == sizeof(Yes);
-};
-
-template <typename T>
-class UnretainedWrapper {
- public:
-  explicit UnretainedWrapper(T* o) : ptr_(o) {}
-  T* get() const { return ptr_; }
-
- private:
-  T* ptr_;
-};
-
-template <typename T>
-class ConstRefWrapper {
- public:
-  explicit ConstRefWrapper(const T& o) : ptr_(&o) {}
-  const T& get() const { return *ptr_; }
-
- private:
-  const T* ptr_;
-};
-
-template <typename T>
-struct IgnoreResultHelper {
-  explicit IgnoreResultHelper(T functor) : functor_(functor) {}
-
-  T functor_;
-};
-
-template <typename T>
-struct IgnoreResultHelper<Callback<T>> {
-  explicit IgnoreResultHelper(const Callback<T>& functor) : functor_(functor) {}
-
-  const Callback<T>& functor_;
-};
-
-// An alternate implementation is to avoid the destructive copy, and instead
-// specialize ParamTraits<> for OwnedWrapper<> to change the StorageType to
-// a class that is essentially a scoped_ptr<>.
-//
-// The current implementation has the benefit though of leaving ParamTraits<>
-// fully in callback_internal.h as well as avoiding type conversions during
-// storage.
-template <typename T>
-class OwnedWrapper {
- public:
-  explicit OwnedWrapper(T* o) : ptr_(o) {}
-  ~OwnedWrapper() { delete ptr_; }
-  T* get() const { return ptr_; }
-  OwnedWrapper(const OwnedWrapper& other) {
-    ptr_ = other.ptr_;
-    other.ptr_ = NULL;
-  }
-
- private:
-  mutable T* ptr_;
-};
-
-// PassedWrapper is a copyable adapter for a scoper that ignores const.
-//
-// It is needed to get around the fact that Bind() takes a const reference to
-// all its arguments.  Because Bind() takes a const reference to avoid
-// unnecessary copies, it is incompatible with movable-but-not-copyable
-// types; doing a destructive "move" of the type into Bind() would violate
-// the const correctness.
-//
-// This conundrum cannot be solved without either C++11 rvalue references or
-// a O(2^n) blowup of Bind() templates to handle each combination of regular
-// types and movable-but-not-copyable types.  Thus we introduce a wrapper type
-// that is copyable to transmit the correct type information down into
-// BindState<>. Ignoring const in this type makes sense because it is only
-// created when we are explicitly trying to do a destructive move.
-//
-// Two notes:
-//  1) PassedWrapper supports any type that has a "Pass()" function.
-//     This is intentional. The whitelisting of which specific types we
-//     support is maintained by CallbackParamTraits<>.
-//  2) is_valid_ is distinct from NULL because it is valid to bind a "NULL"
-//     scoper to a Callback and allow the Callback to execute once.
-template <typename T>
-class PassedWrapper {
- public:
-  explicit PassedWrapper(T scoper) : is_valid_(true), scoper_(scoper.Pass()) {}
-  PassedWrapper(const PassedWrapper& other)
-      : is_valid_(other.is_valid_), scoper_(other.scoper_.Pass()) {}
-  T Pass() const {
-    CHECK(is_valid_);
-    is_valid_ = false;
-    return scoper_.Pass();
-  }
-
- private:
-  mutable bool is_valid_;
-  mutable T scoper_;
-};
-
-// Unwrap the stored parameters for the wrappers above.
-template <typename T>
-struct UnwrapTraits {
-  typedef const T& ForwardType;
-  static ForwardType Unwrap(const T& o) { return o; }
-};
-
-template <typename T>
-struct UnwrapTraits<UnretainedWrapper<T>> {
-  typedef T* ForwardType;
-  static ForwardType Unwrap(UnretainedWrapper<T> unretained) {
-    return unretained.get();
-  }
-};
-
-template <typename T>
-struct UnwrapTraits<ConstRefWrapper<T>> {
-  typedef const T& ForwardType;
-  static ForwardType Unwrap(ConstRefWrapper<T> const_ref) {
-    return const_ref.get();
-  }
-};
-
-template <typename T>
-struct UnwrapTraits<scoped_refptr<T>> {
-  typedef T* ForwardType;
-  static ForwardType Unwrap(const scoped_refptr<T>& o) { return o.get(); }
-};
-
-template <typename T>
-struct UnwrapTraits<WeakPtr<T>> {
-  typedef const WeakPtr<T>& ForwardType;
-  static ForwardType Unwrap(const WeakPtr<T>& o) { return o; }
-};
-
-template <typename T>
-struct UnwrapTraits<OwnedWrapper<T>> {
-  typedef T* ForwardType;
-  static ForwardType Unwrap(const OwnedWrapper<T>& o) { return o.get(); }
-};
-
-template <typename T>
-struct UnwrapTraits<PassedWrapper<T>> {
-  typedef T ForwardType;
-  static T Unwrap(PassedWrapper<T>& o) { return o.Pass(); }
-};
-
-// Utility for handling different refcounting semantics in the Bind()
-// function.
-template <bool is_method, typename T>
-struct MaybeRefcount;
-
-template <typename T>
-struct MaybeRefcount<false, T> {
-  static void AddRef(const T&) {}
-  static void Release(const T&) {}
-};
-
-template <typename T, size_t n>
-struct MaybeRefcount<false, T[n]> {
-  static void AddRef(const T*) {}
-  static void Release(const T*) {}
-};
-
-template <typename T>
-struct MaybeRefcount<true, T> {
-  static void AddRef(const T&) {}
-  static void Release(const T&) {}
-};
-
-template <typename T>
-struct MaybeRefcount<true, T*> {
-  static void AddRef(T* o) { o->AddRef(); }
-  static void Release(T* o) { o->Release(); }
-};
-
-// No need to additionally AddRef() and Release() since we are storing a
-// scoped_refptr<> inside the storage object already.
-template <typename T>
-struct MaybeRefcount<true, scoped_refptr<T>> {
-  static void AddRef(const scoped_refptr<T>& o) {}
-  static void Release(const scoped_refptr<T>& o) {}
-};
-
-template <typename T>
-struct MaybeRefcount<true, const T*> {
-  static void AddRef(const T* o) { o->AddRef(); }
-  static void Release(const T* o) { o->Release(); }
-};
-
-// IsWeakMethod is a helper that determine if we are binding a WeakPtr<> to a
-// method.  It is used internally by Bind() to select the correct
-// InvokeHelper that will no-op itself in the event the WeakPtr<> for
-// the target object is invalidated.
-//
-// P1 should be the type of the object that will be received of the method.
-template <bool IsMethod, typename P1>
-struct IsWeakMethod : public false_type {};
-
-template <typename T>
-struct IsWeakMethod<true, WeakPtr<T>> : public true_type {};
-
-template <typename T>
-struct IsWeakMethod<true, ConstRefWrapper<WeakPtr<T>>> : public true_type {};
-
-}  // namespace cef_internal
-
-template <typename T>
-static inline cef_internal::UnretainedWrapper<T> Unretained(T* o) {
-  return cef_internal::UnretainedWrapper<T>(o);
-}
-
-template <typename T>
-static inline cef_internal::ConstRefWrapper<T> ConstRef(const T& o) {
-  return cef_internal::ConstRefWrapper<T>(o);
-}
-
-template <typename T>
-static inline cef_internal::OwnedWrapper<T> Owned(T* o) {
-  return cef_internal::OwnedWrapper<T>(o);
-}
-
-// We offer 2 syntaxes for calling Passed().  The first takes a temporary and
-// is best suited for use with the return value of a function. The second
-// takes a pointer to the scoper and is just syntactic sugar to avoid having
-// to write Passed(scoper.Pass()).
-template <typename T>
-static inline cef_internal::PassedWrapper<T> Passed(T scoper) {
-  return cef_internal::PassedWrapper<T>(scoper.Pass());
-}
-template <typename T>
-static inline cef_internal::PassedWrapper<T> Passed(T* scoper) {
-  return cef_internal::PassedWrapper<T>(scoper->Pass());
-}
-
-template <typename T>
-static inline cef_internal::IgnoreResultHelper<T> IgnoreResult(T data) {
-  return cef_internal::IgnoreResultHelper<T>(data);
-}
-
-template <typename T>
-static inline cef_internal::IgnoreResultHelper<Callback<T>> IgnoreResult(
-    const Callback<T>& data) {
-  return cef_internal::IgnoreResultHelper<Callback<T>>(data);
-}
-
-void DoNothing();
-
-template <typename T>
-void DeletePointer(T* obj) {
-  delete obj;
-}
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_BIND_HELPERS_H_
diff --git a/src/include/base/cef_build.h b/src/include/base/cef_build.h
index 1e2065ce3..717f05df1 100644
--- a/src/include/base/cef_build.h
+++ b/src/include/base/cef_build.h
@@ -27,53 +27,132 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+/// \file
+/// This file adds defines about the platform we're currently building on.
+///
+/// <pre>
+///  Operating System:
+///    OS_AIX / OS_ANDROID / OS_ASMJS / OS_FREEBSD / OS_FUCHSIA / OS_IOS /
+///    OS_LINUX / OS_MAC / OS_NACL (SFI or NONSFI) / OS_NETBSD / OS_OPENBSD /
+///    OS_QNX / OS_SOLARIS / OS_WIN
+///  Operating System family:
+///    OS_APPLE: IOS or MAC
+///    OS_BSD: FREEBSD or NETBSD or OPENBSD
+///    OS_POSIX: AIX or ANDROID or ASMJS or CHROMEOS or FREEBSD or IOS or LINUX
+///              or MAC or NACL or NETBSD or OPENBSD or QNX or SOLARIS
+///
+///  /!\ Note: OS_CHROMEOS is set by the build system, not this file
+///
+///  Compiler:
+///    COMPILER_MSVC / COMPILER_GCC
+///
+///  Processor:
+///    ARCH_CPU_ARM64 / ARCH_CPU_ARMEL / ARCH_CPU_MIPS / ARCH_CPU_MIPS64 /
+///    ARCH_CPU_MIPS64EL / ARCH_CPU_MIPSEL / ARCH_CPU_PPC64 / ARCH_CPU_S390 /
+///    ARCH_CPU_S390X / ARCH_CPU_X86 / ARCH_CPU_X86_64
+///  Processor family:
+///    ARCH_CPU_ARM_FAMILY: ARMEL or ARM64
+///    ARCH_CPU_MIPS_FAMILY: MIPS64EL or MIPSEL or MIPS64 or MIPS
+///    ARCH_CPU_PPC64_FAMILY: PPC64
+///    ARCH_CPU_S390_FAMILY: S390 or S390X
+///    ARCH_CPU_X86_FAMILY: X86 or X86_64
+///  Processor features:
+///    ARCH_CPU_31_BITS / ARCH_CPU_32_BITS / ARCH_CPU_64_BITS
+///    ARCH_CPU_BIG_ENDIAN / ARCH_CPU_LITTLE_ENDIAN
+/// </pre>
+///
+
 #ifndef CEF_INCLUDE_BASE_CEF_BUILD_H_
 #define CEF_INCLUDE_BASE_CEF_BUILD_H_
 #pragma once
 
 #if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/compiler_specific.h"
+#include "build/build_config.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#if defined(_WIN32)
-#ifndef OS_WIN
-#define OS_WIN 1
-#endif
+// A set of macros to use for platform detection.
+#if defined(ANDROID)
+#define OS_ANDROID 1
 #elif defined(__APPLE__)
-#ifndef OS_MACOSX
+// Only include TargetConditionals after testing ANDROID as some Android builds
+// on the Mac have this header available and it's not needed unless the target
+// is really an Apple platform.
+#include <TargetConditionals.h>
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#define OS_IOS 1
+#else
+#define OS_MAC 1
+// For backwards compatibility.
 #define OS_MACOSX 1
-#endif
+#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
 #elif defined(__linux__)
-#ifndef OS_LINUX
+#if !defined(OS_CHROMEOS)
+// Do not define OS_LINUX on Chrome OS build.
+// The OS_CHROMEOS macro is defined in GN.
 #define OS_LINUX 1
+#endif  // !defined(OS_CHROMEOS)
+// Include a system header to pull in features.h for glibc/uclibc macros.
+#include <unistd.h>
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
+// We really are using glibc, not uClibc pretending to be glibc.
+#define LIBC_GLIBC 1
 #endif
+#elif defined(_WIN32)
+#define OS_WIN 1
+#elif defined(__Fuchsia__)
+#define OS_FUCHSIA 1
+#elif defined(__FreeBSD__)
+#define OS_FREEBSD 1
+#elif defined(__NetBSD__)
+#define OS_NETBSD 1
+#elif defined(__OpenBSD__)
+#define OS_OPENBSD 1
+#elif defined(__sun)
+#define OS_SOLARIS 1
+#elif defined(__QNXNTO__)
+#define OS_QNX 1
+#elif defined(_AIX)
+#define OS_AIX 1
+#elif defined(__asmjs__) || defined(__wasm__)
+#define OS_ASMJS 1
 #else
-#error Please add support for your platform in cef_build.h
+#error Please add support for your platform in include/base/cef_build.h
+#endif
+// NOTE: Adding a new port? Please follow
+// https://chromium.googlesource.com/chromium/src/+/master/docs/new_port_policy.md
+
+#if defined(OS_MAC) || defined(OS_IOS)
+#define OS_APPLE 1
+#endif
+
+// For access to standard BSD features, use OS_BSD instead of a
+// more specific macro.
+#if defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD)
+#define OS_BSD 1
 #endif
 
 // For access to standard POSIXish features, use OS_POSIX instead of a
 // more specific macro.
-#if defined(OS_MACOSX) || defined(OS_LINUX)
-#ifndef OS_POSIX
+#if defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_ASMJS) ||  \
+    defined(OS_FREEBSD) || defined(OS_IOS) || defined(OS_LINUX) ||  \
+    defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_NACL) ||  \
+    defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_QNX) || \
+    defined(OS_SOLARIS)
 #define OS_POSIX 1
 #endif
-#endif
 
-// Compiler detection.
+// Compiler detection. Note: clang masquerades as GCC on POSIX and as MSVC on
+// Windows.
 #if defined(__GNUC__)
-#ifndef COMPILER_GCC
 #define COMPILER_GCC 1
-#endif
 #elif defined(_MSC_VER)
-#ifndef COMPILER_MSVC
 #define COMPILER_MSVC 1
-#endif
 #else
-#error Please add support for your compiler in cef_build.h
+#error Please add support for your compiler in build/build_config.h
 #endif
 
 // Processor architecture detection.  For more info on what's defined, see:
@@ -90,108 +169,95 @@
 #define ARCH_CPU_X86 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
+#elif defined(__s390x__)
+#define ARCH_CPU_S390_FAMILY 1
+#define ARCH_CPU_S390X 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_BIG_ENDIAN 1
+#elif defined(__s390__)
+#define ARCH_CPU_S390_FAMILY 1
+#define ARCH_CPU_S390 1
+#define ARCH_CPU_31_BITS 1
+#define ARCH_CPU_BIG_ENDIAN 1
+#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__)
+#define ARCH_CPU_PPC64_FAMILY 1
+#define ARCH_CPU_PPC64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_BIG_ENDIAN 1
+#elif defined(__PPC64__)
+#define ARCH_CPU_PPC64_FAMILY 1
+#define ARCH_CPU_PPC64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
 #elif defined(__ARMEL__)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARMEL 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(_M_ARM64)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__pnacl__)
+#elif defined(__pnacl__) || defined(__asmjs__) || defined(__wasm__)
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
 #elif defined(__MIPSEL__)
+#if defined(__LP64__)
+#define ARCH_CPU_MIPS_FAMILY 1
+#define ARCH_CPU_MIPS64EL 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
+#else
 #define ARCH_CPU_MIPS_FAMILY 1
 #define ARCH_CPU_MIPSEL 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
+#endif
+#elif defined(__MIPSEB__)
+#if defined(__LP64__)
+#define ARCH_CPU_MIPS_FAMILY 1
+#define ARCH_CPU_MIPS64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_BIG_ENDIAN 1
 #else
-#error Please add support for your architecture in cef_build.h
+#define ARCH_CPU_MIPS_FAMILY 1
+#define ARCH_CPU_MIPS 1
+#define ARCH_CPU_32_BITS 1
+#define ARCH_CPU_BIG_ENDIAN 1
+#endif
+#else
+#error Please add support for your architecture in include/base/cef_build.h
 #endif
 
 // Type detection for wchar_t.
 #if defined(OS_WIN)
-#define WCHAR_T_IS_UTF16
+#define WCHAR_T_IS_16_BIT
+#elif defined(OS_FUCHSIA)
+#define WCHAR_T_IS_32_BIT
 #elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
     (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff)
-#define WCHAR_T_IS_UTF32
+#define WCHAR_T_IS_32_BIT
 #elif defined(OS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \
     (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff)
 // On Posix, we'll detect short wchar_t, but projects aren't guaranteed to
 // compile in this mode (in particular, Chrome doesn't). This is intended for
 // other projects using base who manage their own dependencies and make sure
 // short wchar works for them.
-#define WCHAR_T_IS_UTF16
-#else
-#error Please add support for your compiler in cef_build.h
-#endif
-
-// Annotate a function indicating the caller must examine the return value.
-// Use like:
-//   int foo() WARN_UNUSED_RESULT;
-// To explicitly ignore a result, see |ignore_result()| in <base/macros.h>.
-#ifndef WARN_UNUSED_RESULT
-#if defined(COMPILER_GCC)
-#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-#define WARN_UNUSED_RESULT
-#endif
-#endif  // WARN_UNUSED_RESULT
-
-// Annotate a typedef or function indicating it's ok if it's not used.
-// Use like:
-//   typedef Foo Bar ALLOW_UNUSED_TYPE;
-#ifndef ALLOW_UNUSED_TYPE
-#if defined(COMPILER_GCC)
-#define ALLOW_UNUSED_TYPE __attribute__((unused))
+#define WCHAR_T_IS_16_BIT
 #else
-#define ALLOW_UNUSED_TYPE
+#error Please add support for your compiler in include/base/cef_build.h
 #endif
-#endif  // ALLOW_UNUSED_TYPE
 
-// Annotate a variable indicating it's ok if the variable is not used.
-// (Typically used to silence a compiler warning when the assignment
-// is important for some other reason.)
-// Use like:
-//   int x = ...;
-//   ALLOW_UNUSED_LOCAL(x);
-#ifndef ALLOW_UNUSED_LOCAL
-#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
+#if defined(OS_ANDROID)
+// The compiler thinks std::string::const_iterator and "const char*" are
+// equivalent types.
+#define STD_STRING_ITERATOR_IS_CHAR_POINTER
+// The compiler thinks std::u16string::const_iterator and "char16_t*" are
+// equivalent types.
+#define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
 #endif
 
 #endif  // !USING_CHROMIUM_INCLUDES
 
-// Annotate a virtual method indicating it must be overriding a virtual method
-// in the parent class.
-// Use like:
-//   void foo() OVERRIDE;
-// NOTE: This define should only be used in classes exposed to the client since
-// C++11 support may not be enabled in client applications. CEF internal classes
-// should use the `override` keyword directly.
-#ifndef OVERRIDE
-#if defined(__clang__)
-#define OVERRIDE override
-#elif defined(COMPILER_MSVC) && _MSC_VER >= 1600
-// Visual Studio 2010 and later support override.
-#define OVERRIDE override
-#elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \
-    (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700
-// GCC 4.7 supports explicit virtual overrides when C++11 support is enabled.
-#define OVERRIDE override
-#else
-#define OVERRIDE
-#endif
-#endif  // OVERRIDE
-
-// Check for C++11 template alias support which was added in VS2013 and GCC4.7.
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf
-#if __cplusplus > 199711L || (defined(_MSC_VER) && _MSC_VER >= 1800) || \
-    (defined(__GNUC__) &&                                               \
-     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40700))
-#define HAS_CPP11_TEMPLATE_ALIAS_SUPPORT
-#endif
-
 #endif  // CEF_INCLUDE_BASE_CEF_BUILD_H_
diff --git a/src/include/base/cef_callback.h b/src/include/base/cef_callback.h
index 16e238a97..bcfe4992a 100644
--- a/src/include/base/cef_callback.h
+++ b/src/include/base/cef_callback.h
@@ -28,772 +28,221 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+/// \file
+/// A callback is similar in concept to a function pointer: it wraps a runnable
+/// object such as a function, method, lambda, or even another callback,
+/// allowing the runnable object to be invoked later via the callback object.
+///
+/// Unlike function pointers, callbacks are created with base::BindOnce() or
+/// base::BindRepeating() and support partial function application.
+///
+/// A base::OnceCallback may be Run() at most once; a base::RepeatingCallback
+/// may be Run() any number of times. |is_null()| is guaranteed to return true
+/// for a moved-from callback.
+///
+/// <pre>
+///   // The lambda takes two arguments, but the first argument |x| is bound at
+///   // callback creation.
+///   base::OnceCallback<int(int)> cb = base::BindOnce([] (int x, int y) {
+///     return x + y;
+///   }, 1);
+///   // Run() only needs the remaining unbound argument |y|.
+///   printf("1 + 2 = %d\n", std::move(cb).Run(2));  // Prints 3
+///   printf("cb is null? %s\n",
+///          cb.is_null() ? "true" : "false");  // Prints true
+///   std::move(cb).Run(2);  // Crashes since |cb| has already run.
+/// </pre>
+///
+/// Callbacks also support cancellation. A common use is binding the receiver
+/// object as a WeakPtr<T>. If that weak pointer is invalidated, calling Run()
+/// will be a no-op. Note that |IsCancelled()| and |is_null()| are distinct:
+/// simply cancelling a callback will not also make it null.
+///
+/// See https://chromium.googlesource.com/chromium/src/+/lkgr/docs/callback.md
+/// for the full documentation.
+
 #ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_H_
 #define CEF_INCLUDE_BASE_CEF_CALLBACK_H_
 #pragma once
 
-#if defined(BASE_CALLBACK_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/callback.h"
+#include "base/functional/callback.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
+#include <stddef.h>
+
+#include "include/base/cef_bind.h"
 #include "include/base/cef_callback_forward.h"
-#include "include/base/cef_template_util.h"
+#include "include/base/cef_logging.h"
 #include "include/base/internal/cef_callback_internal.h"
 
-// NOTE: Header files that do not require the full definition of Callback or
-// Closure should #include "base/cef_callback_forward.h" instead of this file.
-
-// -----------------------------------------------------------------------------
-// Introduction
-// -----------------------------------------------------------------------------
-//
-// The templated Callback class is a generalized function object. Together
-// with the Bind() function in bind.h, they provide a type-safe method for
-// performing partial application of functions.
-//
-// Partial application (or "currying") is the process of binding a subset of
-// a function's arguments to produce another function that takes fewer
-// arguments. This can be used to pass around a unit of delayed execution,
-// much like lexical closures are used in other languages. For example, it
-// is used in Chromium code to schedule tasks on different MessageLoops.
-//
-// A callback with no unbound input parameters (base::Callback<void(void)>)
-// is called a base::Closure. Note that this is NOT the same as what other
-// languages refer to as a closure -- it does not retain a reference to its
-// enclosing environment.
-//
-// MEMORY MANAGEMENT AND PASSING
-//
-// The Callback objects themselves should be passed by const-reference, and
-// stored by copy. They internally store their state via a refcounted class
-// and thus do not need to be deleted.
-//
-// The reason to pass via a const-reference is to avoid unnecessary
-// AddRef/Release pairs to the internal state.
-//
-//
-// -----------------------------------------------------------------------------
-// Quick reference for basic stuff
-// -----------------------------------------------------------------------------
-//
-// BINDING A BARE FUNCTION
-//
-//   int Return5() { return 5; }
-//   base::Callback<int(void)> func_cb = base::Bind(&Return5);
-//   LOG(INFO) << func_cb.Run();  // Prints 5.
-//
-// BINDING A CLASS METHOD
-//
-//   The first argument to bind is the member function to call, the second is
-//   the object on which to call it.
-//
-//   class Ref : public base::RefCountedThreadSafe<Ref> {
-//    public:
-//     int Foo() { return 3; }
-//     void PrintBye() { LOG(INFO) << "bye."; }
-//   };
-//   scoped_refptr<Ref> ref = new Ref();
-//   base::Callback<void(void)> ref_cb = base::Bind(&Ref::Foo, ref);
-//   LOG(INFO) << ref_cb.Run();  // Prints out 3.
-//
-//   By default the object must support RefCounted or you will get a compiler
-//   error. If you're passing between threads, be sure it's
-//   RefCountedThreadSafe! See "Advanced binding of member functions" below if
-//   you don't want to use reference counting.
-//
-// RUNNING A CALLBACK
-//
-//   Callbacks can be run with their "Run" method, which has the same
-//   signature as the template argument to the callback.
-//
-//   void DoSomething(const base::Callback<void(int, std::string)>& callback) {
-//     callback.Run(5, "hello");
-//   }
-//
-//   Callbacks can be run more than once (they don't get deleted or marked when
-//   run). However, this precludes using base::Passed (see below).
-//
-//   void DoSomething(const base::Callback<double(double)>& callback) {
-//     double myresult = callback.Run(3.14159);
-//     myresult += callback.Run(2.71828);
-//   }
-//
-// PASSING UNBOUND INPUT PARAMETERS
-//
-//   Unbound parameters are specified at the time a callback is Run(). They are
-//   specified in the Callback template type:
-//
-//   void MyFunc(int i, const std::string& str) {}
-//   base::Callback<void(int, const std::string&)> cb = base::Bind(&MyFunc);
-//   cb.Run(23, "hello, world");
-//
-// PASSING BOUND INPUT PARAMETERS
-//
-//   Bound parameters are specified when you create thee callback as arguments
-//   to Bind(). They will be passed to the function and the Run()ner of the
-//   callback doesn't see those values or even know that the function it's
-//   calling.
-//
-//   void MyFunc(int i, const std::string& str) {}
-//   base::Callback<void(void)> cb = base::Bind(&MyFunc, 23, "hello world");
-//   cb.Run();
-//
-//   A callback with no unbound input parameters (base::Callback<void(void)>)
-//   is called a base::Closure. So we could have also written:
-//
-//   base::Closure cb = base::Bind(&MyFunc, 23, "hello world");
-//
-//   When calling member functions, bound parameters just go after the object
-//   pointer.
-//
-//   base::Closure cb = base::Bind(&MyClass::MyFunc, this, 23, "hello world");
-//
-// PARTIAL BINDING OF PARAMETERS
-//
-//   You can specify some parameters when you create the callback, and specify
-//   the rest when you execute the callback.
-//
-//   void MyFunc(int i, const std::string& str) {}
-//   base::Callback<void(const std::string&)> cb = base::Bind(&MyFunc, 23);
-//   cb.Run("hello world");
-//
-//   When calling a function bound parameters are first, followed by unbound
-//   parameters.
-//
-//
-// -----------------------------------------------------------------------------
-// Quick reference for advanced binding
-// -----------------------------------------------------------------------------
-//
-// BINDING A CLASS METHOD WITH WEAK POINTERS
-//
-//   base::Bind(&MyClass::Foo, GetWeakPtr());
-//
-//   The callback will not be run if the object has already been destroyed.
-//   DANGER: weak pointers are not threadsafe, so don't use this
-//   when passing between threads!
-//
-// BINDING A CLASS METHOD WITH MANUAL LIFETIME MANAGEMENT
-//
-//   base::Bind(&MyClass::Foo, base::Unretained(this));
-//
-//   This disables all lifetime management on the object. You're responsible
-//   for making sure the object is alive at the time of the call. You break it,
-//   you own it!
-//
-// BINDING A CLASS METHOD AND HAVING THE CALLBACK OWN THE CLASS
-//
-//   MyClass* myclass = new MyClass;
-//   base::Bind(&MyClass::Foo, base::Owned(myclass));
-//
-//   The object will be deleted when the callback is destroyed, even if it's
-//   not run (like if you post a task during shutdown). Potentially useful for
-//   "fire and forget" cases.
-//
-// IGNORING RETURN VALUES
-//
-//   Sometimes you want to call a function that returns a value in a callback
-//   that doesn't expect a return value.
-//
-//   int DoSomething(int arg) { cout << arg << endl; }
-//   base::Callback<void<int>) cb =
-//       base::Bind(base::IgnoreResult(&DoSomething));
-//
-//
-// -----------------------------------------------------------------------------
-// Quick reference for binding parameters to Bind()
-// -----------------------------------------------------------------------------
-//
-// Bound parameters are specified as arguments to Bind() and are passed to the
-// function. A callback with no parameters or no unbound parameters is called a
-// Closure (base::Callback<void(void)> and base::Closure are the same thing).
-//
-// PASSING PARAMETERS OWNED BY THE CALLBACK
-//
-//   void Foo(int* arg) { cout << *arg << endl; }
-//   int* pn = new int(1);
-//   base::Closure foo_callback = base::Bind(&foo, base::Owned(pn));
-//
-//   The parameter will be deleted when the callback is destroyed, even if it's
-//   not run (like if you post a task during shutdown).
-//
-// PASSING PARAMETERS AS A scoped_ptr
-//
-//   void TakesOwnership(scoped_ptr<Foo> arg) {}
-//   scoped_ptr<Foo> f(new Foo);
-//   // f becomes null during the following call.
-//   base::Closure cb = base::Bind(&TakesOwnership, base::Passed(&f));
-//
-//   Ownership of the parameter will be with the callback until the it is run,
-//   when ownership is passed to the callback function. This means the callback
-//   can only be run once. If the callback is never run, it will delete the
-//   object when it's destroyed.
-//
-// PASSING PARAMETERS AS A scoped_refptr
-//
-//   void TakesOneRef(scoped_refptr<Foo> arg) {}
-//   scoped_refptr<Foo> f(new Foo)
-//   base::Closure cb = base::Bind(&TakesOneRef, f);
-//
-//   This should "just work." The closure will take a reference as long as it
-//   is alive, and another reference will be taken for the called function.
-//
-// PASSING PARAMETERS BY REFERENCE
-//
-//   Const references are *copied* unless ConstRef is used. Example:
-//
-//   void foo(const int& arg) { printf("%d %p\n", arg, &arg); }
-//   int n = 1;
-//   base::Closure has_copy = base::Bind(&foo, n);
-//   base::Closure has_ref = base::Bind(&foo, base::ConstRef(n));
-//   n = 2;
-//   foo(n);                        // Prints "2 0xaaaaaaaaaaaa"
-//   has_copy.Run();                // Prints "1 0xbbbbbbbbbbbb"
-//   has_ref.Run();                 // Prints "2 0xaaaaaaaaaaaa"
-//
-//   Normally parameters are copied in the closure. DANGER: ConstRef stores a
-//   const reference instead, referencing the original parameter. This means
-//   that you must ensure the object outlives the callback!
-//
-//
-// -----------------------------------------------------------------------------
-// Implementation notes
-// -----------------------------------------------------------------------------
-//
-// WHERE IS THIS DESIGN FROM:
-//
-// The design Callback and Bind is heavily influenced by C++'s
-// tr1::function/tr1::bind, and by the "Google Callback" system used inside
-// Google.
-//
-//
-// HOW THE IMPLEMENTATION WORKS:
-//
-// There are three main components to the system:
-//   1) The Callback classes.
-//   2) The Bind() functions.
-//   3) The arguments wrappers (e.g., Unretained() and ConstRef()).
-//
-// The Callback classes represent a generic function pointer. Internally,
-// it stores a refcounted piece of state that represents the target function
-// and all its bound parameters.  Each Callback specialization has a templated
-// constructor that takes an BindState<>*.  In the context of the constructor,
-// the static type of this BindState<> pointer uniquely identifies the
-// function it is representing, all its bound parameters, and a Run() method
-// that is capable of invoking the target.
-//
-// Callback's constructor takes the BindState<>* that has the full static type
-// and erases the target function type as well as the types of the bound
-// parameters.  It does this by storing a pointer to the specific Run()
-// function, and upcasting the state of BindState<>* to a
-// BindStateBase*. This is safe as long as this BindStateBase pointer
-// is only used with the stored Run() pointer.
-//
-// To BindState<> objects are created inside the Bind() functions.
-// These functions, along with a set of internal templates, are responsible for
-//
-//  - Unwrapping the function signature into return type, and parameters
-//  - Determining the number of parameters that are bound
-//  - Creating the BindState storing the bound parameters
-//  - Performing compile-time asserts to avoid error-prone behavior
-//  - Returning an Callback<> with an arity matching the number of unbound
-//    parameters and that knows the correct refcounting semantics for the
-//    target object if we are binding a method.
-//
-// The Bind functions do the above using type-inference, and template
-// specializations.
-//
-// By default Bind() will store copies of all bound parameters, and attempt
-// to refcount a target object if the function being bound is a class method.
-// These copies are created even if the function takes parameters as const
-// references. (Binding to non-const references is forbidden, see bind.h.)
-//
-// To change this behavior, we introduce a set of argument wrappers
-// (e.g., Unretained(), and ConstRef()).  These are simple container templates
-// that are passed by value, and wrap a pointer to argument.  See the
-// file-level comment in base/bind_helpers.h for more info.
-//
-// These types are passed to the Unwrap() functions, and the MaybeRefcount()
-// functions respectively to modify the behavior of Bind().  The Unwrap()
-// and MaybeRefcount() functions change behavior by doing partial
-// specialization based on whether or not a parameter is a wrapper type.
-//
-// ConstRef() is similar to tr1::cref.  Unretained() is specific to Chromium.
-//
-//
-// WHY NOT TR1 FUNCTION/BIND?
-//
-// Direct use of tr1::function and tr1::bind was considered, but ultimately
-// rejected because of the number of copy constructors invocations involved
-// in the binding of arguments during construction, and the forwarding of
-// arguments during invocation.  These copies will no longer be an issue in
-// C++0x because C++0x will support rvalue reference allowing for the compiler
-// to avoid these copies.  However, waiting for C++0x is not an option.
-//
-// Measured with valgrind on gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5), the
-// tr1::bind call itself will invoke a non-trivial copy constructor three times
-// for each bound parameter.  Also, each when passing a tr1::function, each
-// bound argument will be copied again.
-//
-// In addition to the copies taken at binding and invocation, copying a
-// tr1::function causes a copy to be made of all the bound parameters and
-// state.
-//
-// Furthermore, in Chromium, it is desirable for the Callback to take a
-// reference on a target object when representing a class method call.  This
-// is not supported by tr1.
-//
-// Lastly, tr1::function and tr1::bind has a more general and flexible API.
-// This includes things like argument reordering by use of
-// tr1::bind::placeholder, support for non-const reference parameters, and some
-// limited amount of subtyping of the tr1::function object (e.g.,
-// tr1::function<int(int)> is convertible to tr1::function<void(int)>).
-//
-// These are not features that are required in Chromium. Some of them, such as
-// allowing for reference parameters, and subtyping of functions, may actually
-// become a source of errors. Removing support for these features actually
-// allows for a simpler implementation, and a terser Currying API.
-//
-//
-// WHY NOT GOOGLE CALLBACKS?
-//
-// The Google callback system also does not support refcounting.  Furthermore,
-// its implementation has a number of strange edge cases with respect to type
-// conversion of its arguments.  In particular, the argument's constness must
-// at times match exactly the function signature, or the type-inference might
-// break.  Given the above, writing a custom solution was easier.
-//
-//
-// MISSING FUNCTIONALITY
-//  - Invoking the return of Bind.  Bind(&foo).Run() does not work;
-//  - Binding arrays to functions that take a non-const pointer.
-//    Example:
-//      void Foo(const char* ptr);
-//      void Bar(char* ptr);
-//      Bind(&Foo, "test");
-//      Bind(&Bar, "test");  // This fails because ptr is not const.
-
 namespace base {
 
-// First, we forward declare the Callback class template. This informs the
-// compiler that the template only has 1 type parameter which is the function
-// signature that the Callback is representing.
-//
-// After this, create template specializations for 0-7 parameters. Note that
-// even though the template typelist grows, the specialization still
-// only has one type: the function signature.
-//
-// If you are thinking of forward declaring Callback in your own header file,
-// please include "base/callback_forward.h" instead.
-template <typename Sig>
-class Callback;
-
-namespace cef_internal {
-template <typename Runnable, typename RunType, typename BoundArgsType>
-struct BindState;
-}  // namespace cef_internal
-
-template <typename R>
-class Callback<R(void)> : public cef_internal::CallbackBase {
+template <typename R, typename... Args>
+class OnceCallback<R(Args...)> : public cef_internal::CallbackBase {
  public:
-  typedef R(RunType)();
-
-  Callback() : CallbackBase(NULL) {}
+  using ResultType = R;
+  using RunType = R(Args...);
+  using PolymorphicInvoke = R (*)(cef_internal::BindStateBase*,
+                                  cef_internal::PassingType<Args>...);
 
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
-  }
+  constexpr OnceCallback() = default;
+  OnceCallback(std::nullptr_t) = delete;
 
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
-  }
+  explicit OnceCallback(cef_internal::BindStateBase* bind_state)
+      : cef_internal::CallbackBase(bind_state) {}
 
-  R Run() const {
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
+  OnceCallback(const OnceCallback&) = delete;
+  OnceCallback& operator=(const OnceCallback&) = delete;
 
-    return f(bind_state_.get());
-  }
-
- private:
-  typedef R (*PolymorphicInvoke)(cef_internal::BindStateBase*);
-};
-
-template <typename R, typename A1>
-class Callback<R(A1)> : public cef_internal::CallbackBase {
- public:
-  typedef R(RunType)(A1);
+  OnceCallback(OnceCallback&&) noexcept = default;
+  OnceCallback& operator=(OnceCallback&&) noexcept = default;
 
-  Callback() : CallbackBase(NULL) {}
+  OnceCallback(RepeatingCallback<RunType> other)
+      : cef_internal::CallbackBase(std::move(other)) {}
 
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  OnceCallback& operator=(RepeatingCallback<RunType> other) {
+    static_cast<cef_internal::CallbackBase&>(*this) = std::move(other);
+    return *this;
   }
 
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
+  R Run(Args... args) const& {
+    static_assert(!sizeof(*this),
+                  "OnceCallback::Run() may only be invoked on a non-const "
+                  "rvalue, i.e. std::move(callback).Run().");
+    NOTREACHED();
   }
 
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1) const {
+  R Run(Args... args) && {
+    // Move the callback instance into a local variable before the invocation,
+    // that ensures the internal state is cleared after the invocation.
+    // It's not safe to touch |this| after the invocation, since running the
+    // bound function may destroy |this|.
+    OnceCallback cb = std::move(*this);
     PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1));
+        reinterpret_cast<PolymorphicInvoke>(cb.polymorphic_invoke());
+    return f(cb.bind_state_.get(), std::forward<Args>(args)...);
+  }
+
+  // Then() returns a new OnceCallback that receives the same arguments as
+  // |this|, and with the return type of |then|. The returned callback will:
+  // 1) Run the functor currently bound to |this| callback.
+  // 2) Run the |then| callback with the result from step 1 as its single
+  //    argument.
+  // 3) Return the value from running the |then| callback.
+  //
+  // Since this method generates a callback that is a replacement for `this`,
+  // `this` will be consumed and reset to a null callback to ensure the
+  // originally-bound functor can be run at most once.
+  template <typename ThenR, typename... ThenArgs>
+  OnceCallback<ThenR(Args...)> Then(OnceCallback<ThenR(ThenArgs...)> then) && {
+    CHECK(then);
+    return BindOnce(
+        cef_internal::ThenHelper<
+            OnceCallback, OnceCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
+        std::move(*this), std::move(then));
+  }
+
+  // This overload is required; even though RepeatingCallback is implicitly
+  // convertible to OnceCallback, that conversion will not used when matching
+  // for template argument deduction.
+  template <typename ThenR, typename... ThenArgs>
+  OnceCallback<ThenR(Args...)> Then(
+      RepeatingCallback<ThenR(ThenArgs...)> then) && {
+    CHECK(then);
+    return BindOnce(
+        cef_internal::ThenHelper<
+            OnceCallback,
+            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
+        std::move(*this), std::move(then));
   }
-
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType);
 };
 
-template <typename R, typename A1, typename A2>
-class Callback<R(A1, A2)> : public cef_internal::CallbackBase {
+template <typename R, typename... Args>
+class RepeatingCallback<R(Args...)>
+    : public cef_internal::CallbackBaseCopyable {
  public:
-  typedef R(RunType)(A1, A2);
-
-  Callback() : CallbackBase(NULL) {}
-
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
-  }
-
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
-  }
-
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2) const {
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
-             cef_internal::CallbackForward(a2));
-  }
+  using ResultType = R;
+  using RunType = R(Args...);
+  using PolymorphicInvoke = R (*)(cef_internal::BindStateBase*,
+                                  cef_internal::PassingType<Args>...);
 
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A2>::ForwardType);
-};
+  constexpr RepeatingCallback() = default;
+  RepeatingCallback(std::nullptr_t) = delete;
 
-template <typename R, typename A1, typename A2, typename A3>
-class Callback<R(A1, A2, A3)> : public cef_internal::CallbackBase {
- public:
-  typedef R(RunType)(A1, A2, A3);
+  explicit RepeatingCallback(cef_internal::BindStateBase* bind_state)
+      : cef_internal::CallbackBaseCopyable(bind_state) {}
 
-  Callback() : CallbackBase(NULL) {}
+  // Copyable and movable.
+  RepeatingCallback(const RepeatingCallback&) = default;
+  RepeatingCallback& operator=(const RepeatingCallback&) = default;
+  RepeatingCallback(RepeatingCallback&&) noexcept = default;
+  RepeatingCallback& operator=(RepeatingCallback&&) noexcept = default;
 
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
+  bool operator==(const RepeatingCallback& other) const {
+    return EqualsInternal(other);
   }
 
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
+  bool operator!=(const RepeatingCallback& other) const {
+    return !operator==(other);
   }
 
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3) const {
+  R Run(Args... args) const& {
     PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
-             cef_internal::CallbackForward(a2),
-             cef_internal::CallbackForward(a3));
+        reinterpret_cast<PolymorphicInvoke>(this->polymorphic_invoke());
+    return f(this->bind_state_.get(), std::forward<Args>(args)...);
   }
 
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A3>::ForwardType);
-};
-
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-class Callback<R(A1, A2, A3, A4)> : public cef_internal::CallbackBase {
- public:
-  typedef R(RunType)(A1, A2, A3, A4);
-
-  Callback() : CallbackBase(NULL) {}
-
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
-  }
-
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
-  }
-
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4) const {
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(bind_state_.get(), cef_internal::CallbackForward(a1),
-             cef_internal::CallbackForward(a2),
-             cef_internal::CallbackForward(a3),
-             cef_internal::CallbackForward(a4));
-  }
-
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A4>::ForwardType);
-};
-
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-class Callback<R(A1, A2, A3, A4, A5)> : public cef_internal::CallbackBase {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5);
-
-  Callback() : CallbackBase(NULL) {}
-
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
-  }
-
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
-  }
-
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
-        typename cef_internal::CallbackParamTraits<A5>::ForwardType a5) const {
+  R Run(Args... args) && {
+    // Move the callback instance into a local variable before the invocation,
+    // that ensures the internal state is cleared after the invocation.
+    // It's not safe to touch |this| after the invocation, since running the
+    // bound function may destroy |this|.
+    RepeatingCallback cb = std::move(*this);
     PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(
-        bind_state_.get(), cef_internal::CallbackForward(a1),
-        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
-        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5));
+        reinterpret_cast<PolymorphicInvoke>(cb.polymorphic_invoke());
+    return f(std::move(cb).bind_state_.get(), std::forward<Args>(args)...);
+  }
+
+  // Then() returns a new RepeatingCallback that receives the same arguments as
+  // |this|, and with the return type of |then|. The
+  // returned callback will:
+  // 1) Run the functor currently bound to |this| callback.
+  // 2) Run the |then| callback with the result from step 1 as its single
+  //    argument.
+  // 3) Return the value from running the |then| callback.
+  //
+  // If called on an rvalue (e.g. std::move(cb).Then(...)), this method
+  // generates a callback that is a replacement for `this`. Therefore, `this`
+  // will be consumed and reset to a null callback to ensure the
+  // originally-bound functor will be run at most once.
+  template <typename ThenR, typename... ThenArgs>
+  RepeatingCallback<ThenR(Args...)> Then(
+      RepeatingCallback<ThenR(ThenArgs...)> then) const& {
+    CHECK(then);
+    return BindRepeating(
+        cef_internal::ThenHelper<
+            RepeatingCallback,
+            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
+        *this, std::move(then));
+  }
+
+  template <typename ThenR, typename... ThenArgs>
+  RepeatingCallback<ThenR(Args...)> Then(
+      RepeatingCallback<ThenR(ThenArgs...)> then) && {
+    CHECK(then);
+    return BindRepeating(
+        cef_internal::ThenHelper<
+            RepeatingCallback,
+            RepeatingCallback<ThenR(ThenArgs...)>>::CreateTrampoline(),
+        std::move(*this), std::move(then));
   }
-
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A5>::ForwardType);
 };
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class Callback<R(A1, A2, A3, A4, A5, A6)> : public cef_internal::CallbackBase {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
-
-  Callback() : CallbackBase(NULL) {}
-
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
-  }
-
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
-  }
-
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
-        typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
-        typename cef_internal::CallbackParamTraits<A6>::ForwardType a6) const {
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(
-        bind_state_.get(), cef_internal::CallbackForward(a1),
-        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
-        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5),
-        cef_internal::CallbackForward(a6));
-  }
-
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A5>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A6>::ForwardType);
-};
-
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class Callback<R(A1, A2, A3, A4, A5, A6, A7)>
-    : public cef_internal::CallbackBase {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
-
-  Callback() : CallbackBase(NULL) {}
-
-  // Note that this constructor CANNOT be explicit, and that Bind() CANNOT
-  // return the exact Callback<> type.  See base/bind.h for details.
-  template <typename Runnable, typename BindRunType, typename BoundArgsType>
-  Callback(
-      cef_internal::BindState<Runnable, BindRunType, BoundArgsType>* bind_state)
-      : CallbackBase(bind_state) {
-    // Force the assignment to a local variable of PolymorphicInvoke
-    // so the compiler will typecheck that the passed in Run() method has
-    // the correct type.
-    PolymorphicInvoke invoke_func =
-        &cef_internal::BindState<Runnable, BindRunType,
-                                 BoundArgsType>::InvokerType::Run;
-    polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func);
-  }
-
-  bool Equals(const Callback& other) const {
-    return CallbackBase::Equals(other);
-  }
-
-  R Run(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-        typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-        typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-        typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
-        typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
-        typename cef_internal::CallbackParamTraits<A6>::ForwardType a6,
-        typename cef_internal::CallbackParamTraits<A7>::ForwardType a7) const {
-    PolymorphicInvoke f =
-        reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_);
-
-    return f(
-        bind_state_.get(), cef_internal::CallbackForward(a1),
-        cef_internal::CallbackForward(a2), cef_internal::CallbackForward(a3),
-        cef_internal::CallbackForward(a4), cef_internal::CallbackForward(a5),
-        cef_internal::CallbackForward(a6), cef_internal::CallbackForward(a7));
-  }
-
- private:
-  typedef R (*PolymorphicInvoke)(
-      cef_internal::BindStateBase*,
-      typename cef_internal::CallbackParamTraits<A1>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A2>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A3>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A4>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A5>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A6>::ForwardType,
-      typename cef_internal::CallbackParamTraits<A7>::ForwardType);
-};
-
-// Syntactic sugar to make Callbacks<void(void)> easier to declare since it
-// will be used in a lot of APIs with delayed execution.
-typedef Callback<void(void)> Closure;
-
 }  // namespace base
 
 #endif  // !USING_CHROMIUM_INCLUDES
diff --git a/src/include/base/cef_callback_forward.h b/src/include/base/cef_callback_forward.h
index d604d7cfa..2d2277433 100644
--- a/src/include/base/cef_callback_forward.h
+++ b/src/include/base/cef_callback_forward.h
@@ -32,14 +32,9 @@
 #define INCLUDE_BASE_CEF_CALLBACK_FORWARD_H_
 #pragma once
 
-#if defined(BASE_CALLBACK_FORWARD_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
@@ -47,10 +42,19 @@
 
 namespace base {
 
-template <typename Sig>
-class Callback;
+template <typename Signature>
+class OnceCallback;
 
-typedef Callback<void(void)> Closure;
+template <typename Signature>
+class RepeatingCallback;
+
+///
+/// Syntactic sugar to make OnceClosure<void()> and RepeatingClosure<void()>
+/// easier to declare since they will be used in a lot of APIs with delayed
+/// execution.
+///
+using OnceClosure = OnceCallback<void()>;
+using RepeatingClosure = RepeatingCallback<void()>;
 
 }  // namespace base
 
diff --git a/src/include/base/cef_callback_helpers.h b/src/include/base/cef_callback_helpers.h
index ebe074a1f..5e3864405 100644
--- a/src/include/base/cef_callback_helpers.h
+++ b/src/include/base/cef_callback_helpers.h
@@ -32,60 +32,228 @@
 // are implemented using templates, with a class per callback signature, adding
 // methods to Callback<> itself is unattractive (lots of extra code gets
 // generated).  Instead, consider adding methods here.
-//
-// ResetAndReturn(&cb) is like cb.Reset() but allows executing a callback (via a
-// copy) after the original callback is Reset().  This can be handy if Run()
-// reads/writes the variable holding the Callback.
 
 #ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
 #define CEF_INCLUDE_BASE_CEF_CALLBACK_HELPERS_H_
 #pragma once
 
-#if defined(BASE_CALLBACK_HELPERS_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include "include/base/cef_basictypes.h"
-#include "include/base/cef_build.h"
+#include <atomic>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+#include "include/base/cef_bind.h"
 #include "include/base/cef_callback.h"
-#include "include/base/cef_macros.h"
+#include "include/base/cef_logging.h"
 
 namespace base {
 
-template <typename Sig>
-base::Callback<Sig> ResetAndReturn(base::Callback<Sig>* cb) {
-  base::Callback<Sig> ret(*cb);
-  cb->Reset();
-  return ret;
+namespace internal {
+
+template <typename T>
+struct IsBaseCallbackImpl : std::false_type {};
+
+template <typename R, typename... Args>
+struct IsBaseCallbackImpl<OnceCallback<R(Args...)>> : std::true_type {};
+
+template <typename R, typename... Args>
+struct IsBaseCallbackImpl<RepeatingCallback<R(Args...)>> : std::true_type {};
+
+template <typename T>
+struct IsOnceCallbackImpl : std::false_type {};
+
+template <typename R, typename... Args>
+struct IsOnceCallbackImpl<OnceCallback<R(Args...)>> : std::true_type {};
+
+}  // namespace internal
+
+///
+/// IsBaseCallback<T>::value is true when T is any of the Closure or Callback
+/// family of types.
+///
+template <typename T>
+using IsBaseCallback = internal::IsBaseCallbackImpl<std::decay_t<T>>;
+
+///
+/// IsOnceCallback<T>::value is true when T is a OnceClosure or OnceCallback
+/// type.
+///
+template <typename T>
+using IsOnceCallback = internal::IsOnceCallbackImpl<std::decay_t<T>>;
+
+///
+/// SFINAE friendly enabler allowing to overload methods for both Repeating and
+/// OnceCallbacks.
+///
+/// Usage:
+/// <pre>
+///   template <template <typename> class CallbackType,
+///             ... other template args ...,
+///             typename = EnableIfIsBaseCallback<CallbackType>>
+///   void DoStuff(CallbackType<...> cb, ...);
+/// </pre>
+///
+template <template <typename> class CallbackType>
+using EnableIfIsBaseCallback =
+    std::enable_if_t<IsBaseCallback<CallbackType<void()>>::value>;
+
+namespace internal {
+
+template <typename... Args>
+class OnceCallbackHolder final {
+ public:
+  OnceCallbackHolder(OnceCallback<void(Args...)> callback,
+                     bool ignore_extra_runs)
+      : callback_(std::move(callback)), ignore_extra_runs_(ignore_extra_runs) {
+    DCHECK(callback_);
+  }
+  OnceCallbackHolder(const OnceCallbackHolder&) = delete;
+  OnceCallbackHolder& operator=(const OnceCallbackHolder&) = delete;
+
+  void Run(Args... args) {
+    if (has_run_.exchange(true)) {
+      CHECK(ignore_extra_runs_) << "Both OnceCallbacks returned by "
+                                   "base::SplitOnceCallback() were run. "
+                                   "At most one of the pair should be run.";
+      return;
+    }
+    DCHECK(callback_);
+    std::move(callback_).Run(std::forward<Args>(args)...);
+  }
+
+ private:
+  volatile std::atomic_bool has_run_{false};
+  base::OnceCallback<void(Args...)> callback_;
+  const bool ignore_extra_runs_;
+};
+
+}  // namespace internal
+
+///
+/// Wraps the given OnceCallback into a RepeatingCallback that relays its
+/// invocation to the original OnceCallback on the first invocation. The
+/// following invocations are just ignored.
+///
+/// Note that this deliberately subverts the Once/Repeating paradigm of
+/// Callbacks but helps ease the migration from old-style Callbacks. Avoid if
+/// possible; use if necessary for migration.
+///
+// TODO(tzik): Remove it. https://crbug.com/730593
+template <typename... Args>
+RepeatingCallback<void(Args...)> AdaptCallbackForRepeating(
+    OnceCallback<void(Args...)> callback) {
+  using Helper = internal::OnceCallbackHolder<Args...>;
+  return base::BindRepeating(
+      &Helper::Run, std::make_unique<Helper>(std::move(callback),
+                                             /*ignore_extra_runs=*/true));
 }
 
-// ScopedClosureRunner is akin to scoped_ptr for Closures. It ensures that the
-// Closure is executed and deleted no matter how the current scope exits.
+///
+/// Wraps the given OnceCallback and returns two OnceCallbacks with an identical
+/// signature. On first invokation of either returned callbacks, the original
+/// callback is invoked. Invoking the remaining callback results in a crash.
+///
+template <typename... Args>
+std::pair<OnceCallback<void(Args...)>, OnceCallback<void(Args...)>>
+SplitOnceCallback(OnceCallback<void(Args...)> callback) {
+  using Helper = internal::OnceCallbackHolder<Args...>;
+  auto wrapped_once = base::BindRepeating(
+      &Helper::Run, std::make_unique<Helper>(std::move(callback),
+                                             /*ignore_extra_runs=*/false));
+  return std::make_pair(wrapped_once, wrapped_once);
+}
+
+///
+/// ScopedClosureRunner is akin to std::unique_ptr<> for Closures. It ensures
+/// that the Closure is executed no matter how the current scope exits.
+/// If you are looking for "ScopedCallback", "CallbackRunner", or
+/// "CallbackScoper" this is the class you want.
+///
 class ScopedClosureRunner {
  public:
   ScopedClosureRunner();
-  explicit ScopedClosureRunner(const Closure& closure);
+  explicit ScopedClosureRunner(OnceClosure closure);
+  ScopedClosureRunner(ScopedClosureRunner&& other);
+  // Runs the current closure if it's set, then replaces it with the closure
+  // from |other|. This is akin to how unique_ptr frees the contained pointer in
+  // its move assignment operator. If you need to explicitly avoid running any
+  // current closure, use ReplaceClosure().
+  ScopedClosureRunner& operator=(ScopedClosureRunner&& other);
   ~ScopedClosureRunner();
 
-  void Reset();
-  void Reset(const Closure& closure);
-  Closure Release() WARN_UNUSED_RESULT;
+  explicit operator bool() const { return !!closure_; }
+
+  // Calls the current closure and resets it, so it wont be called again.
+  void RunAndReset();
+
+  // Replaces closure with the new one releasing the old one without calling it.
+  void ReplaceClosure(OnceClosure closure);
+
+  // Releases the Closure without calling.
+  [[nodiscard]] OnceClosure Release();
 
  private:
-  Closure closure_;
+  OnceClosure closure_;
+};
+
+///
+/// Creates a null callback.
+///
+class NullCallback {
+ public:
+  template <typename R, typename... Args>
+  operator RepeatingCallback<R(Args...)>() const {
+    return RepeatingCallback<R(Args...)>();
+  }
+  template <typename R, typename... Args>
+  operator OnceCallback<R(Args...)>() const {
+    return OnceCallback<R(Args...)>();
+  }
+};
 
-  DISALLOW_COPY_AND_ASSIGN(ScopedClosureRunner);
+///
+/// Creates a callback that does nothing when called.
+///
+class DoNothing {
+ public:
+  template <typename... Args>
+  operator RepeatingCallback<void(Args...)>() const {
+    return Repeatedly<Args...>();
+  }
+  template <typename... Args>
+  operator OnceCallback<void(Args...)>() const {
+    return Once<Args...>();
+  }
+  // Explicit way of specifying a specific callback type when the compiler can't
+  // deduce it.
+  template <typename... Args>
+  static RepeatingCallback<void(Args...)> Repeatedly() {
+    return BindRepeating([](Args... args) {});
+  }
+  template <typename... Args>
+  static OnceCallback<void(Args...)> Once() {
+    return BindOnce([](Args... args) {});
+  }
 };
 
+///
+/// Useful for creating a Closure that will delete a pointer when invoked. Only
+/// use this when necessary. In most cases MessageLoop::DeleteSoon() is a better
+/// fit.
+///
+template <typename T>
+void DeletePointer(T* obj) {
+  delete obj;
+}
+
 }  // namespace base
 
 #endif  // !USING_CHROMIUM_INCLUDES
diff --git a/src/include/base/cef_callback_list.h b/src/include/base/cef_callback_list.h
index e0ef3665b..2038acb7d 100644
--- a/src/include/base/cef_callback_list.h
+++ b/src/include/base/cef_callback_list.h
@@ -28,420 +28,374 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+///
+/// \file
+/// A container for a list of callbacks. Provides callers the ability to
+/// manually or automatically unregister callbacks at any time, including during
+/// callback notification.
+///
+/// TYPICAL USAGE:
+///
+/// <pre>
+/// class MyWidget {
+///  public:
+///   using CallbackList = base::RepeatingCallbackList<void(const Foo&)>;
+///
+///   // Registers |cb| to be called whenever NotifyFoo() is executed.
+///   CallbackListSubscription RegisterCallback(CallbackList::CallbackType cb) {
+///     return callback_list_.Add(std::move(cb));
+///   }
+///
+///  private:
+///   // Calls all registered callbacks, with |foo| as the supplied arg.
+///   void NotifyFoo(const Foo& foo) {
+///     callback_list_.Notify(foo);
+///   }
+///
+///   CallbackList callback_list_;
+/// };
+///
+///
+/// class MyWidgetListener {
+///  private:
+///   void OnFoo(const Foo& foo) {
+///     // Called whenever MyWidget::NotifyFoo() is executed, unless
+///     // |foo_subscription_| has been destroyed.
+///   }
+///
+///   // Automatically deregisters the callback when deleted (e.g. in
+///   // ~MyWidgetListener()).  Unretained(this) is safe here since the
+///   // ScopedClosureRunner does not outlive |this|.
+///   CallbackListSubscription foo_subscription_ =
+///       MyWidget::Get()->RegisterCallback(
+///           base::BindRepeating(&MyWidgetListener::OnFoo,
+///                               base::Unretained(this)));
+/// };
+/// </pre>
+///
+/// UNSUPPORTED:
+///
+/// * Destroying the CallbackList during callback notification.
+///
+/// This is possible to support, but not currently necessary.
+///
+
 #ifndef CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_
 #define CEF_INCLUDE_BASE_CEF_CALLBACK_LIST_H_
 #pragma once
 
-#if defined(BASE_CALLBACK_LIST_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
-#include "base/callback_list.h"
+#include "base/functional/callback_list.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
+#include <algorithm>
 #include <list>
+#include <memory>
+#include <utility>
 
-#include "include/base/cef_basictypes.h"
-#include "include/base/cef_build.h"
+#include "include/base/cef_auto_reset.h"
+#include "include/base/cef_bind.h"
 #include "include/base/cef_callback.h"
+#include "include/base/cef_callback_helpers.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
-#include "include/base/cef_scoped_ptr.h"
-#include "include/base/internal/cef_callback_internal.h"
-
-// OVERVIEW:
-//
-// A container for a list of callbacks.  Unlike a normal STL vector or list,
-// this container can be modified during iteration without invalidating the
-// iterator. It safely handles the case of a callback removing itself
-// or another callback from the list while callbacks are being run.
-//
-// TYPICAL USAGE:
-//
-// class MyWidget {
-//  public:
-//   ...
-//
-//   typedef base::Callback<void(const Foo&)> OnFooCallback;
-//
-//   scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
-//   RegisterCallback(const OnFooCallback& cb) {
-//     return callback_list_.Add(cb);
-//   }
-//
-//  private:
-//   void NotifyFoo(const Foo& foo) {
-//      callback_list_.Notify(foo);
-//   }
-//
-//   base::CallbackList<void(const Foo&)> callback_list_;
-//
-//   DISALLOW_COPY_AND_ASSIGN(MyWidget);
-// };
-//
-//
-// class MyWidgetListener {
-//  public:
-//   MyWidgetListener::MyWidgetListener() {
-//     foo_subscription_ = MyWidget::GetCurrent()->RegisterCallback(
-//             base::Bind(&MyWidgetListener::OnFoo, this)));
-//   }
-//
-//   MyWidgetListener::~MyWidgetListener() {
-//      // Subscription gets deleted automatically and will deregister
-//      // the callback in the process.
-//   }
-//
-//  private:
-//   void OnFoo(const Foo& foo) {
-//     // Do something.
-//   }
-//
-//   scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
-//       foo_subscription_;
-//
-//   DISALLOW_COPY_AND_ASSIGN(MyWidgetListener);
-// };
+#include "include/base/cef_weak_ptr.h"
 
 namespace base {
+namespace internal {
+template <typename CallbackListImpl>
+class CallbackListBase;
+}  // namespace internal
+
+template <typename Signature>
+class OnceCallbackList;
+
+template <typename Signature>
+class RepeatingCallbackList;
+
+// A trimmed-down version of ScopedClosureRunner that can be used to guarantee a
+// closure is run on destruction. This is designed to be used by
+// CallbackListBase to run CancelCallback() when this subscription dies;
+// consumers can avoid callbacks on dead objects by ensuring the subscription
+// returned by CallbackListBase::Add() does not outlive the bound object in the
+// callback. A typical way to do this is to bind a callback to a member function
+// on `this` and store the returned subscription as a member variable.
+class CallbackListSubscription {
+ public:
+  CallbackListSubscription();
+  CallbackListSubscription(CallbackListSubscription&& subscription);
+  CallbackListSubscription& operator=(CallbackListSubscription&& subscription);
+  ~CallbackListSubscription();
+
+  explicit operator bool() const { return !!closure_; }
+
+ private:
+  template <typename T>
+  friend class internal::CallbackListBase;
+
+  explicit CallbackListSubscription(base::OnceClosure closure);
+
+  void Run();
+
+  OnceClosure closure_;
+};
 
-namespace cef_internal {
+namespace internal {
+
+// From base/stl_util.h.
+template <class T, class Allocator, class Predicate>
+size_t EraseIf(std::list<T, Allocator>& container, Predicate pred) {
+  size_t old_size = container.size();
+  container.remove_if(pred);
+  return old_size - container.size();
+}
+
+// A traits class to break circular type dependencies between CallbackListBase
+// and its subclasses.
+template <typename CallbackList>
+struct CallbackListTraits;
+
+// NOTE: It's important that Callbacks provide iterator stability when items are
+// added to the end, so e.g. a std::vector<> is not suitable here.
+template <typename Signature>
+struct CallbackListTraits<OnceCallbackList<Signature>> {
+  using CallbackType = OnceCallback<Signature>;
+  using Callbacks = std::list<CallbackType>;
+};
+template <typename Signature>
+struct CallbackListTraits<RepeatingCallbackList<Signature>> {
+  using CallbackType = RepeatingCallback<Signature>;
+  using Callbacks = std::list<CallbackType>;
+};
 
-template <typename CallbackType>
+template <typename CallbackListImpl>
 class CallbackListBase {
  public:
-  class Subscription {
-   public:
-    Subscription(CallbackListBase<CallbackType>* list,
-                 typename std::list<CallbackType>::iterator iter)
-        : list_(list), iter_(iter) {}
-
-    ~Subscription() {
-      if (list_->active_iterator_count_) {
-        iter_->Reset();
-      } else {
-        list_->callbacks_.erase(iter_);
-        if (!list_->removal_callback_.is_null())
-          list_->removal_callback_.Run();
-      }
-    }
+  using CallbackType =
+      typename CallbackListTraits<CallbackListImpl>::CallbackType;
+  static_assert(IsBaseCallback<CallbackType>::value, "");
+
+  // TODO(crbug.com/1103086): Update references to use this directly and by
+  // value, then remove.
+  using Subscription = CallbackListSubscription;
 
-   private:
-    CallbackListBase<CallbackType>* list_;
-    typename std::list<CallbackType>::iterator iter_;
+  CallbackListBase() = default;
+  CallbackListBase(const CallbackListBase&) = delete;
+  CallbackListBase& operator=(const CallbackListBase&) = delete;
 
-    DISALLOW_COPY_AND_ASSIGN(Subscription);
-  };
+  ~CallbackListBase() {
+    // Destroying the list during iteration is unsupported and will cause a UAF.
+    CHECK(!iterating_);
+  }
 
-  // Add a callback to the list. The callback will remain registered until the
-  // returned Subscription is destroyed, which must occur before the
-  // CallbackList is destroyed.
-  scoped_ptr<Subscription> Add(const CallbackType& cb) WARN_UNUSED_RESULT {
+  // Registers |cb| for future notifications. Returns a CallbackListSubscription
+  // whose destruction will cancel |cb|.
+  [[nodiscard]] CallbackListSubscription Add(CallbackType cb) {
     DCHECK(!cb.is_null());
-    return scoped_ptr<Subscription>(
-        new Subscription(this, callbacks_.insert(callbacks_.end(), cb)));
+    return CallbackListSubscription(base::BindOnce(
+        &CallbackListBase::CancelCallback, weak_ptr_factory_.GetWeakPtr(),
+        callbacks_.insert(callbacks_.end(), std::move(cb))));
   }
 
-  // Sets a callback which will be run when a subscription list is changed.
-  void set_removal_callback(const Closure& callback) {
-    removal_callback_ = callback;
+  // Registers |cb| for future notifications. Provides no way for the caller to
+  // cancel, so this is only safe for cases where the callback is guaranteed to
+  // live at least as long as this list (e.g. if it's bound on the same object
+  // that owns the list).
+  // TODO(pkasting): Attempt to use Add() instead and see if callers can relax
+  // other lifetime/ordering mechanisms as a result.
+  void AddUnsafe(CallbackType cb) {
+    DCHECK(!cb.is_null());
+    callbacks_.push_back(std::move(cb));
   }
 
-  // Returns true if there are no subscriptions. This is only valid to call when
-  // not looping through the list.
-  bool empty() {
-    DCHECK_EQ(0, active_iterator_count_);
-    return callbacks_.empty();
+  // Registers |removal_callback| to be run after elements are removed from the
+  // list of registered callbacks.
+  void set_removal_callback(const RepeatingClosure& removal_callback) {
+    removal_callback_ = removal_callback;
   }
 
- protected:
-  // An iterator class that can be used to access the list of callbacks.
-  class Iterator {
-   public:
-    explicit Iterator(CallbackListBase<CallbackType>* list)
-        : list_(list), list_iter_(list_->callbacks_.begin()) {
-      ++list_->active_iterator_count_;
-    }
+  // Returns whether the list of registered callbacks is empty (from an external
+  // perspective -- meaning no remaining callbacks are live).
+  bool empty() const {
+    return std::all_of(callbacks_.cbegin(), callbacks_.cend(),
+                       [](const auto& callback) { return callback.is_null(); });
+  }
 
-    Iterator(const Iterator& iter)
-        : list_(iter.list_), list_iter_(iter.list_iter_) {
-      ++list_->active_iterator_count_;
+  // Calls all registered callbacks that are not canceled beforehand. If any
+  // callbacks are unregistered, notifies any registered removal callback at the
+  // end.
+  //
+  // Arguments must be copyable, since they must be supplied to all callbacks.
+  // Move-only types would be destructively modified by passing them to the
+  // first callback and not reach subsequent callbacks as intended.
+  //
+  // Notify() may be called re-entrantly, in which case the nested call
+  // completes before the outer one continues. Callbacks are only ever added at
+  // the end and canceled callbacks are not pruned from the list until the
+  // outermost iteration completes, so existing iterators should never be
+  // invalidated. However, this does mean that a callback added during a nested
+  // call can be notified by outer calls -- meaning it will be notified about
+  // things that happened before it was added -- if its subscription outlives
+  // the reentrant Notify() call.
+  template <typename... RunArgs>
+  void Notify(RunArgs&&... args) {
+    if (empty()) {
+      return;  // Nothing to do.
     }
 
-    ~Iterator() {
-      if (list_ && --list_->active_iterator_count_ == 0) {
-        list_->Compact();
+    {
+      AutoReset<bool> iterating(&iterating_, true);
+
+      // Skip any callbacks that are canceled during iteration.
+      // NOTE: Since RunCallback() may call Add(), it's not safe to cache the
+      // value of callbacks_.end() across loop iterations.
+      const auto next_valid = [this](const auto it) {
+        return std::find_if_not(it, callbacks_.end(), [](const auto& callback) {
+          return callback.is_null();
+        });
+      };
+      for (auto it = next_valid(callbacks_.begin()); it != callbacks_.end();
+           it = next_valid(it)) {
+        // NOTE: Intentionally does not call std::forward<RunArgs>(args)...,
+        // since that would allow move-only arguments.
+        static_cast<CallbackListImpl*>(this)->RunCallback(it++, args...);
       }
     }
 
-    CallbackType* GetNext() {
-      while ((list_iter_ != list_->callbacks_.end()) && list_iter_->is_null())
-        ++list_iter_;
-
-      CallbackType* cb = NULL;
-      if (list_iter_ != list_->callbacks_.end()) {
-        cb = &(*list_iter_);
-        ++list_iter_;
-      }
-      return cb;
+    // Re-entrant invocations shouldn't prune anything from the list. This can
+    // invalidate iterators from underneath higher call frames. It's safe to
+    // simply do nothing, since the outermost frame will continue through here
+    // and prune all null callbacks below.
+    if (iterating_) {
+      return;
     }
 
-   private:
-    CallbackListBase<CallbackType>* list_;
-    typename std::list<CallbackType>::iterator list_iter_;
-  };
-
-  CallbackListBase() : active_iterator_count_(0) {}
-
-  ~CallbackListBase() {
-    DCHECK_EQ(0, active_iterator_count_);
-    DCHECK_EQ(0U, callbacks_.size());
-  }
-
-  // Returns an instance of a CallbackListBase::Iterator which can be used
-  // to run callbacks.
-  Iterator GetIterator() { return Iterator(this); }
-
-  // Compact the list: remove any entries which were NULLed out during
-  // iteration.
-  void Compact() {
-    typename std::list<CallbackType>::iterator it = callbacks_.begin();
-    bool updated = false;
-    while (it != callbacks_.end()) {
-      if ((*it).is_null()) {
-        updated = true;
-        it = callbacks_.erase(it);
-      } else {
-        ++it;
-      }
-
-      if (updated && !removal_callback_.is_null())
-        removal_callback_.Run();
+    // Any null callbacks remaining in the list were canceled due to
+    // Subscription destruction during iteration, and can safely be erased now.
+    const size_t erased_callbacks =
+        EraseIf(callbacks_, [](const auto& cb) { return cb.is_null(); });
+
+    // Run |removal_callback_| if any callbacks were canceled. Note that we
+    // cannot simply compare list sizes before and after iterating, since
+    // notification may result in Add()ing new callbacks as well as canceling
+    // them. Also note that if this is a OnceCallbackList, the OnceCallbacks
+    // that were executed above have all been removed regardless of whether
+    // they're counted in |erased_callbacks_|.
+    if (removal_callback_ &&
+        (erased_callbacks || IsOnceCallback<CallbackType>::value)) {
+      removal_callback_.Run();  // May delete |this|!
     }
   }
 
- private:
-  std::list<CallbackType> callbacks_;
-  int active_iterator_count_;
-  Closure removal_callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(CallbackListBase);
-};
-
-}  // namespace cef_internal
-
-template <typename Sig>
-class CallbackList;
-
-template <>
-class CallbackList<void(void)>
-    : public cef_internal::CallbackListBase<Callback<void(void)>> {
- public:
-  typedef Callback<void(void)> CallbackType;
-
-  CallbackList() {}
+ protected:
+  using Callbacks = typename CallbackListTraits<CallbackListImpl>::Callbacks;
 
-  void Notify() {
-    cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run();
-    }
-  }
+  // Holds non-null callbacks, which will be called during Notify().
+  Callbacks callbacks_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
-};
-
-template <typename A1>
-class CallbackList<void(A1)>
-    : public cef_internal::CallbackListBase<Callback<void(A1)>> {
- public:
-  typedef Callback<void(A1)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1);
+  // Cancels the callback pointed to by |it|, which is guaranteed to be valid.
+  void CancelCallback(const typename Callbacks::iterator& it) {
+    if (static_cast<CallbackListImpl*>(this)->CancelNullCallback(it)) {
+      return;
     }
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
-};
 
-template <typename A1, typename A2>
-class CallbackList<void(A1, A2)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2)>> {
- public:
-  typedef Callback<void(A1, A2)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1, a2);
+    if (iterating_) {
+      // Calling erase() here is unsafe, since the loop in Notify() may be
+      // referencing this same iterator, e.g. if adjacent callbacks'
+      // Subscriptions are both destroyed when the first one is Run().  Just
+      // reset the callback and let Notify() clean it up at the end.
+      it->Reset();
+    } else {
+      callbacks_.erase(it);
+      if (removal_callback_) {
+        removal_callback_.Run();  // May delete |this|!
+      }
     }
   }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
-};
+  // Set while Notify() is traversing |callbacks_|.  Used primarily to avoid
+  // invalidating iterators that may be in use.
+  bool iterating_ = false;
 
-template <typename A1, typename A2, typename A3>
-class CallbackList<void(A1, A2, A3)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3)>> {
- public:
-  typedef Callback<void(A1, A2, A3)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1, a2, a3);
-    }
-  }
+  // Called after elements are removed from |callbacks_|.
+  RepeatingClosure removal_callback_;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+  WeakPtrFactory<CallbackListBase> weak_ptr_factory_{this};
 };
 
-template <typename A1, typename A2, typename A3, typename A4>
-class CallbackList<void(A1, A2, A3, A4)>
-    : public cef_internal::CallbackListBase<Callback<void(A1, A2, A3, A4)>> {
- public:
-  typedef Callback<void(A1, A2, A3, A4)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1, a2, a3, a4);
-    }
-  }
+}  // namespace internal
 
+template <typename Signature>
+class OnceCallbackList
+    : public internal::CallbackListBase<OnceCallbackList<Signature>> {
  private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
-};
-
-template <typename A1, typename A2, typename A3, typename A4, typename A5>
-class CallbackList<void(A1, A2, A3, A4, A5)>
-    : public cef_internal::CallbackListBase<
-          Callback<void(A1, A2, A3, A4, A5)>> {
- public:
-  typedef Callback<void(A1, A2, A3, A4, A5)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
-              typename cef_internal::CallbackParamTraits<A5>::ForwardType a5) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1, a2, a3, a4, a5);
-    }
+  friend internal::CallbackListBase<OnceCallbackList>;
+  using Traits = internal::CallbackListTraits<OnceCallbackList>;
+
+  // Runs the current callback, which may cancel it or any other callbacks.
+  template <typename... RunArgs>
+  void RunCallback(typename Traits::Callbacks::iterator it, RunArgs&&... args) {
+    // OnceCallbacks still have Subscriptions with outstanding iterators;
+    // splice() removes them from |callbacks_| without invalidating those.
+    null_callbacks_.splice(null_callbacks_.end(), this->callbacks_, it);
+
+    // NOTE: Intentionally does not call std::forward<RunArgs>(args)...; see
+    // comments in Notify().
+    std::move(*it).Run(args...);
   }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
-};
-
-template <typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class CallbackList<void(A1, A2, A3, A4, A5, A6)>
-    : public cef_internal::CallbackListBase<
-          Callback<void(A1, A2, A3, A4, A5, A6)>> {
- public:
-  typedef Callback<void(A1, A2, A3, A4, A5, A6)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
-              typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
-              typename cef_internal::CallbackParamTraits<A6>::ForwardType a6) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1, a2, a3, a4, a5, a6);
+  // If |it| refers to an already-canceled callback, does any necessary cleanup
+  // and returns true.  Otherwise returns false.
+  bool CancelNullCallback(const typename Traits::Callbacks::iterator& it) {
+    if (it->is_null()) {
+      null_callbacks_.erase(it);
+      return true;
     }
+    return false;
   }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+  // Holds null callbacks whose Subscriptions are still alive, so the
+  // Subscriptions will still contain valid iterators.  Only needed for
+  // OnceCallbacks, since RepeatingCallbacks are not canceled except by
+  // Subscription destruction.
+  typename Traits::Callbacks null_callbacks_;
 };
 
-template <typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class CallbackList<void(A1, A2, A3, A4, A5, A6, A7)>
-    : public cef_internal::CallbackListBase<
-          Callback<void(A1, A2, A3, A4, A5, A6, A7)>> {
- public:
-  typedef Callback<void(A1, A2, A3, A4, A5, A6, A7)> CallbackType;
-
-  CallbackList() {}
-
-  void Notify(typename cef_internal::CallbackParamTraits<A1>::ForwardType a1,
-              typename cef_internal::CallbackParamTraits<A2>::ForwardType a2,
-              typename cef_internal::CallbackParamTraits<A3>::ForwardType a3,
-              typename cef_internal::CallbackParamTraits<A4>::ForwardType a4,
-              typename cef_internal::CallbackParamTraits<A5>::ForwardType a5,
-              typename cef_internal::CallbackParamTraits<A6>::ForwardType a6,
-              typename cef_internal::CallbackParamTraits<A7>::ForwardType a7) {
-    typename cef_internal::CallbackListBase<CallbackType>::Iterator it =
-        this->GetIterator();
-    CallbackType* cb;
-    while ((cb = it.GetNext()) != NULL) {
-      cb->Run(a1, a2, a3, a4, a5, a6, a7);
-    }
+template <typename Signature>
+class RepeatingCallbackList
+    : public internal::CallbackListBase<RepeatingCallbackList<Signature>> {
+ private:
+  friend internal::CallbackListBase<RepeatingCallbackList>;
+  using Traits = internal::CallbackListTraits<RepeatingCallbackList>;
+  // Runs the current callback, which may cancel it or any other callbacks.
+  template <typename... RunArgs>
+  void RunCallback(typename Traits::Callbacks::iterator it, RunArgs&&... args) {
+    // NOTE: Intentionally does not call std::forward<RunArgs>(args)...; see
+    // comments in Notify().
+    it->Run(args...);
   }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallbackList);
+  // If |it| refers to an already-canceled callback, does any necessary cleanup
+  // and returns true.  Otherwise returns false.
+  bool CancelNullCallback(const typename Traits::Callbacks::iterator& it) {
+    // Because at most one Subscription can point to a given callback, and
+    // RepeatingCallbacks are only reset by CancelCallback(), no one should be
+    // able to request cancellation of a canceled RepeatingCallback.
+    DCHECK(!it->is_null());
+    return false;
+  }
 };
 
+///
+/// Syntactic sugar to parallel that used for Callbacks.
+///
+using OnceClosureList = OnceCallbackList<void()>;
+using RepeatingClosureList = RepeatingCallbackList<void()>;
+
 }  // namespace base
 
 #endif  // !USING_CHROMIUM_INCLUDES
diff --git a/src/include/base/cef_cancelable_callback.h b/src/include/base/cef_cancelable_callback.h
index febce3a32..35631491f 100644
--- a/src/include/base/cef_cancelable_callback.h
+++ b/src/include/base/cef_cancelable_callback.h
@@ -27,54 +27,58 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// CancelableCallback is a wrapper around base::Callback that allows
-// cancellation of a callback. CancelableCallback takes a reference on the
-// wrapped callback until this object is destroyed or Reset()/Cancel() are
-// called.
-//
-// NOTE:
-//
-// Calling CancelableCallback::Cancel() brings the object back to its natural,
-// default-constructed state, i.e., CancelableCallback::callback() will return
-// a null callback.
-//
-// THREAD-SAFETY:
-//
-// CancelableCallback objects must be created on, posted to, cancelled on, and
-// destroyed on the same thread.
-//
-//
-// EXAMPLE USAGE:
-//
-// In the following example, the test is verifying that RunIntensiveTest()
-// Quit()s the message loop within 4 seconds. The cancelable callback is posted
-// to the message loop, the intensive test runs, the message loop is run,
-// then the callback is cancelled.
-//
-// void TimeoutCallback(const std::string& timeout_message) {
-//   FAIL() << timeout_message;
-//   MessageLoop::current()->QuitWhenIdle();
-// }
-//
-// CancelableClosure timeout(base::Bind(&TimeoutCallback, "Test timed out."));
-// MessageLoop::current()->PostDelayedTask(FROM_HERE, timeout.callback(),
-//                                         4000)  // 4 seconds to run.
-// RunIntensiveTest();
-// MessageLoop::current()->Run();
-// timeout.Cancel();  // Hopefully this is hit before the timeout callback runs.
-//
+
+///
+/// \file
+/// CancelableCallback is a wrapper around base::Callback that allows
+/// cancellation of a callback. CancelableCallback takes a reference on the
+/// wrapped callback until this object is destroyed or Reset()/Cancel() are
+/// called.
+///
+/// NOTE:
+///
+/// Calling CancelableCallback::Cancel() brings the object back to its natural,
+/// default-constructed state, i.e., CancelableCallback::callback() will return
+/// a null callback.
+///
+/// THREAD-SAFETY:
+///
+/// CancelableCallback objects must be created on, posted to, cancelled on, and
+/// destroyed on the same thread.
+///
+///
+/// EXAMPLE USAGE:
+///
+/// In the following example, the test is verifying that RunIntensiveTest()
+/// Quit()s the message loop within 4 seconds. The cancelable callback is posted
+/// to the message loop, the intensive test runs, the message loop is run,
+/// then the callback is cancelled.
+///
+/// <pre>
+///   RunLoop run_loop;
+///
+///   void TimeoutCallback(const std::string& timeout_message) {
+///     FAIL() << timeout_message;
+///     run_loop.QuitWhenIdle();
+///   }
+///
+///   CancelableOnceClosure timeout(
+///       base::BindOnce(&TimeoutCallback, "Test timed out."));
+///   ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE,
+///                                                  timeout.callback(),
+///                                                  TimeDelta::FromSeconds(4));
+///   RunIntensiveTest();
+///   run_loop.Run();
+///   // Hopefully this is hit before the timeout callback runs.
+///   timeout.Cancel();
+/// </pre>
+///
 
 #ifndef CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_
 #define CEF_INCLUDE_BASE_CEF_CANCELABLE_CALLBACK_H_
 #pragma once
 
-#if defined(BASE_CANCELABLE_CALLBACK_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/cancelable_callback.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -82,37 +86,36 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
+#include <utility>
+
 #include "include/base/cef_bind.h"
-#include "include/base/cef_build.h"
 #include "include/base/cef_callback.h"
+#include "include/base/cef_compiler_specific.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
 #include "include/base/cef_weak_ptr.h"
 #include "include/base/internal/cef_callback_internal.h"
 
 namespace base {
+namespace internal {
 
-template <typename Sig>
-class CancelableCallback;
-
-template <>
-class CancelableCallback<void(void)> {
+template <typename CallbackType>
+class CancelableCallbackImpl {
  public:
-  CancelableCallback() : weak_factory_(this) {}
+  CancelableCallbackImpl() = default;
+  CancelableCallbackImpl(const CancelableCallbackImpl&) = delete;
+  CancelableCallbackImpl& operator=(const CancelableCallbackImpl&) = delete;
 
   // |callback| must not be null.
-  explicit CancelableCallback(const base::Callback<void(void)>& callback)
-      : weak_factory_(this), callback_(callback) {
-    DCHECK(!callback.is_null());
-    InitializeForwarder();
+  explicit CancelableCallbackImpl(CallbackType callback)
+      : callback_(std::move(callback)) {
+    DCHECK(callback_);
   }
 
-  ~CancelableCallback() {}
+  ~CancelableCallbackImpl() = default;
 
   // Cancels and drops the reference to the wrapped callback.
   void Cancel() {
-    weak_factory_.InvalidateWeakPtrs();
-    forwarder_.Reset();
+    weak_ptr_factory_.InvalidateWeakPtrs();
     callback_.Reset();
   }
 
@@ -121,170 +124,69 @@ class CancelableCallback<void(void)> {
 
   // Sets |callback| as the closure that may be cancelled. |callback| may not
   // be null. Outstanding and any previously wrapped callbacks are cancelled.
-  void Reset(const base::Callback<void(void)>& callback) {
-    DCHECK(!callback.is_null());
-
+  void Reset(CallbackType callback) {
+    DCHECK(callback);
     // Outstanding tasks (e.g., posted to a message loop) must not be called.
     Cancel();
-
-    // |forwarder_| is no longer valid after Cancel(), so re-bind.
-    InitializeForwarder();
-
-    callback_ = callback;
+    callback_ = std::move(callback);
   }
 
   // Returns a callback that can be disabled by calling Cancel().
-  const base::Callback<void(void)>& callback() const { return forwarder_; }
-
- private:
-  void Forward() { callback_.Run(); }
-
-  // Helper method to bind |forwarder_| using a weak pointer from
-  // |weak_factory_|.
-  void InitializeForwarder() {
-    forwarder_ = base::Bind(&CancelableCallback<void(void)>::Forward,
-                            weak_factory_.GetWeakPtr());
-  }
-
-  // Used to ensure Forward() is not run when this object is destroyed.
-  base::WeakPtrFactory<CancelableCallback<void(void)>> weak_factory_;
-
-  // The wrapper closure.
-  base::Callback<void(void)> forwarder_;
-
-  // The stored closure that may be cancelled.
-  base::Callback<void(void)> callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
-};
-
-template <typename A1>
-class CancelableCallback<void(A1)> {
- public:
-  CancelableCallback() : weak_factory_(this) {}
-
-  // |callback| must not be null.
-  explicit CancelableCallback(const base::Callback<void(A1)>& callback)
-      : weak_factory_(this), callback_(callback) {
-    DCHECK(!callback.is_null());
-    InitializeForwarder();
-  }
-
-  ~CancelableCallback() {}
-
-  // Cancels and drops the reference to the wrapped callback.
-  void Cancel() {
-    weak_factory_.InvalidateWeakPtrs();
-    forwarder_.Reset();
-    callback_.Reset();
-  }
-
-  // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const { return callback_.is_null(); }
-
-  // Sets |callback| as the closure that may be cancelled. |callback| may not
-  // be null. Outstanding and any previously wrapped callbacks are cancelled.
-  void Reset(const base::Callback<void(A1)>& callback) {
-    DCHECK(!callback.is_null());
-
-    // Outstanding tasks (e.g., posted to a message loop) must not be called.
-    Cancel();
-
-    // |forwarder_| is no longer valid after Cancel(), so re-bind.
-    InitializeForwarder();
-
-    callback_ = callback;
+  CallbackType callback() const {
+    if (!callback_) {
+      return CallbackType();
+    }
+    CallbackType forwarder;
+    MakeForwarder(&forwarder);
+    return forwarder;
   }
 
-  // Returns a callback that can be disabled by calling Cancel().
-  const base::Callback<void(A1)>& callback() const { return forwarder_; }
-
  private:
-  void Forward(A1 a1) const { callback_.Run(a1); }
-
-  // Helper method to bind |forwarder_| using a weak pointer from
-  // |weak_factory_|.
-  void InitializeForwarder() {
-    forwarder_ = base::Bind(&CancelableCallback<void(A1)>::Forward,
-                            weak_factory_.GetWeakPtr());
-  }
-
-  // Used to ensure Forward() is not run when this object is destroyed.
-  base::WeakPtrFactory<CancelableCallback<void(A1)>> weak_factory_;
-
-  // The wrapper closure.
-  base::Callback<void(A1)> forwarder_;
-
-  // The stored closure that may be cancelled.
-  base::Callback<void(A1)> callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
-};
-
-template <typename A1, typename A2>
-class CancelableCallback<void(A1, A2)> {
- public:
-  CancelableCallback() : weak_factory_(this) {}
-
-  // |callback| must not be null.
-  explicit CancelableCallback(const base::Callback<void(A1, A2)>& callback)
-      : weak_factory_(this), callback_(callback) {
-    DCHECK(!callback.is_null());
-    InitializeForwarder();
+  template <typename... Args>
+  void MakeForwarder(RepeatingCallback<void(Args...)>* out) const {
+    using ForwarderType = void (CancelableCallbackImpl::*)(Args...);
+    ForwarderType forwarder = &CancelableCallbackImpl::ForwardRepeating;
+    *out = BindRepeating(forwarder, weak_ptr_factory_.GetWeakPtr());
   }
 
-  ~CancelableCallback() {}
-
-  // Cancels and drops the reference to the wrapped callback.
-  void Cancel() {
-    weak_factory_.InvalidateWeakPtrs();
-    forwarder_.Reset();
-    callback_.Reset();
+  template <typename... Args>
+  void MakeForwarder(OnceCallback<void(Args...)>* out) const {
+    using ForwarderType = void (CancelableCallbackImpl::*)(Args...);
+    ForwarderType forwarder = &CancelableCallbackImpl::ForwardOnce;
+    *out = BindOnce(forwarder, weak_ptr_factory_.GetWeakPtr());
   }
 
-  // Returns true if the wrapped callback has been cancelled.
-  bool IsCancelled() const { return callback_.is_null(); }
-
-  // Sets |callback| as the closure that may be cancelled. |callback| may not
-  // be null. Outstanding and any previously wrapped callbacks are cancelled.
-  void Reset(const base::Callback<void(A1, A2)>& callback) {
-    DCHECK(!callback.is_null());
-
-    // Outstanding tasks (e.g., posted to a message loop) must not be called.
-    Cancel();
-
-    // |forwarder_| is no longer valid after Cancel(), so re-bind.
-    InitializeForwarder();
-
-    callback_ = callback;
+  template <typename... Args>
+  void ForwardRepeating(Args... args) {
+    callback_.Run(std::forward<Args>(args)...);
   }
 
-  // Returns a callback that can be disabled by calling Cancel().
-  const base::Callback<void(A1, A2)>& callback() const { return forwarder_; }
-
- private:
-  void Forward(A1 a1, A2 a2) const { callback_.Run(a1, a2); }
-
-  // Helper method to bind |forwarder_| using a weak pointer from
-  // |weak_factory_|.
-  void InitializeForwarder() {
-    forwarder_ = base::Bind(&CancelableCallback<void(A1, A2)>::Forward,
-                            weak_factory_.GetWeakPtr());
+  template <typename... Args>
+  void ForwardOnce(Args... args) {
+    weak_ptr_factory_.InvalidateWeakPtrs();
+    std::move(callback_).Run(std::forward<Args>(args)...);
   }
 
-  // Used to ensure Forward() is not run when this object is destroyed.
-  base::WeakPtrFactory<CancelableCallback<void(A1, A2)>> weak_factory_;
-
-  // The wrapper closure.
-  base::Callback<void(A1, A2)> forwarder_;
-
   // The stored closure that may be cancelled.
-  base::Callback<void(A1, A2)> callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
+  CallbackType callback_;
+  mutable base::WeakPtrFactory<CancelableCallbackImpl> weak_ptr_factory_{this};
 };
 
-typedef CancelableCallback<void(void)> CancelableClosure;
+}  // namespace internal
+
+///
+/// Consider using base::WeakPtr directly instead of base::CancelableCallback
+/// for the task cancellation.
+///
+template <typename Signature>
+using CancelableOnceCallback =
+    internal::CancelableCallbackImpl<OnceCallback<Signature>>;
+using CancelableOnceClosure = CancelableOnceCallback<void()>;
+
+template <typename Signature>
+using CancelableRepeatingCallback =
+    internal::CancelableCallbackImpl<RepeatingCallback<Signature>>;
+using CancelableRepeatingClosure = CancelableRepeatingCallback<void()>;
 
 }  // namespace base
 
diff --git a/src/include/base/cef_compiler_specific.h b/src/include/base/cef_compiler_specific.h
new file mode 100644
index 000000000..24bcfb24b
--- /dev/null
+++ b/src/include/base/cef_compiler_specific.h
@@ -0,0 +1,382 @@
+// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2012
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
+#define CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
+#pragma once
+
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/compiler_specific.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include "include/base/cef_build.h"
+
+// This is a wrapper around `__has_cpp_attribute`, which can be used to test for
+// the presence of an attribute. In case the compiler does not support this
+// macro it will simply evaluate to 0.
+//
+// References:
+// https://wg21.link/sd6#testing-for-the-presence-of-an-attribute-__has_cpp_attribute
+// https://wg21.link/cpp.cond#:__has_cpp_attribute
+#if defined(__has_cpp_attribute)
+#define HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
+#else
+#define HAS_CPP_ATTRIBUTE(x) 0
+#endif
+
+// A wrapper around `__has_builtin`, similar to HAS_CPP_ATTRIBUTE.
+#if defined(__has_builtin)
+#define HAS_BUILTIN(x) __has_builtin(x)
+#else
+#define HAS_BUILTIN(x) 0
+#endif
+
+// __has_feature and __has_attribute don't exist for MSVC.
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif  // !defined(__has_feature)
+
+#if !defined(__has_attribute)
+#define __has_attribute(x) 0
+#endif  // !defined(__has_attribute)
+
+// Annotate a function indicating it should not be inlined.
+// Use like:
+//   NOINLINE void DoStuff() { ... }
+#if defined(COMPILER_GCC)
+#define NOINLINE __attribute__((noinline))
+#elif defined(COMPILER_MSVC)
+#define NOINLINE __declspec(noinline)
+#else
+#define NOINLINE
+#endif
+
+#if defined(COMPILER_GCC) && defined(NDEBUG)
+#define ALWAYS_INLINE inline __attribute__((__always_inline__))
+#elif defined(COMPILER_MSVC) && defined(NDEBUG)
+#define ALWAYS_INLINE __forceinline
+#else
+#define ALWAYS_INLINE inline
+#endif
+
+// Annotate a function indicating it should never be tail called. Useful to make
+// sure callers of the annotated function are never omitted from call-stacks.
+// To provide the complementary behavior (prevent the annotated function from
+// being omitted) look at NOINLINE. Also note that this doesn't prevent code
+// folding of multiple identical caller functions into a single signature. To
+// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
+// Use like:
+//   void NOT_TAIL_CALLED FooBar();
+#if defined(__clang__) && __has_attribute(not_tail_called)
+#define NOT_TAIL_CALLED __attribute__((not_tail_called))
+#else
+#define NOT_TAIL_CALLED
+#endif
+
+// Specify memory alignment for structs, classes, etc.
+// Use like:
+//   class ALIGNAS(16) MyClass { ... }
+//   ALIGNAS(16) int array[4];
+//
+// In most places you can use the C++11 keyword "alignas", which is preferred.
+//
+// But compilers have trouble mixing __attribute__((...)) syntax with
+// alignas(...) syntax.
+//
+// Doesn't work in clang or gcc:
+//   struct alignas(16) __attribute__((packed)) S { char c; };
+// Works in clang but not gcc:
+//   struct __attribute__((packed)) alignas(16) S2 { char c; };
+// Works in clang and gcc:
+//   struct alignas(16) S3 { char c; } __attribute__((packed));
+//
+// There are also some attributes that must be specified *before* a class
+// definition: visibility (used for exporting functions/classes) is one of
+// these attributes. This means that it is not possible to use alignas() with a
+// class that is marked as exported.
+#if defined(COMPILER_MSVC)
+#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
+#elif defined(COMPILER_GCC)
+#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
+#endif
+
+// In case the compiler supports it NO_UNIQUE_ADDRESS evaluates to the C++20
+// attribute [[no_unique_address]]. This allows annotating data members so that
+// they need not have an address distinct from all other non-static data members
+// of its class.
+//
+// References:
+// * https://en.cppreference.com/w/cpp/language/attributes/no_unique_address
+// * https://wg21.link/dcl.attr.nouniqueaddr
+#if HAS_CPP_ATTRIBUTE(no_unique_address)
+#define NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+#define NO_UNIQUE_ADDRESS
+#endif
+
+// Tell the compiler a function is using a printf-style format string.
+// |format_param| is the one-based index of the format string parameter;
+// |dots_param| is the one-based index of the "..." parameter.
+// For v*printf functions (which take a va_list), pass 0 for dots_param.
+// (This is undocumented but matches what the system C headers do.)
+// For member functions, the implicit this parameter counts as index 1.
+#if defined(COMPILER_GCC) || defined(__clang__)
+#define PRINTF_FORMAT(format_param, dots_param) \
+  __attribute__((format(printf, format_param, dots_param)))
+#else
+#define PRINTF_FORMAT(format_param, dots_param)
+#endif
+
+// WPRINTF_FORMAT is the same, but for wide format strings.
+// This doesn't appear to yet be implemented in any compiler.
+// See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38308 .
+#define WPRINTF_FORMAT(format_param, dots_param)
+// If available, it would look like:
+//   __attribute__((format(wprintf, format_param, dots_param)))
+
+// Sanitizers annotations.
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define NO_SANITIZE(what) __attribute__((no_sanitize(what)))
+#endif
+#endif
+#if !defined(NO_SANITIZE)
+#define NO_SANITIZE(what)
+#endif
+
+// MemorySanitizer annotations.
+#if defined(MEMORY_SANITIZER) && !defined(OS_NACL)
+#include <sanitizer/msan_interface.h>
+
+// Mark a memory region fully initialized.
+// Use this to annotate code that deliberately reads uninitialized data, for
+// example a GC scavenging root set pointers from the stack.
+#define MSAN_UNPOISON(p, size) __msan_unpoison(p, size)
+
+// Check a memory region for initializedness, as if it was being used here.
+// If any bits are uninitialized, crash with an MSan report.
+// Use this to sanitize data which MSan won't be able to track, e.g. before
+// passing data to another process via shared memory.
+#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size) \
+  __msan_check_mem_is_initialized(p, size)
+#else  // MEMORY_SANITIZER
+#define MSAN_UNPOISON(p, size)
+#define MSAN_CHECK_MEM_IS_INITIALIZED(p, size)
+#endif  // MEMORY_SANITIZER
+
+// DISABLE_CFI_PERF -- Disable Control Flow Integrity for perf reasons.
+#if !defined(DISABLE_CFI_PERF)
+#if defined(__clang__) && defined(OFFICIAL_BUILD)
+#define DISABLE_CFI_PERF __attribute__((no_sanitize("cfi")))
+#else
+#define DISABLE_CFI_PERF
+#endif
+#endif
+
+// DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks.
+#if !defined(DISABLE_CFI_ICALL)
+#if defined(OS_WIN)
+// Windows also needs __declspec(guard(nocf)).
+#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf))
+#else
+#define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall")
+#endif
+#endif
+#if !defined(DISABLE_CFI_ICALL)
+#define DISABLE_CFI_ICALL
+#endif
+
+// Macro useful for writing cross-platform function pointers.
+#if !defined(CDECL)
+#if defined(OS_WIN)
+#define CDECL __cdecl
+#else  // defined(OS_WIN)
+#define CDECL
+#endif  // defined(OS_WIN)
+#endif  // !defined(CDECL)
+
+// Macro for hinting that an expression is likely to be false.
+#if !defined(UNLIKELY)
+#if defined(COMPILER_GCC) || defined(__clang__)
+#define UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+#define UNLIKELY(x) (x)
+#endif  // defined(COMPILER_GCC)
+#endif  // !defined(UNLIKELY)
+
+#if !defined(LIKELY)
+#if defined(COMPILER_GCC) || defined(__clang__)
+#define LIKELY(x) __builtin_expect(!!(x), 1)
+#else
+#define LIKELY(x) (x)
+#endif  // defined(COMPILER_GCC)
+#endif  // !defined(LIKELY)
+
+// Compiler feature-detection.
+// clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
+#if defined(__has_feature)
+#define HAS_FEATURE(FEATURE) __has_feature(FEATURE)
+#else
+#define HAS_FEATURE(FEATURE) 0
+#endif
+
+#if defined(COMPILER_GCC)
+#define PRETTY_FUNCTION __PRETTY_FUNCTION__
+#elif defined(COMPILER_MSVC)
+#define PRETTY_FUNCTION __FUNCSIG__
+#else
+// See https://en.cppreference.com/w/c/language/function_definition#func
+#define PRETTY_FUNCTION __func__
+#endif
+
+#if !defined(CPU_ARM_NEON)
+#if defined(__arm__)
+#if !defined(__ARMEB__) && !defined(__ARM_EABI__) && !defined(__EABI__) && \
+    !defined(__VFP_FP__) && !defined(_WIN32_WCE) && !defined(ANDROID)
+#error Chromium does not support middle endian architecture
+#endif
+#if defined(__ARM_NEON__)
+#define CPU_ARM_NEON 1
+#endif
+#endif  // defined(__arm__)
+#endif  // !defined(CPU_ARM_NEON)
+
+#if !defined(HAVE_MIPS_MSA_INTRINSICS)
+#if defined(__mips_msa) && defined(__mips_isa_rev) && (__mips_isa_rev >= 5)
+#define HAVE_MIPS_MSA_INTRINSICS 1
+#endif
+#endif
+
+#if defined(__clang__) && __has_attribute(uninitialized)
+// Attribute "uninitialized" disables -ftrivial-auto-var-init=pattern for
+// the specified variable.
+// Library-wide alternative is
+// 'configs -= [ "//build/config/compiler:default_init_stack_vars" ]' in .gn
+// file.
+//
+// See "init_stack_vars" in build/config/compiler/BUILD.gn and
+// http://crbug.com/977230
+// "init_stack_vars" is enabled for non-official builds and we hope to enable it
+// in official build in 2020 as well. The flag writes fixed pattern into
+// uninitialized parts of all local variables. In rare cases such initialization
+// is undesirable and attribute can be used:
+//   1. Degraded performance
+// In most cases compiler is able to remove additional stores. E.g. if memory is
+// never accessed or properly initialized later. Preserved stores mostly will
+// not affect program performance. However if compiler failed on some
+// performance critical code we can get a visible regression in a benchmark.
+//   2. memset, memcpy calls
+// Compiler may replaces some memory writes with memset or memcpy calls. This is
+// not -ftrivial-auto-var-init specific, but it can happen more likely with the
+// flag. It can be a problem if code is not linked with C run-time library.
+//
+// Note: The flag is security risk mitigation feature. So in future the
+// attribute uses should be avoided when possible. However to enable this
+// mitigation on the most of the code we need to be less strict now and minimize
+// number of exceptions later. So if in doubt feel free to use attribute, but
+// please document the problem for someone who is going to cleanup it later.
+// E.g. platform, bot, benchmark or test name in patch description or next to
+// the attribute.
+#define STACK_UNINITIALIZED __attribute__((uninitialized))
+#else
+#define STACK_UNINITIALIZED
+#endif
+
+// The ANALYZER_ASSUME_TRUE(bool arg) macro adds compiler-specific hints
+// to Clang which control what code paths are statically analyzed,
+// and is meant to be used in conjunction with assert & assert-like functions.
+// The expression is passed straight through if analysis isn't enabled.
+//
+// ANALYZER_SKIP_THIS_PATH() suppresses static analysis for the current
+// codepath and any other branching codepaths that might follow.
+#if defined(__clang_analyzer__)
+
+inline constexpr bool AnalyzerNoReturn() __attribute__((analyzer_noreturn)) {
+  return false;
+}
+
+inline constexpr bool AnalyzerAssumeTrue(bool arg) {
+  // AnalyzerNoReturn() is invoked and analysis is terminated if |arg| is
+  // false.
+  return arg || AnalyzerNoReturn();
+}
+
+#define ANALYZER_ASSUME_TRUE(arg) ::AnalyzerAssumeTrue(!!(arg))
+#define ANALYZER_SKIP_THIS_PATH() static_cast<void>(::AnalyzerNoReturn())
+#define ANALYZER_ALLOW_UNUSED(var) static_cast<void>(var);
+
+#else  // !defined(__clang_analyzer__)
+
+#define ANALYZER_ASSUME_TRUE(arg) (arg)
+#define ANALYZER_SKIP_THIS_PATH()
+#define ANALYZER_ALLOW_UNUSED(var) static_cast<void>(var);
+
+#endif  // defined(__clang_analyzer__)
+
+// Use nomerge attribute to disable optimization of merging multiple same calls.
+#if defined(__clang__) && __has_attribute(nomerge)
+#define NOMERGE [[clang::nomerge]]
+#else
+#define NOMERGE
+#endif
+
+// Marks a type as being eligible for the "trivial" ABI despite having a
+// non-trivial destructor or copy/move constructor. Such types can be relocated
+// after construction by simply copying their memory, which makes them eligible
+// to be passed in registers. The canonical example is std::unique_ptr.
+//
+// Use with caution; this has some subtle effects on constructor/destructor
+// ordering and will be very incorrect if the type relies on its address
+// remaining constant. When used as a function argument (by value), the value
+// may be constructed in the caller's stack frame, passed in a register, and
+// then used and destructed in the callee's stack frame. A similar thing can
+// occur when values are returned.
+//
+// TRIVIAL_ABI is not needed for types which have a trivial destructor and
+// copy/move constructors, such as base::TimeTicks and other POD.
+//
+// It is also not likely to be effective on types too large to be passed in one
+// or two registers on typical target ABIs.
+//
+// See also:
+//   https://clang.llvm.org/docs/AttributeReference.html#trivial-abi
+//   https://libcxx.llvm.org/docs/DesignDocs/UniquePtrTrivialAbi.html
+#if defined(__clang__) && __has_attribute(trivial_abi)
+#define TRIVIAL_ABI [[clang::trivial_abi]]
+#else
+#define TRIVIAL_ABI
+#endif
+
+#endif  // !USING_CHROMIUM_INCLUDES
+#endif  // CEF_INCLUDE_BASE_CEF_COMPILER_SPECIFIC_H_
diff --git a/src/include/base/cef_lock.h b/src/include/base/cef_lock.h
index 6909bd6f2..27af8aeb6 100644
--- a/src/include/base/cef_lock.h
+++ b/src/include/base/cef_lock.h
@@ -32,12 +32,7 @@
 #define CEF_INCLUDE_BASE_CEF_LOCK_H_
 #pragma once
 
-#if defined(BASE_SYNCHRONIZATION_LOCK_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/synchronization/lock.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -46,28 +41,35 @@
 // updated to match.
 
 #include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
 #include "include/base/cef_platform_thread.h"
 #include "include/base/internal/cef_lock_impl.h"
 
 namespace base {
 namespace cef_internal {
 
-// A convenient wrapper for an OS specific critical section.  The only real
-// intelligence in this class is in debug mode for the support for the
-// AssertAcquired() method.
+///
+/// A convenient wrapper for an OS specific critical section.  The only real
+/// intelligence in this class is in debug mode for the support for the
+/// AssertAcquired() method.
+///
 class Lock {
  public:
 #if !DCHECK_IS_ON()  // Optimized wrapper implementation
   Lock() : lock_() {}
+
+  Lock(const Lock&) = delete;
+  Lock& operator=(const Lock&) = delete;
+
   ~Lock() {}
   void Acquire() { lock_.Lock(); }
   void Release() { lock_.Unlock(); }
 
-  // If the lock is not held, take it and return true. If the lock is already
-  // held by another thread, immediately return false. This must not be called
-  // by a thread already holding the lock (what happens is undefined and an
-  // assertion may fail).
+  ///
+  /// If the lock is not held, take it and return true. If the lock is already
+  /// held by another thread, immediately return false. This must not be called
+  /// by a thread already holding the lock (what happens is undefined and an
+  /// assertion may fail).
+  ///
   bool Try() { return lock_.Try(); }
 
   // Null implementation if not debug.
@@ -116,11 +118,11 @@ class Lock {
 
   // Platform specific underlying lock implementation.
   LockImpl lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(Lock);
 };
 
-// A helper class that acquires the given Lock while the AutoLock is in scope.
+///
+/// A helper class that acquires the given Lock while the AutoLock is in scope.
+///
 class AutoLock {
  public:
   struct AlreadyAcquired {};
@@ -131,6 +133,9 @@ class AutoLock {
     lock_.AssertAcquired();
   }
 
+  AutoLock(const AutoLock&) = delete;
+  AutoLock& operator=(const AutoLock&) = delete;
+
   ~AutoLock() {
     lock_.AssertAcquired();
     lock_.Release();
@@ -138,11 +143,12 @@ class AutoLock {
 
  private:
   Lock& lock_;
-  DISALLOW_COPY_AND_ASSIGN(AutoLock);
 };
 
-// AutoUnlock is a helper that will Release() the |lock| argument in the
-// constructor, and re-Acquire() it in the destructor.
+///
+/// AutoUnlock is a helper that will Release() the |lock| argument in the
+/// constructor, and re-Acquire() it in the destructor.
+///
 class AutoUnlock {
  public:
   explicit AutoUnlock(Lock& lock) : lock_(lock) {
@@ -151,11 +157,13 @@ class AutoUnlock {
     lock_.Release();
   }
 
+  AutoUnlock(const AutoUnlock&) = delete;
+  AutoUnlock& operator=(const AutoUnlock&) = delete;
+
   ~AutoUnlock() { lock_.Acquire(); }
 
  private:
   Lock& lock_;
-  DISALLOW_COPY_AND_ASSIGN(AutoUnlock);
 };
 
 }  // namespace cef_internal
@@ -163,9 +171,9 @@ class AutoUnlock {
 // Implement classes in the cef_internal namespace and then expose them to the
 // base namespace. This avoids conflicts with the base.lib implementation when
 // linking sandbox support on Windows.
-using cef_internal::Lock;
 using cef_internal::AutoLock;
 using cef_internal::AutoUnlock;
+using cef_internal::Lock;
 
 }  // namespace base
 
diff --git a/src/include/base/cef_logging.h b/src/include/base/cef_logging.h
index 8d8bb889e..7414738fb 100644
--- a/src/include/base/cef_logging.h
+++ b/src/include/base/cef_logging.h
@@ -27,116 +27,140 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file are only available to applications that link
-// against the libcef_dll_wrapper target.
-//
-// WARNING: Logging macros should not be used in the main/browser process before
-// calling CefInitialize or in sub-processes before calling CefExecuteProcess.
-//
-// Instructions
-// ------------
-//
-// Make a bunch of macros for logging.  The way to log things is to stream
-// things to LOG(<a particular severity level>).  E.g.,
-//
-//   LOG(INFO) << "Found " << num_cookies << " cookies";
-//
-// You can also do conditional logging:
-//
-//   LOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
-//
-// The CHECK(condition) macro is active in both debug and release builds and
-// effectively performs a LOG(FATAL) which terminates the process and
-// generates a crashdump unless a debugger is attached.
-//
-// There are also "debug mode" logging macros like the ones above:
-//
-//   DLOG(INFO) << "Found cookies";
-//
-//   DLOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
-//
-// All "debug mode" logging is compiled away to nothing for non-debug mode
-// compiles.  LOG_IF and development flags also work well together
-// because the code can be compiled away sometimes.
-//
-// We also have
-//
-//   LOG_ASSERT(assertion);
-//   DLOG_ASSERT(assertion);
-//
-// which is syntactic sugar for {,D}LOG_IF(FATAL, assert fails) << assertion;
-//
-// There are "verbose level" logging macros.  They look like
-//
-//   VLOG(1) << "I'm printed when you run the program with --v=1 or more";
-//   VLOG(2) << "I'm printed when you run the program with --v=2 or more";
-//
-// These always log at the INFO log level (when they log at all).
-// The verbose logging can also be turned on module-by-module.  For instance,
-//    --vmodule=profile=2,icon_loader=1,browser_*=3,*/chromeos/*=4 --v=0
-// will cause:
-//   a. VLOG(2) and lower messages to be printed from profile.{h,cc}
-//   b. VLOG(1) and lower messages to be printed from icon_loader.{h,cc}
-//   c. VLOG(3) and lower messages to be printed from files prefixed with
-//      "browser"
-//   d. VLOG(4) and lower messages to be printed from files under a
-//     "chromeos" directory.
-//   e. VLOG(0) and lower messages to be printed from elsewhere
-//
-// The wildcarding functionality shown by (c) supports both '*' (match
-// 0 or more characters) and '?' (match any single character)
-// wildcards.  Any pattern containing a forward or backward slash will
-// be tested against the whole pathname and not just the module.
-// E.g., "*/foo/bar/*=2" would change the logging level for all code
-// in source files under a "foo/bar" directory.
-//
-// There's also VLOG_IS_ON(n) "verbose level" condition macro. To be used as
-//
-//   if (VLOG_IS_ON(2)) {
-//     // do some logging preparation and logging
-//     // that can't be accomplished with just VLOG(2) << ...;
-//   }
-//
-// There is also a VLOG_IF "verbose level" condition macro for sample
-// cases, when some extra computation and preparation for logs is not
-// needed.
-//
-//   VLOG_IF(1, (size > 1024))
-//      << "I'm printed when size is more than 1024 and when you run the "
-//         "program with --v=1 or more";
-//
-// We also override the standard 'assert' to use 'DLOG_ASSERT'.
-//
-// Lastly, there is:
-//
-//   PLOG(ERROR) << "Couldn't do foo";
-//   DPLOG(ERROR) << "Couldn't do foo";
-//   PLOG_IF(ERROR, cond) << "Couldn't do foo";
-//   DPLOG_IF(ERROR, cond) << "Couldn't do foo";
-//   PCHECK(condition) << "Couldn't do foo";
-//   DPCHECK(condition) << "Couldn't do foo";
-//
-// which append the last system error to the message in string form (taken from
-// GetLastError() on Windows and errno on POSIX).
-//
-// The supported severity levels for macros that allow you to specify one
-// are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL.
-//
-// Very important: logging a message at the FATAL severity level causes
-// the program to terminate (after the message is logged).
-//
-// There is the special severity of DFATAL, which logs FATAL in debug mode,
-// ERROR in normal mode.
-//
+
+///
+/// \file
+/// A bunch of macros for logging.
+///
+/// NOTE: The contents of this file are only available to applications that link
+/// against the libcef_dll_wrapper target.
+///
+/// WARNING: Logging macros should not be used in the main/browser process
+/// before calling CefInitialize or in sub-processes before calling
+/// CefExecuteProcess.
+///
+/// INSTRUCTIONS:
+///
+/// The way to log things is to stream things to LOG(<a particular severity
+/// level>). E.g.,
+///
+/// <pre>
+///   LOG(INFO) << "Found " << num_cookies << " cookies";
+/// </pre>
+///
+/// You can also do conditional logging:
+///
+/// <pre>
+///   LOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
+/// </pre>
+///
+/// The CHECK(condition) macro is active in both debug and release builds and
+/// effectively performs a LOG(FATAL) which terminates the process and
+/// generates a crashdump unless a debugger is attached.
+///
+/// There are also "debug mode" logging macros like the ones above:
+///
+/// <pre>
+///   DLOG(INFO) << "Found cookies";
+///
+///   DLOG_IF(INFO, num_cookies > 10) << "Got lots of cookies";
+/// </pre>
+///
+/// All "debug mode" logging is compiled away to nothing for non-debug mode
+/// compiles.  LOG_IF and development flags also work well together
+/// because the code can be compiled away sometimes.
+///
+/// We also have
+///
+/// <pre>
+///   LOG_ASSERT(assertion);
+///   DLOG_ASSERT(assertion);
+/// </pre>
+///
+/// which is syntactic sugar for "{,D}LOG_IF(FATAL, assert fails) << assertion;"
+///
+/// There are "verbose level" logging macros.  They look like
+///
+/// <pre>
+///   VLOG(1) << "I'm printed when you run the program with --v=1 or more";
+///   VLOG(2) << "I'm printed when you run the program with --v=2 or more";
+/// </pre>
+///
+/// These always log at the INFO log level (when they log at all).
+/// The verbose logging can also be turned on module-by-module.  For instance,
+/// <pre>
+///    --vmodule=profile=2,icon_loader=1,browser_*=3,*/chromeos/*=4 --v=0
+/// </pre>
+/// will cause:
+/// 1. VLOG(2) and lower messages to be printed from profile.{h,cc}
+/// 2. VLOG(1) and lower messages to be printed from icon_loader.{h,cc}
+/// 3. VLOG(3) and lower messages to be printed from files prefixed with
+///    "browser"
+/// 4. VLOG(4) and lower messages to be printed from files under a
+///    "chromeos" directory.
+/// 5. VLOG(0) and lower messages to be printed from elsewhere
+///
+/// The wildcarding functionality shown by (c) supports both '*' (match
+/// 0 or more characters) and '?' (match any single character)
+/// wildcards.  Any pattern containing a forward or backward slash will
+/// be tested against the whole pathname and not just the module.
+/// E.g., "*/foo/bar/*=2" would change the logging level for all code
+/// in source files under a "foo/bar" directory.
+///
+/// There's also VLOG_IS_ON(n) "verbose level" condition macro. To be used as
+///
+/// <pre>
+///   if (VLOG_IS_ON(2)) {
+///     // do some logging preparation and logging
+///     // that can't be accomplished with just VLOG(2) << ...;
+///   }
+/// </pre>
+///
+/// There is also a VLOG_IF "verbose level" condition macro for sample
+/// cases, when some extra computation and preparation for logs is not
+/// needed.
+///
+/// <pre>
+///   VLOG_IF(1, (size > 1024))
+///      << "I'm printed when size is more than 1024 and when you run the "
+///         "program with --v=1 or more";
+/// </pre>
+///
+/// We also override the standard 'assert' to use 'DLOG_ASSERT'.
+///
+/// Lastly, there is:
+///
+/// <pre>
+///   PLOG(ERROR) << "Couldn't do foo";
+///   DPLOG(ERROR) << "Couldn't do foo";
+///   PLOG_IF(ERROR, cond) << "Couldn't do foo";
+///   DPLOG_IF(ERROR, cond) << "Couldn't do foo";
+///   PCHECK(condition) << "Couldn't do foo";
+///   DPCHECK(condition) << "Couldn't do foo";
+/// </pre>
+///
+/// which append the last system error to the message in string form (taken from
+/// GetLastError() on Windows and errno on POSIX).
+///
+/// The supported severity levels for macros that allow you to specify one
+/// are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL.
+///
+/// Very important: logging a message at the FATAL severity level causes
+/// the program to terminate (after the message is logged).
+///
+/// There is the special severity of DFATAL, which logs FATAL in debug mode,
+/// ERROR in normal mode.
+///
 
 #ifndef CEF_INCLUDE_BASE_CEF_LOGGING_H_
 #define CEF_INCLUDE_BASE_CEF_LOGGING_H_
 #pragma once
 
-#if defined(DCHECK)
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/logging.h"
+#include "base/notreached.h"
+#elif defined(DCHECK)
 // Do nothing if the macros provided by this header already exist.
 // This can happen in cases where Chromium code is used directly by the
 // client application. When using Chromium code directly always include
@@ -144,15 +168,12 @@
 
 // Always define the DCHECK_IS_ON macro which is used from other CEF headers.
 #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-#define DCHECK_IS_ON() 0
+#define DCHECK_IS_ON() false
 #else
-#define DCHECK_IS_ON() 1
+#define DCHECK_IS_ON() true
 #endif
 
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/logging.h"
-#else  // !USING_CHROMIUM_INCLUDES
+#else  // !defined(DCHECK)
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
@@ -163,7 +184,6 @@
 #include <string>
 
 #include "include/base/cef_build.h"
-#include "include/base/cef_macros.h"
 #include "include/internal/cef_logging_internal.h"
 
 namespace cef {
@@ -201,21 +221,21 @@ const LogSeverity LOG_DFATAL = LOG_FATAL;
 // A few definitions of macros that don't generate much code. These are used
 // by LOG() and LOG_IF, etc. Since these are used all over our code, it's
 // better to have compact code for these operations.
-#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                    \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_INFO, \
-                          ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                    \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_WARNING, \
-                          ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                    \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_ERROR, \
-                          ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                    \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_FATAL, \
-                          ##__VA_ARGS__)
-#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                    \
-  cef::logging::ClassName(__FILE__, __LINE__, cef::logging::LOG_DFATAL, \
-                          ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...)                        \
+  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_INFO, \
+                            ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...)                        \
+  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_WARNING, \
+                            ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...)                        \
+  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_ERROR, \
+                            ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...)                        \
+  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_FATAL, \
+                            ##__VA_ARGS__)
+#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...)                        \
+  ::cef::logging::ClassName(__FILE__, __LINE__, ::cef::logging::LOG_DFATAL, \
+                            ##__VA_ARGS__)
 
 #define COMPACT_GOOGLE_LOG_INFO COMPACT_GOOGLE_LOG_EX_INFO(LogMessage)
 #define COMPACT_GOOGLE_LOG_WARNING COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage)
@@ -553,12 +573,7 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
 #define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
 #define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2)
 
-#if defined(NDEBUG) && defined(OS_CHROMEOS)
-#define NOTREACHED() \
-  LOG(ERROR) << "NOTREACHED() hit in " << __FUNCTION__ << ". "
-#else
 #define NOTREACHED() DCHECK(false)
-#endif
 
 // Redefine the standard assert to use our nice log files
 #undef assert
@@ -587,6 +602,9 @@ class LogMessage {
              LogSeverity severity,
              std::string* result);
 
+  LogMessage(const LogMessage&) = delete;
+  LogMessage& operator=(const LogMessage&) = delete;
+
   ~LogMessage();
 
   std::ostream& stream() { return stream_; }
@@ -618,8 +636,6 @@ class LogMessage {
 
   SaveLastError last_error_;
 #endif
-
-  DISALLOW_COPY_AND_ASSIGN(LogMessage);
 };
 
 // A non-macro interface to the log facility; (useful
@@ -659,6 +675,9 @@ class Win32ErrorLogMessage {
                        LogSeverity severity,
                        SystemErrorCode err);
 
+  Win32ErrorLogMessage(const Win32ErrorLogMessage&) = delete;
+  Win32ErrorLogMessage& operator=(const Win32ErrorLogMessage&) = delete;
+
   // Appends the error message before destructing the encapsulated class.
   ~Win32ErrorLogMessage();
 
@@ -667,8 +686,6 @@ class Win32ErrorLogMessage {
  private:
   SystemErrorCode err_;
   LogMessage log_message_;
-
-  DISALLOW_COPY_AND_ASSIGN(Win32ErrorLogMessage);
 };
 #elif defined(OS_POSIX)
 // Appends a formatted system message of the errno type
@@ -679,6 +696,9 @@ class ErrnoLogMessage {
                   LogSeverity severity,
                   SystemErrorCode err);
 
+  ErrnoLogMessage(const ErrnoLogMessage&) = delete;
+  ErrnoLogMessage& operator=(const ErrnoLogMessage&) = delete;
+
   // Appends the error message before destructing the encapsulated class.
   ~ErrnoLogMessage();
 
@@ -687,8 +707,6 @@ class ErrnoLogMessage {
  private:
   SystemErrorCode err_;
   LogMessage log_message_;
-
-  DISALLOW_COPY_AND_ASSIGN(ErrnoLogMessage);
 };
 #endif  // OS_WIN
 
@@ -705,6 +723,13 @@ std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
 inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
   return out << wstr.c_str();
 }
+#if defined(WCHAR_T_IS_32_BIT)
+std::ostream& operator<<(std::ostream& out, const char16_t* wstr);
+#elif defined(WCHAR_T_IS_16_BIT)
+inline std::ostream& operator<<(std::ostream& out, const char16_t* wstr) {
+  return operator<<(out, reinterpret_cast<const wchar_t*>(wstr));
+}
+#endif
 
 // The NOTIMPLEMENTED() macro annotates codepaths which have
 // not been implemented yet.
diff --git a/src/include/base/cef_macros.h b/src/include/base/cef_macros.h
index e714529cd..f5517f9cb 100644
--- a/src/include/base/cef_macros.h
+++ b/src/include/base/cef_macros.h
@@ -32,189 +32,32 @@
 #define CEF_INCLUDE_BASE_CEF_MACROS_H_
 #pragma once
 
-#if defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/macros.h"
-
-#else  // !USING_CHROMIUM_INCLUDES
+#if !defined(USING_CHROMIUM_INCLUDES)
 // The following is substantially similar to the Chromium implementation.
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include <stddef.h>                  // For size_t.
-#include "include/base/cef_build.h"  // For COMPILER_MSVC
-
-#if !defined(arraysize)
-
-// The arraysize(arr) macro returns the # of elements in an array arr.
-// The expression is a compile-time constant, and therefore can be
-// used in defining new arrays, for example.  If you use arraysize on
-// a pointer by mistake, you will get a compile-time error.
-//
-// One caveat is that arraysize() doesn't accept any array of an
-// anonymous type or a type defined inside a function.  In these rare
-// cases, you have to use the unsafe ARRAYSIZE_UNSAFE() macro below.  This is
-// due to a limitation in C++'s template system.  The limitation might
-// eventually be removed, but it hasn't happened yet.
-
-// This template function declaration is used in defining arraysize.
-// Note that the function doesn't need an implementation, as we only
-// use its type.
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-// That gcc wants both of these prototypes seems mysterious. VC, for
-// its part, can't decide which to use (another mystery). Matching of
-// template overloads: the final frontier.
-#ifndef _MSC_VER
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-#endif
-
-#define arraysize(array) (sizeof(ArraySizeHelper(array)))
+// ALL DISALLOW_xxx MACROS ARE DEPRECATED; DO NOT USE IN NEW CODE.
+// Use explicit deletions instead. For more information see
+// https://chromium.googlesource.com/chromium/src/+/lkgr/styleguide/c++/c++-dos-and-donts.md#explicitly-declare-class-copyability_movability
 
-#endif  // !arraysize
+// DEPRECATED: See above. Makes a class uncopyable.
+#define DISALLOW_COPY(TypeName) TypeName(const TypeName&) = delete
 
-#if !defined(DISALLOW_COPY_AND_ASSIGN)
+// DEPRECATED: See above. Makes a class unassignable.
+#define DISALLOW_ASSIGN(TypeName) TypeName& operator=(const TypeName&) = delete
 
-// A macro to disallow the copy constructor and operator= functions
-// This should be used in the private: declarations for a class
+// DEPRECATED: See above. Makes a class uncopyable and unassignable.
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);               \
-  void operator=(const TypeName&)
+  DISALLOW_COPY(TypeName);                 \
+  DISALLOW_ASSIGN(TypeName)
 
-#endif  // !DISALLOW_COPY_AND_ASSIGN
-
-#if !defined(DISALLOW_IMPLICIT_CONSTRUCTORS)
-
-// A macro to disallow all the implicit constructors, namely the
+// DEPRECATED: See above. Disallow all implicit constructors, namely the
 // default constructor, copy constructor and operator= functions.
-//
-// This should be used in the private: declarations for a class
-// that wants to prevent anyone from instantiating it. This is
-// especially useful for classes containing only static methods.
 #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName();                                    \
+  TypeName() = delete;                           \
   DISALLOW_COPY_AND_ASSIGN(TypeName)
 
-#endif  // !DISALLOW_IMPLICIT_CONSTRUCTORS
-
-#if !defined(COMPILE_ASSERT)
-
-// The COMPILE_ASSERT macro can be used to verify that a compile time
-// expression is true. For example, you could use it to verify the
-// size of a static array:
-//
-//   COMPILE_ASSERT(ARRAYSIZE_UNSAFE(content_type_names) == CONTENT_NUM_TYPES,
-//                  content_type_names_incorrect_size);
-//
-// or to make sure a struct is smaller than a certain size:
-//
-//   COMPILE_ASSERT(sizeof(foo) < 128, foo_too_large);
-//
-// The second argument to the macro is the name of the variable. If
-// the expression is false, most compilers will issue a warning/error
-// containing the name of the variable.
-
-#if __cplusplus >= 201103L
-
-// Under C++11, just use static_assert.
-#define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg)
-
-#else
-
-namespace cef {
-
-template <bool>
-struct CompileAssert {};
-
-}  // namespace cef
-
-#define COMPILE_ASSERT(expr, msg)          \
-  typedef cef::CompileAssert<(bool(expr))> \
-      msg[bool(expr) ? 1 : -1] ALLOW_UNUSED_TYPE
-
-// Implementation details of COMPILE_ASSERT:
-//
-// - COMPILE_ASSERT works by defining an array type that has -1
-//   elements (and thus is invalid) when the expression is false.
-//
-// - The simpler definition
-//
-//     #define COMPILE_ASSERT(expr, msg) typedef char msg[(expr) ? 1 : -1]
-//
-//   does not work, as gcc supports variable-length arrays whose sizes
-//   are determined at run-time (this is gcc's extension and not part
-//   of the C++ standard).  As a result, gcc fails to reject the
-//   following code with the simple definition:
-//
-//     int foo;
-//     COMPILE_ASSERT(foo, msg); // not supposed to compile as foo is
-//                               // not a compile-time constant.
-//
-// - By using the type CompileAssert<(bool(expr))>, we ensures that
-//   expr is a compile-time constant.  (Template arguments must be
-//   determined at compile-time.)
-//
-// - The outer parentheses in CompileAssert<(bool(expr))> are necessary
-//   to work around a bug in gcc 3.4.4 and 4.0.1.  If we had written
-//
-//     CompileAssert<bool(expr)>
-//
-//   instead, these compilers will refuse to compile
-//
-//     COMPILE_ASSERT(5 > 0, some_message);
-//
-//   (They seem to think the ">" in "5 > 0" marks the end of the
-//   template argument list.)
-//
-// - The array size is (bool(expr) ? 1 : -1), instead of simply
-//
-//     ((expr) ? 1 : -1).
-//
-//   This is to avoid running into a bug in MS VC 7.1, which
-//   causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
-
-#endif  // !(__cplusplus >= 201103L)
-
-#endif  // !defined(COMPILE_ASSERT)
-
 #endif  // !USING_CHROMIUM_INCLUDES
 
-#if !defined(MSVC_PUSH_DISABLE_WARNING) && defined(COMPILER_MSVC)
-
-// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled.
-// The warning remains disabled until popped by MSVC_POP_WARNING.
-#define MSVC_PUSH_DISABLE_WARNING(n) \
-  __pragma(warning(push)) __pragma(warning(disable : n))
-
-// MSVC_PUSH_WARNING_LEVEL pushes |n| as the global warning level.  The level
-// remains in effect until popped by MSVC_POP_WARNING().  Use 0 to disable all
-// warnings.
-#define MSVC_PUSH_WARNING_LEVEL(n) __pragma(warning(push, n))
-
-// Pop effects of innermost MSVC_PUSH_* macro.
-#define MSVC_POP_WARNING() __pragma(warning(pop))
-
-#endif  // !defined(MSVC_PUSH_DISABLE_WARNING) && defined(COMPILER_MSVC)
-
-#if !defined(ALLOW_THIS_IN_INITIALIZER_LIST)
-#if defined(COMPILER_MSVC)
-// Allows |this| to be passed as an argument in constructor initializer lists.
-// This uses push/pop instead of the seemingly simpler suppress feature to avoid
-// having the warning be disabled for more than just |code|.
-//
-// Example usage:
-// Foo::Foo() : x(NULL), ALLOW_THIS_IN_INITIALIZER_LIST(y(this)), z(3) {}
-//
-// Compiler warning C4355: 'this': used in base member initializer list:
-// http://msdn.microsoft.com/en-us/library/3c594ae3(VS.80).aspx
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) \
-  MSVC_PUSH_DISABLE_WARNING(4355)            \
-  code MSVC_POP_WARNING()
-#else  // !COMPILER_MSVC
-#define ALLOW_THIS_IN_INITIALIZER_LIST(code) code
-#endif  // !COMPILER_MSVC
-#endif  // !ALLOW_THIS_IN_INITIALIZER_LIST
-
 #endif  // CEF_INCLUDE_BASE_CEF_MACROS_H_
diff --git a/src/include/base/cef_move.h b/src/include/base/cef_move.h
deleted file mode 100644
index da47d2d32..000000000
--- a/src/include/base/cef_move.h
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_MOVE_H_
-#define CEF_INCLUDE_BASE_CEF_MOVE_H_
-
-#if defined(MOVE_ONLY_TYPE_FOR_CPP_03)
-// Do nothing if the macro in this header has already been defined.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/move.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-// Macro with the boilerplate that makes a type move-only in C++03.
-//
-// USAGE
-//
-// This macro should be used instead of DISALLOW_COPY_AND_ASSIGN to create
-// a "move-only" type.  Unlike DISALLOW_COPY_AND_ASSIGN, this macro should be
-// the first line in a class declaration.
-//
-// A class using this macro must call .Pass() (or somehow be an r-value already)
-// before it can be:
-//
-//   * Passed as a function argument
-//   * Used as the right-hand side of an assignment
-//   * Returned from a function
-//
-// Each class will still need to define their own "move constructor" and "move
-// operator=" to make this useful.  Here's an example of the macro, the move
-// constructor, and the move operator= from the scoped_ptr class:
-//
-//  template <typename T>
-//  class scoped_ptr {
-//     MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
-//   public:
-//    scoped_ptr(RValue& other) : ptr_(other.release()) { }
-//    scoped_ptr& operator=(RValue& other) {
-//      swap(other);
-//      return *this;
-//    }
-//  };
-//
-// Note that the constructor must NOT be marked explicit.
-//
-// For consistency, the second parameter to the macro should always be RValue
-// unless you have a strong reason to do otherwise.  It is only exposed as a
-// macro parameter so that the move constructor and move operator= don't look
-// like they're using a phantom type.
-//
-//
-// HOW THIS WORKS
-//
-// For a thorough explanation of this technique, see:
-//
-//   http://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Move_Constructor
-//
-// The summary is that we take advantage of 2 properties:
-//
-//   1) non-const references will not bind to r-values.
-//   2) C++ can apply one user-defined conversion when initializing a
-//      variable.
-//
-// The first lets us disable the copy constructor and assignment operator
-// by declaring private version of them with a non-const reference parameter.
-//
-// For l-values, direct initialization still fails like in
-// DISALLOW_COPY_AND_ASSIGN because the copy constructor and assignment
-// operators are private.
-//
-// For r-values, the situation is different. The copy constructor and
-// assignment operator are not viable due to (1), so we are trying to call
-// a non-existent constructor and non-existing operator= rather than a private
-// one.  Since we have not committed an error quite yet, we can provide an
-// alternate conversion sequence and a constructor.  We add
-//
-//   * a private struct named "RValue"
-//   * a user-defined conversion "operator RValue()"
-//   * a "move constructor" and "move operator=" that take the RValue& as
-//     their sole parameter.
-//
-// Only r-values will trigger this sequence and execute our "move constructor"
-// or "move operator=."  L-values will match the private copy constructor and
-// operator= first giving a "private in this context" error.  This combination
-// gives us a move-only type.
-//
-// For signaling a destructive transfer of data from an l-value, we provide a
-// method named Pass() which creates an r-value for the current instance
-// triggering the move constructor or move operator=.
-//
-// Other ways to get r-values is to use the result of an expression like a
-// function call.
-//
-// Here's an example with comments explaining what gets triggered where:
-//
-//    class Foo {
-//      MOVE_ONLY_TYPE_FOR_CPP_03(Foo, RValue);
-//
-//     public:
-//       ... API ...
-//       Foo(RValue other);           // Move constructor.
-//       Foo& operator=(RValue rhs);  // Move operator=
-//    };
-//
-//    Foo MakeFoo();  // Function that returns a Foo.
-//
-//    Foo f;
-//    Foo f_copy(f);  // ERROR: Foo(Foo&) is private in this context.
-//    Foo f_assign;
-//    f_assign = f;   // ERROR: operator=(Foo&) is private in this context.
-//
-//
-//    Foo f(MakeFoo());      // R-value so alternate conversion executed.
-//    Foo f_copy(f.Pass());  // R-value so alternate conversion executed.
-//    f = f_copy.Pass();     // R-value so alternate conversion executed.
-//
-//
-// IMPLEMENTATION SUBTLETIES WITH RValue
-//
-// The RValue struct is just a container for a pointer back to the original
-// object. It should only ever be created as a temporary, and no external
-// class should ever declare it or use it in a parameter.
-//
-// It is tempting to want to use the RValue type in function parameters, but
-// excluding the limited usage here for the move constructor and move
-// operator=, doing so would mean that the function could take both r-values
-// and l-values equially which is unexpected.  See COMPARED To Boost.Move for
-// more details.
-//
-// An alternate, and incorrect, implementation of the RValue class used by
-// Boost.Move makes RValue a fieldless child of the move-only type. RValue&
-// is then used in place of RValue in the various operators.  The RValue& is
-// "created" by doing *reinterpret_cast<RValue*>(this).  This has the appeal
-// of never creating a temporary RValue struct even with optimizations
-// disabled.  Also, by virtue of inheritance you can treat the RValue
-// reference as if it were the move-only type itself.  Unfortunately,
-// using the result of this reinterpret_cast<> is actually undefined behavior
-// due to C++98 5.2.10.7. In certain compilers (e.g., NaCl) the optimizer
-// will generate non-working code.
-//
-// In optimized builds, both implementations generate the same assembly so we
-// choose the one that adheres to the standard.
-//
-//
-// WHY HAVE typedef void MoveOnlyTypeForCPP03
-//
-// Callback<>/Bind() needs to understand movable-but-not-copyable semantics
-// to call .Pass() appropriately when it is expected to transfer the value.
-// The cryptic typedef MoveOnlyTypeForCPP03 is added to make this check
-// easy and automatic in helper templates for Callback<>/Bind().
-// See IsMoveOnlyType template and its usage in base/callback_internal.h
-// for more details.
-//
-//
-// COMPARED TO C++11
-//
-// In C++11, you would implement this functionality using an r-value reference
-// and our .Pass() method would be replaced with a call to std::move().
-//
-// This emulation also has a deficiency where it uses up the single
-// user-defined conversion allowed by C++ during initialization.  This can
-// cause problems in some API edge cases.  For instance, in scoped_ptr, it is
-// impossible to make a function "void Foo(scoped_ptr<Parent> p)" accept a
-// value of type scoped_ptr<Child> even if you add a constructor to
-// scoped_ptr<> that would make it look like it should work.  C++11 does not
-// have this deficiency.
-//
-//
-// COMPARED TO Boost.Move
-//
-// Our implementation similar to Boost.Move, but we keep the RValue struct
-// private to the move-only type, and we don't use the reinterpret_cast<> hack.
-//
-// In Boost.Move, RValue is the boost::rv<> template.  This type can be used
-// when writing APIs like:
-//
-//   void MyFunc(boost::rv<Foo>& f)
-//
-// that can take advantage of rv<> to avoid extra copies of a type.  However you
-// would still be able to call this version of MyFunc with an l-value:
-//
-//   Foo f;
-//   MyFunc(f);  // Uh oh, we probably just destroyed |f| w/o calling Pass().
-//
-// unless someone is very careful to also declare a parallel override like:
-//
-//   void MyFunc(const Foo& f)
-//
-// that would catch the l-values first.  This was declared unsafe in C++11 and
-// a C++11 compiler will explicitly fail MyFunc(f).  Unfortunately, we cannot
-// ensure this in C++03.
-//
-// Since we have no need for writing such APIs yet, our implementation keeps
-// RValue private and uses a .Pass() method to do the conversion instead of
-// trying to write a version of "std::move()." Writing an API like std::move()
-// would require the RValue struct to be public.
-//
-//
-// CAVEATS
-//
-// If you include a move-only type as a field inside a class that does not
-// explicitly declare a copy constructor, the containing class's implicit
-// copy constructor will change from Containing(const Containing&) to
-// Containing(Containing&).  This can cause some unexpected errors.
-//
-//   http://llvm.org/bugs/show_bug.cgi?id=11528
-//
-// The workaround is to explicitly declare your copy constructor.
-//
-#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type)       \
- private:                                                  \
-  struct rvalue_type {                                     \
-    explicit rvalue_type(type* object) : object(object) {} \
-    type* object;                                          \
-  };                                                       \
-  type(type&);                                             \
-  void operator=(type&);                                   \
-                                                           \
- public:                                                   \
-  operator rvalue_type() { return rvalue_type(this); }     \
-  type Pass() { return type(rvalue_type(this)); }          \
-  typedef void MoveOnlyTypeForCPP03;                       \
-                                                           \
- private:
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_MOVE_H_
diff --git a/src/include/base/cef_platform_thread.h b/src/include/base/cef_platform_thread.h
index d3fdd798e..8e6dd0508 100644
--- a/src/include/base/cef_platform_thread.h
+++ b/src/include/base/cef_platform_thread.h
@@ -35,12 +35,7 @@
 #ifndef CEF_INCLUDE_BASE_PLATFORM_THREAD_H_
 #define CEF_INCLUDE_BASE_PLATFORM_THREAD_H_
 
-#if defined(BASE_THREADING_PLATFORM_THREAD_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/platform_thread.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -48,23 +43,26 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include "include/base/cef_basictypes.h"
 #include "include/base/cef_build.h"
 #include "include/internal/cef_thread_internal.h"
 
 namespace base {
 
-// Used for logging. Always an integer value.
+///
+/// Used for logging. Always an integer value.
+///
 typedef cef_platform_thread_id_t PlatformThreadId;
 
-// Used for thread checking and debugging.
-// Meant to be as fast as possible.
-// These are produced by PlatformThread::CurrentRef(), and used to later
-// check if we are on the same thread or not by using ==. These are safe
-// to copy between threads, but can't be copied to another process as they
-// have no meaning there. Also, the internal identifier can be re-used
-// after a thread dies, so a PlatformThreadRef cannot be reliably used
-// to distinguish a new thread from an old, dead thread.
+///
+/// Used for thread checking and debugging.
+/// Meant to be as fast as possible.
+/// These are produced by PlatformThread::CurrentRef(), and used to later
+/// check if we are on the same thread or not by using ==. These are safe
+/// to copy between threads, but can't be copied to another process as they
+/// have no meaning there. Also, the internal identifier can be re-used
+/// after a thread dies, so a PlatformThreadRef cannot be reliably used
+/// to distinguish a new thread from an old, dead thread.
+///
 class PlatformThreadRef {
  public:
   typedef cef_platform_thread_handle_t RefType;
@@ -81,18 +79,24 @@ class PlatformThreadRef {
   RefType id_;
 };
 
-// A namespace for low-level thread functions.
-// Chromium uses a class with static methods but CEF uses an actual namespace
-// to avoid linker problems with the sandbox libaries on Windows.
+///
+/// A namespace for low-level thread functions.
+/// Chromium uses a class with static methods but CEF uses an actual namespace
+/// to avoid linker problems with the sandbox libaries on Windows.
+///
 namespace PlatformThread {
 
-// Gets the current thread id, which may be useful for logging purposes.
+///
+/// Gets the current thread id, which may be useful for logging purposes.
+///
 inline PlatformThreadId CurrentId() {
   return cef_get_current_platform_thread_id();
 }
 
-// Gets the current thread reference, which can be used to check if
-// we're on the right thread quickly.
+///
+/// Gets the current thread reference, which can be used to check if
+/// we're on the right thread quickly.
+///
 inline PlatformThreadRef CurrentRef() {
   return PlatformThreadRef(cef_get_current_platform_thread_handle());
 }
diff --git a/src/include/base/cef_basictypes.h b/src/include/base/cef_ptr_util.h
similarity index 51%
rename from src/include/base/cef_basictypes.h
rename to src/include/base/cef_ptr_util.h
index e38f4f729..3e0e2aaae 100644
--- a/src/include/base/cef_basictypes.h
+++ b/src/include/base/cef_ptr_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
+// Copyright (c) 2021 Marshall A. Greenblatt. Portions copyright (c) 2015
 // Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -28,60 +28,35 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
-#define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
+#ifndef INCLUDE_BASE_CEF_PTR_UTIL_H_
+#define INCLUDE_BASE_CEF_PTR_UTIL_H_
 #pragma once
 
-#include <limits.h>  // For UINT_MAX
-#include <stddef.h>  // For size_t
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/memory/ptr_util.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
 
-#include "include/base/cef_build.h"
+#include <memory>
+#include <utility>
 
-// The NSPR system headers define 64-bit as |long| when possible, except on
-// Mac OS X.  In order to not have typedef mismatches, we do the same on LP64.
-//
-// On Mac OS X, |long long| is used for 64-bit types for compatibility with
-// <inttypes.h> format macros even in the LP64 model.
-#if defined(__LP64__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
-typedef long int64;
-typedef unsigned long uint64;
-#else
-typedef long long int64;
-typedef unsigned long long uint64;
 #endif
 
-// TODO: Remove these type guards.  These are to avoid conflicts with
-// obsolete/protypes.h in the Gecko SDK.
-#ifndef _INT32
-#define _INT32
-typedef int int32;
-#endif
+namespace base {
 
-// TODO: Remove these type guards.  These are to avoid conflicts with
-// obsolete/protypes.h in the Gecko SDK.
-#ifndef _UINT32
-#define _UINT32
-typedef unsigned int uint32;
-#endif
-
-#ifndef _INT16
-#define _INT16
-typedef short int16;
-#endif
+///
+/// Helper to transfer ownership of a raw pointer to a std::unique_ptr<T>.
+/// Note that std::unique_ptr<T> has very different semantics from
+/// std::unique_ptr<T[]>: do not use this helper for array allocations.
+///
+template <typename T>
+std::unique_ptr<T> WrapUnique(T* ptr) {
+  return std::unique_ptr<T>(ptr);
+}
 
-#ifndef _UINT16
-#define _UINT16
-typedef unsigned short uint16;
-#endif
-
-// UTF-16 character type.
-// This should be kept synchronized with base/strings/string16.h
-#ifndef char16
-#if defined(WCHAR_T_IS_UTF16)
-typedef wchar_t char16;
-#elif defined(WCHAR_T_IS_UTF32)
-typedef unsigned short char16;
-#endif
-#endif
+}  // namespace base
 
-#endif  // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
+#endif  // INCLUDE_BASE_CEF_PTR_UTIL_H_
diff --git a/src/include/base/cef_ref_counted.h b/src/include/base/cef_ref_counted.h
index 480b1ce9d..58c40d81d 100644
--- a/src/include/base/cef_ref_counted.h
+++ b/src/include/base/cef_ref_counted.h
@@ -33,12 +33,7 @@
 #define CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_
 #pragma once
 
-#if defined(BASE_MEMORY_REF_COUNTED_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/memory/ref_counted.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -46,31 +41,42 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include <cassert>
+#include <stddef.h>
+
+#include <utility>
 
 #include "include/base/cef_atomic_ref_count.h"
 #include "include/base/cef_build.h"
+#include "include/base/cef_compiler_specific.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_thread_collision_warner.h"
+#include "include/base/cef_scoped_refptr.h"
+#include "include/base/cef_thread_checker.h"
 
 namespace base {
-
 namespace cef_subtle {
 
 class RefCountedBase {
  public:
   bool HasOneRef() const { return ref_count_ == 1; }
+  bool HasAtLeastOneRef() const { return ref_count_ >= 1; }
 
  protected:
-  RefCountedBase()
-      : ref_count_(0)
+  explicit RefCountedBase(StartRefCountFromZeroTag) {
+#if DCHECK_IS_ON()
+    thread_checker_.DetachFromThread();
+#endif
+  }
+
+  explicit RefCountedBase(StartRefCountFromOneTag) : ref_count_(1) {
 #if DCHECK_IS_ON()
-        ,
-        in_dtor_(false)
+    needs_adopt_ref_ = true;
+    thread_checker_.DetachFromThread();
 #endif
-  {
   }
 
+  RefCountedBase(const RefCountedBase&) = delete;
+  RefCountedBase& operator=(const RefCountedBase&) = delete;
+
   ~RefCountedBase() {
 #if DCHECK_IS_ON()
     DCHECK(in_dtor_) << "RefCounted object deleted without calling Release()";
@@ -78,109 +84,323 @@ class RefCountedBase {
   }
 
   void AddRef() const {
-// TODO(maruel): Add back once it doesn't assert 500 times/sec.
-// Current thread books the critical section "AddRelease"
-// without release it.
-// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
 #if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
+    DCHECK(!needs_adopt_ref_)
+        << "This RefCounted object is created with non-zero reference count."
+        << " The first reference to such a object has to be made by AdoptRef or"
+        << " MakeRefCounted.";
+    if (ref_count_ >= 1) {
+      DCHECK(CalledOnValidThread());
+    }
 #endif
-    ++ref_count_;
+
+    AddRefImpl();
   }
 
   // Returns true if the object should self-delete.
   bool Release() const {
-// TODO(maruel): Add back once it doesn't assert 500 times/sec.
-// Current thread books the critical section "AddRelease"
-// without release it.
-// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
+    ReleaseImpl();
+
 #if DCHECK_IS_ON()
     DCHECK(!in_dtor_);
+    if (ref_count_ == 0) {
+      in_dtor_ = true;
+    }
+
+    if (ref_count_ >= 1) {
+      DCHECK(CalledOnValidThread());
+    }
+    if (ref_count_ == 1) {
+      thread_checker_.DetachFromThread();
+    }
 #endif
-    if (--ref_count_ == 0) {
+
+    return ref_count_ == 0;
+  }
+
+  // Returns true if it is safe to read or write the object, from a thread
+  // safety standpoint. Should be DCHECK'd from the methods of RefCounted
+  // classes if there is a danger of objects being shared across threads.
+  //
+  // This produces fewer false positives than adding a separate ThreadChecker
+  // into the subclass, because it automatically detaches from the thread when
+  // the reference count is 1 (and never fails if there is only one reference).
+  //
+  // This means unlike a separate ThreadChecker, it will permit a singly
+  // referenced object to be passed between threads (not holding a reference on
+  // the sending thread), but will trap if the sending thread holds onto a
+  // reference, or if the object is accessed from multiple threads
+  // simultaneously.
+  bool IsOnValidThread() const {
 #if DCHECK_IS_ON()
-      in_dtor_ = true;
+    return ref_count_ <= 1 || CalledOnValidThread();
+#else
+    return true;
 #endif
-      return true;
-    }
-    return false;
   }
 
  private:
-  mutable int ref_count_;
+  template <typename U>
+  friend scoped_refptr<U> base::AdoptRef(U*);
+
+  void Adopted() const {
 #if DCHECK_IS_ON()
-  mutable bool in_dtor_;
+    DCHECK(needs_adopt_ref_);
+    needs_adopt_ref_ = false;
+#endif
+  }
+
+#if defined(ARCH_CPU_64_BITS)
+  void AddRefImpl() const;
+  void ReleaseImpl() const;
+#else
+  void AddRefImpl() const { ++ref_count_; }
+  void ReleaseImpl() const { --ref_count_; }
 #endif
 
-  DFAKE_MUTEX(add_release_);
+#if DCHECK_IS_ON()
+  bool CalledOnValidThread() const;
+#endif
 
-  DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
+  mutable uint32_t ref_count_ = 0;
+  static_assert(std::is_unsigned<decltype(ref_count_)>::value,
+                "ref_count_ must be an unsigned type.");
+
+#if DCHECK_IS_ON()
+  mutable bool needs_adopt_ref_ = false;
+  mutable bool in_dtor_ = false;
+  mutable ThreadChecker thread_checker_;
+#endif
 };
 
 class RefCountedThreadSafeBase {
  public:
   bool HasOneRef() const;
+  bool HasAtLeastOneRef() const;
 
  protected:
-  RefCountedThreadSafeBase();
-  ~RefCountedThreadSafeBase();
+  explicit constexpr RefCountedThreadSafeBase(StartRefCountFromZeroTag) {}
+  explicit constexpr RefCountedThreadSafeBase(StartRefCountFromOneTag)
+      : ref_count_(1) {
+#if DCHECK_IS_ON()
+    needs_adopt_ref_ = true;
+#endif
+  }
 
-  void AddRef() const;
+  RefCountedThreadSafeBase(const RefCountedThreadSafeBase&) = delete;
+  RefCountedThreadSafeBase& operator=(const RefCountedThreadSafeBase&) = delete;
 
+#if DCHECK_IS_ON()
+  ~RefCountedThreadSafeBase();
+#else
+  ~RefCountedThreadSafeBase() = default;
+#endif
+
+// Release and AddRef are suitable for inlining on X86 because they generate
+// very small code threads. On other platforms (ARM), it causes a size
+// regression and is probably not worth it.
+#if defined(ARCH_CPU_X86_FAMILY)
+  // Returns true if the object should self-delete.
+  bool Release() const { return ReleaseImpl(); }
+  void AddRef() const { AddRefImpl(); }
+  void AddRefWithCheck() const { AddRefWithCheckImpl(); }
+#else
   // Returns true if the object should self-delete.
   bool Release() const;
+  void AddRef() const;
+  void AddRefWithCheck() const;
+#endif
 
  private:
-  mutable AtomicRefCount ref_count_;
+  template <typename U>
+  friend scoped_refptr<U> base::AdoptRef(U*);
+
+  void Adopted() const {
 #if DCHECK_IS_ON()
-  mutable bool in_dtor_;
+    DCHECK(needs_adopt_ref_);
+    needs_adopt_ref_ = false;
 #endif
+  }
+
+  ALWAYS_INLINE void AddRefImpl() const {
+#if DCHECK_IS_ON()
+    DCHECK(!in_dtor_);
+    DCHECK(!needs_adopt_ref_)
+        << "This RefCounted object is created with non-zero reference count."
+        << " The first reference to such a object has to be made by AdoptRef or"
+        << " MakeRefCounted.";
+#endif
+    ref_count_.Increment();
+  }
+
+  ALWAYS_INLINE void AddRefWithCheckImpl() const {
+#if DCHECK_IS_ON()
+    DCHECK(!in_dtor_);
+    DCHECK(!needs_adopt_ref_)
+        << "This RefCounted object is created with non-zero reference count."
+        << " The first reference to such a object has to be made by AdoptRef or"
+        << " MakeRefCounted.";
+#endif
+    CHECK(ref_count_.Increment() > 0);
+  }
 
-  DISALLOW_COPY_AND_ASSIGN(RefCountedThreadSafeBase);
+  ALWAYS_INLINE bool ReleaseImpl() const {
+#if DCHECK_IS_ON()
+    DCHECK(!in_dtor_);
+    DCHECK(!ref_count_.IsZero());
+#endif
+    if (!ref_count_.Decrement()) {
+#if DCHECK_IS_ON()
+      in_dtor_ = true;
+#endif
+      return true;
+    }
+    return false;
+  }
+
+  mutable AtomicRefCount ref_count_{0};
+#if DCHECK_IS_ON()
+  mutable bool needs_adopt_ref_ = false;
+  mutable bool in_dtor_ = false;
+#endif
+};
+
+// ScopedAllowCrossThreadRefCountAccess disables the check documented on
+// RefCounted below for rare pre-existing use cases where thread-safety was
+// guaranteed through other means (e.g. explicit sequencing of calls across
+// execution threads when bouncing between threads in order). New callers
+// should refrain from using this (callsites handling thread-safety through
+// locks should use RefCountedThreadSafe per the overhead of its atomics being
+// negligible compared to locks anyways and callsites doing explicit sequencing
+// should properly std::move() the ref to avoid hitting this check).
+// TODO(tzik): Cleanup existing use cases and remove
+// ScopedAllowCrossThreadRefCountAccess.
+class ScopedAllowCrossThreadRefCountAccess final {
+ public:
+#if DCHECK_IS_ON()
+  ScopedAllowCrossThreadRefCountAccess();
+  ~ScopedAllowCrossThreadRefCountAccess();
+#else
+  ScopedAllowCrossThreadRefCountAccess() {}
+  ~ScopedAllowCrossThreadRefCountAccess() {}
+#endif
 };
 
 }  // namespace cef_subtle
 
-//
-// A base class for reference counted classes.  Otherwise, known as a cheap
-// knock-off of WebKit's RefCounted<T> class.  To use this guy just extend your
-// class from it like so:
-//
-//   class MyFoo : public base::RefCounted<MyFoo> {
-//    ...
-//    private:
-//     friend class base::RefCounted<MyFoo>;
-//     ~MyFoo();
-//   };
-//
-// You should always make your destructor private, to avoid any code deleting
-// the object accidently while there are references to it.
-template <class T>
+using ScopedAllowCrossThreadRefCountAccess =
+    cef_subtle::ScopedAllowCrossThreadRefCountAccess;
+
+///
+/// The reference count starts from zero by default, and we intended to migrate
+/// to start-from-one ref count. Put REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE() to
+/// the ref counted class to opt-in.
+///
+/// If an object has start-from-one ref count, the first scoped_refptr need to
+/// be created by base::AdoptRef() or base::MakeRefCounted(). We can use
+/// base::MakeRefCounted() to create create both type of ref counted object.
+///
+/// The motivations to use start-from-one ref count are:
+///  - Start-from-one ref count doesn't need the ref count increment for the
+///    first reference.
+///  - It can detect an invalid object acquisition for a being-deleted object
+///    that has zero ref count. That tends to happen on custom deleter that
+///    delays the deletion.
+///    TODO(tzik): Implement invalid acquisition detection.
+///  - Behavior parity to Blink's WTF::RefCounted, whose count starts from one.
+///    And start-from-one ref count is a step to merge WTF::RefCounted into
+///    base::RefCounted.
+///
+#define REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE()                 \
+  static constexpr ::base::cef_subtle::StartRefCountFromOneTag \
+      kRefCountPreference = ::base::cef_subtle::kStartRefCountFromOneTag
+
+template <class T, typename Traits>
+class RefCounted;
+
+///
+/// Default traits for RefCounted<T>.  Deletes the object when its ref count
+/// reaches 0. Overload to delete it on a different thread etc.
+///
+template <typename T>
+struct DefaultRefCountedTraits {
+  static void Destruct(const T* x) {
+    RefCounted<T, DefaultRefCountedTraits>::DeleteInternal(x);
+  }
+};
+
+///
+/// A base class for reference counted classes. Otherwise, known as a cheap
+/// knock-off of WebKit's RefCounted<T> class. To use this, just extend your
+/// class from it like so:
+///
+/// <pre>
+///   class MyFoo : public base::RefCounted<MyFoo> {
+///    ...
+///    private:
+///     friend class base::RefCounted<MyFoo>;
+///     ~MyFoo();
+///   };
+/// </pre>
+///
+/// Usage Notes:
+/// 1. You should always make your destructor non-public, to avoid any code
+///    deleting the object accidentally while there are references to it.
+/// 2. You should always make the ref-counted base class a friend of your class,
+///    so that it can access the destructor.
+///
+/// The ref count manipulation to RefCounted is NOT thread safe and has DCHECKs
+/// to trap unsafe cross thread usage. A subclass instance of RefCounted can be
+/// passed to another execution thread only when its ref count is 1. If the ref
+/// count is more than 1, the RefCounted class verifies the ref updates are made
+/// on the same execution thread as the previous ones. The subclass can also
+/// manually call IsOnValidThread to trap other non-thread-safe accesses; see
+/// the documentation for that method.
+///
+template <class T, typename Traits = DefaultRefCountedTraits<T>>
 class RefCounted : public cef_subtle::RefCountedBase {
  public:
-  RefCounted() {}
+  static constexpr cef_subtle::StartRefCountFromZeroTag kRefCountPreference =
+      cef_subtle::kStartRefCountFromZeroTag;
+
+  RefCounted() : cef_subtle::RefCountedBase(T::kRefCountPreference) {}
+
+  RefCounted(const RefCounted&) = delete;
+  RefCounted& operator=(const RefCounted&) = delete;
 
   void AddRef() const { cef_subtle::RefCountedBase::AddRef(); }
 
   void Release() const {
     if (cef_subtle::RefCountedBase::Release()) {
-      delete static_cast<const T*>(this);
+      // Prune the code paths which the static analyzer may take to simulate
+      // object destruction. Use-after-free errors aren't possible given the
+      // lifetime guarantees of the refcounting system.
+      ANALYZER_SKIP_THIS_PATH();
+
+      Traits::Destruct(static_cast<const T*>(this));
     }
   }
 
  protected:
-  ~RefCounted() {}
+  ~RefCounted() = default;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(RefCounted<T>);
+  friend struct DefaultRefCountedTraits<T>;
+  template <typename U>
+  static void DeleteInternal(const U* x) {
+    delete x;
+  }
 };
 
 // Forward declaration.
 template <class T, typename Traits>
 class RefCountedThreadSafe;
 
-// Default traits for RefCountedThreadSafe<T>.  Deletes the object when its ref
-// count reaches 0.  Overload to delete it on a different thread etc.
+///
+/// Default traits for RefCountedThreadSafe<T>. Deletes the object when its ref
+/// count reaches 0. Overload to delete it on a different thread etc.
+///
 template <typename T>
 struct DefaultRefCountedThreadSafeTraits {
   static void Destruct(const T* x) {
@@ -192,187 +412,100 @@ struct DefaultRefCountedThreadSafeTraits {
   }
 };
 
-//
-// A thread-safe variant of RefCounted<T>
-//
-//   class MyFoo : public base::RefCountedThreadSafe<MyFoo> {
-//    ...
-//   };
-//
-// If you're using the default trait, then you should add compile time
-// asserts that no one else is deleting your object.  i.e.
-//    private:
-//     friend class base::RefCountedThreadSafe<MyFoo>;
-//     ~MyFoo();
+///
+/// A thread-safe variant of RefCounted<T>
+///
+/// <pre>
+///   class MyFoo : public base::RefCountedThreadSafe<MyFoo> {
+///    ...
+///   };
+/// </pre>
+///
+/// If you're using the default trait, then you should add compile time
+/// asserts that no one else is deleting your object.  i.e.
+/// <pre>
+///    private:
+///     friend class base::RefCountedThreadSafe<MyFoo>;
+///     ~MyFoo();
+/// </pre>
+///
+/// We can use REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE() with RefCountedThreadSafe
+/// too. See the comment above the RefCounted definition for details.
+///
 template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T>>
 class RefCountedThreadSafe : public cef_subtle::RefCountedThreadSafeBase {
  public:
-  RefCountedThreadSafe() {}
+  static constexpr cef_subtle::StartRefCountFromZeroTag kRefCountPreference =
+      cef_subtle::kStartRefCountFromZeroTag;
+
+  explicit RefCountedThreadSafe()
+      : cef_subtle::RefCountedThreadSafeBase(T::kRefCountPreference) {}
+
+  RefCountedThreadSafe(const RefCountedThreadSafe&) = delete;
+  RefCountedThreadSafe& operator=(const RefCountedThreadSafe&) = delete;
 
-  void AddRef() const { cef_subtle::RefCountedThreadSafeBase::AddRef(); }
+  void AddRef() const { AddRefImpl(T::kRefCountPreference); }
 
   void Release() const {
     if (cef_subtle::RefCountedThreadSafeBase::Release()) {
+      ANALYZER_SKIP_THIS_PATH();
       Traits::Destruct(static_cast<const T*>(this));
     }
   }
 
  protected:
-  ~RefCountedThreadSafe() {}
+  ~RefCountedThreadSafe() = default;
 
  private:
   friend struct DefaultRefCountedThreadSafeTraits<T>;
-  static void DeleteInternal(const T* x) { delete x; }
+  template <typename U>
+  static void DeleteInternal(const U* x) {
+    delete x;
+  }
 
-  DISALLOW_COPY_AND_ASSIGN(RefCountedThreadSafe);
+  void AddRefImpl(cef_subtle::StartRefCountFromZeroTag) const {
+    cef_subtle::RefCountedThreadSafeBase::AddRef();
+  }
+
+  void AddRefImpl(cef_subtle::StartRefCountFromOneTag) const {
+    cef_subtle::RefCountedThreadSafeBase::AddRefWithCheck();
+  }
 };
 
-//
-// A thread-safe wrapper for some piece of data so we can place other
-// things in scoped_refptrs<>.
-//
+///
+/// A thread-safe wrapper for some piece of data so we can place other
+/// things in scoped_refptrs<>.
+///
 template <typename T>
 class RefCountedData
     : public base::RefCountedThreadSafe<base::RefCountedData<T>> {
  public:
   RefCountedData() : data() {}
   RefCountedData(const T& in_value) : data(in_value) {}
+  RefCountedData(T&& in_value) : data(std::move(in_value)) {}
+  template <typename... Args>
+  explicit RefCountedData(std::in_place_t, Args&&... args)
+      : data(std::forward<Args>(args)...) {}
 
   T data;
 
  private:
   friend class base::RefCountedThreadSafe<base::RefCountedData<T>>;
-  ~RefCountedData() {}
+  ~RefCountedData() = default;
 };
 
-}  // namespace base
-
-//
-// A smart pointer class for reference counted objects.  Use this class instead
-// of calling AddRef and Release manually on a reference counted object to
-// avoid common memory leaks caused by forgetting to Release an object
-// reference.  Sample usage:
-//
-//   class MyFoo : public RefCounted<MyFoo> {
-//    ...
-//   };
-//
-//   void some_function() {
-//     scoped_refptr<MyFoo> foo = new MyFoo();
-//     foo->Method(param);
-//     // |foo| is released when this function returns
-//   }
-//
-//   void some_other_function() {
-//     scoped_refptr<MyFoo> foo = new MyFoo();
-//     ...
-//     foo = NULL;  // explicitly releases |foo|
-//     ...
-//     if (foo)
-//       foo->Method(param);
-//   }
-//
-// The above examples show how scoped_refptr<T> acts like a pointer to T.
-// Given two scoped_refptr<T> classes, it is also possible to exchange
-// references between the two objects, like so:
-//
-//   {
-//     scoped_refptr<MyFoo> a = new MyFoo();
-//     scoped_refptr<MyFoo> b;
-//
-//     b.swap(a);
-//     // now, |b| references the MyFoo object, and |a| references NULL.
-//   }
-//
-// To make both |a| and |b| in the above example reference the same MyFoo
-// object, simply use the assignment operator:
-//
-//   {
-//     scoped_refptr<MyFoo> a = new MyFoo();
-//     scoped_refptr<MyFoo> b;
-//
-//     b = a;
-//     // now, |a| and |b| each own a reference to the same MyFoo object.
-//   }
-//
-template <class T>
-class scoped_refptr {
- public:
-  typedef T element_type;
-
-  scoped_refptr() : ptr_(NULL) {}
-
-  scoped_refptr(T* p) : ptr_(p) {
-    if (ptr_)
-      ptr_->AddRef();
-  }
-
-  scoped_refptr(const scoped_refptr<T>& r) : ptr_(r.ptr_) {
-    if (ptr_)
-      ptr_->AddRef();
-  }
-
-  template <typename U>
-  scoped_refptr(const scoped_refptr<U>& r) : ptr_(r.get()) {
-    if (ptr_)
-      ptr_->AddRef();
-  }
-
-  ~scoped_refptr() {
-    if (ptr_)
-      ptr_->Release();
-  }
-
-  T* get() const { return ptr_; }
-
-  // Allow scoped_refptr<C> to be used in boolean expression
-  // and comparison operations.
-  operator T*() const { return ptr_; }
-
-  T* operator->() const {
-    assert(ptr_ != NULL);
-    return ptr_;
-  }
-
-  scoped_refptr<T>& operator=(T* p) {
-    // AddRef first so that self assignment should work
-    if (p)
-      p->AddRef();
-    T* old_ptr = ptr_;
-    ptr_ = p;
-    if (old_ptr)
-      old_ptr->Release();
-    return *this;
-  }
-
-  scoped_refptr<T>& operator=(const scoped_refptr<T>& r) {
-    return *this = r.ptr_;
-  }
-
-  template <typename U>
-  scoped_refptr<T>& operator=(const scoped_refptr<U>& r) {
-    return *this = r.get();
-  }
-
-  void swap(T** pp) {
-    T* p = ptr_;
-    ptr_ = *pp;
-    *pp = p;
-  }
-
-  void swap(scoped_refptr<T>& r) { swap(&r.ptr_); }
-
- protected:
-  T* ptr_;
-};
+template <typename T>
+bool operator==(const RefCountedData<T>& lhs, const RefCountedData<T>& rhs) {
+  return lhs.data == rhs.data;
+}
 
-// Handy utility for creating a scoped_refptr<T> out of a T* explicitly without
-// having to retype all the template arguments
 template <typename T>
-scoped_refptr<T> make_scoped_refptr(T* t) {
-  return scoped_refptr<T>(t);
+bool operator!=(const RefCountedData<T>& lhs, const RefCountedData<T>& rhs) {
+  return !(lhs == rhs);
 }
 
+}  // namespace base
+
 #endif  // !USING_CHROMIUM_INCLUDES
 
 #endif  // CEF_INCLUDE_BASE_CEF_REF_COUNTED_H_
diff --git a/src/include/base/cef_scoped_ptr.h b/src/include/base/cef_scoped_ptr.h
deleted file mode 100644
index eb9e0e29b..000000000
--- a/src/include/base/cef_scoped_ptr.h
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Scopers help you manage ownership of a pointer, helping you easily manage a
-// pointer within a scope, and automatically destroying the pointer at the end
-// of a scope.  There are two main classes you will use, which correspond to the
-// operators new/delete and new[]/delete[].
-//
-// Example usage (scoped_ptr<T>):
-//   {
-//     scoped_ptr<Foo> foo(new Foo("wee"));
-//   }  // foo goes out of scope, releasing the pointer with it.
-//
-//   {
-//     scoped_ptr<Foo> foo;          // No pointer managed.
-//     foo.reset(new Foo("wee"));    // Now a pointer is managed.
-//     foo.reset(new Foo("wee2"));   // Foo("wee") was destroyed.
-//     foo.reset(new Foo("wee3"));   // Foo("wee2") was destroyed.
-//     foo->Method();                // Foo::Method() called.
-//     foo.get()->Method();          // Foo::Method() called.
-//     SomeFunc(foo.release());      // SomeFunc takes ownership, foo no longer
-//                                   // manages a pointer.
-//     foo.reset(new Foo("wee4"));   // foo manages a pointer again.
-//     foo.reset();                  // Foo("wee4") destroyed, foo no longer
-//                                   // manages a pointer.
-//   }  // foo wasn't managing a pointer, so nothing was destroyed.
-//
-// Example usage (scoped_ptr<T[]>):
-//   {
-//     scoped_ptr<Foo[]> foo(new Foo[100]);
-//     foo.get()->Method();  // Foo::Method on the 0th element.
-//     foo[10].Method();     // Foo::Method on the 10th element.
-//   }
-//
-// These scopers also implement part of the functionality of C++11 unique_ptr
-// in that they are "movable but not copyable."  You can use the scopers in
-// the parameter and return types of functions to signify ownership transfer
-// in to and out of a function.  When calling a function that has a scoper
-// as the argument type, it must be called with the result of an analogous
-// scoper's Pass() function or another function that generates a temporary;
-// passing by copy will NOT work.  Here is an example using scoped_ptr:
-//
-//   void TakesOwnership(scoped_ptr<Foo> arg) {
-//     // Do something with arg
-//   }
-//   scoped_ptr<Foo> CreateFoo() {
-//     // No need for calling Pass() because we are constructing a temporary
-//     // for the return value.
-//     return scoped_ptr<Foo>(new Foo("new"));
-//   }
-//   scoped_ptr<Foo> PassThru(scoped_ptr<Foo> arg) {
-//     return arg.Pass();
-//   }
-//
-//   {
-//     scoped_ptr<Foo> ptr(new Foo("yay"));  // ptr manages Foo("yay").
-//     TakesOwnership(ptr.Pass());           // ptr no longer owns Foo("yay").
-//     scoped_ptr<Foo> ptr2 = CreateFoo();   // ptr2 owns the return Foo.
-//     scoped_ptr<Foo> ptr3 =                // ptr3 now owns what was in ptr2.
-//         PassThru(ptr2.Pass());            // ptr2 is correspondingly NULL.
-//   }
-//
-// Notice that if you do not call Pass() when returning from PassThru(), or
-// when invoking TakesOwnership(), the code will not compile because scopers
-// are not copyable; they only implement move semantics which require calling
-// the Pass() function to signify a destructive transfer of state. CreateFoo()
-// is different though because we are constructing a temporary on the return
-// line and thus can avoid needing to call Pass().
-//
-// Pass() properly handles upcast in initialization, i.e. you can use a
-// scoped_ptr<Child> to initialize a scoped_ptr<Parent>:
-//
-//   scoped_ptr<Foo> foo(new Foo());
-//   scoped_ptr<FooParent> parent(foo.Pass());
-//
-// PassAs<>() should be used to upcast return value in return statement:
-//
-//   scoped_ptr<Foo> CreateFoo() {
-//     scoped_ptr<FooChild> result(new FooChild());
-//     return result.PassAs<Foo>();
-//   }
-//
-// Note that PassAs<>() is implemented only for scoped_ptr<T>, but not for
-// scoped_ptr<T[]>. This is because casting array pointers may not be safe.
-
-#ifndef CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_
-#define CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_
-#pragma once
-
-#if defined(BASE_MEMORY_SCOPED_PTR_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// Do nothing when building CEF.
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-// This is an implementation designed to match the anticipated future TR2
-// implementation of the scoped_ptr class.
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <algorithm>  // For std::swap().
-
-#include "include/base/cef_basictypes.h"
-#include "include/base/cef_build.h"
-#include "include/base/cef_macros.h"
-#include "include/base/cef_move.h"
-#include "include/base/cef_template_util.h"
-
-namespace base {
-
-namespace subtle {
-class RefCountedBase;
-class RefCountedThreadSafeBase;
-}  // namespace subtle
-
-// Function object which deletes its parameter, which must be a pointer.
-// If C is an array type, invokes 'delete[]' on the parameter; otherwise,
-// invokes 'delete'. The default deleter for scoped_ptr<T>.
-template <class T>
-struct DefaultDeleter {
-  DefaultDeleter() {}
-  template <typename U>
-  DefaultDeleter(const DefaultDeleter<U>& other) {
-    // IMPLEMENTATION NOTE: C++11 20.7.1.1.2p2 only provides this constructor
-    // if U* is implicitly convertible to T* and U is not an array type.
-    //
-    // Correct implementation should use SFINAE to disable this
-    // constructor. However, since there are no other 1-argument constructors,
-    // using a COMPILE_ASSERT() based on is_convertible<> and requiring
-    // complete types is simpler and will cause compile failures for equivalent
-    // misuses.
-    //
-    // Note, the is_convertible<U*, T*> check also ensures that U is not an
-    // array. T is guaranteed to be a non-array, so any U* where U is an array
-    // cannot convert to T*.
-    enum { T_must_be_complete = sizeof(T) };
-    enum { U_must_be_complete = sizeof(U) };
-    COMPILE_ASSERT((base::is_convertible<U*, T*>::value),
-                   U_ptr_must_implicitly_convert_to_T_ptr);
-  }
-  inline void operator()(T* ptr) const {
-    enum { type_must_be_complete = sizeof(T) };
-    delete ptr;
-  }
-};
-
-// Specialization of DefaultDeleter for array types.
-template <class T>
-struct DefaultDeleter<T[]> {
-  inline void operator()(T* ptr) const {
-    enum { type_must_be_complete = sizeof(T) };
-    delete[] ptr;
-  }
-
- private:
-  // Disable this operator for any U != T because it is undefined to execute
-  // an array delete when the static type of the array mismatches the dynamic
-  // type.
-  //
-  // References:
-  //   C++98 [expr.delete]p3
-  //   http://cplusplus.github.com/LWG/lwg-defects.html#938
-  template <typename U>
-  void operator()(U* array) const;
-};
-
-template <class T, int n>
-struct DefaultDeleter<T[n]> {
-  // Never allow someone to declare something like scoped_ptr<int[10]>.
-  COMPILE_ASSERT(sizeof(T) == -1, do_not_use_array_with_size_as_type);
-};
-
-// Function object which invokes 'free' on its parameter, which must be
-// a pointer. Can be used to store malloc-allocated pointers in scoped_ptr:
-//
-// scoped_ptr<int, base::FreeDeleter> foo_ptr(
-//     static_cast<int*>(malloc(sizeof(int))));
-struct FreeDeleter {
-  inline void operator()(void* ptr) const { free(ptr); }
-};
-
-namespace cef_internal {
-
-template <typename T>
-struct IsNotRefCounted {
-  enum {
-    value =
-        !base::is_convertible<T*, base::subtle::RefCountedBase*>::value &&
-        !base::is_convertible<T*,
-                              base::subtle::RefCountedThreadSafeBase*>::value
-  };
-};
-
-// Minimal implementation of the core logic of scoped_ptr, suitable for
-// reuse in both scoped_ptr and its specializations.
-template <class T, class D>
-class scoped_ptr_impl {
- public:
-  explicit scoped_ptr_impl(T* p) : data_(p) {}
-
-  // Initializer for deleters that have data parameters.
-  scoped_ptr_impl(T* p, const D& d) : data_(p, d) {}
-
-  // Templated constructor that destructively takes the value from another
-  // scoped_ptr_impl.
-  template <typename U, typename V>
-  scoped_ptr_impl(scoped_ptr_impl<U, V>* other)
-      : data_(other->release(), other->get_deleter()) {
-    // We do not support move-only deleters.  We could modify our move
-    // emulation to have base::subtle::move() and base::subtle::forward()
-    // functions that are imperfect emulations of their C++11 equivalents,
-    // but until there's a requirement, just assume deleters are copyable.
-  }
-
-  template <typename U, typename V>
-  void TakeState(scoped_ptr_impl<U, V>* other) {
-    // See comment in templated constructor above regarding lack of support
-    // for move-only deleters.
-    reset(other->release());
-    get_deleter() = other->get_deleter();
-  }
-
-  ~scoped_ptr_impl() {
-    if (data_.ptr != NULL) {
-      // Not using get_deleter() saves one function call in non-optimized
-      // builds.
-      static_cast<D&>(data_)(data_.ptr);
-    }
-  }
-
-  void reset(T* p) {
-    // This is a self-reset, which is no longer allowed: http://crbug.com/162971
-    if (p != NULL && p == data_.ptr)
-      abort();
-
-    // Note that running data_.ptr = p can lead to undefined behavior if
-    // get_deleter()(get()) deletes this. In order to prevent this, reset()
-    // should update the stored pointer before deleting its old value.
-    //
-    // However, changing reset() to use that behavior may cause current code to
-    // break in unexpected ways. If the destruction of the owned object
-    // dereferences the scoped_ptr when it is destroyed by a call to reset(),
-    // then it will incorrectly dispatch calls to |p| rather than the original
-    // value of |data_.ptr|.
-    //
-    // During the transition period, set the stored pointer to NULL while
-    // deleting the object. Eventually, this safety check will be removed to
-    // prevent the scenario initially described from occuring and
-    // http://crbug.com/176091 can be closed.
-    T* old = data_.ptr;
-    data_.ptr = NULL;
-    if (old != NULL)
-      static_cast<D&>(data_)(old);
-    data_.ptr = p;
-  }
-
-  T* get() const { return data_.ptr; }
-
-  D& get_deleter() { return data_; }
-  const D& get_deleter() const { return data_; }
-
-  void swap(scoped_ptr_impl& p2) {
-    // Standard swap idiom: 'using std::swap' ensures that std::swap is
-    // present in the overload set, but we call swap unqualified so that
-    // any more-specific overloads can be used, if available.
-    using std::swap;
-    swap(static_cast<D&>(data_), static_cast<D&>(p2.data_));
-    swap(data_.ptr, p2.data_.ptr);
-  }
-
-  T* release() {
-    T* old_ptr = data_.ptr;
-    data_.ptr = NULL;
-    return old_ptr;
-  }
-
- private:
-  // Needed to allow type-converting constructor.
-  template <typename U, typename V>
-  friend class scoped_ptr_impl;
-
-  // Use the empty base class optimization to allow us to have a D
-  // member, while avoiding any space overhead for it when D is an
-  // empty class.  See e.g. http://www.cantrip.org/emptyopt.html for a good
-  // discussion of this technique.
-  struct Data : public D {
-    explicit Data(T* ptr_in) : ptr(ptr_in) {}
-    Data(T* ptr_in, const D& other) : D(other), ptr(ptr_in) {}
-    T* ptr;
-  };
-
-  Data data_;
-
-  DISALLOW_COPY_AND_ASSIGN(scoped_ptr_impl);
-};
-
-}  // namespace cef_internal
-
-}  // namespace base
-
-// A scoped_ptr<T> is like a T*, except that the destructor of scoped_ptr<T>
-// automatically deletes the pointer it holds (if any).
-// That is, scoped_ptr<T> owns the T object that it points to.
-// Like a T*, a scoped_ptr<T> may hold either NULL or a pointer to a T object.
-// Also like T*, scoped_ptr<T> is thread-compatible, and once you
-// dereference it, you get the thread safety guarantees of T.
-//
-// The size of scoped_ptr is small. On most compilers, when using the
-// DefaultDeleter, sizeof(scoped_ptr<T>) == sizeof(T*). Custom deleters will
-// increase the size proportional to whatever state they need to have. See
-// comments inside scoped_ptr_impl<> for details.
-//
-// Current implementation targets having a strict subset of  C++11's
-// unique_ptr<> features. Known deficiencies include not supporting move-only
-// deleteres, function pointers as deleters, and deleters with reference
-// types.
-template <class T, class D = base::DefaultDeleter<T>>
-class scoped_ptr {
-  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
-
-  COMPILE_ASSERT(base::cef_internal::IsNotRefCounted<T>::value,
-                 T_is_refcounted_type_and_needs_scoped_refptr);
-
- public:
-  // The element and deleter types.
-  typedef T element_type;
-  typedef D deleter_type;
-
-  // Constructor.  Defaults to initializing with NULL.
-  scoped_ptr() : impl_(NULL) {}
-
-  // Constructor.  Takes ownership of p.
-  explicit scoped_ptr(element_type* p) : impl_(p) {}
-
-  // Constructor.  Allows initialization of a stateful deleter.
-  scoped_ptr(element_type* p, const D& d) : impl_(p, d) {}
-
-  // Constructor.  Allows construction from a scoped_ptr rvalue for a
-  // convertible type and deleter.
-  //
-  // IMPLEMENTATION NOTE: C++11 unique_ptr<> keeps this constructor distinct
-  // from the normal move constructor. By C++11 20.7.1.2.1.21, this constructor
-  // has different post-conditions if D is a reference type. Since this
-  // implementation does not support deleters with reference type,
-  // we do not need a separate move constructor allowing us to avoid one
-  // use of SFINAE. You only need to care about this if you modify the
-  // implementation of scoped_ptr.
-  template <typename U, typename V>
-  scoped_ptr(scoped_ptr<U, V> other) : impl_(&other.impl_) {
-    COMPILE_ASSERT(!base::is_array<U>::value, U_cannot_be_an_array);
-  }
-
-  // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) {}
-
-  // operator=.  Allows assignment from a scoped_ptr rvalue for a convertible
-  // type and deleter.
-  //
-  // IMPLEMENTATION NOTE: C++11 unique_ptr<> keeps this operator= distinct from
-  // the normal move assignment operator. By C++11 20.7.1.2.3.4, this templated
-  // form has different requirements on for move-only Deleters. Since this
-  // implementation does not support move-only Deleters, we do not need a
-  // separate move assignment operator allowing us to avoid one use of SFINAE.
-  // You only need to care about this if you modify the implementation of
-  // scoped_ptr.
-  template <typename U, typename V>
-  scoped_ptr& operator=(scoped_ptr<U, V> rhs) {
-    COMPILE_ASSERT(!base::is_array<U>::value, U_cannot_be_an_array);
-    impl_.TakeState(&rhs.impl_);
-    return *this;
-  }
-
-  // Reset.  Deletes the currently owned object, if any.
-  // Then takes ownership of a new object, if given.
-  void reset(element_type* p = NULL) { impl_.reset(p); }
-
-  // Accessors to get the owned object.
-  // operator* and operator-> will assert() if there is no current object.
-  element_type& operator*() const {
-    assert(impl_.get() != NULL);
-    return *impl_.get();
-  }
-  element_type* operator->() const {
-    assert(impl_.get() != NULL);
-    return impl_.get();
-  }
-  element_type* get() const { return impl_.get(); }
-
-  // Access to the deleter.
-  deleter_type& get_deleter() { return impl_.get_deleter(); }
-  const deleter_type& get_deleter() const { return impl_.get_deleter(); }
-
-  // Allow scoped_ptr<element_type> to be used in boolean expressions, but not
-  // implicitly convertible to a real bool (which is dangerous).
-  //
-  // Note that this trick is only safe when the == and != operators
-  // are declared explicitly, as otherwise "scoped_ptr1 ==
-  // scoped_ptr2" will compile but do the wrong thing (i.e., convert
-  // to Testable and then do the comparison).
- private:
-  typedef base::cef_internal::scoped_ptr_impl<element_type, deleter_type>
-      scoped_ptr::*Testable;
-
- public:
-  operator Testable() const { return impl_.get() ? &scoped_ptr::impl_ : NULL; }
-
-  // Comparison operators.
-  // These return whether two scoped_ptr refer to the same object, not just to
-  // two different but equal objects.
-  bool operator==(const element_type* p) const { return impl_.get() == p; }
-  bool operator!=(const element_type* p) const { return impl_.get() != p; }
-
-  // Swap two scoped pointers.
-  void swap(scoped_ptr& p2) { impl_.swap(p2.impl_); }
-
-  // Release a pointer.
-  // The return value is the current pointer held by this object.
-  // If this object holds a NULL pointer, the return value is NULL.
-  // After this operation, this object will hold a NULL pointer,
-  // and will not own the object any more.
-  element_type* release() WARN_UNUSED_RESULT { return impl_.release(); }
-
-  // C++98 doesn't support functions templates with default parameters which
-  // makes it hard to write a PassAs() that understands converting the deleter
-  // while preserving simple calling semantics.
-  //
-  // Until there is a use case for PassAs() with custom deleters, just ignore
-  // the custom deleter.
-  template <typename PassAsType>
-  scoped_ptr<PassAsType> PassAs() {
-    return scoped_ptr<PassAsType>(Pass());
-  }
-
- private:
-  // Needed to reach into |impl_| in the constructor.
-  template <typename U, typename V>
-  friend class scoped_ptr;
-  base::cef_internal::scoped_ptr_impl<element_type, deleter_type> impl_;
-
-  // Forbidden for API compatibility with std::unique_ptr.
-  explicit scoped_ptr(int disallow_construction_from_null);
-
-  // Forbid comparison of scoped_ptr types.  If U != T, it totally
-  // doesn't make sense, and if U == T, it still doesn't make sense
-  // because you should never have the same object owned by two different
-  // scoped_ptrs.
-  template <class U>
-  bool operator==(scoped_ptr<U> const& p2) const;
-  template <class U>
-  bool operator!=(scoped_ptr<U> const& p2) const;
-};
-
-template <class T, class D>
-class scoped_ptr<T[], D> {
-  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
-
- public:
-  // The element and deleter types.
-  typedef T element_type;
-  typedef D deleter_type;
-
-  // Constructor.  Defaults to initializing with NULL.
-  scoped_ptr() : impl_(NULL) {}
-
-  // Constructor. Stores the given array. Note that the argument's type
-  // must exactly match T*. In particular:
-  // - it cannot be a pointer to a type derived from T, because it is
-  //   inherently unsafe in the general case to access an array through a
-  //   pointer whose dynamic type does not match its static type (eg., if
-  //   T and the derived types had different sizes access would be
-  //   incorrectly calculated). Deletion is also always undefined
-  //   (C++98 [expr.delete]p3). If you're doing this, fix your code.
-  // - it cannot be NULL, because NULL is an integral expression, not a
-  //   pointer to T. Use the no-argument version instead of explicitly
-  //   passing NULL.
-  // - it cannot be const-qualified differently from T per unique_ptr spec
-  //   (http://cplusplus.github.com/LWG/lwg-active.html#2118). Users wanting
-  //   to work around this may use implicit_cast<const T*>().
-  //   However, because of the first bullet in this comment, users MUST
-  //   NOT use implicit_cast<Base*>() to upcast the static type of the array.
-  explicit scoped_ptr(element_type* array) : impl_(array) {}
-
-  // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_ptr(RValue rvalue) : impl_(&rvalue.object->impl_) {}
-
-  // operator=.  Move operator= for C++03 move emulation of this type.
-  scoped_ptr& operator=(RValue rhs) {
-    impl_.TakeState(&rhs.object->impl_);
-    return *this;
-  }
-
-  // Reset.  Deletes the currently owned array, if any.
-  // Then takes ownership of a new object, if given.
-  void reset(element_type* array = NULL) { impl_.reset(array); }
-
-  // Accessors to get the owned array.
-  element_type& operator[](size_t i) const {
-    assert(impl_.get() != NULL);
-    return impl_.get()[i];
-  }
-  element_type* get() const { return impl_.get(); }
-
-  // Access to the deleter.
-  deleter_type& get_deleter() { return impl_.get_deleter(); }
-  const deleter_type& get_deleter() const { return impl_.get_deleter(); }
-
-  // Allow scoped_ptr<element_type> to be used in boolean expressions, but not
-  // implicitly convertible to a real bool (which is dangerous).
- private:
-  typedef base::cef_internal::scoped_ptr_impl<element_type, deleter_type>
-      scoped_ptr::*Testable;
-
- public:
-  operator Testable() const { return impl_.get() ? &scoped_ptr::impl_ : NULL; }
-
-  // Comparison operators.
-  // These return whether two scoped_ptr refer to the same object, not just to
-  // two different but equal objects.
-  bool operator==(element_type* array) const { return impl_.get() == array; }
-  bool operator!=(element_type* array) const { return impl_.get() != array; }
-
-  // Swap two scoped pointers.
-  void swap(scoped_ptr& p2) { impl_.swap(p2.impl_); }
-
-  // Release a pointer.
-  // The return value is the current pointer held by this object.
-  // If this object holds a NULL pointer, the return value is NULL.
-  // After this operation, this object will hold a NULL pointer,
-  // and will not own the object any more.
-  element_type* release() WARN_UNUSED_RESULT { return impl_.release(); }
-
- private:
-  // Force element_type to be a complete type.
-  enum { type_must_be_complete = sizeof(element_type) };
-
-  // Actually hold the data.
-  base::cef_internal::scoped_ptr_impl<element_type, deleter_type> impl_;
-
-  // Disable initialization from any type other than element_type*, by
-  // providing a constructor that matches such an initialization, but is
-  // private and has no definition. This is disabled because it is not safe to
-  // call delete[] on an array whose static type does not match its dynamic
-  // type.
-  template <typename U>
-  explicit scoped_ptr(U* array);
-  explicit scoped_ptr(int disallow_construction_from_null);
-
-  // Disable reset() from any type other than element_type*, for the same
-  // reasons as the constructor above.
-  template <typename U>
-  void reset(U* array);
-  void reset(int disallow_reset_from_null);
-
-  // Forbid comparison of scoped_ptr types.  If U != T, it totally
-  // doesn't make sense, and if U == T, it still doesn't make sense
-  // because you should never have the same object owned by two different
-  // scoped_ptrs.
-  template <class U>
-  bool operator==(scoped_ptr<U> const& p2) const;
-  template <class U>
-  bool operator!=(scoped_ptr<U> const& p2) const;
-};
-
-// Free functions
-template <class T, class D>
-void swap(scoped_ptr<T, D>& p1, scoped_ptr<T, D>& p2) {
-  p1.swap(p2);
-}
-
-template <class T, class D>
-bool operator==(T* p1, const scoped_ptr<T, D>& p2) {
-  return p1 == p2.get();
-}
-
-template <class T, class D>
-bool operator!=(T* p1, const scoped_ptr<T, D>& p2) {
-  return p1 != p2.get();
-}
-
-// A function to convert T* into scoped_ptr<T>
-// Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
-// for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
-template <typename T>
-scoped_ptr<T> make_scoped_ptr(T* ptr) {
-  return scoped_ptr<T>(ptr);
-}
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_MEMORY_SCOPED_PTR_H_
diff --git a/src/include/base/cef_scoped_refptr.h b/src/include/base/cef_scoped_refptr.h
new file mode 100644
index 000000000..926903945
--- /dev/null
+++ b/src/include/base/cef_scoped_refptr.h
@@ -0,0 +1,420 @@
+// Copyright (c) 2017 Marshall A. Greenblatt. Portions copyright (c) 2011
+// Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
+#define CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
+#pragma once
+
+#if defined(USING_CHROMIUM_INCLUDES)
+// When building CEF include the Chromium header directly.
+#include "base/memory/scoped_refptr.h"
+#else  // !USING_CHROMIUM_INCLUDES
+// The following is substantially similar to the Chromium implementation.
+// If the Chromium implementation diverges the below implementation should be
+// updated to match.
+
+#include <stddef.h>
+
+#include <iosfwd>
+#include <type_traits>
+#include <utility>
+
+#include "include/base/cef_logging.h"
+
+template <class T>
+class scoped_refptr;
+
+namespace base {
+
+template <class, typename>
+class RefCounted;
+template <class, typename>
+class RefCountedThreadSafe;
+class SequencedTaskRunner;
+class WrappedPromise;
+
+template <typename T>
+scoped_refptr<T> AdoptRef(T* t);
+
+namespace internal {
+
+class BasePromise;
+
+}  // namespace internal
+
+namespace cef_subtle {
+
+enum AdoptRefTag { kAdoptRefTag };
+enum StartRefCountFromZeroTag { kStartRefCountFromZeroTag };
+enum StartRefCountFromOneTag { kStartRefCountFromOneTag };
+
+template <typename T, typename U, typename V>
+constexpr bool IsRefCountPreferenceOverridden(const T*,
+                                              const RefCounted<U, V>*) {
+  return !std::is_same<std::decay_t<decltype(T::kRefCountPreference)>,
+                       std::decay_t<decltype(U::kRefCountPreference)>>::value;
+}
+
+template <typename T, typename U, typename V>
+constexpr bool IsRefCountPreferenceOverridden(
+    const T*,
+    const RefCountedThreadSafe<U, V>*) {
+  return !std::is_same<std::decay_t<decltype(T::kRefCountPreference)>,
+                       std::decay_t<decltype(U::kRefCountPreference)>>::value;
+}
+
+constexpr bool IsRefCountPreferenceOverridden(...) {
+  return false;
+}
+
+}  // namespace cef_subtle
+
+// Creates a scoped_refptr from a raw pointer without incrementing the reference
+// count. Use this only for a newly created object whose reference count starts
+// from 1 instead of 0.
+template <typename T>
+scoped_refptr<T> AdoptRef(T* obj) {
+  using Tag = std::decay_t<decltype(T::kRefCountPreference)>;
+  static_assert(std::is_same<cef_subtle::StartRefCountFromOneTag, Tag>::value,
+                "Use AdoptRef only if the reference count starts from one.");
+
+  DCHECK(obj);
+  DCHECK(obj->HasOneRef());
+  obj->Adopted();
+  return scoped_refptr<T>(obj, cef_subtle::kAdoptRefTag);
+}
+
+namespace cef_subtle {
+
+template <typename T>
+scoped_refptr<T> AdoptRefIfNeeded(T* obj, StartRefCountFromZeroTag) {
+  return scoped_refptr<T>(obj);
+}
+
+template <typename T>
+scoped_refptr<T> AdoptRefIfNeeded(T* obj, StartRefCountFromOneTag) {
+  return AdoptRef(obj);
+}
+
+}  // namespace cef_subtle
+
+// Constructs an instance of T, which is a ref counted type, and wraps the
+// object into a scoped_refptr<T>.
+template <typename T, typename... Args>
+scoped_refptr<T> MakeRefCounted(Args&&... args) {
+  T* obj = new T(std::forward<Args>(args)...);
+  return cef_subtle::AdoptRefIfNeeded(obj, T::kRefCountPreference);
+}
+
+// Takes an instance of T, which is a ref counted type, and wraps the object
+// into a scoped_refptr<T>.
+template <typename T>
+scoped_refptr<T> WrapRefCounted(T* t) {
+  return scoped_refptr<T>(t);
+}
+
+}  // namespace base
+
+///
+/// A smart pointer class for reference counted objects.  Use this class instead
+/// of calling AddRef and Release manually on a reference counted object to
+/// avoid common memory leaks caused by forgetting to Release an object
+/// reference. Sample usage:
+///
+/// <pre>
+///   class MyFoo : public RefCounted<MyFoo> {
+///    ...
+///    private:
+///     friend class RefCounted<MyFoo>;  // Allow destruction by RefCounted<>.
+///     ~MyFoo();                        // Destructor must be
+///     private/protected.
+///   };
+///
+///   void some_function() {
+///     scoped_refptr<MyFoo> foo = MakeRefCounted<MyFoo>();
+///     foo->Method(param);
+///     // |foo| is released when this function returns
+///   }
+///
+///   void some_other_function() {
+///     scoped_refptr<MyFoo> foo = MakeRefCounted<MyFoo>();
+///     ...
+///     foo.reset();  // explicitly releases |foo|
+///     ...
+///     if (foo)
+///       foo->Method(param);
+///   }
+/// </pre>
+///
+/// The above examples show how scoped_refptr<T> acts like a pointer to T.
+/// Given two scoped_refptr<T> classes, it is also possible to exchange
+/// references between the two objects, like so:
+///
+/// <pre>
+///   {
+///     scoped_refptr<MyFoo> a = MakeRefCounted<MyFoo>();
+///     scoped_refptr<MyFoo> b;
+///
+///     b.swap(a);
+///     // now, |b| references the MyFoo object, and |a| references nullptr.
+///   }
+/// </pre>
+///
+/// To make both |a| and |b| in the above example reference the same MyFoo
+/// object, simply use the assignment operator:
+///
+/// <pre>
+///   {
+///     scoped_refptr<MyFoo> a = MakeRefCounted<MyFoo>();
+///     scoped_refptr<MyFoo> b;
+///
+///     b = a;
+///     // now, |a| and |b| each own a reference to the same MyFoo object.
+///   }
+/// </pre>
+///
+/// Also see Chromium's ownership and calling conventions:
+/// https://chromium.googlesource.com/chromium/src/+/lkgr/styleguide/c++/c++.md#object-ownership-and-calling-conventions
+/// Specifically:
+///   If the function (at least sometimes) takes a ref on a refcounted object,
+///   declare the param as scoped_refptr<T>. The caller can decide whether it
+///   wishes to transfer ownership (by calling std::move(t) when passing t) or
+///   retain its ref (by simply passing t directly).
+///   In other words, use scoped_refptr like you would a std::unique_ptr except
+///   in the odd case where it's required to hold on to a ref while handing one
+///   to another component (if a component merely needs to use t on the stack
+///   without keeping a ref: pass t as a raw T*).
+///
+template <class T>
+class TRIVIAL_ABI scoped_refptr {
+ public:
+  typedef T element_type;
+
+  constexpr scoped_refptr() = default;
+
+  // Allow implicit construction from nullptr.
+  constexpr scoped_refptr(std::nullptr_t) {}
+
+  // Constructs from a raw pointer. Note that this constructor allows implicit
+  // conversion from T* to scoped_refptr<T> which is strongly discouraged. If
+  // you are creating a new ref-counted object please use
+  // base::MakeRefCounted<T>() or base::WrapRefCounted<T>(). Otherwise you
+  // should move or copy construct from an existing scoped_refptr<T> to the
+  // ref-counted object.
+  scoped_refptr(T* p) : ptr_(p) {
+    if (ptr_) {
+      AddRef(ptr_);
+    }
+  }
+
+  // Copy constructor. This is required in addition to the copy conversion
+  // constructor below.
+  scoped_refptr(const scoped_refptr& r) : scoped_refptr(r.ptr_) {}
+
+  // Copy conversion constructor.
+  template <typename U,
+            typename = typename std::enable_if<
+                std::is_convertible<U*, T*>::value>::type>
+  scoped_refptr(const scoped_refptr<U>& r) : scoped_refptr(r.ptr_) {}
+
+  // Move constructor. This is required in addition to the move conversion
+  // constructor below.
+  scoped_refptr(scoped_refptr&& r) noexcept : ptr_(r.ptr_) { r.ptr_ = nullptr; }
+
+  // Move conversion constructor.
+  template <typename U,
+            typename = typename std::enable_if<
+                std::is_convertible<U*, T*>::value>::type>
+  scoped_refptr(scoped_refptr<U>&& r) noexcept : ptr_(r.ptr_) {
+    r.ptr_ = nullptr;
+  }
+
+  ~scoped_refptr() {
+    static_assert(!base::cef_subtle::IsRefCountPreferenceOverridden(
+                      static_cast<T*>(nullptr), static_cast<T*>(nullptr)),
+                  "It's unsafe to override the ref count preference."
+                  " Please remove REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE"
+                  " from subclasses.");
+    if (ptr_) {
+      Release(ptr_);
+    }
+  }
+
+  T* get() const { return ptr_; }
+
+  T& operator*() const {
+    DCHECK(ptr_);
+    return *ptr_;
+  }
+
+  T* operator->() const {
+    DCHECK(ptr_);
+    return ptr_;
+  }
+
+  scoped_refptr& operator=(std::nullptr_t) {
+    reset();
+    return *this;
+  }
+
+  scoped_refptr& operator=(T* p) { return *this = scoped_refptr(p); }
+
+  // Unified assignment operator.
+  scoped_refptr& operator=(scoped_refptr r) noexcept {
+    swap(r);
+    return *this;
+  }
+
+  // Sets managed object to null and releases reference to the previous managed
+  // object, if it existed.
+  void reset() { scoped_refptr().swap(*this); }
+
+  // Returns the owned pointer (if any), releasing ownership to the caller. The
+  // caller is responsible for managing the lifetime of the reference.
+  [[nodiscard]] T* release();
+
+  void swap(scoped_refptr& r) noexcept { std::swap(ptr_, r.ptr_); }
+
+  explicit operator bool() const { return ptr_ != nullptr; }
+
+  template <typename U>
+  bool operator==(const scoped_refptr<U>& rhs) const {
+    return ptr_ == rhs.get();
+  }
+
+  template <typename U>
+  bool operator!=(const scoped_refptr<U>& rhs) const {
+    return !operator==(rhs);
+  }
+
+  template <typename U>
+  bool operator<(const scoped_refptr<U>& rhs) const {
+    return ptr_ < rhs.get();
+  }
+
+ protected:
+  T* ptr_ = nullptr;
+
+ private:
+  template <typename U>
+  friend scoped_refptr<U> base::AdoptRef(U*);
+  friend class ::base::SequencedTaskRunner;
+
+  // Friend access so these classes can use the constructor below as part of a
+  // binary size optimization.
+  friend class ::base::internal::BasePromise;
+  friend class ::base::WrappedPromise;
+
+  scoped_refptr(T* p, base::cef_subtle::AdoptRefTag) : ptr_(p) {}
+
+  // Friend required for move constructors that set r.ptr_ to null.
+  template <typename U>
+  friend class scoped_refptr;
+
+  // Non-inline helpers to allow:
+  //     class Opaque;
+  //     extern template class scoped_refptr<Opaque>;
+  // Otherwise the compiler will complain that Opaque is an incomplete type.
+  static void AddRef(T* ptr);
+  static void Release(T* ptr);
+};
+
+template <typename T>
+T* scoped_refptr<T>::release() {
+  T* ptr = ptr_;
+  ptr_ = nullptr;
+  return ptr;
+}
+
+// static
+template <typename T>
+void scoped_refptr<T>::AddRef(T* ptr) {
+  ptr->AddRef();
+}
+
+// static
+template <typename T>
+void scoped_refptr<T>::Release(T* ptr) {
+  ptr->Release();
+}
+
+template <typename T, typename U>
+bool operator==(const scoped_refptr<T>& lhs, const U* rhs) {
+  return lhs.get() == rhs;
+}
+
+template <typename T, typename U>
+bool operator==(const T* lhs, const scoped_refptr<U>& rhs) {
+  return lhs == rhs.get();
+}
+
+template <typename T>
+bool operator==(const scoped_refptr<T>& lhs, std::nullptr_t null) {
+  return !static_cast<bool>(lhs);
+}
+
+template <typename T>
+bool operator==(std::nullptr_t null, const scoped_refptr<T>& rhs) {
+  return !static_cast<bool>(rhs);
+}
+
+template <typename T, typename U>
+bool operator!=(const scoped_refptr<T>& lhs, const U* rhs) {
+  return !operator==(lhs, rhs);
+}
+
+template <typename T, typename U>
+bool operator!=(const T* lhs, const scoped_refptr<U>& rhs) {
+  return !operator==(lhs, rhs);
+}
+
+template <typename T>
+bool operator!=(const scoped_refptr<T>& lhs, std::nullptr_t null) {
+  return !operator==(lhs, null);
+}
+
+template <typename T>
+bool operator!=(std::nullptr_t null, const scoped_refptr<T>& rhs) {
+  return !operator==(null, rhs);
+}
+
+template <typename T>
+std::ostream& operator<<(std::ostream& out, const scoped_refptr<T>& p) {
+  return out << p.get();
+}
+
+template <typename T>
+void swap(scoped_refptr<T>& lhs, scoped_refptr<T>& rhs) noexcept {
+  lhs.swap(rhs);
+}
+
+#endif  // !USING_CHROMIUM_INCLUDES
+
+#endif  // CEF_INCLUDE_BASE_CEF_SCOPED_REFPTR_H_
diff --git a/src/include/base/cef_string16.h b/src/include/base/cef_string16.h
deleted file mode 100644
index 427564073..000000000
--- a/src/include/base/cef_string16.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2013
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_STRING16_H_
-#define CEF_INCLUDE_BASE_CEF_STRING16_H_
-#pragma once
-
-#if defined(BASE_STRINGS_STRING16_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/strings/string16.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-// WHAT:
-// A version of std::basic_string that provides 2-byte characters even when
-// wchar_t is not implemented as a 2-byte type. You can access this class as
-// string16. We also define char16, which string16 is based upon.
-//
-// WHY:
-// On Windows, wchar_t is 2 bytes, and it can conveniently handle UTF-16/UCS-2
-// data. Plenty of existing code operates on strings encoded as UTF-16.
-//
-// On many other platforms, sizeof(wchar_t) is 4 bytes by default. We can make
-// it 2 bytes by using the GCC flag -fshort-wchar. But then std::wstring fails
-// at run time, because it calls some functions (like wcslen) that come from
-// the system's native C library -- which was built with a 4-byte wchar_t!
-// It's wasteful to use 4-byte wchar_t strings to carry UTF-16 data, and it's
-// entirely improper on those systems where the encoding of wchar_t is defined
-// as UTF-32.
-//
-// Here, we define string16, which is similar to std::wstring but replaces all
-// libc functions with custom, 2-byte-char compatible routines. It is capable
-// of carrying UTF-16-encoded data.
-
-#include <stdio.h>
-#include <string>
-
-#include "include/base/cef_basictypes.h"
-
-#if defined(WCHAR_T_IS_UTF16)
-
-namespace base {
-
-typedef wchar_t char16;
-typedef std::wstring string16;
-typedef std::char_traits<wchar_t> string16_char_traits;
-
-}  // namespace base
-
-#elif defined(WCHAR_T_IS_UTF32)
-
-#include <stdint.h>  // For uint16_t
-
-#include "include/base/cef_macros.h"
-
-namespace base {
-
-typedef uint16_t char16;
-
-// char16 versions of the functions required by string16_char_traits; these
-// are based on the wide character functions of similar names ("w" or "wcs"
-// instead of "c16").
-int c16memcmp(const char16* s1, const char16* s2, size_t n);
-size_t c16len(const char16* s);
-const char16* c16memchr(const char16* s, char16 c, size_t n);
-char16* c16memmove(char16* s1, const char16* s2, size_t n);
-char16* c16memcpy(char16* s1, const char16* s2, size_t n);
-char16* c16memset(char16* s, char16 c, size_t n);
-
-struct string16_char_traits {
-  typedef char16 char_type;
-  typedef int int_type;
-
-  // int_type needs to be able to hold each possible value of char_type, and in
-  // addition, the distinct value of eof().
-  COMPILE_ASSERT(sizeof(int_type) > sizeof(char_type), unexpected_type_width);
-
-  typedef std::streamoff off_type;
-  typedef mbstate_t state_type;
-  typedef std::fpos<state_type> pos_type;
-
-  static void assign(char_type& c1, const char_type& c2) { c1 = c2; }
-
-  static bool eq(const char_type& c1, const char_type& c2) { return c1 == c2; }
-  static bool lt(const char_type& c1, const char_type& c2) { return c1 < c2; }
-
-  static int compare(const char_type* s1, const char_type* s2, size_t n) {
-    return c16memcmp(s1, s2, n);
-  }
-
-  static size_t length(const char_type* s) { return c16len(s); }
-
-  static const char_type* find(const char_type* s,
-                               size_t n,
-                               const char_type& a) {
-    return c16memchr(s, a, n);
-  }
-
-  static char_type* move(char_type* s1, const char_type* s2, int_type n) {
-    return c16memmove(s1, s2, n);
-  }
-
-  static char_type* copy(char_type* s1, const char_type* s2, size_t n) {
-    return c16memcpy(s1, s2, n);
-  }
-
-  static char_type* assign(char_type* s, size_t n, char_type a) {
-    return c16memset(s, a, n);
-  }
-
-  static int_type not_eof(const int_type& c) {
-    return eq_int_type(c, eof()) ? 0 : c;
-  }
-
-  static char_type to_char_type(const int_type& c) { return char_type(c); }
-
-  static int_type to_int_type(const char_type& c) { return int_type(c); }
-
-  static bool eq_int_type(const int_type& c1, const int_type& c2) {
-    return c1 == c2;
-  }
-
-  static int_type eof() { return static_cast<int_type>(EOF); }
-};
-
-typedef std::basic_string<char16, base::string16_char_traits> string16;
-
-extern std::ostream& operator<<(std::ostream& out, const string16& str);
-
-// This is required by googletest to print a readable output on test failures.
-extern void PrintTo(const string16& str, std::ostream* out);
-
-}  // namespace base
-
-// The string class will be explicitly instantiated only once, in string16.cc.
-//
-// std::basic_string<> in GNU libstdc++ contains a static data member,
-// _S_empty_rep_storage, to represent empty strings.  When an operation such
-// as assignment or destruction is performed on a string, causing its existing
-// data member to be invalidated, it must not be freed if this static data
-// member is being used.  Otherwise, it counts as an attempt to free static
-// (and not allocated) data, which is a memory error.
-//
-// Generally, due to C++ template magic, _S_empty_rep_storage will be marked
-// as a coalesced symbol, meaning that the linker will combine multiple
-// instances into a single one when generating output.
-//
-// If a string class is used by multiple shared libraries, a problem occurs.
-// Each library will get its own copy of _S_empty_rep_storage.  When strings
-// are passed across a library boundary for alteration or destruction, memory
-// errors will result.  GNU libstdc++ contains a configuration option,
-// --enable-fully-dynamic-string (_GLIBCXX_FULLY_DYNAMIC_STRING), which
-// disables the static data member optimization, but it's a good optimization
-// and non-STL code is generally at the mercy of the system's STL
-// configuration.  Fully-dynamic strings are not the default for GNU libstdc++
-// libstdc++ itself or for the libstdc++ installations on the systems we care
-// about, such as Mac OS X and relevant flavors of Linux.
-//
-// See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24196 .
-//
-// To avoid problems, string classes need to be explicitly instantiated only
-// once, in exactly one library.  All other string users see it via an "extern"
-// declaration.  This is precisely how GNU libstdc++ handles
-// std::basic_string<char> (string) and std::basic_string<wchar_t> (wstring).
-//
-// This also works around a Mac OS X linker bug in ld64-85.2.1 (Xcode 3.1.2),
-// in which the linker does not fully coalesce symbols when dead code
-// stripping is enabled.  This bug causes the memory errors described above
-// to occur even when a std::basic_string<> does not cross shared library
-// boundaries, such as in statically-linked executables.
-//
-// TODO(mark): File this bug with Apple and update this note with a bug number.
-
-extern template class std::basic_string<base::char16,
-                                        base::string16_char_traits>;
-
-#endif  // WCHAR_T_IS_UTF32
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_STRING16_H_
diff --git a/src/include/base/cef_template_util.h b/src/include/base/cef_template_util.h
deleted file mode 100644
index 38fa5839c..000000000
--- a/src/include/base/cef_template_util.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2011
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
-#define CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
-#pragma once
-
-#if defined(BASE_TEMPLATE_UTIL_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/template_util.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <cstddef>  // For size_t.
-
-#include "include/base/cef_build.h"
-
-namespace base {
-
-// template definitions from tr1
-
-template <class T, T v>
-struct integral_constant {
-  static const T value = v;
-  typedef T value_type;
-  typedef integral_constant<T, v> type;
-};
-
-template <class T, T v>
-const T integral_constant<T, v>::value;
-
-typedef integral_constant<bool, true> true_type;
-typedef integral_constant<bool, false> false_type;
-
-template <class T>
-struct is_pointer : false_type {};
-template <class T>
-struct is_pointer<T*> : true_type {};
-
-// Member function pointer detection up to four params. Add more as needed
-// below. This is built-in to C++ 11, and we can remove this when we switch.
-template <typename T>
-struct is_member_function_pointer : false_type {};
-
-template <typename R, typename Z>
-struct is_member_function_pointer<R (Z::*)()> : true_type {};
-template <typename R, typename Z>
-struct is_member_function_pointer<R (Z::*)() const> : true_type {};
-
-template <typename R, typename Z, typename A>
-struct is_member_function_pointer<R (Z::*)(A)> : true_type {};
-template <typename R, typename Z, typename A>
-struct is_member_function_pointer<R (Z::*)(A) const> : true_type {};
-
-template <typename R, typename Z, typename A, typename B>
-struct is_member_function_pointer<R (Z::*)(A, B)> : true_type {};
-template <typename R, typename Z, typename A, typename B>
-struct is_member_function_pointer<R (Z::*)(A, B) const> : true_type {};
-
-template <typename R, typename Z, typename A, typename B, typename C>
-struct is_member_function_pointer<R (Z::*)(A, B, C)> : true_type {};
-template <typename R, typename Z, typename A, typename B, typename C>
-struct is_member_function_pointer<R (Z::*)(A, B, C) const> : true_type {};
-
-template <typename R,
-          typename Z,
-          typename A,
-          typename B,
-          typename C,
-          typename D>
-struct is_member_function_pointer<R (Z::*)(A, B, C, D)> : true_type {};
-template <typename R,
-          typename Z,
-          typename A,
-          typename B,
-          typename C,
-          typename D>
-struct is_member_function_pointer<R (Z::*)(A, B, C, D) const> : true_type {};
-
-template <class T, class U>
-struct is_same : public false_type {};
-template <class T>
-struct is_same<T, T> : true_type {};
-
-template <class>
-struct is_array : public false_type {};
-template <class T, size_t n>
-struct is_array<T[n]> : public true_type {};
-template <class T>
-struct is_array<T[]> : public true_type {};
-
-template <class T>
-struct is_non_const_reference : false_type {};
-template <class T>
-struct is_non_const_reference<T&> : true_type {};
-template <class T>
-struct is_non_const_reference<const T&> : false_type {};
-
-template <class T>
-struct is_const : false_type {};
-template <class T>
-struct is_const<const T> : true_type {};
-
-template <class T>
-struct is_void : false_type {};
-template <>
-struct is_void<void> : true_type {};
-
-namespace cef_internal {
-
-// Types YesType and NoType are guaranteed such that sizeof(YesType) <
-// sizeof(NoType).
-typedef char YesType;
-
-struct NoType {
-  YesType dummy[2];
-};
-
-// This class is an implementation detail for is_convertible, and you
-// don't need to know how it works to use is_convertible. For those
-// who care: we declare two different functions, one whose argument is
-// of type To and one with a variadic argument list. We give them
-// return types of different size, so we can use sizeof to trick the
-// compiler into telling us which function it would have chosen if we
-// had called it with an argument of type From.  See Alexandrescu's
-// _Modern C++ Design_ for more details on this sort of trick.
-
-struct ConvertHelper {
-  template <typename To>
-  static YesType Test(To);
-
-  template <typename To>
-  static NoType Test(...);
-
-  template <typename From>
-  static From& Create();
-};
-
-// Used to determine if a type is a struct/union/class. Inspired by Boost's
-// is_class type_trait implementation.
-struct IsClassHelper {
-  template <typename C>
-  static YesType Test(void (C::*)(void));
-
-  template <typename C>
-  static NoType Test(...);
-};
-
-}  // namespace cef_internal
-
-// Inherits from true_type if From is convertible to To, false_type otherwise.
-//
-// Note that if the type is convertible, this will be a true_type REGARDLESS
-// of whether or not the conversion would emit a warning.
-template <typename From, typename To>
-struct is_convertible
-    : integral_constant<bool,
-                        sizeof(cef_internal::ConvertHelper::Test<To>(
-                            cef_internal::ConvertHelper::Create<From>())) ==
-                            sizeof(cef_internal::YesType)> {};
-
-template <typename T>
-struct is_class
-    : integral_constant<bool,
-                        sizeof(cef_internal::IsClassHelper::Test<T>(0)) ==
-                            sizeof(cef_internal::YesType)> {};
-
-template <bool B, class T = void>
-struct enable_if {};
-
-template <class T>
-struct enable_if<true, T> {
-  typedef T type;
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_TEMPLATE_UTIL_H_
diff --git a/src/include/base/cef_thread_checker.h b/src/include/base/cef_thread_checker.h
index e48c8d033..6f21c697c 100644
--- a/src/include/base/cef_thread_checker.h
+++ b/src/include/base/cef_thread_checker.h
@@ -32,12 +32,7 @@
 #define CEF_INCLUDE_BASE_THREAD_CHECKER_H_
 #pragma once
 
-#if defined(BASE_THREADING_THREAD_CHECKER_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/threading/thread_checker.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -48,10 +43,12 @@
 #include "include/base/cef_logging.h"
 #include "include/base/internal/cef_thread_checker_impl.h"
 
-// Apart from debug builds, we also enable the thread checker in
-// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
-// with this define will get the same level of thread checking as
-// debug bots.
+///
+/// Apart from debug builds, we also enable the thread checker in
+/// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
+/// with this define will get the same level of thread checking as
+/// debug bots.
+///
 #if DCHECK_IS_ON()
 #define ENABLE_THREAD_CHECKER 1
 #else
@@ -62,10 +59,12 @@ namespace base {
 
 namespace cef_internal {
 
-// Do nothing implementation, for use in release mode.
-//
-// Note: You should almost always use the ThreadChecker class to get the
-// right version for your build configuration.
+///
+/// Do nothing implementation, for use in release mode.
+///
+/// Note: You should almost always use the ThreadChecker class to get the
+/// right version for your build configuration.
+///
 class ThreadCheckerDoNothing {
  public:
   bool CalledOnValidThread() const { return true; }
@@ -75,37 +74,42 @@ class ThreadCheckerDoNothing {
 
 }  // namespace cef_internal
 
-// ThreadChecker is a helper class used to help verify that some methods of a
-// class are called from the same thread. It provides identical functionality to
-// base::NonThreadSafe, but it is meant to be held as a member variable, rather
-// than inherited from base::NonThreadSafe.
-//
-// While inheriting from base::NonThreadSafe may give a clear indication about
-// the thread-safety of a class, it may also lead to violations of the style
-// guide with regard to multiple inheritance. The choice between having a
-// ThreadChecker member and inheriting from base::NonThreadSafe should be based
-// on whether:
-//  - Derived classes need to know the thread they belong to, as opposed to
-//    having that functionality fully encapsulated in the base class.
-//  - Derived classes should be able to reassign the base class to another
-//    thread, via DetachFromThread.
-//
-// If neither of these are true, then having a ThreadChecker member and calling
-// CalledOnValidThread is the preferable solution.
-//
-// Example:
-// class MyClass {
-//  public:
-//   void Foo() {
-//     DCHECK(thread_checker_.CalledOnValidThread());
-//     ... (do stuff) ...
-//   }
-//
-//  private:
-//   ThreadChecker thread_checker_;
-// }
-//
-// In Release mode, CalledOnValidThread will always return true.
+///
+/// ThreadChecker is a helper class used to help verify that some methods of a
+/// class are called from the same thread. It provides identical functionality
+/// to base::NonThreadSafe, but it is meant to be held as a member variable,
+/// rather than inherited from base::NonThreadSafe.
+///
+/// While inheriting from base::NonThreadSafe may give a clear indication about
+/// the thread-safety of a class, it may also lead to violations of the style
+/// guide with regard to multiple inheritance. The choice between having a
+/// ThreadChecker member and inheriting from base::NonThreadSafe should be based
+/// on whether:
+///  - Derived classes need to know the thread they belong to, as opposed to
+///    having that functionality fully encapsulated in the base class.
+///  - Derived classes should be able to reassign the base class to another
+///    thread, via DetachFromThread.
+///
+/// If neither of these are true, then having a ThreadChecker member and calling
+/// CalledOnValidThread is the preferable solution.
+///
+/// Example:
+///
+/// <pre>
+///   class MyClass {
+///    public:
+///     void Foo() {
+///       DCHECK(thread_checker_.CalledOnValidThread());
+///       ... (do stuff) ...
+///     }
+///
+///    private:
+///     ThreadChecker thread_checker_;
+///   }
+/// </pre>
+///
+/// In Release mode, CalledOnValidThread will always return true.
+///
 #if ENABLE_THREAD_CHECKER
 class ThreadChecker : public cef_internal::ThreadCheckerImpl {};
 #else
diff --git a/src/include/base/cef_thread_collision_warner.h b/src/include/base/cef_thread_collision_warner.h
deleted file mode 100644
index 53f6ef6d5..000000000
--- a/src/include/base/cef_thread_collision_warner.h
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
-// Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_
-#define CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_
-#pragma once
-
-#if defined(BASE_THREADING_THREAD_COLLISION_WARNER_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
-#include "base/threading/thread_collision_warner.h"
-#else  // !USING_CHROMIUM_INCLUDES
-// The following is substantially similar to the Chromium implementation.
-// If the Chromium implementation diverges the below implementation should be
-// updated to match.
-
-#include <memory>
-
-#include "include/base/cef_atomicops.h"
-#include "include/base/cef_basictypes.h"
-#include "include/base/cef_build.h"
-#include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
-
-// A helper class alongside macros to be used to verify assumptions about thread
-// safety of a class.
-//
-// Example: Queue implementation non thread-safe but still usable if clients
-//          are synchronized somehow.
-//
-//          In this case the macro DFAKE_SCOPED_LOCK has to be
-//          used, it checks that if a thread is inside the push/pop then
-//          noone else is still inside the pop/push
-//
-// class NonThreadSafeQueue {
-//  public:
-//   ...
-//   void push(int) { DFAKE_SCOPED_LOCK(push_pop_); ... }
-//   int pop() { DFAKE_SCOPED_LOCK(push_pop_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(push_pop_);
-// };
-//
-//
-// Example: Queue implementation non thread-safe but still usable if clients
-//          are synchronized somehow, it calls a method to "protect" from
-//          a "protected" method
-//
-//          In this case the macro DFAKE_SCOPED_RECURSIVE_LOCK
-//          has to be used, it checks that if a thread is inside the push/pop
-//          then noone else is still inside the pop/push
-//
-// class NonThreadSafeQueue {
-//  public:
-//   void push(int) {
-//     DFAKE_SCOPED_LOCK(push_pop_);
-//     ...
-//   }
-//   int pop() {
-//     DFAKE_SCOPED_RECURSIVE_LOCK(push_pop_);
-//     bar();
-//     ...
-//   }
-//   void bar() { DFAKE_SCOPED_RECURSIVE_LOCK(push_pop_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(push_pop_);
-// };
-//
-//
-// Example: Queue implementation not usable even if clients are synchronized,
-//          so only one thread in the class life cycle can use the two members
-//          push/pop.
-//
-//          In this case the macro DFAKE_SCOPED_LOCK_THREAD_LOCKED pins the
-//          specified
-//          critical section the first time a thread enters push or pop, from
-//          that time on only that thread is allowed to execute push or pop.
-//
-// class NonThreadSafeQueue {
-//  public:
-//   ...
-//   void push(int) { DFAKE_SCOPED_LOCK_THREAD_LOCKED(push_pop_); ... }
-//   int pop() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(push_pop_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(push_pop_);
-// };
-//
-//
-// Example: Class that has to be contructed/destroyed on same thread, it has
-//          a "shareable" method (with external synchronization) and a not
-//          shareable method (even with external synchronization).
-//
-//          In this case 3 Critical sections have to be defined
-//
-// class ExoticClass {
-//  public:
-//   ExoticClass() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(ctor_dtor_); ... }
-//   ~ExoticClass() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(ctor_dtor_); ... }
-//
-//   void Shareable() { DFAKE_SCOPED_LOCK(shareable_section_); ... }
-//   void NotShareable() { DFAKE_SCOPED_LOCK_THREAD_LOCKED(ctor_dtor_); ... }
-//   ...
-//  private:
-//   DFAKE_MUTEX(ctor_dtor_);
-//   DFAKE_MUTEX(shareable_section_);
-// };
-
-#if DCHECK_IS_ON()
-
-// Defines a class member that acts like a mutex. It is used only as a
-// verification tool.
-#define DFAKE_MUTEX(obj) mutable base::ThreadCollisionWarner obj
-// Asserts the call is never called simultaneously in two threads. Used at
-// member function scope.
-#define DFAKE_SCOPED_LOCK(obj) \
-  base::ThreadCollisionWarner::ScopedCheck s_check_##obj(&obj)
-// Asserts the call is never called simultaneously in two threads. Used at
-// member function scope. Same as DFAKE_SCOPED_LOCK but allows recursive locks.
-#define DFAKE_SCOPED_RECURSIVE_LOCK(obj) \
-  base::ThreadCollisionWarner::ScopedRecursiveCheck sr_check_##obj(&obj)
-// Asserts the code is always executed in the same thread.
-#define DFAKE_SCOPED_LOCK_THREAD_LOCKED(obj) \
-  base::ThreadCollisionWarner::Check check_##obj(&obj)
-
-#else
-
-#define DFAKE_MUTEX(obj) typedef void InternalFakeMutexType##obj
-#define DFAKE_SCOPED_LOCK(obj) ((void)0)
-#define DFAKE_SCOPED_RECURSIVE_LOCK(obj) ((void)0)
-#define DFAKE_SCOPED_LOCK_THREAD_LOCKED(obj) ((void)0)
-
-#endif
-
-namespace base {
-
-// The class ThreadCollisionWarner uses an Asserter to notify the collision
-// AsserterBase is the interfaces and DCheckAsserter is the default asserter
-// used. During the unit tests is used another class that doesn't "DCHECK"
-// in case of collision (check thread_collision_warner_unittests.cc)
-struct AsserterBase {
-  virtual ~AsserterBase() {}
-  virtual void warn() = 0;
-};
-
-struct DCheckAsserter : public AsserterBase {
-  virtual ~DCheckAsserter() {}
-  virtual void warn() OVERRIDE;
-};
-
-class ThreadCollisionWarner {
- public:
-  // The parameter asserter is there only for test purpose
-  explicit ThreadCollisionWarner(AsserterBase* asserter = new DCheckAsserter())
-      : valid_thread_id_(0), counter_(0), asserter_(asserter) {}
-
-  ~ThreadCollisionWarner() { delete asserter_; }
-
-  // This class is meant to be used through the macro
-  // DFAKE_SCOPED_LOCK_THREAD_LOCKED
-  // it doesn't leave the critical section, as opposed to ScopedCheck,
-  // because the critical section being pinned is allowed to be used only
-  // from one thread
-  class Check {
-   public:
-    explicit Check(ThreadCollisionWarner* warner) : warner_(warner) {
-      warner_->EnterSelf();
-    }
-
-    ~Check() {}
-
-   private:
-    ThreadCollisionWarner* warner_;
-
-    DISALLOW_COPY_AND_ASSIGN(Check);
-  };
-
-  // This class is meant to be used through the macro
-  // DFAKE_SCOPED_LOCK
-  class ScopedCheck {
-   public:
-    explicit ScopedCheck(ThreadCollisionWarner* warner) : warner_(warner) {
-      warner_->Enter();
-    }
-
-    ~ScopedCheck() { warner_->Leave(); }
-
-   private:
-    ThreadCollisionWarner* warner_;
-
-    DISALLOW_COPY_AND_ASSIGN(ScopedCheck);
-  };
-
-  // This class is meant to be used through the macro
-  // DFAKE_SCOPED_RECURSIVE_LOCK
-  class ScopedRecursiveCheck {
-   public:
-    explicit ScopedRecursiveCheck(ThreadCollisionWarner* warner)
-        : warner_(warner) {
-      warner_->EnterSelf();
-    }
-
-    ~ScopedRecursiveCheck() { warner_->Leave(); }
-
-   private:
-    ThreadCollisionWarner* warner_;
-
-    DISALLOW_COPY_AND_ASSIGN(ScopedRecursiveCheck);
-  };
-
- private:
-  // This method stores the current thread identifier and does a DCHECK
-  // if a another thread has already done it, it is safe if same thread
-  // calls this multiple time (recursion allowed).
-  void EnterSelf();
-
-  // Same as EnterSelf but recursion is not allowed.
-  void Enter();
-
-  // Removes the thread_id stored in order to allow other threads to
-  // call EnterSelf or Enter.
-  void Leave();
-
-  // This stores the thread id that is inside the critical section, if the
-  // value is 0 then no thread is inside.
-  volatile subtle::Atomic32 valid_thread_id_;
-
-  // Counter to trace how many time a critical section was "pinned"
-  // (when allowed) in order to unpin it when counter_ reaches 0.
-  volatile subtle::Atomic32 counter_;
-
-  // Here only for class unit tests purpose, during the test I need to not
-  // DCHECK but notify the collision with something else.
-  AsserterBase* asserter_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThreadCollisionWarner);
-};
-
-}  // namespace base
-
-#endif  // !USING_CHROMIUM_INCLUDES
-
-#endif  // CEF_INCLUDE_BASE_CEF_THREAD_COLLISION_WARNER_H_
diff --git a/src/include/base/cef_trace_event.h b/src/include/base/cef_trace_event.h
index 1b2cad014..30e31af75 100644
--- a/src/include/base/cef_trace_event.h
+++ b/src/include/base/cef_trace_event.h
@@ -29,124 +29,133 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ///
-// Trace events are for tracking application performance and resource usage.
-// Macros are provided to track:
-//    Begin and end of function calls
-//    Counters
-//
-// Events are issued against categories. Whereas LOG's categories are statically
-// defined, TRACE categories are created implicitly with a string. For example:
-//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
-//
-// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
-//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
-//   doSomethingCostly()
-//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
-// Note: Our tools can't always determine the correct BEGIN/END pairs unless
-// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
-// need them to be in separate scopes.
-//
-// A common use case is to trace entire function scopes. This issues a trace
-// BEGIN and END automatically:
-//   void doSomethingCostly() {
-//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
-//     ...
-//   }
-//
-// Additional parameters can be associated with an event:
-//   void doSomethingCostly2(int howMuch) {
-//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
-//         "howMuch", howMuch);
-//     ...
-//   }
-//
-// The trace system will automatically add to this information the current
-// process id, thread id, and a timestamp in microseconds.
-//
-// To trace an asynchronous procedure such as an IPC send/receive, use
-// ASYNC_BEGIN and ASYNC_END:
-//   [single threaded sender code]
-//     static int send_count = 0;
-//     ++send_count;
-//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
-//     Send(new MyMessage(send_count));
-//   [receive code]
-//     void OnMyMessage(send_count) {
-//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
-//     }
-// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
-// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
-// Pointers can be used for the ID parameter, and they will be mangled
-// internally so that the same pointer on two different processes will not
-// match. For example:
-//   class MyTracedClass {
-//    public:
-//     MyTracedClass() {
-//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
-//     }
-//     ~MyTracedClass() {
-//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
-//     }
-//   }
-//
-// The trace event also supports counters, which is a way to track a quantity
-// as it varies over time. Counters are created with the following macro:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
-//
-// Counters are process-specific. The macro itself can be issued from any
-// thread, however.
-//
-// Sometimes, you want to track two counters at once. You can do this with two
-// counter macros:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
-// Or you can do it with a combined macro:
-//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
-//       "bytesPinned", g_myCounterValue[0],
-//       "bytesAllocated", g_myCounterValue[1]);
-// This indicates to the tracing UI that these counters should be displayed
-// in a single graph, as a summed area chart.
-//
-// Since counters are in a global namespace, you may want to disembiguate with a
-// unique ID, by using the TRACE_COUNTER_ID* variations.
-//
-// By default, trace collection is compiled in, but turned off at runtime.
-// Collecting trace data is the responsibility of the embedding application. In
-// CEF's case, calling BeginTracing will turn on tracing on all active
-// processes.
-//
-//
-// Memory scoping note:
-// Tracing copies the pointers, not the string content, of the strings passed
-// in for category, name, and arg_names.  Thus, the following code will cause
-// problems:
-//     char* str = strdup("impprtantName");
-//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
-//     free(str);                   // Trace system now has dangling pointer
-//
-// To avoid this issue with the |name| and |arg_name| parameters, use the
-// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime
-// overhead.
-// Notes: The category must always be in a long-lived char* (i.e. static const).
-//        The |arg_values|, when used, are always deep copied with the _COPY
-//        macros.
-//
-//
-// Thread Safety:
-// All macros are thread safe and can be used from any process.
+/// \file
+/// Trace events are for tracking application performance and resource usage.
+/// Macros are provided to track:
+///    Begin and end of function calls
+///    Counters
+///
+/// Events are issued against categories. Whereas LOG's categories are
+/// statically defined, TRACE categories are created implicitly with a string.
+/// For example: <pre>
+///   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
+/// </pre>
+///
+/// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
+/// <pre>
+///   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
+///   doSomethingCostly()
+///   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
+/// </pre>
+/// Note: Our tools can't always determine the correct BEGIN/END pairs unless
+/// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
+/// need them to be in separate scopes.
+///
+/// A common use case is to trace entire function scopes. This issues a trace
+/// BEGIN and END automatically:
+/// <pre>
+///   void doSomethingCostly() {
+///     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
+///     ...
+///   }
+/// </pre>
+///
+/// Additional parameters can be associated with an event:
+/// <pre>
+///   void doSomethingCostly2(int howMuch) {
+///     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
+///         "howMuch", howMuch);
+///     ...
+///   }
+/// </pre>
+///
+/// The trace system will automatically add to this information the current
+/// process id, thread id, and a timestamp in microseconds.
+///
+/// To trace an asynchronous procedure such as an IPC send/receive, use
+/// ASYNC_BEGIN and ASYNC_END:
+/// <pre>
+///   [single threaded sender code]
+///     static int send_count = 0;
+///     ++send_count;
+///     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
+///     Send(new MyMessage(send_count));
+///   [receive code]
+///     void OnMyMessage(send_count) {
+///       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
+///     }
+/// </pre>
+/// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
+/// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
+/// Pointers can be used for the ID parameter, and they will be mangled
+/// internally so that the same pointer on two different processes will not
+/// match. For example:
+/// <pre>
+///   class MyTracedClass {
+///    public:
+///     MyTracedClass() {
+///       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
+///     }
+///     ~MyTracedClass() {
+///       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
+///     }
+///   }
+/// </pre>
+///
+/// The trace event also supports counters, which is a way to track a quantity
+/// as it varies over time. Counters are created with the following macro:
+/// <pre>
+///   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
+/// </pre>
+///
+/// Counters are process-specific. The macro itself can be issued from any
+/// thread, however.
+///
+/// Sometimes, you want to track two counters at once. You can do this with two
+/// counter macros:
+/// <pre>
+///   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
+///   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
+/// </pre>
+/// Or you can do it with a combined macro:
+/// <pre>
+///   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
+///       "bytesPinned", g_myCounterValue[0],
+///       "bytesAllocated", g_myCounterValue[1]);
+/// </pre>
+/// This indicates to the tracing UI that these counters should be displayed
+/// in a single graph, as a summed area chart.
+///
+/// Since counters are in a global namespace, you may want to disembiguate with
+/// a unique ID, by using the TRACE_COUNTER_ID* variations.
+///
+/// By default, trace collection is compiled in, but turned off at runtime.
+/// Collecting trace data is the responsibility of the embedding application. In
+/// CEF's case, calling BeginTracing will turn on tracing on all active
+/// processes.
+///
+///
+/// Memory scoping note:
+/// Tracing copies the pointers, not the string content, of the strings passed
+/// in for category, name, and arg_names.  Thus, the following code will cause
+/// problems:
+/// <pre>
+///     char* str = strdup("impprtantName");
+///     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
+///     free(str);                   // Trace system now has dangling pointer
+/// </pre>
+///
+///
+/// Thread Safety:
+/// All macros are thread safe and can be used from any process.
 ///
 
 #ifndef CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_
 #define CEF_INCLUDE_BASE_CEF_TRACE_EVENT_H_
 #pragma once
 
-#if defined(TRACE_EVENT0)
-// Do nothing if the macros provided by this header already exist.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
-// When building CEF include the Chromium header directly.
+#if defined(USING_CHROMIUM_INCLUDES)
+/// When building CEF include the Chromium header directly.
 #include "base/trace_event/trace_event.h"
 #else  // !USING_CHROMIUM_INCLUDES
 // The following is substantially similar to the Chromium implementation.
@@ -155,20 +164,22 @@
 
 #include "include/internal/cef_trace_event_internal.h"
 
-// Records a pair of begin and end events called "name" for the current
-// scope, with 0, 1 or 2 associated arguments. If the category is not
-// enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT0(category, name)                              \
-  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false); \
+///
+/// Records a pair of begin and end events called "name" for the current
+/// scope, with 0, 1 or 2 associated arguments. If the category is not
+/// enabled, then this does nothing.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+///
+#define TRACE_EVENT0(category, name)                       \
+  cef_trace_event_begin(category, name, NULL, 0, NULL, 0); \
   CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
-#define TRACE_EVENT1(category, name, arg1_name, arg1_val)                     \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, false); \
+#define TRACE_EVENT1(category, name, arg1_name, arg1_val)              \
+  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0); \
   CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
 #define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \
   cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name,        \
-                        arg2_val, false);                                      \
+                        arg2_val);                                             \
   CEF_INTERNAL_TRACE_END_ON_SCOPE_CLOSE(category, name)
 
 // Implementation detail: trace event macros create temporary variable names.
@@ -184,228 +195,181 @@
   cef_trace_event::CefTraceEndOnScopeClose CEF_INTERNAL_TRACE_EVENT_UID( \
       profileScope)(category, name)
 
-// Records a single event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
+///
+/// Records a single event called "name" immediately, with 0, 1 or 2
+/// associated arguments. If the category is not enabled, then this
+/// does nothing.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+///
 #define TRACE_EVENT_INSTANT0(category, name) \
-  cef_trace_event_instant(category, name, NULL, 0, NULL, 0, false)
+  cef_trace_event_instant(category, name, NULL, 0, NULL, 0)
 #define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0, false)
+  cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0)
 #define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, arg2_name, \
                              arg2_val)                                       \
   cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name,    \
-                          arg2_val, false)
-#define TRACE_EVENT_COPY_INSTANT0(category, name) \
-  cef_trace_event_instant(category, name, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val,    \
-                                  arg2_name, arg2_val)                    \
-  cef_trace_event_instant(category, name, arg1_name, arg1_val, arg2_name, \
-                          arg2_val, true)
+                          arg2_val)
 
-// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
+///
+/// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
+/// associated arguments. If the category is not enabled, then this
+/// does nothing.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+///
 #define TRACE_EVENT_BEGIN0(category, name) \
-  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, false)
+  cef_trace_event_begin(category, name, NULL, 0, NULL, 0)
 #define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, false)
+  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0)
 #define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, arg2_name, \
                            arg2_val)                                       \
   cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name,    \
-                        arg2_val, false)
-#define TRACE_EVENT_COPY_BEGIN0(category, name) \
-  cef_trace_event_begin(category, name, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val,    \
-                                arg2_name, arg2_val)                    \
-  cef_trace_event_begin(category, name, arg1_name, arg1_val, arg2_name, \
-                        arg2_val, true)
+                        arg2_val)
 
-// Records a single END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
+///
+/// Records a single END event for "name" immediately. If the category
+/// is not enabled, then this does nothing.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+///
 #define TRACE_EVENT_END0(category, name) \
-  cef_trace_event_end(category, name, NULL, 0, NULL, 0, false)
+  cef_trace_event_end(category, name, NULL, 0, NULL, 0)
 #define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0, false)
+  cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0)
 #define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, arg2_name, \
                          arg2_val)                                       \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,    \
-                      arg2_val, false)
-#define TRACE_EVENT_COPY_END0(category, name) \
-  cef_trace_event_end(category, name, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, NULL, 0, true)
-#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, arg2_name, \
-                              arg2_val)                                       \
-  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name,         \
-                      arg2_val, true)
+  cef_trace_event_end(category, name, arg1_name, arg1_val, arg2_name, arg2_val)
 
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
+///
+/// Records the value of a counter called "name" immediately. Value
+/// must be representable as a 32 bit integer.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+///
 #define TRACE_COUNTER1(category, name, value) \
-  cef_trace_counter(category, name, NULL, value, NULL, 0, false)
-#define TRACE_COPY_COUNTER1(category, name, value) \
-  cef_trace_counter(category, name, NULL, value, NULL, 0, true)
+  cef_trace_counter(category, name, NULL, value, NULL, 0)
 
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
+///
+/// Records the values of a multi-parted counter called "name" immediately.
+/// The UI will treat value1 and value2 as parts of a whole, displaying their
+/// values as a stacked-bar chart.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+///
 #define TRACE_COUNTER2(category, name, value1_name, value1_val, value2_name, \
                        value2_val)                                           \
   cef_trace_counter(category, name, value1_name, value1_val, value2_name,    \
-                    value2_val, false)
-#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val,      \
-                            value2_name, value2_val)                      \
-  cef_trace_counter(category, name, value1_name, value1_val, value2_name, \
-                    value2_val, true)
+                    value2_val)
 
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the
-//   bits will be xored with a hash of the process ID so that the same pointer
-//   on two different processes will not collide.
+///
+/// Records the value of a counter called "name" immediately. Value
+/// must be representable as a 32 bit integer.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+/// - |id| is used to disambiguate counters with the same name. It must either
+///   be a pointer or an integer value up to 64 bits. If it's a pointer, the
+///   bits will be xored with a hash of the process ID so that the same pointer
+///   on two different processes will not collide.
+///
 #define TRACE_COUNTER_ID1(category, name, id, value) \
-  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0, false)
-#define TRACE_COPY_COUNTER_ID1(category, name, id, value) \
-  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0, true)
+  cef_trace_counter_id(category, name, id, NULL, value, NULL, 0)
 
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the
-//   bits will be xored with a hash of the process ID so that the same pointer
-//   on two different processes will not collide.
+///
+/// Records the values of a multi-parted counter called "name" immediately.
+/// The UI will treat value1 and value2 as parts of a whole, displaying their
+/// values as a stacked-bar chart.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+/// - |id| is used to disambiguate counters with the same name. It must either
+///   be a pointer or an integer value up to 64 bits. If it's a pointer, the
+///   bits will be xored with a hash of the process ID so that the same pointer
+///   on two different processes will not collide.
+///
 #define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
                           value2_name, value2_val)                     \
   cef_trace_counter_id(category, name, id, value1_name, value1_val,    \
-                       value2_name, value2_val, false)
-#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \
-                               value2_name, value2_val)                     \
-  cef_trace_counter_id(category, name, id, value1_name, value1_val,         \
-                       value2_name, value2_val, true)
+                       value2_name, value2_val)
 
-// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event.
-//   ASYNC events are considered to match if their category, name and id values
-//   all match. |id| must either be a pointer or an integer value up to 64
-//   bits. If it's a pointer, the bits will be xored with a hash of the process
-//   ID sothat the same pointer on two different processes will not collide.
-// An asynchronous operation can consist of multiple phases. The first phase is
-// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
-// ASYNC_STEP_BEGIN macros. When the operation completes, call ASYNC_END.
-// An async operation can span threads and processes, but all events in that
-// operation must use the same |name| and |id|. Each event can have its own
-// args.
+///
+/// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
+/// associated arguments. If the category is not enabled, then this
+/// does nothing.
+/// - category and name strings must have application lifetime (statics or
+///   literals). They may not include " chars.
+/// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event.
+///   ASYNC events are considered to match if their category, name and id values
+///   all match. |id| must either be a pointer or an integer value up to 64
+///   bits. If it's a pointer, the bits will be xored with a hash of the process
+///   ID sothat the same pointer on two different processes will not collide.
+/// An asynchronous operation can consist of multiple phases. The first phase is
+/// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
+/// ASYNC_STEP_BEGIN macros. When the operation completes, call ASYNC_END.
+/// An async operation can span threads and processes, but all events in that
+/// operation must use the same |name| and |id|. Each event can have its own
+/// args.
+///
 #define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
-  cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val)    \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL, \
-                              0, false)
+  cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0)
+#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
+  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL, 0)
 #define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
                                  arg2_name, arg2_val)                     \
   cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,    \
-                              arg2_name, arg2_val, false)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \
-  cef_trace_event_async_begin(category, name, id, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val, NULL,   \
-                              0, true)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
-                                      arg2_name, arg2_val)                     \
-  cef_trace_event_async_begin(category, name, id, arg1_name, arg1_val,         \
-                              arg2_name, arg2_val, true)
+                              arg2_name, arg2_val)
 
-// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
-// category is not enabled, then this does nothing. The |name| and |id| must
-// match the ASYNC_BEGIN event above. The |step| param identifies this step
-// within the async event. This should be called at the beginning of the next
-// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-// ASYNC_STEP_PAST events.
+///
+/// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
+/// category is not enabled, then this does nothing. The |name| and |id| must
+/// match the ASYNC_BEGIN event above. The |step| param identifies this step
+/// within the async event. This should be called at the beginning of the next
+/// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
+/// ASYNC_STEP_PAST events.
+///
 #define TRACE_EVENT_ASYNC_STEP_INTO0(category, name, id, step) \
-  cef_trace_event_async_step_into(category, name, id, step, NULL, 0, false)
+  cef_trace_event_async_step_into(category, name, id, step, NULL, 0)
 #define TRACE_EVENT_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
                                      arg1_val)                            \
-  cef_trace_event_async_step_into(category, name, id, step, arg1_name,    \
-                                  arg1_val, false)
-#define TRACE_EVENT_COPY_ASYNC_STEP_INTO0(category, name, id, step) \
-  cef_trace_event_async_step_into(category, name, id, step, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_STEP_INTO1(category, name, id, step, arg1_name, \
-                                          arg1_val)                            \
-  cef_trace_event_async_step_into(category, name, id, step, arg1_name,         \
-                                  arg1_val, true)
+  cef_trace_event_async_step_into(category, name, id, step, arg1_name, arg1_val)
 
-// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
-// category is not enabled, then this does nothing. The |name| and |id| must
-// match the ASYNC_BEGIN event above. The |step| param identifies this step
-// within the async event. This should be called at the beginning of the next
-// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-// ASYNC_STEP_INTO events.
+///
+/// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
+/// category is not enabled, then this does nothing. The |name| and |id| must
+/// match the ASYNC_BEGIN event above. The |step| param identifies this step
+/// within the async event. This should be called at the beginning of the next
+/// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
+/// ASYNC_STEP_INTO events.
+///
 #define TRACE_EVENT_ASYNC_STEP_PAST0(category, name, id, step) \
-  cef_trace_event_async_step_past(category, name, id, step, NULL, 0, false)
+  cef_trace_event_async_step_past(category, name, id, step, NULL, 0)
 #define TRACE_EVENT_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
                                      arg1_val)                            \
-  cef_trace_event_async_step_past(category, name, id, step, arg1_name,    \
-                                  arg1_val, false)
-#define TRACE_EVENT_COPY_ASYNC_STEP_PAST0(category, name, id, step) \
-  cef_trace_event_async_step_past(category, name, id, step, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_STEP_PAST1(category, name, id, step, arg1_name, \
-                                          arg1_val)                            \
-  cef_trace_event_async_step_past(category, name, id, step, arg1_name,         \
-                                  arg1_val, true)
+  cef_trace_event_async_step_past(category, name, id, step, arg1_name, arg1_val)
 
-// Records a single ASYNC_END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
+///
+/// Records a single ASYNC_END event for "name" immediately. If the category
+/// is not enabled, then this does nothing.
+///
 #define TRACE_EVENT_ASYNC_END0(category, name, id) \
-  cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, false)
-#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val)       \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0, \
-                            false)
+  cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0)
+#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
+  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0)
 #define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
                                arg2_name, arg2_val)                     \
   cef_trace_event_async_end(category, name, id, arg1_name, arg1_val,    \
-                            arg2_name, arg2_val, false)
-#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \
-  cef_trace_event_async_end(category, name, id, NULL, 0, NULL, 0, true)
-#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val)  \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val, NULL, 0, \
-                            true)
-#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
-                                    arg2_name, arg2_val)                     \
-  cef_trace_event_async_end(category, name, id, arg1_name, arg1_val,         \
-                            arg2_name, arg2_val, true)
+                            arg2_name, arg2_val)
 
 namespace cef_trace_event {
 
-// Used by TRACE_EVENTx macro. Do not use directly.
+///
+/// Used by TRACE_EVENTx macro. Do not use directly.
+///
 class CefTraceEndOnScopeClose {
  public:
   CefTraceEndOnScopeClose(const char* category, const char* name)
       : category_(category), name_(name) {}
   ~CefTraceEndOnScopeClose() {
-    cef_trace_event_end(category_, name_, NULL, 0, NULL, 0, false);
+    cef_trace_event_end(category_, name_, NULL, 0, NULL, 0);
   }
 
  private:
@@ -413,7 +377,7 @@ class CefTraceEndOnScopeClose {
   const char* name_;
 };
 
-}  // cef_trace_event
+}  // namespace cef_trace_event
 
 #endif  // !USING_CHROMIUM_INCLUDES
 
diff --git a/src/include/base/cef_tuple.h b/src/include/base/cef_tuple.h
index aeb6e9cea..ae438d39e 100644
--- a/src/include/base/cef_tuple.h
+++ b/src/include/base/cef_tuple.h
@@ -28,40 +28,36 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// A Tuple is a generic templatized container, similar in concept to std::pair.
-// There are classes Tuple0 to Tuple6, cooresponding to the number of elements
-// it contains.  The convenient MakeTuple() function takes 0 to 6 arguments,
-// and will construct and return the appropriate Tuple object.  The functions
-// DispatchToMethod and DispatchToFunction take a function pointer or instance
-// and method pointer, and unpack a tuple into arguments to the call.
-//
-// Tuple elements are copied by value, and stored in the tuple.  See the unit
-// tests for more details of how/when the values are copied.
-//
-// Example usage:
-//   // These two methods of creating a Tuple are identical.
-//   Tuple2<int, const char*> tuple_a(1, "wee");
-//   Tuple2<int, const char*> tuple_b = MakeTuple(1, "wee");
-//
-//   void SomeFunc(int a, const char* b) { }
-//   DispatchToFunction(&SomeFunc, tuple_a);  // SomeFunc(1, "wee")
-//   DispatchToFunction(
-//       &SomeFunc, MakeTuple(10, "foo"));    // SomeFunc(10, "foo")
-//
-//   struct { void SomeMeth(int a, int b, int c) { } } foo;
-//   DispatchToMethod(&foo, &Foo::SomeMeth, MakeTuple(1, 2, 3));
-//   // foo->SomeMeth(1, 2, 3);
+///
+/// \file
+/// Use std::tuple as tuple type. This file contains helper functions for
+/// working with std::tuples.
+/// The functions DispatchToMethod and DispatchToFunction take a function
+/// pointer or instance and method pointer, and unpack a tuple into arguments to
+/// the call.
+///
+/// Example usage:
+/// <pre>
+///   // These two methods of creating a Tuple are identical.
+///   std::tuple<int, const char*> tuple_a(1, "wee");
+///   std::tuple<int, const char*> tuple_b = std::make_tuple(1, "wee");
+///
+///   void SomeFunc(int a, const char* b) { }
+///   DispatchToFunction(&SomeFunc, tuple_a);  // SomeFunc(1, "wee")
+///   DispatchToFunction(
+///       &SomeFunc, std::make_tuple(10, "foo"));    // SomeFunc(10, "foo")
+///
+///   struct { void SomeMeth(int a, int b, int c) { } } foo;
+///   DispatchToMethod(&foo, &Foo::SomeMeth, std::make_tuple(1, 2, 3));
+///   // foo->SomeMeth(1, 2, 3);
+/// </pre>
+///
 
 #ifndef CEF_INCLUDE_BASE_CEF_TUPLE_H_
 #define CEF_INCLUDE_BASE_CEF_TUPLE_H_
 #pragma once
 
-#if defined(BASE_TUPLE_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/tuple.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -69,558 +65,13 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include "include/base/cef_bind_helpers.h"
-
-namespace base {
-
-// Traits ----------------------------------------------------------------------
-//
-// A simple traits class for tuple arguments.
-//
-// ValueType: the bare, nonref version of a type (same as the type for nonrefs).
-// RefType: the ref version of a type (same as the type for refs).
-// ParamType: what type to pass to functions (refs should not be constified).
-
-template <class P>
-struct TupleTraits {
-  typedef P ValueType;
-  typedef P& RefType;
-  typedef const P& ParamType;
-};
-
-template <class P>
-struct TupleTraits<P&> {
-  typedef P ValueType;
-  typedef P& RefType;
-  typedef P& ParamType;
-};
-
-template <class P>
-struct TupleTypes {};
-
-// Tuple -----------------------------------------------------------------------
-//
-// This set of classes is useful for bundling 0 or more heterogeneous data types
-// into a single variable.  The advantage of this is that it greatly simplifies
-// function objects that need to take an arbitrary number of parameters; see
-// RunnableMethod and IPC::MessageWithTuple.
-//
-// Tuple0 is supplied to act as a 'void' type.  It can be used, for example,
-// when dispatching to a function that accepts no arguments (see the
-// Dispatchers below).
-// Tuple1<A> is rarely useful.  One such use is when A is non-const ref that you
-// want filled by the dispatchee, and the tuple is merely a container for that
-// output (a "tier").  See MakeRefTuple and its usages.
-
-struct Tuple0 {
-  typedef Tuple0 ValueTuple;
-  typedef Tuple0 RefTuple;
-  typedef Tuple0 ParamTuple;
-};
-
-template <class A>
-struct Tuple1 {
- public:
-  typedef A TypeA;
-
-  Tuple1() {}
-  explicit Tuple1(typename TupleTraits<A>::ParamType a) : a(a) {}
-
-  A a;
-};
-
-template <class A, class B>
-struct Tuple2 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-
-  Tuple2() {}
-  Tuple2(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b)
-      : a(a), b(b) {}
-
-  A a;
-  B b;
-};
-
-template <class A, class B, class C>
-struct Tuple3 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-  typedef C TypeC;
-
-  Tuple3() {}
-  Tuple3(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c)
-      : a(a), b(b), c(c) {}
-
-  A a;
-  B b;
-  C c;
-};
-
-template <class A, class B, class C, class D>
-struct Tuple4 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-  typedef C TypeC;
-  typedef D TypeD;
-
-  Tuple4() {}
-  Tuple4(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c,
-         typename TupleTraits<D>::ParamType d)
-      : a(a), b(b), c(c), d(d) {}
-
-  A a;
-  B b;
-  C c;
-  D d;
-};
-
-template <class A, class B, class C, class D, class E>
-struct Tuple5 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-  typedef C TypeC;
-  typedef D TypeD;
-  typedef E TypeE;
-
-  Tuple5() {}
-  Tuple5(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c,
-         typename TupleTraits<D>::ParamType d,
-         typename TupleTraits<E>::ParamType e)
-      : a(a), b(b), c(c), d(d), e(e) {}
-
-  A a;
-  B b;
-  C c;
-  D d;
-  E e;
-};
-
-template <class A, class B, class C, class D, class E, class F>
-struct Tuple6 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-  typedef C TypeC;
-  typedef D TypeD;
-  typedef E TypeE;
-  typedef F TypeF;
-
-  Tuple6() {}
-  Tuple6(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c,
-         typename TupleTraits<D>::ParamType d,
-         typename TupleTraits<E>::ParamType e,
-         typename TupleTraits<F>::ParamType f)
-      : a(a), b(b), c(c), d(d), e(e), f(f) {}
-
-  A a;
-  B b;
-  C c;
-  D d;
-  E e;
-  F f;
-};
-
-template <class A, class B, class C, class D, class E, class F, class G>
-struct Tuple7 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-  typedef C TypeC;
-  typedef D TypeD;
-  typedef E TypeE;
-  typedef F TypeF;
-  typedef G TypeG;
+#include <stddef.h>
+#include <tuple>
+#include <utility>
 
-  Tuple7() {}
-  Tuple7(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c,
-         typename TupleTraits<D>::ParamType d,
-         typename TupleTraits<E>::ParamType e,
-         typename TupleTraits<F>::ParamType f,
-         typename TupleTraits<G>::ParamType g)
-      : a(a), b(b), c(c), d(d), e(e), f(f), g(g) {}
-
-  A a;
-  B b;
-  C c;
-  D d;
-  E e;
-  F f;
-  G g;
-};
-
-template <class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G,
-          class H>
-struct Tuple8 {
- public:
-  typedef A TypeA;
-  typedef B TypeB;
-  typedef C TypeC;
-  typedef D TypeD;
-  typedef E TypeE;
-  typedef F TypeF;
-  typedef G TypeG;
-  typedef H TypeH;
-
-  Tuple8() {}
-  Tuple8(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c,
-         typename TupleTraits<D>::ParamType d,
-         typename TupleTraits<E>::ParamType e,
-         typename TupleTraits<F>::ParamType f,
-         typename TupleTraits<G>::ParamType g,
-         typename TupleTraits<H>::ParamType h)
-      : a(a), b(b), c(c), d(d), e(e), f(f), g(g), h(h) {}
-
-  A a;
-  B b;
-  C c;
-  D d;
-  E e;
-  F f;
-  G g;
-  H h;
-};
-
-// Tuple types ----------------------------------------------------------------
-//
-// Allows for selection of ValueTuple/RefTuple/ParamTuple without needing the
-// definitions of class types the tuple takes as parameters.
-
-template <>
-struct TupleTypes<Tuple0> {
-  typedef Tuple0 ValueTuple;
-  typedef Tuple0 RefTuple;
-  typedef Tuple0 ParamTuple;
-};
-
-template <class A>
-struct TupleTypes<Tuple1<A>> {
-  typedef Tuple1<typename TupleTraits<A>::ValueType> ValueTuple;
-  typedef Tuple1<typename TupleTraits<A>::RefType> RefTuple;
-  typedef Tuple1<typename TupleTraits<A>::ParamType> ParamTuple;
-};
-
-template <class A, class B>
-struct TupleTypes<Tuple2<A, B>> {
-  typedef Tuple2<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType>
-      ValueTuple;
-  typedef Tuple2<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType>
-      RefTuple;
-  typedef Tuple2<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType>
-      ParamTuple;
-};
-
-template <class A, class B, class C>
-struct TupleTypes<Tuple3<A, B, C>> {
-  typedef Tuple3<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType>
-      ValueTuple;
-  typedef Tuple3<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType,
-                 typename TupleTraits<C>::RefType>
-      RefTuple;
-  typedef Tuple3<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType>
-      ParamTuple;
-};
-
-template <class A, class B, class C, class D>
-struct TupleTypes<Tuple4<A, B, C, D>> {
-  typedef Tuple4<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType,
-                 typename TupleTraits<D>::ValueType>
-      ValueTuple;
-  typedef Tuple4<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType,
-                 typename TupleTraits<C>::RefType,
-                 typename TupleTraits<D>::RefType>
-      RefTuple;
-  typedef Tuple4<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType,
-                 typename TupleTraits<D>::ParamType>
-      ParamTuple;
-};
-
-template <class A, class B, class C, class D, class E>
-struct TupleTypes<Tuple5<A, B, C, D, E>> {
-  typedef Tuple5<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType,
-                 typename TupleTraits<D>::ValueType,
-                 typename TupleTraits<E>::ValueType>
-      ValueTuple;
-  typedef Tuple5<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType,
-                 typename TupleTraits<C>::RefType,
-                 typename TupleTraits<D>::RefType,
-                 typename TupleTraits<E>::RefType>
-      RefTuple;
-  typedef Tuple5<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType,
-                 typename TupleTraits<D>::ParamType,
-                 typename TupleTraits<E>::ParamType>
-      ParamTuple;
-};
-
-template <class A, class B, class C, class D, class E, class F>
-struct TupleTypes<Tuple6<A, B, C, D, E, F>> {
-  typedef Tuple6<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType,
-                 typename TupleTraits<D>::ValueType,
-                 typename TupleTraits<E>::ValueType,
-                 typename TupleTraits<F>::ValueType>
-      ValueTuple;
-  typedef Tuple6<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType,
-                 typename TupleTraits<C>::RefType,
-                 typename TupleTraits<D>::RefType,
-                 typename TupleTraits<E>::RefType,
-                 typename TupleTraits<F>::RefType>
-      RefTuple;
-  typedef Tuple6<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType,
-                 typename TupleTraits<D>::ParamType,
-                 typename TupleTraits<E>::ParamType,
-                 typename TupleTraits<F>::ParamType>
-      ParamTuple;
-};
-
-template <class A, class B, class C, class D, class E, class F, class G>
-struct TupleTypes<Tuple7<A, B, C, D, E, F, G>> {
-  typedef Tuple7<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType,
-                 typename TupleTraits<D>::ValueType,
-                 typename TupleTraits<E>::ValueType,
-                 typename TupleTraits<F>::ValueType,
-                 typename TupleTraits<G>::ValueType>
-      ValueTuple;
-  typedef Tuple7<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType,
-                 typename TupleTraits<C>::RefType,
-                 typename TupleTraits<D>::RefType,
-                 typename TupleTraits<E>::RefType,
-                 typename TupleTraits<F>::RefType,
-                 typename TupleTraits<G>::RefType>
-      RefTuple;
-  typedef Tuple7<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType,
-                 typename TupleTraits<D>::ParamType,
-                 typename TupleTraits<E>::ParamType,
-                 typename TupleTraits<F>::ParamType,
-                 typename TupleTraits<G>::ParamType>
-      ParamTuple;
-};
-
-template <class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G,
-          class H>
-struct TupleTypes<Tuple8<A, B, C, D, E, F, G, H>> {
-  typedef Tuple8<typename TupleTraits<A>::ValueType,
-                 typename TupleTraits<B>::ValueType,
-                 typename TupleTraits<C>::ValueType,
-                 typename TupleTraits<D>::ValueType,
-                 typename TupleTraits<E>::ValueType,
-                 typename TupleTraits<F>::ValueType,
-                 typename TupleTraits<G>::ValueType,
-                 typename TupleTraits<H>::ValueType>
-      ValueTuple;
-  typedef Tuple8<typename TupleTraits<A>::RefType,
-                 typename TupleTraits<B>::RefType,
-                 typename TupleTraits<C>::RefType,
-                 typename TupleTraits<D>::RefType,
-                 typename TupleTraits<E>::RefType,
-                 typename TupleTraits<F>::RefType,
-                 typename TupleTraits<G>::RefType,
-                 typename TupleTraits<H>::RefType>
-      RefTuple;
-  typedef Tuple8<typename TupleTraits<A>::ParamType,
-                 typename TupleTraits<B>::ParamType,
-                 typename TupleTraits<C>::ParamType,
-                 typename TupleTraits<D>::ParamType,
-                 typename TupleTraits<E>::ParamType,
-                 typename TupleTraits<F>::ParamType,
-                 typename TupleTraits<G>::ParamType,
-                 typename TupleTraits<H>::ParamType>
-      ParamTuple;
-};
-
-// Tuple creators -------------------------------------------------------------
-//
-// Helper functions for constructing tuples while inferring the template
-// argument types.
-
-inline Tuple0 MakeTuple() {
-  return Tuple0();
-}
-
-template <class A>
-inline Tuple1<A> MakeTuple(const A& a) {
-  return Tuple1<A>(a);
-}
-
-template <class A, class B>
-inline Tuple2<A, B> MakeTuple(const A& a, const B& b) {
-  return Tuple2<A, B>(a, b);
-}
-
-template <class A, class B, class C>
-inline Tuple3<A, B, C> MakeTuple(const A& a, const B& b, const C& c) {
-  return Tuple3<A, B, C>(a, b, c);
-}
-
-template <class A, class B, class C, class D>
-inline Tuple4<A, B, C, D> MakeTuple(const A& a,
-                                    const B& b,
-                                    const C& c,
-                                    const D& d) {
-  return Tuple4<A, B, C, D>(a, b, c, d);
-}
-
-template <class A, class B, class C, class D, class E>
-inline Tuple5<A, B, C, D, E> MakeTuple(const A& a,
-                                       const B& b,
-                                       const C& c,
-                                       const D& d,
-                                       const E& e) {
-  return Tuple5<A, B, C, D, E>(a, b, c, d, e);
-}
-
-template <class A, class B, class C, class D, class E, class F>
-inline Tuple6<A, B, C, D, E, F> MakeTuple(const A& a,
-                                          const B& b,
-                                          const C& c,
-                                          const D& d,
-                                          const E& e,
-                                          const F& f) {
-  return Tuple6<A, B, C, D, E, F>(a, b, c, d, e, f);
-}
-
-template <class A, class B, class C, class D, class E, class F, class G>
-inline Tuple7<A, B, C, D, E, F, G> MakeTuple(const A& a,
-                                             const B& b,
-                                             const C& c,
-                                             const D& d,
-                                             const E& e,
-                                             const F& f,
-                                             const G& g) {
-  return Tuple7<A, B, C, D, E, F, G>(a, b, c, d, e, f, g);
-}
-
-template <class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G,
-          class H>
-inline Tuple8<A, B, C, D, E, F, G, H> MakeTuple(const A& a,
-                                                const B& b,
-                                                const C& c,
-                                                const D& d,
-                                                const E& e,
-                                                const F& f,
-                                                const G& g,
-                                                const H& h) {
-  return Tuple8<A, B, C, D, E, F, G, H>(a, b, c, d, e, f, g, h);
-}
+#include "include/base/cef_build.h"
 
-// The following set of helpers make what Boost refers to as "Tiers" - a tuple
-// of references.
-
-template <class A>
-inline Tuple1<A&> MakeRefTuple(A& a) {
-  return Tuple1<A&>(a);
-}
-
-template <class A, class B>
-inline Tuple2<A&, B&> MakeRefTuple(A& a, B& b) {
-  return Tuple2<A&, B&>(a, b);
-}
-
-template <class A, class B, class C>
-inline Tuple3<A&, B&, C&> MakeRefTuple(A& a, B& b, C& c) {
-  return Tuple3<A&, B&, C&>(a, b, c);
-}
-
-template <class A, class B, class C, class D>
-inline Tuple4<A&, B&, C&, D&> MakeRefTuple(A& a, B& b, C& c, D& d) {
-  return Tuple4<A&, B&, C&, D&>(a, b, c, d);
-}
-
-template <class A, class B, class C, class D, class E>
-inline Tuple5<A&, B&, C&, D&, E&> MakeRefTuple(A& a, B& b, C& c, D& d, E& e) {
-  return Tuple5<A&, B&, C&, D&, E&>(a, b, c, d, e);
-}
-
-template <class A, class B, class C, class D, class E, class F>
-inline Tuple6<A&, B&, C&, D&, E&, F&> MakeRefTuple(A& a,
-                                                   B& b,
-                                                   C& c,
-                                                   D& d,
-                                                   E& e,
-                                                   F& f) {
-  return Tuple6<A&, B&, C&, D&, E&, F&>(a, b, c, d, e, f);
-}
-
-template <class A, class B, class C, class D, class E, class F, class G>
-inline Tuple7<A&, B&, C&, D&, E&, F&, G&>
-MakeRefTuple(A& a, B& b, C& c, D& d, E& e, F& f, G& g) {
-  return Tuple7<A&, B&, C&, D&, E&, F&, G&>(a, b, c, d, e, f, g);
-}
-
-template <class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G,
-          class H>
-inline Tuple8<A&, B&, C&, D&, E&, F&, G&, H&>
-MakeRefTuple(A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h) {
-  return Tuple8<A&, B&, C&, D&, E&, F&, G&, H&>(a, b, c, d, e, f, g, h);
-}
+namespace base {
 
 // Dispatchers ----------------------------------------------------------------
 //
@@ -633,974 +84,65 @@ MakeRefTuple(A& a, B& b, C& c, D& d, E& e, F& f, G& g, H& h) {
 
 // Non-Static Dispatchers with no out params.
 
-template <class ObjT, class Method>
-inline void DispatchToMethod(ObjT* obj, Method method, const Tuple0& arg) {
-  (obj->*method)();
+template <typename ObjT, typename Method, typename Tuple, size_t... Ns>
+inline void DispatchToMethodImpl(const ObjT& obj,
+                                 Method method,
+                                 Tuple&& args,
+                                 std::index_sequence<Ns...>) {
+  (obj->*method)(std::get<Ns>(std::forward<Tuple>(args))...);
 }
 
-template <class ObjT, class Method, class A>
-inline void DispatchToMethod(ObjT* obj, Method method, const A& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg));
-}
-
-template <class ObjT, class Method, class A>
-inline void DispatchToMethod(ObjT* obj, Method method, const Tuple1<A>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a));
-}
-
-template <class ObjT, class Method, class A, class B>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<A, B>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b));
-}
-
-template <class ObjT, class Method, class A, class B, class C>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<A, B, C>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c));
-}
-
-template <class ObjT, class Method, class A, class B, class C, class D>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<A, B, C, D>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d));
-}
-
-template <class ObjT, class Method, class A, class B, class C, class D, class E>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<A, B, C, D, E>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-                 base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e));
-}
-
-template <class ObjT,
-          class Method,
-          class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<A, B, C, D, E, F>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-                 base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-                 base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f));
-}
-
-template <class ObjT,
-          class Method,
-          class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple7<A, B, C, D, E, F, G>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-                 base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-                 base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f),
-                 base::cef_internal::UnwrapTraits<G>::Unwrap(arg.g));
-}
-
-template <class ObjT,
-          class Method,
-          class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G,
-          class H>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple8<A, B, C, D, E, F, G, H>& arg) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-                 base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-                 base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f),
-                 base::cef_internal::UnwrapTraits<G>::Unwrap(arg.g),
-                 base::cef_internal::UnwrapTraits<H>::Unwrap(arg.h));
+template <typename ObjT, typename Method, typename Tuple>
+inline void DispatchToMethod(const ObjT& obj, Method method, Tuple&& args) {
+  constexpr size_t size = std::tuple_size<std::decay_t<Tuple>>::value;
+  DispatchToMethodImpl(obj, method, std::forward<Tuple>(args),
+                       std::make_index_sequence<size>());
 }
 
 // Static Dispatchers with no out params.
 
-template <class Function>
-inline void DispatchToFunction(Function function, const Tuple0& arg) {
-  (*function)();
-}
-
-template <class Function, class A>
-inline void DispatchToFunction(Function function, const A& arg) {
-  (*function)(arg);
-}
-
-template <class Function, class A>
-inline void DispatchToFunction(Function function, const Tuple1<A>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a));
-}
-
-template <class Function, class A, class B>
-inline void DispatchToFunction(Function function, const Tuple2<A, B>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b));
-}
-
-template <class Function, class A, class B, class C>
-inline void DispatchToFunction(Function function, const Tuple3<A, B, C>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-              base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c));
-}
-
-template <class Function, class A, class B, class C, class D>
-inline void DispatchToFunction(Function function,
-                               const Tuple4<A, B, C, D>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-              base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-              base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d));
-}
-
-template <class Function, class A, class B, class C, class D, class E>
-inline void DispatchToFunction(Function function,
-                               const Tuple5<A, B, C, D, E>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-              base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-              base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-              base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e));
-}
-
-template <class Function, class A, class B, class C, class D, class E, class F>
-inline void DispatchToFunction(Function function,
-                               const Tuple6<A, B, C, D, E, F>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-              base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-              base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-              base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-              base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f));
-}
-
-template <class Function,
-          class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G>
-inline void DispatchToFunction(Function function,
-                               const Tuple7<A, B, C, D, E, F, G>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-              base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-              base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-              base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-              base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f),
-              base::cef_internal::UnwrapTraits<G>::Unwrap(arg.g));
-}
-
-template <class Function,
-          class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F,
-          class G,
-          class H>
-inline void DispatchToFunction(Function function,
-                               const Tuple8<A, B, C, D, E, F, G, H>& arg) {
-  (*function)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-              base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-              base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-              base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-              base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-              base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f),
-              base::cef_internal::UnwrapTraits<G>::Unwrap(arg.g),
-              base::cef_internal::UnwrapTraits<H>::Unwrap(arg.h));
-}
-
-// Dispatchers with 0 out param (as a Tuple0).
-
-template <class ObjT, class Method>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple0& arg,
-                             Tuple0*) {
-  (obj->*method)();
-}
-
-template <class ObjT, class Method, class A>
-inline void DispatchToMethod(ObjT* obj, Method method, const A& arg, Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg));
-}
-
-template <class ObjT, class Method, class A>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple1<A>& arg,
-                             Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a));
-}
-
-template <class ObjT, class Method, class A, class B>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<A, B>& arg,
-                             Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b));
-}
-
-template <class ObjT, class Method, class A, class B, class C>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<A, B, C>& arg,
-                             Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c));
-}
-
-template <class ObjT, class Method, class A, class B, class C, class D>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<A, B, C, D>& arg,
-                             Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d));
-}
-
-template <class ObjT, class Method, class A, class B, class C, class D, class E>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<A, B, C, D, E>& arg,
-                             Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-                 base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e));
-}
-
-template <class ObjT,
-          class Method,
-          class A,
-          class B,
-          class C,
-          class D,
-          class E,
-          class F>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<A, B, C, D, E, F>& arg,
-                             Tuple0*) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<A>::Unwrap(arg.a),
-                 base::cef_internal::UnwrapTraits<B>::Unwrap(arg.b),
-                 base::cef_internal::UnwrapTraits<C>::Unwrap(arg.c),
-                 base::cef_internal::UnwrapTraits<D>::Unwrap(arg.d),
-                 base::cef_internal::UnwrapTraits<E>::Unwrap(arg.e),
-                 base::cef_internal::UnwrapTraits<F>::Unwrap(arg.f));
-}
-
-// Dispatchers with 1 out param.
-
-template <class ObjT, class Method, class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple0& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(&out->a);
-}
-
-template <class ObjT, class Method, class InA, class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const InA& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(in, &out->a);
-}
-
-template <class ObjT, class Method, class InA, class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple1<InA>& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a);
-}
-
-template <class ObjT, class Method, class InA, class InB, class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<InA, InB>& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a);
-}
-
-template <class ObjT, class Method, class InA, class InB, class InC, class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<InA, InB, InC>& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<InA, InB, InC, InD>& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<InA, InB, InC, InD, InE>& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class InF,
-          class OutA>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<InA, InB, InC, InD, InE, InF>& in,
-                             Tuple1<OutA>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a);
-}
-
-// Dispatchers with 2 out params.
-
-template <class ObjT, class Method, class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple0& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(&out->a, &out->b);
-}
-
-template <class ObjT, class Method, class InA, class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const InA& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(in, &out->a, &out->b);
-}
-
-template <class ObjT, class Method, class InA, class OutA, class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple1<InA>& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
-                 &out->b);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class OutA,
-          class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<InA, InB>& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
-                 &out->b);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class OutA,
-          class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<InA, InB, InC>& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
-                 &out->b);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class OutA,
-          class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<InA, InB, InC, InD>& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
-                 &out->b);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class OutA,
-          class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<InA, InB, InC, InD, InE>& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
-                 &out->b);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class InF,
-          class OutA,
-          class OutB>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<InA, InB, InC, InD, InE, InF>& in,
-                             Tuple2<OutA, OutB>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
-                 &out->b);
-}
-
-// Dispatchers with 3 out params.
-
-template <class ObjT, class Method, class OutA, class OutB, class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple0& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(&out->a, &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const InA& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(in, &out->a, &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple1<InA>& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
-                 &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<InA, InB>& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
-                 &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<InA, InB, InC>& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
-                 &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<InA, InB, InC, InD>& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
-                 &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<InA, InB, InC, InD, InE>& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
-                 &out->b, &out->c);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class InF,
-          class OutA,
-          class OutB,
-          class OutC>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<InA, InB, InC, InD, InE, InF>& in,
-                             Tuple3<OutA, OutB, OutC>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
-                 &out->b, &out->c);
-}
-
-// Dispatchers with 4 out params.
-
-template <class ObjT,
-          class Method,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple0& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(&out->a, &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const InA& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple1<InA>& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<InA, InB>& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<InA, InB, InC>& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<InA, InB, InC, InD>& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<InA, InB, InC, InD, InE>& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class InF,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<InA, InB, InC, InD, InE, InF>& in,
-                             Tuple4<OutA, OutB, OutC, OutD>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
-                 &out->b, &out->c, &out->d);
-}
-
-// Dispatchers with 5 out params.
-
-template <class ObjT,
-          class Method,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple0& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(&out->a, &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const InA& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple1<InA>& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple2<InA, InB>& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple3<InA, InB, InC>& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple4<InA, InB, InC, InD>& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple5<InA, InB, InC, InD, InE>& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
-}
-
-template <class ObjT,
-          class Method,
-          class InA,
-          class InB,
-          class InC,
-          class InD,
-          class InE,
-          class InF,
-          class OutA,
-          class OutB,
-          class OutC,
-          class OutD,
-          class OutE>
-inline void DispatchToMethod(ObjT* obj,
-                             Method method,
-                             const Tuple6<InA, InB, InC, InD, InE, InF>& in,
-                             Tuple5<OutA, OutB, OutC, OutD, OutE>* out) {
-  (obj->*method)(base::cef_internal::UnwrapTraits<InA>::Unwrap(in.a),
-                 base::cef_internal::UnwrapTraits<InB>::Unwrap(in.b),
-                 base::cef_internal::UnwrapTraits<InC>::Unwrap(in.c),
-                 base::cef_internal::UnwrapTraits<InD>::Unwrap(in.d),
-                 base::cef_internal::UnwrapTraits<InE>::Unwrap(in.e),
-                 base::cef_internal::UnwrapTraits<InF>::Unwrap(in.f), &out->a,
-                 &out->b, &out->c, &out->d, &out->e);
+template <typename Function, typename Tuple, size_t... Ns>
+inline void DispatchToFunctionImpl(Function function,
+                                   Tuple&& args,
+                                   std::index_sequence<Ns...>) {
+  (*function)(std::get<Ns>(std::forward<Tuple>(args))...);
+}
+
+template <typename Function, typename Tuple>
+inline void DispatchToFunction(Function function, Tuple&& args) {
+  constexpr size_t size = std::tuple_size<std::decay_t<Tuple>>::value;
+  DispatchToFunctionImpl(function, std::forward<Tuple>(args),
+                         std::make_index_sequence<size>());
+}
+
+// Dispatchers with out parameters.
+
+template <typename ObjT,
+          typename Method,
+          typename InTuple,
+          typename OutTuple,
+          size_t... InNs,
+          size_t... OutNs>
+inline void DispatchToMethodImpl(const ObjT& obj,
+                                 Method method,
+                                 InTuple&& in,
+                                 OutTuple* out,
+                                 std::index_sequence<InNs...>,
+                                 std::index_sequence<OutNs...>) {
+  (obj->*method)(std::get<InNs>(std::forward<InTuple>(in))...,
+                 &std::get<OutNs>(*out)...);
+}
+
+template <typename ObjT, typename Method, typename InTuple, typename OutTuple>
+inline void DispatchToMethod(const ObjT& obj,
+                             Method method,
+                             InTuple&& in,
+                             OutTuple* out) {
+  constexpr size_t in_size = std::tuple_size<std::decay_t<InTuple>>::value;
+  constexpr size_t out_size = std::tuple_size<OutTuple>::value;
+  DispatchToMethodImpl(obj, method, std::forward<InTuple>(in), out,
+                       std::make_index_sequence<in_size>(),
+                       std::make_index_sequence<out_size>());
 }
 
 }  // namespace base
diff --git a/src/include/base/cef_weak_ptr.h b/src/include/base/cef_weak_ptr.h
index 1ba34b9db..294668981 100644
--- a/src/include/base/cef_weak_ptr.h
+++ b/src/include/base/cef_weak_ptr.h
@@ -28,80 +28,79 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Weak pointers are pointers to an object that do not affect its lifetime,
-// and which may be invalidated (i.e. reset to NULL) by the object, or its
-// owner, at any time, most commonly when the object is about to be deleted.
-
-// Weak pointers are useful when an object needs to be accessed safely by one
-// or more objects other than its owner, and those callers can cope with the
-// object vanishing and e.g. tasks posted to it being silently dropped.
-// Reference-counting such an object would complicate the ownership graph and
-// make it harder to reason about the object's lifetime.
-
-// EXAMPLE:
-//
-//  class Controller {
-//   public:
-//    Controller() : weak_factory_(this) {}
-//    void SpawnWorker() { Worker::StartNew(weak_factory_.GetWeakPtr()); }
-//    void WorkComplete(const Result& result) { ... }
-//   private:
-//    // Member variables should appear before the WeakPtrFactory, to ensure
-//    // that any WeakPtrs to Controller are invalidated before its members
-//    // variable's destructors are executed, rendering them invalid.
-//    WeakPtrFactory<Controller> weak_factory_;
-//  };
-//
-//  class Worker {
-//   public:
-//    static void StartNew(const WeakPtr<Controller>& controller) {
-//      Worker* worker = new Worker(controller);
-//      // Kick off asynchronous processing...
-//    }
-//   private:
-//    Worker(const WeakPtr<Controller>& controller)
-//        : controller_(controller) {}
-//    void DidCompleteAsynchronousProcessing(const Result& result) {
-//      if (controller_)
-//        controller_->WorkComplete(result);
-//    }
-//    WeakPtr<Controller> controller_;
-//  };
-//
-// With this implementation a caller may use SpawnWorker() to dispatch multiple
-// Workers and subsequently delete the Controller, without waiting for all
-// Workers to have completed.
-
-// ------------------------- IMPORTANT: Thread-safety -------------------------
-
-// Weak pointers may be passed safely between threads, but must always be
-// dereferenced and invalidated on the same thread otherwise checking the
-// pointer would be racey.
-//
-// To ensure correct use, the first time a WeakPtr issued by a WeakPtrFactory
-// is dereferenced, the factory and its WeakPtrs become bound to the calling
-// thread, and cannot be dereferenced or invalidated on any other thread. Bound
-// WeakPtrs can still be handed off to other threads, e.g. to use to post tasks
-// back to object on the bound thread.
-//
-// If all WeakPtr objects are destroyed or invalidated then the factory is
-// unbound from the SequencedTaskRunner/Thread. The WeakPtrFactory may then be
-// destroyed, or new WeakPtr objects may be used, from a different sequence.
-//
-// Thus, at least one WeakPtr object must exist and have been dereferenced on
-// the correct thread to enforce that other WeakPtr objects will enforce they
-// are used on the desired thread.
+///
+/// \file
+/// Weak pointers are pointers to an object that do not affect its lifetime.
+/// They may be invalidated (i.e. reset to nullptr) by the object, or its
+/// owner, at any time, most commonly when the object is about to be deleted.
+///
+/// Weak pointers are useful when an object needs to be accessed safely by one
+/// or more objects other than its owner, and those callers can cope with the
+/// object vanishing and e.g. tasks posted to it being silently dropped.
+/// Reference-counting such an object would complicate the ownership graph and
+/// make it harder to reason about the object's lifetime.
+///
+/// EXAMPLE:
+///
+/// <pre>
+///  class Controller {
+///   public:
+///    void SpawnWorker() { Worker::StartNew(weak_factory_.GetWeakPtr()); }
+///    void WorkComplete(const Result& result) { ... }
+///   private:
+///    // Member variables should appear before the WeakPtrFactory, to ensure
+///    // that any WeakPtrs to Controller are invalidated before its members
+///    // variable's destructors are executed, rendering them invalid.
+///    WeakPtrFactory<Controller> weak_factory_{this};
+///  };
+///
+///  class Worker {
+///   public:
+///    static void StartNew(WeakPtr<Controller> controller) {
+///      Worker* worker = new Worker(std::move(controller));
+///      // Kick off asynchronous processing...
+///    }
+///   private:
+///    Worker(WeakPtr<Controller> controller)
+///        : controller_(std::move(controller)) {}
+///    void DidCompleteAsynchronousProcessing(const Result& result) {
+///      if (controller_)
+///        controller_->WorkComplete(result);
+///    }
+///    WeakPtr<Controller> controller_;
+///  };
+/// </pre>
+///
+/// With this implementation a caller may use SpawnWorker() to dispatch multiple
+/// Workers and subsequently delete the Controller, without waiting for all
+/// Workers to have completed.
+///
+/// <b>IMPORTANT: Thread-safety</b>
+///
+/// Weak pointers may be passed safely between threads, but must always be
+/// dereferenced and invalidated on the same ThreaddTaskRunner otherwise
+/// checking the pointer would be racey.
+///
+/// To ensure correct use, the first time a WeakPtr issued by a WeakPtrFactory
+/// is dereferenced, the factory and its WeakPtrs become bound to the calling
+/// thread or current ThreaddWorkerPool token, and cannot be dereferenced or
+/// invalidated on any other task runner. Bound WeakPtrs can still be handed
+/// off to other task runners, e.g. to use to post tasks back to object on the
+/// bound thread.
+///
+/// If all WeakPtr objects are destroyed or invalidated then the factory is
+/// unbound from the ThreadedTaskRunner/Thread. The WeakPtrFactory may then be
+/// destroyed, or new WeakPtr objects may be used, from a different thread.
+///
+/// Thus, at least one WeakPtr object must exist and have been dereferenced on
+/// the correct thread to enforce that other WeakPtr objects will enforce they
+/// are used on the desired thread.
 
 #ifndef CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
 #define CEF_INCLUDE_BASE_CEF_WEAK_PTR_H_
 #pragma once
 
-#if defined(BASE_MEMORY_WEAK_PTR_H_)
-// Do nothing if the Chromium header has already been included.
-// This can happen in cases where Chromium code is used directly by the
-// client application. When using Chromium code directly always include
-// the Chromium header first to avoid type conflicts.
-#elif defined(USING_CHROMIUM_INCLUDES)
+#if defined(USING_CHROMIUM_INCLUDES)
 // When building CEF include the Chromium header directly.
 #include "base/memory/weak_ptr.h"
 #else  // !USING_CHROMIUM_INCLUDES
@@ -109,10 +108,12 @@
 // If the Chromium implementation diverges the below implementation should be
 // updated to match.
 
-#include "include/base/cef_basictypes.h"
+#include <cstddef>
+#include <type_traits>
+
+#include "include/base/cef_atomic_flag.h"
 #include "include/base/cef_logging.h"
 #include "include/base/cef_ref_counted.h"
-#include "include/base/cef_template_util.h"
 #include "include/base/cef_thread_checker.h"
 
 namespace base {
@@ -128,8 +129,8 @@ namespace cef_internal {
 
 class WeakReference {
  public:
-  // Although Flag is bound to a specific thread, it may be deleted from another
-  // via base::WeakPtr::~WeakPtr().
+  // Although Flag is bound to a specific ThreaddTaskRunner, it may be
+  // deleted from another via base::WeakPtr::~WeakPtr().
   class Flag : public RefCountedThreadSafe<Flag> {
    public:
     Flag();
@@ -137,23 +138,30 @@ class WeakReference {
     void Invalidate();
     bool IsValid() const;
 
+    bool MaybeValid() const;
+
+    void DetachFromThread();
+
    private:
     friend class base::RefCountedThreadSafe<Flag>;
 
     ~Flag();
 
-    // The current Chromium implementation uses SequenceChecker instead of
-    // ThreadChecker to support SequencedWorkerPools. CEF does not yet expose
-    // the concept of SequencedWorkerPools.
-    ThreadChecker thread_checker_;
-    bool is_valid_;
+    base::ThreadChecker thread_checker_;
+    AtomicFlag invalidated_;
   };
 
   WeakReference();
-  explicit WeakReference(const Flag* flag);
+  explicit WeakReference(const scoped_refptr<Flag>& flag);
   ~WeakReference();
 
-  bool is_valid() const;
+  WeakReference(WeakReference&& other) noexcept;
+  WeakReference(const WeakReference& other);
+  WeakReference& operator=(WeakReference&& other) noexcept = default;
+  WeakReference& operator=(const WeakReference& other) = default;
+
+  bool IsValid() const;
+  bool MaybeValid() const;
 
  private:
   scoped_refptr<const Flag> flag_;
@@ -166,12 +174,12 @@ class WeakReferenceOwner {
 
   WeakReference GetRef() const;
 
-  bool HasRefs() const { return flag_.get() && !flag_->HasOneRef(); }
+  bool HasRefs() const { return !flag_->HasOneRef(); }
 
   void Invalidate();
 
  private:
-  mutable scoped_refptr<WeakReference::Flag> flag_;
+  scoped_refptr<WeakReference::Flag> flag_;
 };
 
 // This class simplifies the implementation of WeakPtr's type conversion
@@ -183,10 +191,24 @@ class WeakPtrBase {
   WeakPtrBase();
   ~WeakPtrBase();
 
+  WeakPtrBase(const WeakPtrBase& other) = default;
+  WeakPtrBase(WeakPtrBase&& other) noexcept = default;
+  WeakPtrBase& operator=(const WeakPtrBase& other) = default;
+  WeakPtrBase& operator=(WeakPtrBase&& other) noexcept = default;
+
+  void reset() {
+    ref_ = cef_internal::WeakReference();
+    ptr_ = 0;
+  }
+
  protected:
-  explicit WeakPtrBase(const WeakReference& ref);
+  WeakPtrBase(const WeakReference& ref, uintptr_t ptr);
 
   WeakReference ref_;
+
+  // This pointer is only valid when ref_.is_valid() is true.  Otherwise, its
+  // value is undefined (as opposed to nullptr).
+  uintptr_t ptr_;
 };
 
 // This class provides a common implementation of common functions that would
@@ -198,13 +220,14 @@ class SupportsWeakPtrBase {
   // conversion will only compile if there is exists a Base which inherits
   // from SupportsWeakPtr<Base>. See base::AsWeakPtr() below for a helper
   // function that makes calling this easier.
+  //
+  // Precondition: t != nullptr
   template <typename Derived>
   static WeakPtr<Derived> StaticAsWeakPtr(Derived* t) {
-    typedef is_convertible<Derived, cef_internal::SupportsWeakPtrBase&>
-        convertible;
-    COMPILE_ASSERT(convertible::value,
-                   AsWeakPtr_argument_inherits_from_SupportsWeakPtr);
-    return AsWeakPtrImpl<Derived>(t, *t);
+    static_assert(
+        std::is_base_of<cef_internal::SupportsWeakPtrBase, Derived>::value,
+        "AsWeakPtr argument must inherit from SupportsWeakPtr");
+    return AsWeakPtrImpl<Derived>(t);
   }
 
  private:
@@ -212,10 +235,10 @@ class SupportsWeakPtrBase {
   // which is an instance of SupportsWeakPtr<Base>. We can then safely
   // static_cast the Base* to a Derived*.
   template <typename Derived, typename Base>
-  static WeakPtr<Derived> AsWeakPtrImpl(Derived* t,
-                                        const SupportsWeakPtr<Base>&) {
-    WeakPtr<Base> ptr = t->Base::AsWeakPtr();
-    return WeakPtr<Derived>(ptr.ref_, static_cast<Derived*>(ptr.ptr_));
+  static WeakPtr<Derived> AsWeakPtrImpl(SupportsWeakPtr<Base>* t) {
+    WeakPtr<Base> ptr = t->AsWeakPtr();
+    return WeakPtr<Derived>(
+        ptr.ref_, static_cast<Derived*>(reinterpret_cast<Base*>(ptr.ptr_)));
   }
 };
 
@@ -224,66 +247,84 @@ class SupportsWeakPtrBase {
 template <typename T>
 class WeakPtrFactory;
 
-// The WeakPtr class holds a weak reference to |T*|.
-//
-// This class is designed to be used like a normal pointer.  You should always
-// null-test an object of this class before using it or invoking a method that
-// may result in the underlying object being destroyed.
-//
-// EXAMPLE:
-//
-//   class Foo { ... };
-//   WeakPtr<Foo> foo;
-//   if (foo)
-//     foo->method();
-//
+///
+/// The WeakPtr class holds a weak reference to |T*|.
+///
+/// This class is designed to be used like a normal pointer.  You should always
+/// null-test an object of this class before using it or invoking a method that
+/// may result in the underlying object being destroyed.
+///
+/// EXAMPLE:
+///
+/// <pre>
+///   class Foo { ... };
+///   WeakPtr<Foo> foo;
+///   if (foo)
+///     foo->method();
+/// </pre>
+///
 template <typename T>
 class WeakPtr : public cef_internal::WeakPtrBase {
  public:
-  WeakPtr() : ptr_(NULL) {}
+  WeakPtr() = default;
+  WeakPtr(std::nullptr_t) {}
 
-  // Allow conversion from U to T provided U "is a" T. Note that this
-  // is separate from the (implicit) copy constructor.
+  ///
+  /// Allow conversion from U to T provided U "is a" T. Note that this
+  /// is separate from the (implicit) copy and move constructors.
+  ///
+  template <typename U>
+  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other) {
+    // Need to cast from U* to T* to do pointer adjustment in case of multiple
+    // inheritance. This also enforces the "U is a T" rule.
+    T* t = reinterpret_cast<U*>(other.ptr_);
+    ptr_ = reinterpret_cast<uintptr_t>(t);
+  }
   template <typename U>
-  WeakPtr(const WeakPtr<U>& other) : WeakPtrBase(other), ptr_(other.ptr_) {}
+  WeakPtr(WeakPtr<U>&& other) noexcept : WeakPtrBase(std::move(other)) {
+    // Need to cast from U* to T* to do pointer adjustment in case of multiple
+    // inheritance. This also enforces the "U is a T" rule.
+    T* t = reinterpret_cast<U*>(other.ptr_);
+    ptr_ = reinterpret_cast<uintptr_t>(t);
+  }
 
-  T* get() const { return ref_.is_valid() ? ptr_ : NULL; }
+  T* get() const {
+    return ref_.IsValid() ? reinterpret_cast<T*>(ptr_) : nullptr;
+  }
 
   T& operator*() const {
-    DCHECK(get() != NULL);
+    CHECK(ref_.IsValid());
     return *get();
   }
   T* operator->() const {
-    DCHECK(get() != NULL);
+    CHECK(ref_.IsValid());
     return get();
   }
 
-  // Allow WeakPtr<element_type> to be used in boolean expressions, but not
-  // implicitly convertible to a real bool (which is dangerous).
-  //
-  // Note that this trick is only safe when the == and != operators
-  // are declared explicitly, as otherwise "weak_ptr1 == weak_ptr2"
-  // will compile but do the wrong thing (i.e., convert to Testable
-  // and then do the comparison).
- private:
-  typedef T* WeakPtr::*Testable;
-
- public:
-  operator Testable() const { return get() ? &WeakPtr::ptr_ : NULL; }
-
-  void reset() {
-    ref_ = cef_internal::WeakReference();
-    ptr_ = NULL;
-  }
+  ///
+  /// Allow conditionals to test validity, e.g. `if (weak_ptr) {...}`;
+  ///
+  explicit operator bool() const { return get() != nullptr; }
+
+  ///
+  /// Returns false if the WeakPtr is confirmed to be invalid. This call is safe
+  /// to make from any thread, e.g. to optimize away unnecessary work, but
+  /// operator bool() must always be called, on the correct thread, before
+  /// actually using the pointer.
+  ///
+  /// Warning: as with any object, this call is only thread-safe if the WeakPtr
+  /// instance isn't being re-assigned or reset() racily with this call.
+  ///
+  bool MaybeValid() const { return ref_.MaybeValid(); }
+
+  ///
+  /// Returns whether the object |this| points to has been invalidated. This can
+  /// be used to distinguish a WeakPtr to a destroyed object from one that has
+  /// been explicitly set to null.
+  ///
+  bool WasInvalidated() const { return ptr_ && !ref_.IsValid(); }
 
  private:
-  // Explicitly declare comparison operators as required by the bool
-  // trick, but keep them private.
-  template <class U>
-  bool operator==(WeakPtr<U> const&) const;
-  template <class U>
-  bool operator!=(WeakPtr<U> const&) const;
-
   friend class cef_internal::SupportsWeakPtrBase;
   template <typename U>
   friend class WeakPtr;
@@ -291,88 +332,131 @@ class WeakPtr : public cef_internal::WeakPtrBase {
   friend class WeakPtrFactory<T>;
 
   WeakPtr(const cef_internal::WeakReference& ref, T* ptr)
-      : WeakPtrBase(ref), ptr_(ptr) {}
+      : WeakPtrBase(ref, reinterpret_cast<uintptr_t>(ptr)) {}
+};
 
-  // This pointer is only valid when ref_.is_valid() is true.  Otherwise, its
-  // value is undefined (as opposed to NULL).
-  T* ptr_;
+///
+/// Allow callers to compare WeakPtrs against nullptr to test validity.
+///
+template <class T>
+bool operator!=(const WeakPtr<T>& weak_ptr, std::nullptr_t) {
+  return !(weak_ptr == nullptr);
+}
+template <class T>
+bool operator!=(std::nullptr_t, const WeakPtr<T>& weak_ptr) {
+  return weak_ptr != nullptr;
+}
+template <class T>
+bool operator==(const WeakPtr<T>& weak_ptr, std::nullptr_t) {
+  return weak_ptr.get() == nullptr;
+}
+template <class T>
+bool operator==(std::nullptr_t, const WeakPtr<T>& weak_ptr) {
+  return weak_ptr == nullptr;
+}
+
+namespace cef_internal {
+class WeakPtrFactoryBase {
+ protected:
+  WeakPtrFactoryBase(uintptr_t ptr);
+  ~WeakPtrFactoryBase();
+  cef_internal::WeakReferenceOwner weak_reference_owner_;
+  uintptr_t ptr_;
 };
+}  // namespace cef_internal
 
-// A class may be composed of a WeakPtrFactory and thereby
-// control how it exposes weak pointers to itself.  This is helpful if you only
-// need weak pointers within the implementation of a class.  This class is also
-// useful when working with primitive types.  For example, you could have a
-// WeakPtrFactory<bool> that is used to pass around a weak reference to a bool.
+///
+/// A class may be composed of a WeakPtrFactory and thereby control how it
+/// exposes weak pointers to itself.  This is helpful if you only need weak
+/// pointers within the implementation of a class.  This class is also useful
+/// when working with primitive types.  For example, you could have a
+/// WeakPtrFactory<bool> that is used to pass around a weak reference to a
+/// bool.
+///
 template <class T>
-class WeakPtrFactory {
+class WeakPtrFactory : public cef_internal::WeakPtrFactoryBase {
  public:
-  explicit WeakPtrFactory(T* ptr) : ptr_(ptr) {}
+  WeakPtrFactory() = delete;
 
-  ~WeakPtrFactory() { ptr_ = NULL; }
+  explicit WeakPtrFactory(T* ptr)
+      : WeakPtrFactoryBase(reinterpret_cast<uintptr_t>(ptr)) {}
 
-  WeakPtr<T> GetWeakPtr() {
-    DCHECK(ptr_);
-    return WeakPtr<T>(weak_reference_owner_.GetRef(), ptr_);
+  WeakPtrFactory(const WeakPtrFactory&) = delete;
+  WeakPtrFactory& operator=(const WeakPtrFactory&) = delete;
+
+  ~WeakPtrFactory() = default;
+
+  WeakPtr<T> GetWeakPtr() const {
+    return WeakPtr<T>(weak_reference_owner_.GetRef(),
+                      reinterpret_cast<T*>(ptr_));
   }
 
-  // Call this method to invalidate all existing weak pointers.
+  ///
+  /// Call this method to invalidate all existing weak pointers.
+  ///
   void InvalidateWeakPtrs() {
     DCHECK(ptr_);
     weak_reference_owner_.Invalidate();
   }
 
-  // Call this method to determine if any weak pointers exist.
+  ///
+  /// Call this method to determine if any weak pointers exist.
+  ///
   bool HasWeakPtrs() const {
     DCHECK(ptr_);
     return weak_reference_owner_.HasRefs();
   }
-
- private:
-  cef_internal::WeakReferenceOwner weak_reference_owner_;
-  T* ptr_;
-  DISALLOW_IMPLICIT_CONSTRUCTORS(WeakPtrFactory);
 };
 
-// A class may extend from SupportsWeakPtr to let others take weak pointers to
-// it. This avoids the class itself implementing boilerplate to dispense weak
-// pointers.  However, since SupportsWeakPtr's destructor won't invalidate
-// weak pointers to the class until after the derived class' members have been
-// destroyed, its use can lead to subtle use-after-destroy issues.
+///
+/// A class may extend from SupportsWeakPtr to let others take weak pointers to
+/// it. This avoids the class itself implementing boilerplate to dispense weak
+/// pointers.  However, since SupportsWeakPtr's destructor won't invalidate
+/// weak pointers to the class until after the derived class' members have been
+/// destroyed, its use can lead to subtle use-after-destroy issues.
+///
 template <class T>
 class SupportsWeakPtr : public cef_internal::SupportsWeakPtrBase {
  public:
-  SupportsWeakPtr() {}
+  SupportsWeakPtr() = default;
+
+  SupportsWeakPtr(const SupportsWeakPtr&) = delete;
+  SupportsWeakPtr& operator=(const SupportsWeakPtr&) = delete;
 
   WeakPtr<T> AsWeakPtr() {
     return WeakPtr<T>(weak_reference_owner_.GetRef(), static_cast<T*>(this));
   }
 
  protected:
-  ~SupportsWeakPtr() {}
+  ~SupportsWeakPtr() = default;
 
  private:
   cef_internal::WeakReferenceOwner weak_reference_owner_;
-  DISALLOW_COPY_AND_ASSIGN(SupportsWeakPtr);
 };
 
-// Helper function that uses type deduction to safely return a WeakPtr<Derived>
-// when Derived doesn't directly extend SupportsWeakPtr<Derived>, instead it
-// extends a Base that extends SupportsWeakPtr<Base>.
-//
-// EXAMPLE:
-//   class Base : public base::SupportsWeakPtr<Producer> {};
-//   class Derived : public Base {};
-//
-//   Derived derived;
-//   base::WeakPtr<Derived> ptr = base::AsWeakPtr(&derived);
-//
-// Note that the following doesn't work (invalid type conversion) since
-// Derived::AsWeakPtr() is WeakPtr<Base> SupportsWeakPtr<Base>::AsWeakPtr(),
-// and there's no way to safely cast WeakPtr<Base> to WeakPtr<Derived> at
-// the caller.
-//
-//   base::WeakPtr<Derived> ptr = derived.AsWeakPtr();  // Fails.
-
+///
+/// Helper function that uses type deduction to safely return a WeakPtr<Derived>
+/// when Derived doesn't directly extend SupportsWeakPtr<Derived>, instead it
+/// extends a Base that extends SupportsWeakPtr<Base>.
+///
+/// EXAMPLE:
+/// <pre>
+///   class Base : public base::SupportsWeakPtr<Producer> {};
+///   class Derived : public Base {};
+///
+///   Derived derived;
+///   base::WeakPtr<Derived> ptr = base::AsWeakPtr(&derived);
+/// </pre>
+///
+/// Note that the following doesn't work (invalid type conversion) since
+/// Derived::AsWeakPtr() is WeakPtr<Base> SupportsWeakPtr<Base>::AsWeakPtr(),
+/// and there's no way to safely cast WeakPtr<Base> to WeakPtr<Derived> at
+/// the caller.
+///
+/// <pre>
+///   base::WeakPtr<Derived> ptr = derived.AsWeakPtr();  // Fails.
+/// </pre>
+///
 template <typename Derived>
 WeakPtr<Derived> AsWeakPtr(Derived* t) {
   return cef_internal::SupportsWeakPtrBase::StaticAsWeakPtr<Derived>(t);
diff --git a/src/include/base/internal/README-TRANSFER.txt b/src/include/base/internal/README-TRANSFER.txt
new file mode 100644
index 000000000..344984d24
--- /dev/null
+++ b/src/include/base/internal/README-TRANSFER.txt
@@ -0,0 +1,6 @@
+Files in this directory have been copied from other locations in the Chromium
+source tree. They have been modified only to the extent necessary to work in
+the CEF Binary Distribution directory structure. Below is a listing of the
+original file locations.
+
+../net/base/net_error_list.h
diff --git a/src/include/base/internal/cef_atomicops_arm_gcc.h b/src/include/base/internal/cef_atomicops_arm_gcc.h
deleted file mode 100644
index 2e39ce3c2..000000000
--- a/src/include/base/internal/cef_atomicops_arm_gcc.h
+++ /dev/null
@@ -1,325 +0,0 @@
-// Copyright (c) 2013 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Do not include this header file directly. Use base/cef_atomicops.h
-// instead.
-//
-// LinuxKernelCmpxchg and Barrier_AtomicIncrement are from Google Gears.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM_GCC_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM_GCC_H_
-
-#if defined(OS_QNX)
-#include <sys/cpuinline.h>
-#endif
-
-namespace base {
-namespace subtle {
-
-// Memory barriers on ARM are funky, but the kernel is here to help:
-//
-// * ARMv5 didn't support SMP, there is no memory barrier instruction at
-//   all on this architecture, or when targeting its machine code.
-//
-// * Some ARMv6 CPUs support SMP. A full memory barrier can be produced by
-//   writing a random value to a very specific coprocessor register.
-//
-// * On ARMv7, the "dmb" instruction is used to perform a full memory
-//   barrier (though writing to the co-processor will still work).
-//   However, on single core devices (e.g. Nexus One, or Nexus S),
-//   this instruction will take up to 200 ns, which is huge, even though
-//   it's completely un-needed on these devices.
-//
-// * There is no easy way to determine at runtime if the device is
-//   single or multi-core. However, the kernel provides a useful helper
-//   function at a fixed memory address (0xffff0fa0), which will always
-//   perform a memory barrier in the most efficient way. I.e. on single
-//   core devices, this is an empty function that exits immediately.
-//   On multi-core devices, it implements a full memory barrier.
-//
-// * This source could be compiled to ARMv5 machine code that runs on a
-//   multi-core ARMv6 or ARMv7 device. In this case, memory barriers
-//   are needed for correct execution. Always call the kernel helper, even
-//   when targeting ARMv5TE.
-//
-
-inline void MemoryBarrier() {
-#if defined(OS_LINUX) || defined(OS_ANDROID)
-  // Note: This is a function call, which is also an implicit compiler barrier.
-  typedef void (*KernelMemoryBarrierFunc)();
-  ((KernelMemoryBarrierFunc)0xffff0fa0)();
-#elif defined(OS_QNX)
-  __cpu_membarrier();
-#else
-#error MemoryBarrier() is not implemented on this platform.
-#endif
-}
-
-// An ARM toolchain would only define one of these depending on which
-// variant of the target architecture is being used. This tests against
-// any known ARMv6 or ARMv7 variant, where it is possible to directly
-// use ldrex/strex instructions to implement fast atomic operations.
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||  \
-    defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
-    defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||  \
-    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
-    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  Atomic32 prev_value;
-  int reloop;
-  do {
-    // The following is equivalent to:
-    //
-    //   prev_value = LDREX(ptr)
-    //   reloop = 0
-    //   if (prev_value != old_value)
-    //      reloop = STREX(ptr, new_value)
-    __asm__ __volatile__(
-        "    ldrex %0, [%3]\n"
-        "    mov %1, #0\n"
-        "    cmp %0, %4\n"
-#ifdef __thumb2__
-        "    it eq\n"
-#endif
-        "    strexeq %1, %5, [%3]\n"
-        : "=&r"(prev_value), "=&r"(reloop), "+m"(*ptr)
-        : "r"(ptr), "r"(old_value), "r"(new_value)
-        : "cc", "memory");
-  } while (reloop != 0);
-  return prev_value;
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  Atomic32 result = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-  MemoryBarrier();
-  return result;
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  MemoryBarrier();
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  Atomic32 value;
-  int reloop;
-  do {
-    // Equivalent to:
-    //
-    //  value = LDREX(ptr)
-    //  value += increment
-    //  reloop = STREX(ptr, value)
-    //
-    __asm__ __volatile__(
-        "    ldrex %0, [%3]\n"
-        "    add %0, %0, %4\n"
-        "    strex %1, %0, [%3]\n"
-        : "=&r"(value), "=&r"(reloop), "+m"(*ptr)
-        : "r"(ptr), "r"(increment)
-        : "cc", "memory");
-  } while (reloop);
-  return value;
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  // TODO(digit): Investigate if it's possible to implement this with
-  // a single MemoryBarrier() operation between the LDREX and STREX.
-  // See http://crbug.com/246514
-  MemoryBarrier();
-  Atomic32 result = NoBarrier_AtomicIncrement(ptr, increment);
-  MemoryBarrier();
-  return result;
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  Atomic32 old_value;
-  int reloop;
-  do {
-    // old_value = LDREX(ptr)
-    // reloop = STREX(ptr, new_value)
-    __asm__ __volatile__(
-        "   ldrex %0, [%3]\n"
-        "   strex %1, %4, [%3]\n"
-        : "=&r"(old_value), "=&r"(reloop), "+m"(*ptr)
-        : "r"(ptr), "r"(new_value)
-        : "cc", "memory");
-  } while (reloop != 0);
-  return old_value;
-}
-
-// This tests against any known ARMv5 variant.
-#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \
-    defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
-
-// The kernel also provides a helper function to perform an atomic
-// compare-and-swap operation at the hard-wired address 0xffff0fc0.
-// On ARMv5, this is implemented by a special code path that the kernel
-// detects and treats specially when thread pre-emption happens.
-// On ARMv6 and higher, it uses LDREX/STREX instructions instead.
-//
-// Note that this always perform a full memory barrier, there is no
-// need to add calls MemoryBarrier() before or after it. It also
-// returns 0 on success, and 1 on exit.
-//
-// Available and reliable since Linux 2.6.24. Both Android and ChromeOS
-// use newer kernel revisions, so this should not be a concern.
-namespace {
-
-inline int LinuxKernelCmpxchg(Atomic32 old_value,
-                              Atomic32 new_value,
-                              volatile Atomic32* ptr) {
-  typedef int (*KernelCmpxchgFunc)(Atomic32, Atomic32, volatile Atomic32*);
-  return ((KernelCmpxchgFunc)0xffff0fc0)(old_value, new_value, ptr);
-}
-
-}  // namespace
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  Atomic32 prev_value;
-  for (;;) {
-    prev_value = *ptr;
-    if (prev_value != old_value)
-      return prev_value;
-    if (!LinuxKernelCmpxchg(old_value, new_value, ptr))
-      return old_value;
-  }
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  Atomic32 old_value;
-  do {
-    old_value = *ptr;
-  } while (LinuxKernelCmpxchg(old_value, new_value, ptr));
-  return old_value;
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  return Barrier_AtomicIncrement(ptr, increment);
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  for (;;) {
-    // Atomic exchange the old value with an incremented one.
-    Atomic32 old_value = *ptr;
-    Atomic32 new_value = old_value + increment;
-    if (!LinuxKernelCmpxchg(old_value, new_value, ptr)) {
-      // The exchange took place as expected.
-      return new_value;
-    }
-    // Otherwise, *ptr changed mid-loop and we need to retry.
-  }
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  Atomic32 prev_value;
-  for (;;) {
-    prev_value = *ptr;
-    if (prev_value != old_value) {
-      // Always ensure acquire semantics.
-      MemoryBarrier();
-      return prev_value;
-    }
-    if (!LinuxKernelCmpxchg(old_value, new_value, ptr))
-      return old_value;
-  }
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  // This could be implemented as:
-  //    MemoryBarrier();
-  //    return NoBarrier_CompareAndSwap();
-  //
-  // But would use 3 barriers per succesful CAS. To save performance,
-  // use Acquire_CompareAndSwap(). Its implementation guarantees that:
-  // - A succesful swap uses only 2 barriers (in the kernel helper).
-  // - An early return due to (prev_value != old_value) performs
-  //   a memory barrier with no store, which is equivalent to the
-  //   generic implementation above.
-  return Acquire_CompareAndSwap(ptr, old_value, new_value);
-}
-
-#else
-#error "Your CPU's ARM architecture is not supported yet"
-#endif
-
-// NOTE: Atomicity of the following load and store operations is only
-// guaranteed in case of 32-bit alignement of |ptr| values.
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  MemoryBarrier();
-  *ptr = value;
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return *ptr;
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr;
-  MemoryBarrier();
-  return value;
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-}  // namespace base::subtle
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ARM_GCC_H_
diff --git a/src/include/base/internal/cef_atomicops_atomicword_compat.h b/src/include/base/internal/cef_atomicops_atomicword_compat.h
deleted file mode 100644
index f905de85f..000000000
--- a/src/include/base/internal/cef_atomicops_atomicword_compat.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2011 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/cef_atomicops.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
-
-// AtomicWord is a synonym for intptr_t, and Atomic32 is a synonym for int32,
-// which in turn means int. On some LP32 platforms, intptr_t is an int, but
-// on others, it's a long. When AtomicWord and Atomic32 are based on different
-// fundamental types, their pointers are incompatible.
-//
-// This file defines function overloads to allow both AtomicWord and Atomic32
-// data to be used with this interface.
-//
-// On LP64 platforms, AtomicWord and Atomic64 are both always long,
-// so this problem doesn't occur.
-
-#if !defined(ARCH_CPU_64_BITS)
-
-namespace base {
-namespace subtle {
-
-inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr,
-                                           AtomicWord old_value,
-                                           AtomicWord new_value) {
-  return NoBarrier_CompareAndSwap(reinterpret_cast<volatile Atomic32*>(ptr),
-                                  old_value, new_value);
-}
-
-inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr,
-                                           AtomicWord new_value) {
-  return NoBarrier_AtomicExchange(reinterpret_cast<volatile Atomic32*>(ptr),
-                                  new_value);
-}
-
-inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr,
-                                            AtomicWord increment) {
-  return NoBarrier_AtomicIncrement(reinterpret_cast<volatile Atomic32*>(ptr),
-                                   increment);
-}
-
-inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
-                                          AtomicWord increment) {
-  return Barrier_AtomicIncrement(reinterpret_cast<volatile Atomic32*>(ptr),
-                                 increment);
-}
-
-inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
-                                         AtomicWord old_value,
-                                         AtomicWord new_value) {
-  return base::subtle::Acquire_CompareAndSwap(
-      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
-}
-
-inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr,
-                                         AtomicWord old_value,
-                                         AtomicWord new_value) {
-  return base::subtle::Release_CompareAndSwap(
-      reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  NoBarrier_Store(reinterpret_cast<volatile Atomic32*>(ptr), value);
-}
-
-inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return base::subtle::Acquire_Store(reinterpret_cast<volatile Atomic32*>(ptr),
-                                     value);
-}
-
-inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) {
-  return base::subtle::Release_Store(reinterpret_cast<volatile Atomic32*>(ptr),
-                                     value);
-}
-
-inline AtomicWord NoBarrier_Load(volatile const AtomicWord* ptr) {
-  return NoBarrier_Load(reinterpret_cast<volatile const Atomic32*>(ptr));
-}
-
-inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) {
-  return base::subtle::Acquire_Load(
-      reinterpret_cast<volatile const Atomic32*>(ptr));
-}
-
-inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
-  return base::subtle::Release_Load(
-      reinterpret_cast<volatile const Atomic32*>(ptr));
-}
-
-}  // namespace base::subtle
-}  // namespace base
-
-#endif  // !defined(ARCH_CPU_64_BITS)
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
diff --git a/src/include/base/internal/cef_atomicops_mac.h b/src/include/base/internal/cef_atomicops_mac.h
deleted file mode 100644
index 374ae35d6..000000000
--- a/src/include/base/internal/cef_atomicops_mac.h
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) 2012 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/cef_atomicops.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
-
-#include <libkern/OSAtomic.h>
-
-namespace base {
-namespace subtle {
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  Atomic32 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap32(old_value, new_value,
-                                 const_cast<Atomic32*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  Atomic32 old_value;
-  do {
-    old_value = *ptr;
-  } while (!OSAtomicCompareAndSwap32(old_value, new_value,
-                                     const_cast<Atomic32*>(ptr)));
-  return old_value;
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  return OSAtomicAdd32(increment, const_cast<Atomic32*>(ptr));
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  return OSAtomicAdd32Barrier(increment, const_cast<Atomic32*>(ptr));
-}
-
-inline void MemoryBarrier() {
-  OSMemoryBarrier();
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  Atomic32 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap32Barrier(old_value, new_value,
-                                        const_cast<Atomic32*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return Acquire_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  MemoryBarrier();
-  *ptr = value;
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return *ptr;
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr;
-  MemoryBarrier();
-  return value;
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#ifdef __LP64__
-
-// 64-bit implementation on 64-bit platform
-
-inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                         Atomic64 old_value,
-                                         Atomic64 new_value) {
-  Atomic64 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap64(old_value, new_value,
-                                 reinterpret_cast<volatile int64_t*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
-                                         Atomic64 new_value) {
-  Atomic64 old_value;
-  do {
-    old_value = *ptr;
-  } while (!OSAtomicCompareAndSwap64(old_value, new_value,
-                                     reinterpret_cast<volatile int64_t*>(ptr)));
-  return old_value;
-}
-
-inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
-                                          Atomic64 increment) {
-  return OSAtomicAdd64(increment, reinterpret_cast<volatile int64_t*>(ptr));
-}
-
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  return OSAtomicAdd64Barrier(increment,
-                              reinterpret_cast<volatile int64_t*>(ptr));
-}
-
-inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  Atomic64 prev_value;
-  do {
-    if (OSAtomicCompareAndSwap64Barrier(
-            old_value, new_value, reinterpret_cast<volatile int64_t*>(ptr))) {
-      return old_value;
-    }
-    prev_value = *ptr;
-  } while (prev_value == old_value);
-  return prev_value;
-}
-
-inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  // The lib kern interface does not distinguish between
-  // Acquire and Release memory barriers; they are equivalent.
-  return Acquire_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  MemoryBarrier();
-  *ptr = value;
-}
-
-inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
-  return *ptr;
-}
-
-inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  Atomic64 value = *ptr;
-  MemoryBarrier();
-  return value;
-}
-
-inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#endif  // defined(__LP64__)
-
-}  // namespace base::subtle
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
diff --git a/src/include/base/internal/cef_atomicops_x86_gcc.h b/src/include/base/internal/cef_atomicops_x86_gcc.h
deleted file mode 100644
index b93df21b0..000000000
--- a/src/include/base/internal/cef_atomicops_x86_gcc.h
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) 2011 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/cef_atomicops.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_GCC_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_GCC_H_
-
-// This struct is not part of the public API of this module; clients may not
-// use it.
-// Features of this x86.  Values may not be correct before main() is run,
-// but are set conservatively.
-struct AtomicOps_x86CPUFeatureStruct {
-  bool has_amd_lock_mb_bug;  // Processor has AMD memory-barrier bug; do lfence
-                             // after acquire compare-and-swap.
-};
-extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures;
-
-#define ATOMICOPS_COMPILER_BARRIER() __asm__ __volatile__("" : : : "memory")
-
-namespace base {
-namespace subtle {
-
-// 32-bit low-level operations on any platform.
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  Atomic32 prev;
-  __asm__ __volatile__("lock; cmpxchgl %1,%2"
-                       : "=a"(prev)
-                       : "q"(new_value), "m"(*ptr), "0"(old_value)
-                       : "memory");
-  return prev;
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  __asm__ __volatile__("xchgl %1,%0"  // The lock prefix is implicit for xchg.
-                       : "=r"(new_value)
-                       : "m"(*ptr), "0"(new_value)
-                       : "memory");
-  return new_value;  // Now it's the previous value.
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  Atomic32 temp = increment;
-  __asm__ __volatile__("lock; xaddl %0,%1"
-                       : "+r"(temp), "+m"(*ptr)
-                       :
-                       : "memory");
-  // temp now holds the old value of *ptr
-  return temp + increment;
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  Atomic32 temp = increment;
-  __asm__ __volatile__("lock; xaddl %0,%1"
-                       : "+r"(temp), "+m"(*ptr)
-                       :
-                       : "memory");
-  // temp now holds the old value of *ptr
-  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
-    __asm__ __volatile__("lfence" : : : "memory");
-  }
-  return temp + increment;
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  Atomic32 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
-    __asm__ __volatile__("lfence" : : : "memory");
-  }
-  return x;
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-}
-
-inline void MemoryBarrier() {
-  __asm__ __volatile__("mfence" : : : "memory");
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  ATOMICOPS_COMPILER_BARRIER();
-  *ptr = value;  // An x86 store acts as a release barrier.
-  // See comments in Atomic64 version of Release_Store(), below.
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return *ptr;
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr;  // An x86 load acts as a acquire barrier.
-  // See comments in Atomic64 version of Release_Store(), below.
-  ATOMICOPS_COMPILER_BARRIER();
-  return value;
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#if defined(__x86_64__)
-
-// 64-bit low-level operations on 64-bit platform.
-
-inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                         Atomic64 old_value,
-                                         Atomic64 new_value) {
-  Atomic64 prev;
-  __asm__ __volatile__("lock; cmpxchgq %1,%2"
-                       : "=a"(prev)
-                       : "q"(new_value), "m"(*ptr), "0"(old_value)
-                       : "memory");
-  return prev;
-}
-
-inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
-                                         Atomic64 new_value) {
-  __asm__ __volatile__("xchgq %1,%0"  // The lock prefix is implicit for xchg.
-                       : "=r"(new_value)
-                       : "m"(*ptr), "0"(new_value)
-                       : "memory");
-  return new_value;  // Now it's the previous value.
-}
-
-inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
-                                          Atomic64 increment) {
-  Atomic64 temp = increment;
-  __asm__ __volatile__("lock; xaddq %0,%1"
-                       : "+r"(temp), "+m"(*ptr)
-                       :
-                       : "memory");
-  // temp now contains the previous value of *ptr
-  return temp + increment;
-}
-
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  Atomic64 temp = increment;
-  __asm__ __volatile__("lock; xaddq %0,%1"
-                       : "+r"(temp), "+m"(*ptr)
-                       :
-                       : "memory");
-  // temp now contains the previous value of *ptr
-  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
-    __asm__ __volatile__("lfence" : : : "memory");
-  }
-  return temp + increment;
-}
-
-inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-  MemoryBarrier();
-}
-
-inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  ATOMICOPS_COMPILER_BARRIER();
-
-  *ptr = value;  // An x86 store acts as a release barrier
-                 // for current AMD/Intel chips as of Jan 2008.
-                 // See also Acquire_Load(), below.
-
-  // When new chips come out, check:
-  //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
-  //  System Programming Guide, Chatper 7: Multiple-processor management,
-  //  Section 7.2, Memory Ordering.
-  // Last seen at:
-  //   http://developer.intel.com/design/pentium4/manuals/index_new.htm
-  //
-  // x86 stores/loads fail to act as barriers for a few instructions (clflush
-  // maskmovdqu maskmovq movntdq movnti movntpd movntps movntq) but these are
-  // not generated by the compiler, and are rare.  Users of these instructions
-  // need to know about cache behaviour in any case since all of these involve
-  // either flushing cache lines or non-temporal cache hints.
-}
-
-inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
-  return *ptr;
-}
-
-inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  Atomic64 value = *ptr;  // An x86 load acts as a acquire barrier,
-                          // for current AMD/Intel chips as of Jan 2008.
-                          // See also Release_Store(), above.
-  ATOMICOPS_COMPILER_BARRIER();
-  return value;
-}
-
-inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  Atomic64 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-  if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
-    __asm__ __volatile__("lfence" : : : "memory");
-  }
-  return x;
-}
-
-inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-#endif  // defined(__x86_64__)
-
-}  // namespace base::subtle
-}  // namespace base
-
-#undef ATOMICOPS_COMPILER_BARRIER
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_GCC_H_
diff --git a/src/include/base/internal/cef_atomicops_x86_msvc.h b/src/include/base/internal/cef_atomicops_x86_msvc.h
deleted file mode 100644
index a262c81f1..000000000
--- a/src/include/base/internal/cef_atomicops_x86_msvc.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) 2008 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/cef_atomicops.h
-// instead.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_MSVC_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_MSVC_H_
-
-#include <windows.h>
-
-#include <intrin.h>
-
-#include "include/base/cef_macros.h"
-
-#if defined(ARCH_CPU_64_BITS)
-// windows.h #defines this (only on x64). This causes problems because the
-// public API also uses MemoryBarrier at the public name for this fence. So, on
-// X64, undef it, and call its documented
-// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx)
-// implementation directly.
-#undef MemoryBarrier
-#endif
-
-namespace base {
-namespace subtle {
-
-inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
-                                         Atomic32 old_value,
-                                         Atomic32 new_value) {
-  LONG result = _InterlockedCompareExchange(
-      reinterpret_cast<volatile LONG*>(ptr), static_cast<LONG>(new_value),
-      static_cast<LONG>(old_value));
-  return static_cast<Atomic32>(result);
-}
-
-inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
-                                         Atomic32 new_value) {
-  LONG result = _InterlockedExchange(reinterpret_cast<volatile LONG*>(ptr),
-                                     static_cast<LONG>(new_value));
-  return static_cast<Atomic32>(result);
-}
-
-inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
-                                        Atomic32 increment) {
-  return _InterlockedExchangeAdd(reinterpret_cast<volatile LONG*>(ptr),
-                                 static_cast<LONG>(increment)) +
-         increment;
-}
-
-inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
-                                          Atomic32 increment) {
-  return Barrier_AtomicIncrement(ptr, increment);
-}
-
-#if !(defined(_MSC_VER) && _MSC_VER >= 1400)
-#error "We require at least vs2005 for MemoryBarrier"
-#endif
-inline void MemoryBarrier() {
-#if defined(ARCH_CPU_64_BITS)
-  // See #undef and note at the top of this file.
-  __faststorefence();
-#else
-  // We use MemoryBarrier from WinNT.h
-  ::MemoryBarrier();
-#endif
-}
-
-inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
-                                       Atomic32 old_value,
-                                       Atomic32 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
-  NoBarrier_AtomicExchange(ptr, value);
-  // acts as a barrier in this implementation
-}
-
-inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
-  *ptr = value;  // works w/o barrier for current Intel chips as of June 2005
-  // See comments in Atomic64 version of Release_Store() below.
-}
-
-inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
-  return *ptr;
-}
-
-inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
-  Atomic32 value = *ptr;
-  return value;
-}
-
-inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-#if defined(_WIN64)
-
-// 64-bit low-level operations on 64-bit platform.
-
-COMPILE_ASSERT(sizeof(Atomic64) == sizeof(PVOID), atomic_word_is_atomic);
-
-inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
-                                         Atomic64 old_value,
-                                         Atomic64 new_value) {
-  PVOID result = InterlockedCompareExchangePointer(
-      reinterpret_cast<volatile PVOID*>(ptr),
-      reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
-  return reinterpret_cast<Atomic64>(result);
-}
-
-inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
-                                         Atomic64 new_value) {
-  PVOID result =
-      InterlockedExchangePointer(reinterpret_cast<volatile PVOID*>(ptr),
-                                 reinterpret_cast<PVOID>(new_value));
-  return reinterpret_cast<Atomic64>(result);
-}
-
-inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
-                                        Atomic64 increment) {
-  return InterlockedExchangeAdd64(reinterpret_cast<volatile LONGLONG*>(ptr),
-                                  static_cast<LONGLONG>(increment)) +
-         increment;
-}
-
-inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
-                                          Atomic64 increment) {
-  return Barrier_AtomicIncrement(ptr, increment);
-}
-
-inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;
-}
-
-inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
-  NoBarrier_AtomicExchange(ptr, value);
-  // acts as a barrier in this implementation
-}
-
-inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
-  *ptr = value;  // works w/o barrier for current Intel chips as of June 2005
-
-  // When new chips come out, check:
-  //  IA-32 Intel Architecture Software Developer's Manual, Volume 3:
-  //  System Programming Guide, Chatper 7: Multiple-processor management,
-  //  Section 7.2, Memory Ordering.
-  // Last seen at:
-  //   http://developer.intel.com/design/pentium4/manuals/index_new.htm
-}
-
-inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
-  return *ptr;
-}
-
-inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
-  Atomic64 value = *ptr;
-  return value;
-}
-
-inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
-  MemoryBarrier();
-  return *ptr;
-}
-
-inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-                                       Atomic64 old_value,
-                                       Atomic64 new_value) {
-  return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
-}
-
-#endif  // defined(_WIN64)
-
-}  // namespace base::subtle
-}  // namespace base
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_X86_MSVC_H_
diff --git a/src/include/base/internal/cef_bind_internal.h b/src/include/base/internal/cef_bind_internal.h
index 64eeb3f3b..fddfec0dc 100644
--- a/src/include/base/internal/cef_bind_internal.h
+++ b/src/include/base/internal/cef_bind_internal.h
@@ -29,3162 +29,1386 @@
 
 // Do not include this header file directly. Use base/cef_bind.h instead.
 
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_H_
-
-#include "include/base/cef_bind_helpers.h"
-#include "include/base/cef_build.h"
-#include "include/base/cef_template_util.h"
-#include "include/base/cef_weak_ptr.h"
-#include "include/base/internal/cef_callback_internal.h"
-#include "include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h"
-
-#if defined(OS_WIN)
-#include "include/base/internal/cef_bind_internal_win.h"
-#endif
-
-namespace base {
-namespace cef_internal {
-
-// See base/callback.h for user documentation.
+// See base/cef_callback.h for user documentation.
 //
 //
 // CONCEPTS:
-//  Runnable -- A type (really a type class) that has a single Run() method
-//              and a RunType typedef that corresponds to the type of Run().
-//              A Runnable can declare that it should treated like a method
-//              call by including a typedef named IsMethod.  The value of
-//              this typedef is NOT inspected, only the existence.  When a
-//              Runnable declares itself a method, Bind() will enforce special
-//              refcounting + WeakPtr handling semantics for the first
-//              parameter which is expected to be an object.
-//  Functor -- A copyable type representing something that should be called.
-//             All function pointers, Callback<>, and Runnables are functors
-//             even if the invocation syntax differs.
+//  Functor -- A movable type representing something that should be called.
+//             All function pointers and Callback<> are functors even if the
+//             invocation syntax differs.
 //  RunType -- A function type (as opposed to function _pointer_ type) for
-//             a Run() function.  Usually just a convenience typedef.
-//  (Bound)ArgsType -- A function type that is being (ab)used to store the
-//                     types of set of arguments.  The "return" type is always
-//                     void here.  We use this hack so that we do not need
-//                     a new type name for each arity of type. (eg.,
-//                     BindState1, BindState2).  This makes forward
-//                     declarations and friending much much easier.
+//             a Callback<>::Run().  Usually just a convenience typedef.
+//  (Bound)Args -- A set of types that stores the arguments.
 //
 // Types:
-//  RunnableAdapter<> -- Wraps the various "function" pointer types into an
-//                       object that adheres to the Runnable interface.
-//                       There are |3*ARITY| RunnableAdapter types.
-//  FunctionTraits<> -- Type traits that unwrap a function signature into a
-//                      a set of easier to use typedefs.  Used mainly for
-//                      compile time asserts.
-//                      There are |ARITY| FunctionTraits types.
 //  ForceVoidReturn<> -- Helper class for translating function signatures to
 //                       equivalent forms with a "void" return type.
-//                    There are |ARITY| ForceVoidReturn types.
-//  FunctorTraits<> -- Type traits used determine the correct RunType and
-//                     RunnableType for a Functor.  This is where function
+//  FunctorTraits<> -- Type traits used to determine the correct RunType and
+//                     invocation manner for a Functor.  This is where function
 //                     signature adapters are applied.
-//                    There are |ARITY| ForceVoidReturn types.
-//  MakeRunnable<> -- Takes a Functor and returns an object in the Runnable
-//                    type class that represents the underlying Functor.
-//                    There are |O(1)| MakeRunnable types.
-//  InvokeHelper<> -- Take a Runnable + arguments and actully invokes it.
-// Handle the differing syntaxes needed for WeakPtr<> support,
-//                    and for ignoring return values.  This is separate from
-//                    Invoker to avoid creating multiple version of Invoker<>
-//                    which grows at O(n^2) with the arity.
-//                    There are |k*ARITY| InvokeHelper types.
-//  Invoker<> -- Unwraps the curried parameters and executes the Runnable.
-//               There are |(ARITY^2 + ARITY)/2| Invoketypes.
+//  InvokeHelper<> -- Take a Functor + arguments and actully invokes it.
+//                    Handle the differing syntaxes needed for WeakPtr<>
+//                    support.  This is separate from Invoker to avoid creating
+//                    multiple version of Invoker<>.
+//  Invoker<> -- Unwraps the curried parameters and executes the Functor.
 //  BindState<> -- Stores the curried parameters, and is the main entry point
-//                 into the Bind() system, doing most of the type resolution.
-//                 There are ARITY BindState types.
+//                 into the Bind() system.
 
-// RunnableAdapter<>
-//
-// The RunnableAdapter<> templates provide a uniform interface for invoking
-// a function pointer, method pointer, or const method pointer. The adapter
-// exposes a Run() method with an appropriate signature. Using this wrapper
-// allows for writing code that supports all three pointer types without
-// undue repetition.  Without it, a lot of code would need to be repeated 3
-// times.
-//
-// For method pointers and const method pointers the first argument to Run()
-// is considered to be the received of the method.  This is similar to STL's
-// mem_fun().
-//
-// This class also exposes a RunType typedef that is the function type of the
-// Run() function.
-//
-// If and only if the wrapper contains a method or const method pointer, an
-// IsMethod typedef is exposed.  The existence of this typedef (NOT the value)
-// marks that the wrapper should be considered a method wrapper.
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_H_
 
-template <typename Functor>
-class RunnableAdapter;
+#include <stddef.h>
 
-// Function: Arity 0.
-template <typename R>
-class RunnableAdapter<R (*)()> {
- public:
-  typedef R(RunType)();
+#include <functional>
+#include <memory>
+#include <tuple>
+#include <type_traits>
+#include <utility>
 
-  explicit RunnableAdapter(R (*function)()) : function_(function) {}
+#include "include/base/cef_build.h"
+#include "include/base/cef_compiler_specific.h"
+#include "include/base/cef_logging.h"
+#include "include/base/cef_weak_ptr.h"
+#include "include/base/internal/cef_callback_internal.h"
+#include "include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h"
 
-  R Run() { return function_(); }
+#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc)
+#include "include/base/internal/cef_scoped_block_mac.h"
+#endif
 
- private:
-  R (*function_)();
-};
+#if defined(OS_WIN)
+namespace Microsoft {
+namespace WRL {
+template <typename>
+class ComPtr;
+}  // namespace WRL
+}  // namespace Microsoft
+#endif
 
-// Method: Arity 0.
-template <typename R, typename T>
-class RunnableAdapter<R (T::*)()> {
- public:
-  typedef R(RunType)(T*);
-  typedef true_type IsMethod;
+namespace base {
 
-  explicit RunnableAdapter(R (T::*method)()) : method_(method) {}
+template <typename T>
+struct IsWeakReceiver;
 
-  R Run(T* object) { return (object->*method_)(); }
+template <typename>
+struct BindUnwrapTraits;
 
- private:
-  R (T::*method_)();
-};
+template <typename Functor, typename BoundArgsTuple, typename SFINAE = void>
+struct CallbackCancellationTraits;
 
-// Const Method: Arity 0.
-template <typename R, typename T>
-class RunnableAdapter<R (T::*)() const> {
- public:
-  typedef R(RunType)(const T*);
-  typedef true_type IsMethod;
+namespace cef_internal {
 
-  explicit RunnableAdapter(R (T::*method)() const) : method_(method) {}
+template <typename Functor, typename SFINAE = void>
+struct FunctorTraits;
 
-  R Run(const T* object) { return (object->*method_)(); }
+template <typename T>
+class UnretainedWrapper {
+ public:
+  explicit UnretainedWrapper(T* o) : ptr_(o) {}
+  T* get() const { return ptr_; }
 
  private:
-  R (T::*method_)() const;
+  T* ptr_;
 };
 
-// Function: Arity 1.
-template <typename R, typename A1>
-class RunnableAdapter<R (*)(A1)> {
+template <typename T>
+class RetainedRefWrapper {
  public:
-  typedef R(RunType)(A1);
-
-  explicit RunnableAdapter(R (*function)(A1)) : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
-    return function_(CallbackForward(a1));
-  }
+  explicit RetainedRefWrapper(T* o) : ptr_(o) {}
+  explicit RetainedRefWrapper(scoped_refptr<T> o) : ptr_(std::move(o)) {}
+  T* get() const { return ptr_.get(); }
 
  private:
-  R (*function_)(A1);
+  scoped_refptr<T> ptr_;
 };
 
-// Method: Arity 1.
-template <typename R, typename T, typename A1>
-class RunnableAdapter<R (T::*)(A1)> {
- public:
-  typedef R(RunType)(T*, A1);
-  typedef true_type IsMethod;
+template <typename T>
+struct IgnoreResultHelper {
+  explicit IgnoreResultHelper(T functor) : functor_(std::move(functor)) {}
+  explicit operator bool() const { return !!functor_; }
 
-  explicit RunnableAdapter(R (T::*method)(A1)) : method_(method) {}
+  T functor_;
+};
 
-  R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1) {
-    return (object->*method_)(CallbackForward(a1));
-  }
+template <typename T, typename Deleter = std::default_delete<T>>
+class OwnedWrapper {
+ public:
+  explicit OwnedWrapper(T* o) : ptr_(o) {}
+  explicit OwnedWrapper(std::unique_ptr<T, Deleter>&& ptr)
+      : ptr_(std::move(ptr)) {}
+  T* get() const { return ptr_.get(); }
 
  private:
-  R (T::*method_)(A1);
+  std::unique_ptr<T, Deleter> ptr_;
 };
 
-// Const Method: Arity 1.
-template <typename R, typename T, typename A1>
-class RunnableAdapter<R (T::*)(A1) const> {
+template <typename T>
+class OwnedRefWrapper {
  public:
-  typedef R(RunType)(const T*, A1);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1) const) : method_(method) {}
-
-  R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1) {
-    return (object->*method_)(CallbackForward(a1));
-  }
+  explicit OwnedRefWrapper(const T& t) : t_(t) {}
+  explicit OwnedRefWrapper(T&& t) : t_(std::move(t)) {}
+  T& get() const { return t_; }
 
  private:
-  R (T::*method_)(A1) const;
+  mutable T t_;
 };
 
-// Function: Arity 2.
-template <typename R, typename A1, typename A2>
-class RunnableAdapter<R (*)(A1, A2)> {
+// PassedWrapper is a copyable adapter for a scoper that ignores const.
+//
+// It is needed to get around the fact that Bind() takes a const reference to
+// all its arguments.  Because Bind() takes a const reference to avoid
+// unnecessary copies, it is incompatible with movable-but-not-copyable
+// types; doing a destructive "move" of the type into Bind() would violate
+// the const correctness.
+//
+// This conundrum cannot be solved without either C++11 rvalue references or
+// a O(2^n) blowup of Bind() templates to handle each combination of regular
+// types and movable-but-not-copyable types.  Thus we introduce a wrapper type
+// that is copyable to transmit the correct type information down into
+// BindState<>. Ignoring const in this type makes sense because it is only
+// created when we are explicitly trying to do a destructive move.
+//
+// Two notes:
+//  1) PassedWrapper supports any type that has a move constructor, however
+//     the type will need to be specifically allowed in order for it to be
+//     bound to a Callback. We guard this explicitly at the call of Passed()
+//     to make for clear errors. Things not given to Passed() will be forwarded
+//     and stored by value which will not work for general move-only types.
+//  2) is_valid_ is distinct from NULL because it is valid to bind a "NULL"
+//     scoper to a Callback and allow the Callback to execute once.
+template <typename T>
+class PassedWrapper {
  public:
-  typedef R(RunType)(A1, A2);
-
-  explicit RunnableAdapter(R (*function)(A1, A2)) : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2) {
-    return function_(CallbackForward(a1), CallbackForward(a2));
+  explicit PassedWrapper(T&& scoper)
+      : is_valid_(true), scoper_(std::move(scoper)) {}
+  PassedWrapper(PassedWrapper&& other)
+      : is_valid_(other.is_valid_), scoper_(std::move(other.scoper_)) {}
+  T Take() const {
+    CHECK(is_valid_);
+    is_valid_ = false;
+    return std::move(scoper_);
   }
 
  private:
-  R (*function_)(A1, A2);
+  mutable bool is_valid_;
+  mutable T scoper_;
 };
 
-// Method: Arity 2.
-template <typename R, typename T, typename A1, typename A2>
-class RunnableAdapter<R (T::*)(A1, A2)> {
- public:
-  typedef R(RunType)(T*, A1, A2);
-  typedef true_type IsMethod;
+template <typename T>
+using Unwrapper = BindUnwrapTraits<std::decay_t<T>>;
 
-  explicit RunnableAdapter(R (T::*method)(A1, A2)) : method_(method) {}
+template <typename T>
+decltype(auto) Unwrap(T&& o) {
+  return Unwrapper<T>::Unwrap(std::forward<T>(o));
+}
 
-  R Run(T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2));
-  }
+// IsWeakMethod is a helper that determine if we are binding a WeakPtr<> to a
+// method.  It is used internally by Bind() to select the correct
+// InvokeHelper that will no-op itself in the event the WeakPtr<> for
+// the target object is invalidated.
+//
+// The first argument should be the type of the object that will be received by
+// the method.
+template <bool is_method, typename... Args>
+struct IsWeakMethod : std::false_type {};
 
- private:
-  R (T::*method_)(A1, A2);
-};
+template <typename T, typename... Args>
+struct IsWeakMethod<true, T, Args...> : IsWeakReceiver<T> {};
 
-// Const Method: Arity 2.
-template <typename R, typename T, typename A1, typename A2>
-class RunnableAdapter<R (T::*)(A1, A2) const> {
- public:
-  typedef R(RunType)(const T*, A1, A2);
-  typedef true_type IsMethod;
+// Packs a list of types to hold them in a single type.
+template <typename... Types>
+struct TypeList {};
 
-  explicit RunnableAdapter(R (T::*method)(A1, A2) const) : method_(method) {}
+// Used for DropTypeListItem implementation.
+template <size_t n, typename List>
+struct DropTypeListItemImpl;
 
-  R Run(const T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2));
-  }
+// Do not use enable_if and SFINAE here to avoid MSVC2013 compile failure.
+template <size_t n, typename T, typename... List>
+struct DropTypeListItemImpl<n, TypeList<T, List...>>
+    : DropTypeListItemImpl<n - 1, TypeList<List...>> {};
 
- private:
-  R (T::*method_)(A1, A2) const;
+template <typename T, typename... List>
+struct DropTypeListItemImpl<0, TypeList<T, List...>> {
+  using Type = TypeList<T, List...>;
 };
 
-// Function: Arity 3.
-template <typename R, typename A1, typename A2, typename A3>
-class RunnableAdapter<R (*)(A1, A2, A3)> {
- public:
-  typedef R(RunType)(A1, A2, A3);
+template <>
+struct DropTypeListItemImpl<0, TypeList<>> {
+  using Type = TypeList<>;
+};
 
-  explicit RunnableAdapter(R (*function)(A1, A2, A3)) : function_(function) {}
+// A type-level function that drops |n| list item from given TypeList.
+template <size_t n, typename List>
+using DropTypeListItem = typename DropTypeListItemImpl<n, List>::Type;
 
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3) {
-    return function_(CallbackForward(a1), CallbackForward(a2),
-                     CallbackForward(a3));
-  }
+// Used for TakeTypeListItem implementation.
+template <size_t n, typename List, typename... Accum>
+struct TakeTypeListItemImpl;
 
- private:
-  R (*function_)(A1, A2, A3);
+// Do not use enable_if and SFINAE here to avoid MSVC2013 compile failure.
+template <size_t n, typename T, typename... List, typename... Accum>
+struct TakeTypeListItemImpl<n, TypeList<T, List...>, Accum...>
+    : TakeTypeListItemImpl<n - 1, TypeList<List...>, Accum..., T> {};
+
+template <typename T, typename... List, typename... Accum>
+struct TakeTypeListItemImpl<0, TypeList<T, List...>, Accum...> {
+  using Type = TypeList<Accum...>;
 };
 
-// Method: Arity 3.
-template <typename R, typename T, typename A1, typename A2, typename A3>
-class RunnableAdapter<R (T::*)(A1, A2, A3)> {
- public:
-  typedef R(RunType)(T*, A1, A2, A3);
-  typedef true_type IsMethod;
+template <typename... Accum>
+struct TakeTypeListItemImpl<0, TypeList<>, Accum...> {
+  using Type = TypeList<Accum...>;
+};
 
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3)) : method_(method) {}
+// A type-level function that takes first |n| list item from given TypeList.
+// E.g. TakeTypeListItem<3, TypeList<A, B, C, D>> is evaluated to
+// TypeList<A, B, C>.
+template <size_t n, typename List>
+using TakeTypeListItem = typename TakeTypeListItemImpl<n, List>::Type;
 
-  R Run(T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3));
-  }
+// Used for ConcatTypeLists implementation.
+template <typename List1, typename List2>
+struct ConcatTypeListsImpl;
 
- private:
-  R (T::*method_)(A1, A2, A3);
+template <typename... Types1, typename... Types2>
+struct ConcatTypeListsImpl<TypeList<Types1...>, TypeList<Types2...>> {
+  using Type = TypeList<Types1..., Types2...>;
 };
 
-// Const Method: Arity 3.
-template <typename R, typename T, typename A1, typename A2, typename A3>
-class RunnableAdapter<R (T::*)(A1, A2, A3) const> {
- public:
-  typedef R(RunType)(const T*, A1, A2, A3);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3) const)
-      : method_(method) {}
-
-  R Run(const T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3));
-  }
+// A type-level function that concats two TypeLists.
+template <typename List1, typename List2>
+using ConcatTypeLists = typename ConcatTypeListsImpl<List1, List2>::Type;
 
- private:
-  R (T::*method_)(A1, A2, A3) const;
-};
+// Used for MakeFunctionType implementation.
+template <typename R, typename ArgList>
+struct MakeFunctionTypeImpl;
 
-// Function: Arity 4.
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-class RunnableAdapter<R (*)(A1, A2, A3, A4)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4);
+template <typename R, typename... Args>
+struct MakeFunctionTypeImpl<R, TypeList<Args...>> {
+  // MSVC 2013 doesn't support Type Alias of function types.
+  // Revisit this after we update it to newer version.
+  typedef R Type(Args...);
+};
 
-  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4))
-      : function_(function) {}
+// A type-level function that constructs a function type that has |R| as its
+// return type and has TypeLists items as its arguments.
+template <typename R, typename ArgList>
+using MakeFunctionType = typename MakeFunctionTypeImpl<R, ArgList>::Type;
 
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4) {
-    return function_(CallbackForward(a1), CallbackForward(a2),
-                     CallbackForward(a3), CallbackForward(a4));
-  }
+// Used for ExtractArgs and ExtractReturnType.
+template <typename Signature>
+struct ExtractArgsImpl;
 
- private:
-  R (*function_)(A1, A2, A3, A4);
+template <typename R, typename... Args>
+struct ExtractArgsImpl<R(Args...)> {
+  using ReturnType = R;
+  using ArgsList = TypeList<Args...>;
 };
 
-// Method: Arity 4.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4)> {
- public:
-  typedef R(RunType)(T*, A1, A2, A3, A4);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4)) : method_(method) {}
-
-  R Run(T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4));
-  }
+// A type-level function that extracts function arguments into a TypeList.
+// E.g. ExtractArgs<R(A, B, C)> is evaluated to TypeList<A, B, C>.
+template <typename Signature>
+using ExtractArgs = typename ExtractArgsImpl<Signature>::ArgsList;
 
- private:
-  R (T::*method_)(A1, A2, A3, A4);
-};
+// A type-level function that extracts the return type of a function.
+// E.g. ExtractReturnType<R(A, B, C)> is evaluated to R.
+template <typename Signature>
+using ExtractReturnType = typename ExtractArgsImpl<Signature>::ReturnType;
 
-// Const Method: Arity 4.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4) const> {
- public:
-  typedef R(RunType)(const T*, A1, A2, A3, A4);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4) const)
-      : method_(method) {}
-
-  R Run(const T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4));
-  }
+template <typename Callable,
+          typename Signature = decltype(&Callable::operator())>
+struct ExtractCallableRunTypeImpl;
 
- private:
-  R (T::*method_)(A1, A2, A3, A4) const;
+template <typename Callable, typename R, typename... Args>
+struct ExtractCallableRunTypeImpl<Callable, R (Callable::*)(Args...)> {
+  using Type = R(Args...);
 };
 
-// Function: Arity 5.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-class RunnableAdapter<R (*)(A1, A2, A3, A4, A5)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5);
-
-  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4, A5))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5) {
-    return function_(CallbackForward(a1), CallbackForward(a2),
-                     CallbackForward(a3), CallbackForward(a4),
-                     CallbackForward(a5));
-  }
-
- private:
-  R (*function_)(A1, A2, A3, A4, A5);
+template <typename Callable, typename R, typename... Args>
+struct ExtractCallableRunTypeImpl<Callable, R (Callable::*)(Args...) const> {
+  using Type = R(Args...);
 };
 
-// Method: Arity 5.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5)> {
- public:
-  typedef R(RunType)(T*, A1, A2, A3, A4, A5);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5))
-      : method_(method) {}
-
-  R Run(T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4),
-                              CallbackForward(a5));
-  }
+// Evaluated to RunType of the given callable type.
+// Example:
+//   auto f = [](int, char*) { return 0.1; };
+//   ExtractCallableRunType<decltype(f)>
+//   is evaluated to
+//   double(int, char*);
+template <typename Callable>
+using ExtractCallableRunType =
+    typename ExtractCallableRunTypeImpl<Callable>::Type;
 
- private:
-  R (T::*method_)(A1, A2, A3, A4, A5);
-};
+// IsCallableObject<Functor> is std::true_type if |Functor| has operator().
+// Otherwise, it's std::false_type.
+// Example:
+//   IsCallableObject<void(*)()>::value is false.
+//
+//   struct Foo {};
+//   IsCallableObject<void(Foo::*)()>::value is false.
+//
+//   int i = 0;
+//   auto f = [i]() {};
+//   IsCallableObject<decltype(f)>::value is false.
+template <typename Functor, typename SFINAE = void>
+struct IsCallableObject : std::false_type {};
+
+template <typename Callable>
+struct IsCallableObject<Callable, std::void_t<decltype(&Callable::operator())>>
+    : std::true_type {};
+
+// HasRefCountedTypeAsRawPtr inherits from true_type when any of the |Args| is a
+// raw pointer to a RefCounted type.
+template <typename... Ts>
+struct HasRefCountedTypeAsRawPtr
+    : std::disjunction<NeedsScopedRefptrButGetsRawPtr<Ts>...> {};
 
-// Const Method: Arity 5.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5) const> {
- public:
-  typedef R(RunType)(const T*, A1, A2, A3, A4, A5);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5) const)
-      : method_(method) {}
-
-  R Run(const T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4),
-                              CallbackForward(a5));
-  }
+// ForceVoidReturn<>
+//
+// Set of templates that support forcing the function return type to void.
+template <typename Sig>
+struct ForceVoidReturn;
 
- private:
-  R (T::*method_)(A1, A2, A3, A4, A5) const;
+template <typename R, typename... Args>
+struct ForceVoidReturn<R(Args...)> {
+  using RunType = void(Args...);
 };
 
-// Function: Arity 6.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class RunnableAdapter<R (*)(A1, A2, A3, A4, A5, A6)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
-
-  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4, A5, A6))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6) {
-    return function_(CallbackForward(a1), CallbackForward(a2),
-                     CallbackForward(a3), CallbackForward(a4),
-                     CallbackForward(a5), CallbackForward(a6));
-  }
+// FunctorTraits<>
+//
+// See description at top of file.
+template <typename Functor, typename SFINAE>
+struct FunctorTraits;
+
+// For empty callable types.
+// This specialization is intended to allow binding captureless lambdas, based
+// on the fact that captureless lambdas are empty while capturing lambdas are
+// not. This also allows any functors as far as it's an empty class.
+// Example:
+//
+//   // Captureless lambdas are allowed.
+//   []() {return 42;};
+//
+//   // Capturing lambdas are *not* allowed.
+//   int x;
+//   [x]() {return x;};
+//
+//   // Any empty class with operator() is allowed.
+//   struct Foo {
+//     void operator()() const {}
+//     // No non-static member variable and no virtual functions.
+//   };
+template <typename Functor>
+struct FunctorTraits<Functor,
+                     std::enable_if_t<IsCallableObject<Functor>::value &&
+                                      std::is_empty<Functor>::value>> {
+  using RunType = ExtractCallableRunType<Functor>;
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = false;
+  static constexpr bool is_callback = false;
 
- private:
-  R (*function_)(A1, A2, A3, A4, A5, A6);
+  template <typename RunFunctor, typename... RunArgs>
+  static ExtractReturnType<RunType> Invoke(RunFunctor&& functor,
+                                           RunArgs&&... args) {
+    return std::forward<RunFunctor>(functor)(std::forward<RunArgs>(args)...);
+  }
 };
 
-// Method: Arity 6.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6)> {
- public:
-  typedef R(RunType)(T*, A1, A2, A3, A4, A5, A6);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6))
-      : method_(method) {}
-
-  R Run(T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4),
-                              CallbackForward(a5), CallbackForward(a6));
-  }
+// For functions.
+template <typename R, typename... Args>
+struct FunctorTraits<R (*)(Args...)> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
- private:
-  R (T::*method_)(A1, A2, A3, A4, A5, A6);
+  template <typename Function, typename... RunArgs>
+  static R Invoke(Function&& function, RunArgs&&... args) {
+    return std::forward<Function>(function)(std::forward<RunArgs>(args)...);
+  }
 };
 
-// Const Method: Arity 6.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6) const> {
- public:
-  typedef R(RunType)(const T*, A1, A2, A3, A4, A5, A6);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6) const)
-      : method_(method) {}
-
-  R Run(const T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4),
-                              CallbackForward(a5), CallbackForward(a6));
-  }
+#if defined(OS_WIN) && !defined(ARCH_CPU_64_BITS)
 
- private:
-  R (T::*method_)(A1, A2, A3, A4, A5, A6) const;
-};
+// For functions.
+template <typename R, typename... Args>
+struct FunctorTraits<R(__stdcall*)(Args...)> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-// Function: Arity 7.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class RunnableAdapter<R (*)(A1, A2, A3, A4, A5, A6, A7)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
-
-  explicit RunnableAdapter(R (*function)(A1, A2, A3, A4, A5, A6, A7))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6,
-        typename CallbackParamTraits<A7>::ForwardType a7) {
-    return function_(CallbackForward(a1), CallbackForward(a2),
-                     CallbackForward(a3), CallbackForward(a4),
-                     CallbackForward(a5), CallbackForward(a6),
-                     CallbackForward(a7));
+  template <typename... RunArgs>
+  static R Invoke(R(__stdcall* function)(Args...), RunArgs&&... args) {
+    return function(std::forward<RunArgs>(args)...);
   }
-
- private:
-  R (*function_)(A1, A2, A3, A4, A5, A6, A7);
 };
 
-// Method: Arity 7.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6, A7)> {
- public:
-  typedef R(RunType)(T*, A1, A2, A3, A4, A5, A6, A7);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6, A7))
-      : method_(method) {}
-
-  R Run(T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6,
-        typename CallbackParamTraits<A7>::ForwardType a7) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4),
-                              CallbackForward(a5), CallbackForward(a6),
-                              CallbackForward(a7));
-  }
+// For functions.
+template <typename R, typename... Args>
+struct FunctorTraits<R(__fastcall*)(Args...)> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
- private:
-  R (T::*method_)(A1, A2, A3, A4, A5, A6, A7);
+  template <typename... RunArgs>
+  static R Invoke(R(__fastcall* function)(Args...), RunArgs&&... args) {
+    return function(std::forward<RunArgs>(args)...);
+  }
 };
 
-// Const Method: Arity 7.
-template <typename R,
-          typename T,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class RunnableAdapter<R (T::*)(A1, A2, A3, A4, A5, A6, A7) const> {
- public:
-  typedef R(RunType)(const T*, A1, A2, A3, A4, A5, A6, A7);
-  typedef true_type IsMethod;
-
-  explicit RunnableAdapter(R (T::*method)(A1, A2, A3, A4, A5, A6, A7) const)
-      : method_(method) {}
-
-  R Run(const T* object,
-        typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6,
-        typename CallbackParamTraits<A7>::ForwardType a7) {
-    return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
-                              CallbackForward(a3), CallbackForward(a4),
-                              CallbackForward(a5), CallbackForward(a6),
-                              CallbackForward(a7));
-  }
+#endif  // defined(OS_WIN) && !defined(ARCH_CPU_64_BITS)
 
- private:
-  R (T::*method_)(A1, A2, A3, A4, A5, A6, A7) const;
-};
+#if defined(OS_APPLE)
 
-// FunctionTraits<>
+// Support for Objective-C blocks. There are two implementation depending
+// on whether Automated Reference Counting (ARC) is enabled. When ARC is
+// enabled, then the block itself can be bound as the compiler will ensure
+// its lifetime will be correctly managed. Otherwise, require the block to
+// be wrapped in a base::mac::ScopedBlock (via base::RetainBlock) that will
+// correctly manage the block lifetime.
 //
-// Breaks a function signature apart into typedefs for easier introspection.
-template <typename Sig>
-struct FunctionTraits;
+// The two implementation ensure that the One Definition Rule (ODR) is not
+// broken (it is not possible to write a template base::RetainBlock that would
+// work correctly both with ARC enabled and disabled).
+
+#if HAS_FEATURE(objc_arc)
 
-template <typename R>
-struct FunctionTraits<R()> {
-  typedef R ReturnType;
-};
+template <typename R, typename... Args>
+struct FunctorTraits<R (^)(Args...)> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-template <typename R, typename A1>
-struct FunctionTraits<R(A1)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
+  template <typename BlockType, typename... RunArgs>
+  static R Invoke(BlockType&& block, RunArgs&&... args) {
+    // According to LLVM documentation (6.3), "local variables of automatic
+    // storage duration do not have precise lifetime." Use objc_precise_lifetime
+    // to ensure that the Objective-C block is not deallocated until it has
+    // finished executing even if the Callback<> is destroyed during the block
+    // execution.
+    // https://clang.llvm.org/docs/AutomaticReferenceCounting.html#precise-lifetime-semantics
+    __attribute__((objc_precise_lifetime)) R (^scoped_block)(Args...) = block;
+    return scoped_block(std::forward<RunArgs>(args)...);
+  }
 };
 
-template <typename R, typename A1, typename A2>
-struct FunctionTraits<R(A1, A2)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
-  typedef A2 A2Type;
-};
+#else  // HAS_FEATURE(objc_arc)
 
-template <typename R, typename A1, typename A2, typename A3>
-struct FunctionTraits<R(A1, A2, A3)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
-  typedef A2 A2Type;
-  typedef A3 A3Type;
-};
+template <typename R, typename... Args>
+struct FunctorTraits<base::mac::ScopedBlock<R (^)(Args...)>> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-struct FunctionTraits<R(A1, A2, A3, A4)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
-  typedef A2 A2Type;
-  typedef A3 A3Type;
-  typedef A4 A4Type;
+  template <typename BlockType, typename... RunArgs>
+  static R Invoke(BlockType&& block, RunArgs&&... args) {
+    // Copy the block to ensure that the Objective-C block is not deallocated
+    // until it has finished executing even if the Callback<> is destroyed
+    // during the block execution.
+    base::mac::ScopedBlock<R (^)(Args...)> scoped_block(block);
+    return scoped_block.get()(std::forward<RunArgs>(args)...);
+  }
 };
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-struct FunctionTraits<R(A1, A2, A3, A4, A5)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
-  typedef A2 A2Type;
-  typedef A3 A3Type;
-  typedef A4 A4Type;
-  typedef A5 A5Type;
-};
+#endif  // HAS_FEATURE(objc_arc)
+#endif  // defined(OS_APPLE)
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-struct FunctionTraits<R(A1, A2, A3, A4, A5, A6)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
-  typedef A2 A2Type;
-  typedef A3 A3Type;
-  typedef A4 A4Type;
-  typedef A5 A5Type;
-  typedef A6 A6Type;
-};
+// For methods.
+template <typename R, typename Receiver, typename... Args>
+struct FunctorTraits<R (Receiver::*)(Args...)> {
+  using RunType = R(Receiver*, Args...);
+  static constexpr bool is_method = true;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-struct FunctionTraits<R(A1, A2, A3, A4, A5, A6, A7)> {
-  typedef R ReturnType;
-  typedef A1 A1Type;
-  typedef A2 A2Type;
-  typedef A3 A3Type;
-  typedef A4 A4Type;
-  typedef A5 A5Type;
-  typedef A6 A6Type;
-  typedef A7 A7Type;
+  template <typename Method, typename ReceiverPtr, typename... RunArgs>
+  static R Invoke(Method method,
+                  ReceiverPtr&& receiver_ptr,
+                  RunArgs&&... args) {
+    return ((*receiver_ptr).*method)(std::forward<RunArgs>(args)...);
+  }
 };
 
-// ForceVoidReturn<>
-//
-// Set of templates that support forcing the function return type to void.
-template <typename Sig>
-struct ForceVoidReturn;
+// For const methods.
+template <typename R, typename Receiver, typename... Args>
+struct FunctorTraits<R (Receiver::*)(Args...) const> {
+  using RunType = R(const Receiver*, Args...);
+  static constexpr bool is_method = true;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-template <typename R>
-struct ForceVoidReturn<R()> {
-  typedef void(RunType)();
+  template <typename Method, typename ReceiverPtr, typename... RunArgs>
+  static R Invoke(Method method,
+                  ReceiverPtr&& receiver_ptr,
+                  RunArgs&&... args) {
+    return ((*receiver_ptr).*method)(std::forward<RunArgs>(args)...);
+  }
 };
 
-template <typename R, typename A1>
-struct ForceVoidReturn<R(A1)> {
-  typedef void(RunType)(A1);
-};
+#if defined(OS_WIN) && !defined(ARCH_CPU_64_BITS)
 
-template <typename R, typename A1, typename A2>
-struct ForceVoidReturn<R(A1, A2)> {
-  typedef void(RunType)(A1, A2);
-};
+// For __stdcall methods.
+template <typename R, typename Receiver, typename... Args>
+struct FunctorTraits<R (__stdcall Receiver::*)(Args...)> {
+  using RunType = R(Receiver*, Args...);
+  static constexpr bool is_method = true;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-template <typename R, typename A1, typename A2, typename A3>
-struct ForceVoidReturn<R(A1, A2, A3)> {
-  typedef void(RunType)(A1, A2, A3);
+  template <typename Method, typename ReceiverPtr, typename... RunArgs>
+  static R Invoke(Method method,
+                  ReceiverPtr&& receiver_ptr,
+                  RunArgs&&... args) {
+    return ((*receiver_ptr).*method)(std::forward<RunArgs>(args)...);
+  }
 };
 
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-struct ForceVoidReturn<R(A1, A2, A3, A4)> {
-  typedef void(RunType)(A1, A2, A3, A4);
-};
+// For __stdcall const methods.
+template <typename R, typename Receiver, typename... Args>
+struct FunctorTraits<R (__stdcall Receiver::*)(Args...) const> {
+  using RunType = R(const Receiver*, Args...);
+  static constexpr bool is_method = true;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = false;
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-struct ForceVoidReturn<R(A1, A2, A3, A4, A5)> {
-  typedef void(RunType)(A1, A2, A3, A4, A5);
+  template <typename Method, typename ReceiverPtr, typename... RunArgs>
+  static R Invoke(Method method,
+                  ReceiverPtr&& receiver_ptr,
+                  RunArgs&&... args) {
+    return ((*receiver_ptr).*method)(std::forward<RunArgs>(args)...);
+  }
 };
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-struct ForceVoidReturn<R(A1, A2, A3, A4, A5, A6)> {
-  typedef void(RunType)(A1, A2, A3, A4, A5, A6);
-};
+#endif  // defined(OS_WIN) && !defined(ARCH_CPU_64_BITS)
 
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-struct ForceVoidReturn<R(A1, A2, A3, A4, A5, A6, A7)> {
-  typedef void(RunType)(A1, A2, A3, A4, A5, A6, A7);
+#ifdef __cpp_noexcept_function_type
+// noexcept makes a distinct function type in C++17.
+// I.e. `void(*)()` and `void(*)() noexcept` are same in pre-C++17, and
+// different in C++17.
+template <typename R, typename... Args>
+struct FunctorTraits<R (*)(Args...) noexcept> : FunctorTraits<R (*)(Args...)> {
 };
 
-// FunctorTraits<>
-//
-// See description at top of file.
-template <typename T>
-struct FunctorTraits {
-  typedef RunnableAdapter<T> RunnableType;
-  typedef typename RunnableType::RunType RunType;
-};
+template <typename R, typename Receiver, typename... Args>
+struct FunctorTraits<R (Receiver::*)(Args...) noexcept>
+    : FunctorTraits<R (Receiver::*)(Args...)> {};
 
-template <typename T>
-struct FunctorTraits<IgnoreResultHelper<T>> {
-  typedef typename FunctorTraits<T>::RunnableType RunnableType;
-  typedef
-      typename ForceVoidReturn<typename RunnableType::RunType>::RunType RunType;
-};
+template <typename R, typename Receiver, typename... Args>
+struct FunctorTraits<R (Receiver::*)(Args...) const noexcept>
+    : FunctorTraits<R (Receiver::*)(Args...) const> {};
+#endif
 
+// For IgnoreResults.
 template <typename T>
-struct FunctorTraits<Callback<T>> {
-  typedef Callback<T> RunnableType;
-  typedef typename Callback<T>::RunType RunType;
+struct FunctorTraits<IgnoreResultHelper<T>> : FunctorTraits<T> {
+  using RunType =
+      typename ForceVoidReturn<typename FunctorTraits<T>::RunType>::RunType;
+
+  template <typename IgnoreResultType, typename... RunArgs>
+  static void Invoke(IgnoreResultType&& ignore_result_helper,
+                     RunArgs&&... args) {
+    FunctorTraits<T>::Invoke(
+        std::forward<IgnoreResultType>(ignore_result_helper).functor_,
+        std::forward<RunArgs>(args)...);
+  }
 };
 
-// MakeRunnable<>
-//
-// Converts a passed in functor to a RunnableType using type inference.
+// For OnceCallbacks.
+template <typename R, typename... Args>
+struct FunctorTraits<OnceCallback<R(Args...)>> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = true;
 
-template <typename T>
-typename FunctorTraits<T>::RunnableType MakeRunnable(const T& t) {
-  return RunnableAdapter<T>(t);
-}
+  template <typename CallbackType, typename... RunArgs>
+  static R Invoke(CallbackType&& callback, RunArgs&&... args) {
+    DCHECK(!callback.is_null());
+    return std::forward<CallbackType>(callback).Run(
+        std::forward<RunArgs>(args)...);
+  }
+};
 
-template <typename T>
-typename FunctorTraits<T>::RunnableType MakeRunnable(
-    const IgnoreResultHelper<T>& t) {
-  return MakeRunnable(t.functor_);
-}
+// For RepeatingCallbacks.
+template <typename R, typename... Args>
+struct FunctorTraits<RepeatingCallback<R(Args...)>> {
+  using RunType = R(Args...);
+  static constexpr bool is_method = false;
+  static constexpr bool is_nullable = true;
+  static constexpr bool is_callback = true;
 
-template <typename T>
-const typename FunctorTraits<Callback<T>>::RunnableType& MakeRunnable(
-    const Callback<T>& t) {
-  DCHECK(!t.is_null());
-  return t;
-}
+  template <typename CallbackType, typename... RunArgs>
+  static R Invoke(CallbackType&& callback, RunArgs&&... args) {
+    DCHECK(!callback.is_null());
+    return std::forward<CallbackType>(callback).Run(
+        std::forward<RunArgs>(args)...);
+  }
+};
+
+template <typename Functor>
+using MakeFunctorTraits = FunctorTraits<std::decay_t<Functor>>;
 
 // InvokeHelper<>
 //
-// There are 3 logical InvokeHelper<> specializations: normal, void-return,
-// WeakCalls.
+// There are 2 logical InvokeHelper<> specializations: normal, WeakCalls.
 //
 // The normal type just calls the underlying runnable.
 //
-// We need a InvokeHelper to handle void return types in order to support
-// IgnoreResult().  Normally, if the Runnable's RunType had a void return,
-// the template system would just accept "return functor.Run()" ignoring
-// the fact that a void function is being used with return. This piece of
-// sugar breaks though when the Runnable's RunType is not void.  Thus, we
-// need a partial specialization to change the syntax to drop the "return"
-// from the invocation call.
-//
-// WeakCalls similarly need special syntax that is applied to the first
-// argument to check if they should no-op themselves.
-template <bool IsWeakCall,
-          typename ReturnType,
-          typename Runnable,
-          typename ArgsType>
+// WeakCalls need special syntax that is applied to the first argument to check
+// if they should no-op themselves.
+template <bool is_weak_call, typename ReturnType>
 struct InvokeHelper;
 
-template <typename ReturnType, typename Runnable>
-struct InvokeHelper<false, ReturnType, Runnable, void()> {
-  static ReturnType MakeItSo(Runnable runnable) { return runnable.Run(); }
-};
-
-template <typename Runnable>
-struct InvokeHelper<false, void, Runnable, void()> {
-  static void MakeItSo(Runnable runnable) { runnable.Run(); }
-};
-
-template <typename ReturnType, typename Runnable, typename A1>
-struct InvokeHelper<false, ReturnType, Runnable, void(A1)> {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1) {
-    return runnable.Run(CallbackForward(a1));
-  }
-};
-
-template <typename Runnable, typename A1>
-struct InvokeHelper<false, void, Runnable, void(A1)> {
-  static void MakeItSo(Runnable runnable, A1 a1) {
-    runnable.Run(CallbackForward(a1));
+template <typename ReturnType>
+struct InvokeHelper<false, ReturnType> {
+  template <typename Functor, typename... RunArgs>
+  static inline ReturnType MakeItSo(Functor&& functor, RunArgs&&... args) {
+    using Traits = MakeFunctorTraits<Functor>;
+    return Traits::Invoke(std::forward<Functor>(functor),
+                          std::forward<RunArgs>(args)...);
   }
 };
 
-template <typename Runnable, typename BoundWeakPtr>
-struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr)> {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr) {
-    if (!weak_ptr.get()) {
+template <typename ReturnType>
+struct InvokeHelper<true, ReturnType> {
+  // WeakCalls are only supported for functions with a void return type.
+  // Otherwise, the function result would be undefined if the WeakPtr<>
+  // is invalidated.
+  static_assert(std::is_void<ReturnType>::value,
+                "weak_ptrs can only bind to methods without return values");
+
+  template <typename Functor, typename BoundWeakPtr, typename... RunArgs>
+  static inline void MakeItSo(Functor&& functor,
+                              BoundWeakPtr&& weak_ptr,
+                              RunArgs&&... args) {
+    if (!weak_ptr) {
       return;
     }
-    runnable.Run(weak_ptr.get());
+    using Traits = MakeFunctorTraits<Functor>;
+    Traits::Invoke(std::forward<Functor>(functor),
+                   std::forward<BoundWeakPtr>(weak_ptr),
+                   std::forward<RunArgs>(args)...);
   }
 };
 
-template <typename ReturnType, typename Runnable, typename A1, typename A2>
-struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2)> {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2) {
-    return runnable.Run(CallbackForward(a1), CallbackForward(a2));
-  }
-};
+// Invoker<>
+//
+// See description at the top of the file.
+template <typename StorageType, typename UnboundRunType>
+struct Invoker;
 
-template <typename Runnable, typename A1, typename A2>
-struct InvokeHelper<false, void, Runnable, void(A1, A2)> {
-  static void MakeItSo(Runnable runnable, A1 a1, A2 a2) {
-    runnable.Run(CallbackForward(a1), CallbackForward(a2));
+template <typename StorageType, typename R, typename... UnboundArgs>
+struct Invoker<StorageType, R(UnboundArgs...)> {
+  static R RunOnce(BindStateBase* base,
+                   PassingType<UnboundArgs>... unbound_args) {
+    // Local references to make debugger stepping easier. If in a debugger,
+    // you really want to warp ahead and step through the
+    // InvokeHelper<>::MakeItSo() call below.
+    StorageType* storage = static_cast<StorageType*>(base);
+    static constexpr size_t num_bound_args =
+        std::tuple_size<decltype(storage->bound_args_)>::value;
+    return RunImpl(std::move(storage->functor_),
+                   std::move(storage->bound_args_),
+                   std::make_index_sequence<num_bound_args>(),
+                   std::forward<UnboundArgs>(unbound_args)...);
   }
-};
 
-template <typename Runnable, typename BoundWeakPtr, typename A2>
-struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2)> {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2) {
-    if (!weak_ptr.get()) {
-      return;
-    }
-    runnable.Run(weak_ptr.get(), CallbackForward(a2));
+  static R Run(BindStateBase* base, PassingType<UnboundArgs>... unbound_args) {
+    // Local references to make debugger stepping easier. If in a debugger,
+    // you really want to warp ahead and step through the
+    // InvokeHelper<>::MakeItSo() call below.
+    const StorageType* storage = static_cast<StorageType*>(base);
+    static constexpr size_t num_bound_args =
+        std::tuple_size<decltype(storage->bound_args_)>::value;
+    return RunImpl(storage->functor_, storage->bound_args_,
+                   std::make_index_sequence<num_bound_args>(),
+                   std::forward<UnboundArgs>(unbound_args)...);
   }
-};
 
-template <typename ReturnType,
-          typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3>
-struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3)> {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
-    return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-                        CallbackForward(a3));
-  }
+ private:
+  template <typename Functor, typename BoundArgsTuple, size_t... indices>
+  static inline R RunImpl(Functor&& functor,
+                          BoundArgsTuple&& bound,
+                          std::index_sequence<indices...>,
+                          UnboundArgs&&... unbound_args) {
+    static constexpr bool is_method = MakeFunctorTraits<Functor>::is_method;
+
+    using DecayedArgsTuple = std::decay_t<BoundArgsTuple>;
+    static constexpr bool is_weak_call =
+        IsWeakMethod<is_method,
+                     std::tuple_element_t<indices, DecayedArgsTuple>...>();
+
+    return InvokeHelper<is_weak_call, R>::MakeItSo(
+        std::forward<Functor>(functor),
+        Unwrap(std::get<indices>(std::forward<BoundArgsTuple>(bound)))...,
+        std::forward<UnboundArgs>(unbound_args)...);
+  }
+};
+
+// Extracts necessary type info from Functor and BoundArgs.
+// Used to implement MakeUnboundRunType, BindOnce and BindRepeating.
+template <typename Functor, typename... BoundArgs>
+struct BindTypeHelper {
+  static constexpr size_t num_bounds = sizeof...(BoundArgs);
+  using FunctorTraits = MakeFunctorTraits<Functor>;
+
+  // Example:
+  //   When Functor is `double (Foo::*)(int, const std::string&)`, and BoundArgs
+  //   is a template pack of `Foo*` and `int16_t`:
+  //    - RunType is `double(Foo*, int, const std::string&)`,
+  //    - ReturnType is `double`,
+  //    - RunParamsList is `TypeList<Foo*, int, const std::string&>`,
+  //    - BoundParamsList is `TypeList<Foo*, int>`,
+  //    - UnboundParamsList is `TypeList<const std::string&>`,
+  //    - BoundArgsList is `TypeList<Foo*, int16_t>`,
+  //    - UnboundRunType is `double(const std::string&)`.
+  using RunType = typename FunctorTraits::RunType;
+  using ReturnType = ExtractReturnType<RunType>;
+
+  using RunParamsList = ExtractArgs<RunType>;
+  using BoundParamsList = TakeTypeListItem<num_bounds, RunParamsList>;
+  using UnboundParamsList = DropTypeListItem<num_bounds, RunParamsList>;
+
+  using BoundArgsList = TypeList<BoundArgs...>;
+
+  using UnboundRunType = MakeFunctionType<ReturnType, UnboundParamsList>;
 };
 
-template <typename Runnable, typename A1, typename A2, typename A3>
-struct InvokeHelper<false, void, Runnable, void(A1, A2, A3)> {
-  static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
-    runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3));
-  }
-};
+template <typename Functor>
+std::enable_if_t<FunctorTraits<Functor>::is_nullable, bool> IsNull(
+    const Functor& functor) {
+  return !functor;
+}
 
-template <typename Runnable, typename BoundWeakPtr, typename A2, typename A3>
-struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2, A3)> {
-  static void MakeItSo(Runnable runnable, BoundWeakPtr weak_ptr, A2 a2, A3 a3) {
-    if (!weak_ptr.get()) {
-      return;
-    }
-    runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3));
-  }
-};
+template <typename Functor>
+std::enable_if_t<!FunctorTraits<Functor>::is_nullable, bool> IsNull(
+    const Functor&) {
+  return false;
+}
 
-template <typename ReturnType,
-          typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4>
-struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3, A4)> {
-  static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
-    return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-                        CallbackForward(a3), CallbackForward(a4));
-  }
-};
+// Used by QueryCancellationTraits below.
+template <typename Functor, typename BoundArgsTuple, size_t... indices>
+bool QueryCancellationTraitsImpl(BindStateBase::CancellationQueryMode mode,
+                                 const Functor& functor,
+                                 const BoundArgsTuple& bound_args,
+                                 std::index_sequence<indices...>) {
+  switch (mode) {
+    case BindStateBase::IS_CANCELLED:
+      return CallbackCancellationTraits<Functor, BoundArgsTuple>::IsCancelled(
+          functor, std::get<indices>(bound_args)...);
+    case BindStateBase::MAYBE_VALID:
+      return CallbackCancellationTraits<Functor, BoundArgsTuple>::MaybeValid(
+          functor, std::get<indices>(bound_args)...);
+  }
+  NOTREACHED();
+  return false;
+}
 
-template <typename Runnable, typename A1, typename A2, typename A3, typename A4>
-struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4)> {
-  static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
-    runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4));
-  }
-};
+// Relays |base| to corresponding CallbackCancellationTraits<>::Run(). Returns
+// true if the callback |base| represents is canceled.
+template <typename BindStateType>
+bool QueryCancellationTraits(const BindStateBase* base,
+                             BindStateBase::CancellationQueryMode mode) {
+  const BindStateType* storage = static_cast<const BindStateType*>(base);
+  static constexpr size_t num_bound_args =
+      std::tuple_size<decltype(storage->bound_args_)>::value;
+  return QueryCancellationTraitsImpl(
+      mode, storage->functor_, storage->bound_args_,
+      std::make_index_sequence<num_bound_args>());
+}
 
-template <typename Runnable,
-          typename BoundWeakPtr,
-          typename A2,
-          typename A3,
-          typename A4>
-struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2, A3, A4)> {
-  static void MakeItSo(Runnable runnable,
-                       BoundWeakPtr weak_ptr,
-                       A2 a2,
-                       A3 a3,
-                       A4 a4) {
-    if (!weak_ptr.get()) {
-      return;
-    }
-    runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4));
-  }
-};
+// The base case of BanUnconstructedRefCountedReceiver that checks nothing.
+template <typename Functor, typename Receiver, typename... Unused>
+std::enable_if_t<
+    !(MakeFunctorTraits<Functor>::is_method &&
+      std::is_pointer<std::decay_t<Receiver>>::value &&
+      IsRefCountedType<std::remove_pointer_t<std::decay_t<Receiver>>>::value)>
+BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) {}
 
-template <typename ReturnType,
-          typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3, A4, A5)> {
-  static ReturnType MakeItSo(Runnable runnable,
-                             A1 a1,
-                             A2 a2,
-                             A3 a3,
-                             A4 a4,
-                             A5 a5) {
-    return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-                        CallbackForward(a3), CallbackForward(a4),
-                        CallbackForward(a5));
-  }
-};
+template <typename Functor>
+void BanUnconstructedRefCountedReceiver() {}
+
+// Asserts that Callback is not the first owner of a ref-counted receiver.
+template <typename Functor, typename Receiver, typename... Unused>
+std::enable_if_t<
+    MakeFunctorTraits<Functor>::is_method &&
+    std::is_pointer<std::decay_t<Receiver>>::value &&
+    IsRefCountedType<std::remove_pointer_t<std::decay_t<Receiver>>>::value>
+BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) {
+  DCHECK(receiver);
+
+  // It's error prone to make the implicit first reference to ref-counted types.
+  // In the example below, base::BindOnce() makes the implicit first reference
+  // to the ref-counted Foo. If PostTask() failed or the posted task ran fast
+  // enough, the newly created instance can be destroyed before |oo| makes
+  // another reference.
+  //   Foo::Foo() {
+  //     base::PostTask(FROM_HERE, base::BindOnce(&Foo::Bar, this));
+  //   }
+  //
+  //   scoped_refptr<Foo> oo = new Foo();
+  //
+  // Instead of doing like above, please consider adding a static constructor,
+  // and keep the first reference alive explicitly.
+  //   // static
+  //   scoped_refptr<Foo> Foo::Create() {
+  //     auto foo = base::WrapRefCounted(new Foo());
+  //     base::PostTask(FROM_HERE, base::BindOnce(&Foo::Bar, foo));
+  //     return foo;
+  //   }
+  //
+  //   Foo::Foo() {}
+  //
+  //   scoped_refptr<Foo> oo = Foo::Create();
+  DCHECK(receiver->HasAtLeastOneRef())
+      << "base::Bind{Once,Repeating}() refuses to create the first reference "
+         "to ref-counted objects. That typically happens around PostTask() in "
+         "their constructor, and such objects can be destroyed before `new` "
+         "returns if the task resolves fast enough.";
+}
 
-template <typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4, A5)> {
-  static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
-    runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4), CallbackForward(a5));
-  }
-};
+// BindState<>
+//
+// This stores all the state passed into Bind().
+template <typename Functor, typename... BoundArgs>
+struct BindState final : BindStateBase {
+  using IsCancellable = std::bool_constant<
+      CallbackCancellationTraits<Functor,
+                                 std::tuple<BoundArgs...>>::is_cancellable>;
+  template <typename ForwardFunctor, typename... ForwardBoundArgs>
+  static BindState* Create(BindStateBase::InvokeFuncStorage invoke_func,
+                           ForwardFunctor&& functor,
+                           ForwardBoundArgs&&... bound_args) {
+    // Ban ref counted receivers that were not yet fully constructed to avoid
+    // a common pattern of racy situation.
+    BanUnconstructedRefCountedReceiver<ForwardFunctor>(bound_args...);
+
+    // IsCancellable is std::false_type if
+    // CallbackCancellationTraits<>::IsCancelled returns always false.
+    // Otherwise, it's std::true_type.
+    return new BindState(IsCancellable{}, invoke_func,
+                         std::forward<ForwardFunctor>(functor),
+                         std::forward<ForwardBoundArgs>(bound_args)...);
+  }
+
+  Functor functor_;
+  std::tuple<BoundArgs...> bound_args_;
 
-template <typename Runnable,
-          typename BoundWeakPtr,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-struct InvokeHelper<true, void, Runnable, void(BoundWeakPtr, A2, A3, A4, A5)> {
-  static void MakeItSo(Runnable runnable,
-                       BoundWeakPtr weak_ptr,
-                       A2 a2,
-                       A3 a3,
-                       A4 a4,
-                       A5 a5) {
-    if (!weak_ptr.get()) {
-      return;
+ private:
+  static constexpr bool is_nested_callback =
+      MakeFunctorTraits<Functor>::is_callback;
+
+  template <typename ForwardFunctor, typename... ForwardBoundArgs>
+  explicit BindState(std::true_type,
+                     BindStateBase::InvokeFuncStorage invoke_func,
+                     ForwardFunctor&& functor,
+                     ForwardBoundArgs&&... bound_args)
+      : BindStateBase(invoke_func,
+                      &Destroy,
+                      &QueryCancellationTraits<BindState>),
+        functor_(std::forward<ForwardFunctor>(functor)),
+        bound_args_(std::forward<ForwardBoundArgs>(bound_args)...) {
+    // We check the validity of nested callbacks (e.g., Bind(callback, ...)) in
+    // release builds to avoid null pointers from ending up in posted tasks,
+    // causing hard-to-diagnose crashes. Ideally we'd do this for all functors
+    // here, but that would have a large binary size impact.
+    if (is_nested_callback) {
+      CHECK(!IsNull(functor_));
+    } else {
+      DCHECK(!IsNull(functor_));
     }
-    runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4), CallbackForward(a5));
   }
-};
 
-template <typename ReturnType,
-          typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-struct InvokeHelper<false, ReturnType, Runnable, void(A1, A2, A3, A4, A5, A6)> {
-  static ReturnType
-  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
-    return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-                        CallbackForward(a3), CallbackForward(a4),
-                        CallbackForward(a5), CallbackForward(a6));
+  template <typename ForwardFunctor, typename... ForwardBoundArgs>
+  explicit BindState(std::false_type,
+                     BindStateBase::InvokeFuncStorage invoke_func,
+                     ForwardFunctor&& functor,
+                     ForwardBoundArgs&&... bound_args)
+      : BindStateBase(invoke_func, &Destroy),
+        functor_(std::forward<ForwardFunctor>(functor)),
+        bound_args_(std::forward<ForwardBoundArgs>(bound_args)...) {
+    // See above for CHECK/DCHECK rationale.
+    if (is_nested_callback) {
+      CHECK(!IsNull(functor_));
+    } else {
+      DCHECK(!IsNull(functor_));
+    }
   }
-};
 
-template <typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4, A5, A6)> {
-  static void
-  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
-    runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
-  }
-};
+  ~BindState() = default;
 
-template <typename Runnable,
-          typename BoundWeakPtr,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-struct InvokeHelper<true,
-                    void,
-                    Runnable,
-                    void(BoundWeakPtr, A2, A3, A4, A5, A6)> {
-  static void MakeItSo(Runnable runnable,
-                       BoundWeakPtr weak_ptr,
-                       A2 a2,
-                       A3 a3,
-                       A4 a4,
-                       A5 a5,
-                       A6 a6) {
-    if (!weak_ptr.get()) {
-      return;
-    }
-    runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
+  static void Destroy(const BindStateBase* self) {
+    delete static_cast<const BindState*>(self);
   }
 };
 
-template <typename ReturnType,
-          typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-struct InvokeHelper<false,
-                    ReturnType,
-                    Runnable,
-                    void(A1, A2, A3, A4, A5, A6, A7)> {
-  static ReturnType
-  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
-    return runnable.Run(CallbackForward(a1), CallbackForward(a2),
-                        CallbackForward(a3), CallbackForward(a4),
-                        CallbackForward(a5), CallbackForward(a6),
-                        CallbackForward(a7));
-  }
+// Used to implement MakeBindStateType.
+template <bool is_method, typename Functor, typename... BoundArgs>
+struct MakeBindStateTypeImpl;
+
+template <typename Functor, typename... BoundArgs>
+struct MakeBindStateTypeImpl<false, Functor, BoundArgs...> {
+  static_assert(!HasRefCountedTypeAsRawPtr<std::decay_t<BoundArgs>...>::value,
+                "A parameter is a refcounted type and needs scoped_refptr.");
+  using Type = BindState<std::decay_t<Functor>, std::decay_t<BoundArgs>...>;
 };
 
-template <typename Runnable,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-struct InvokeHelper<false, void, Runnable, void(A1, A2, A3, A4, A5, A6, A7)> {
-  static void
-  MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
-    runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
-                 CallbackForward(a7));
-  }
+template <typename Functor>
+struct MakeBindStateTypeImpl<true, Functor> {
+  using Type = BindState<std::decay_t<Functor>>;
 };
 
-template <typename Runnable,
-          typename BoundWeakPtr,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-struct InvokeHelper<true,
-                    void,
-                    Runnable,
-                    void(BoundWeakPtr, A2, A3, A4, A5, A6, A7)> {
-  static void MakeItSo(Runnable runnable,
-                       BoundWeakPtr weak_ptr,
-                       A2 a2,
-                       A3 a3,
-                       A4 a4,
-                       A5 a5,
-                       A6 a6,
-                       A7 a7) {
-    if (!weak_ptr.get()) {
-      return;
-    }
-    runnable.Run(weak_ptr.get(), CallbackForward(a2), CallbackForward(a3),
-                 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
-                 CallbackForward(a7));
-  }
-};
-
-#if !defined(_MSC_VER)
-
-template <typename ReturnType, typename Runnable, typename ArgsType>
-struct InvokeHelper<true, ReturnType, Runnable, ArgsType> {
-  // WeakCalls are only supported for functions with a void return type.
-  // Otherwise, the function result would be undefined if the the WeakPtr<>
-  // is invalidated.
-  COMPILE_ASSERT(is_void<ReturnType>::value,
-                 weak_ptrs_can_only_bind_to_methods_without_return_values);
-};
-
-#endif
-
-// Invoker<>
-//
-// See description at the top of the file.
-template <int NumBound, typename Storage, typename RunType>
-struct Invoker;
-
-// Arity 0 -> 0.
-template <typename StorageType, typename R>
-struct Invoker<0, StorageType, R()> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void()>::MakeItSo(storage->runnable_);
-  }
-};
-
-// Arity 1 -> 1.
-template <typename StorageType, typename R, typename X1>
-struct Invoker<0, StorageType, R(X1)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType);
-
-  typedef R(UnboundRunType)(X1);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename CallbackParamTraits<X1>::ForwardType
-                                 x1)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1));
-  }
-};
-
-// Arity 1 -> 0.
-template <typename StorageType, typename R, typename X1>
-struct Invoker<1, StorageType, R(X1)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1));
-  }
-};
-
-// Arity 2 -> 2.
-template <typename StorageType, typename R, typename X1, typename X2>
-struct Invoker<0, StorageType, R(X1, X2)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType,
-                     typename CallbackParamTraits<X2>::ForwardType);
-
-  typedef R(UnboundRunType)(X1, X2);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename CallbackParamTraits<X1>::ForwardType x1,
-                             typename CallbackParamTraits<X2>::ForwardType
-                                 x2)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2));
-  }
-};
-
-// Arity 2 -> 1.
-template <typename StorageType, typename R, typename X1, typename X2>
-struct Invoker<1, StorageType, R(X1, X2)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X2>::ForwardType);
-
-  typedef R(UnboundRunType)(X2);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X2>::ForwardType x2) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename CallbackParamTraits<X2>::ForwardType
-                                 x2)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2));
-  }
-};
-
-// Arity 2 -> 0.
-template <typename StorageType, typename R, typename X1, typename X2>
-struct Invoker<2, StorageType, R(X1, X2)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2));
-  }
-};
-
-// Arity 3 -> 3.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3>
-struct Invoker<0, StorageType, R(X1, X2, X3)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType);
-
-  typedef R(UnboundRunType)(X1, X2, X3);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename CallbackParamTraits<X1>::ForwardType x1,
-                             typename CallbackParamTraits<X2>::ForwardType x2,
-                             typename CallbackParamTraits<X3>::ForwardType
-                                 x3)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3));
-  }
-};
-
-// Arity 3 -> 2.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3>
-struct Invoker<1, StorageType, R(X1, X2, X3)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType);
-
-  typedef R(UnboundRunType)(X2, X3);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename CallbackParamTraits<X2>::ForwardType x2,
-                             typename CallbackParamTraits<X3>::ForwardType
-                                 x3)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3));
-  }
-};
-
-// Arity 3 -> 1.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3>
-struct Invoker<2, StorageType, R(X1, X2, X3)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X3>::ForwardType);
-
-  typedef R(UnboundRunType)(X3);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X3>::ForwardType x3) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename CallbackParamTraits<X3>::ForwardType
-                                 x3)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3));
-  }
-};
-
-// Arity 3 -> 0.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3>
-struct Invoker<3, StorageType, R(X1, X2, X3)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename Bound3UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
-                 CallbackForward(x3));
-  }
-};
-
-// Arity 4 -> 4.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4>
-struct Invoker<0, StorageType, R(X1, X2, X3, X4)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType);
-
-  typedef R(UnboundRunType)(X1, X2, X3, X4);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename CallbackParamTraits<X1>::ForwardType x1,
-                             typename CallbackParamTraits<X2>::ForwardType x2,
-                             typename CallbackParamTraits<X3>::ForwardType x3,
-                             typename CallbackParamTraits<X4>::ForwardType
-                                 x4)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3),
-                                                CallbackForward(x4));
-  }
-};
-
-// Arity 4 -> 3.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4>
-struct Invoker<1, StorageType, R(X1, X2, X3, X4)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType);
-
-  typedef R(UnboundRunType)(X2, X3, X4);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename CallbackParamTraits<X2>::ForwardType x2,
-                             typename CallbackParamTraits<X3>::ForwardType x3,
-                             typename CallbackParamTraits<X4>::ForwardType
-                                 x4)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3),
-                                                CallbackForward(x4));
-  }
-};
-
-// Arity 4 -> 2.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4>
-struct Invoker<2, StorageType, R(X1, X2, X3, X4)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType);
-
-  typedef R(UnboundRunType)(X3, X4);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename CallbackParamTraits<X3>::ForwardType x3,
-                             typename CallbackParamTraits<X4>::ForwardType
-                                 x4)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3),
-                                                CallbackForward(x4));
-  }
-};
-
-// Arity 4 -> 1.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4>
-struct Invoker<3, StorageType, R(X1, X2, X3, X4)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X4>::ForwardType);
-
-  typedef R(UnboundRunType)(X4);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X4>::ForwardType x4) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename Bound3UnwrapTraits::ForwardType,
-                             typename CallbackParamTraits<X4>::ForwardType
-                                 x4)>::MakeItSo(storage->runnable_,
-                                                CallbackForward(x1),
-                                                CallbackForward(x2),
-                                                CallbackForward(x3),
-                                                CallbackForward(x4));
-  }
-};
-
-// Arity 4 -> 0.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4>
-struct Invoker<4, StorageType, R(X1, X2, X3, X4)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename Bound3UnwrapTraits::ForwardType,
-                             typename Bound4UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
-                 CallbackForward(x3), CallbackForward(x4));
-  }
-};
-
-// Arity 5 -> 5.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5>
-struct Invoker<0, StorageType, R(X1, X2, X3, X4, X5)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType);
-
-  typedef R(UnboundRunType)(X1, X2, X3, X4, X5);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename CallbackParamTraits<X1>::ForwardType x1,
-             typename CallbackParamTraits<X2>::ForwardType x2,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType
-                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5));
-  }
-};
-
-// Arity 5 -> 4.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5>
-struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType);
-
-  typedef R(UnboundRunType)(X2, X3, X4, X5);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X2>::ForwardType x2,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType
-                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5));
-  }
-};
-
-// Arity 5 -> 3.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5>
-struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType);
-
-  typedef R(UnboundRunType)(X3, X4, X5);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType
-                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5));
-  }
-};
-
-// Arity 5 -> 2.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5>
-struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType);
-
-  typedef R(UnboundRunType)(X4, X5);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType
-                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5));
-  }
-};
-
-// Arity 5 -> 1.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5>
-struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X5>::ForwardType);
-
-  typedef R(UnboundRunType)(X5);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X5>::ForwardType x5) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename Bound4UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X5>::ForwardType
-                 x5)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5));
-  }
-};
-
-// Arity 5 -> 0.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5>
-struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-    typedef typename StorageType::Bound5UnwrapTraits Bound5UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    typename Bound5UnwrapTraits::ForwardType x5 =
-        Bound5UnwrapTraits::Unwrap(storage->p5_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename Bound3UnwrapTraits::ForwardType,
-                             typename Bound4UnwrapTraits::ForwardType,
-                             typename Bound5UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
-                 CallbackForward(x3), CallbackForward(x4), CallbackForward(x5));
-  }
-};
-
-// Arity 6 -> 6.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<0, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType);
-
-  typedef R(UnboundRunType)(X1, X2, X3, X4, X5, X6);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename CallbackParamTraits<X1>::ForwardType x1,
-             typename CallbackParamTraits<X2>::ForwardType x2,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType
-                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6));
-  }
-};
-
-// Arity 6 -> 5.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType);
-
-  typedef R(UnboundRunType)(X2, X3, X4, X5, X6);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X2>::ForwardType x2,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType
-                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6));
-  }
-};
-
-// Arity 6 -> 4.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType);
-
-  typedef R(UnboundRunType)(X3, X4, X5, X6);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType
-                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6));
-  }
-};
-
-// Arity 6 -> 3.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType);
-
-  typedef R(UnboundRunType)(X4, X5, X6);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType
-                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6));
-  }
-};
-
-// Arity 6 -> 2.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType);
-
-  typedef R(UnboundRunType)(X5, X6);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename Bound4UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType
-                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6));
-  }
-};
+template <typename Functor, typename Receiver, typename... BoundArgs>
+struct MakeBindStateTypeImpl<true, Functor, Receiver, BoundArgs...> {
+ private:
+  using DecayedReceiver = std::decay_t<Receiver>;
+
+  static_assert(!std::is_array<std::remove_reference_t<Receiver>>::value,
+                "First bound argument to a method cannot be an array.");
+  static_assert(
+      !std::is_pointer<DecayedReceiver>::value ||
+          IsRefCountedType<std::remove_pointer_t<DecayedReceiver>>::value,
+      "Receivers may not be raw pointers. If using a raw pointer here is safe"
+      " and has no lifetime concerns, use base::Unretained() and document why"
+      " it's safe.");
+  static_assert(!HasRefCountedTypeAsRawPtr<std::decay_t<BoundArgs>...>::value,
+                "A parameter is a refcounted type and needs scoped_refptr.");
 
-// Arity 6 -> 1.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X6>::ForwardType);
-
-  typedef R(UnboundRunType)(X6);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X6>::ForwardType x6) {
-    StorageType* storage = static_cast<StorageType*>(base);
+ public:
+  using Type = BindState<
+      std::decay_t<Functor>,
+      std::conditional_t<std::is_pointer<DecayedReceiver>::value,
+                         scoped_refptr<std::remove_pointer_t<DecayedReceiver>>,
+                         DecayedReceiver>,
+      std::decay_t<BoundArgs>...>;
+};
+
+template <typename Functor, typename... BoundArgs>
+using MakeBindStateType =
+    typename MakeBindStateTypeImpl<MakeFunctorTraits<Functor>::is_method,
+                                   Functor,
+                                   BoundArgs...>::Type;
+
+// Returns a RunType of bound functor.
+// E.g. MakeUnboundRunType<R(A, B, C), A, B> is evaluated to R(C).
+template <typename Functor, typename... BoundArgs>
+using MakeUnboundRunType =
+    typename BindTypeHelper<Functor, BoundArgs...>::UnboundRunType;
+
+// The implementation of TransformToUnwrappedType below.
+template <bool is_once, typename T>
+struct TransformToUnwrappedTypeImpl;
 
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-    typedef typename StorageType::Bound5UnwrapTraits Bound5UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    typename Bound5UnwrapTraits::ForwardType x5 =
-        Bound5UnwrapTraits::Unwrap(storage->p5_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename Bound4UnwrapTraits::ForwardType,
-             typename Bound5UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X6>::ForwardType
-                 x6)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6));
-  }
+template <typename T>
+struct TransformToUnwrappedTypeImpl<true, T> {
+  using StoredType = std::decay_t<T>;
+  using ForwardType = StoredType&&;
+  using Unwrapped = decltype(Unwrap(std::declval<ForwardType>()));
 };
 
-// Arity 6 -> 0.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6>
-struct Invoker<6, StorageType, R(X1, X2, X3, X4, X5, X6)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-    typedef typename StorageType::Bound5UnwrapTraits Bound5UnwrapTraits;
-    typedef typename StorageType::Bound6UnwrapTraits Bound6UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    typename Bound5UnwrapTraits::ForwardType x5 =
-        Bound5UnwrapTraits::Unwrap(storage->p5_);
-    typename Bound6UnwrapTraits::ForwardType x6 =
-        Bound6UnwrapTraits::Unwrap(storage->p6_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename Bound3UnwrapTraits::ForwardType,
-                             typename Bound4UnwrapTraits::ForwardType,
-                             typename Bound5UnwrapTraits::ForwardType,
-                             typename Bound6UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
-                 CallbackForward(x3), CallbackForward(x4), CallbackForward(x5),
-                 CallbackForward(x6));
-  }
+template <typename T>
+struct TransformToUnwrappedTypeImpl<false, T> {
+  using StoredType = std::decay_t<T>;
+  using ForwardType = const StoredType&;
+  using Unwrapped = decltype(Unwrap(std::declval<ForwardType>()));
+};
+
+// Transform |T| into `Unwrapped` type, which is passed to the target function.
+// Example:
+//   In is_once == true case,
+//     `int&&` -> `int&&`,
+//     `const int&` -> `int&&`,
+//     `OwnedWrapper<int>&` -> `int*&&`.
+//   In is_once == false case,
+//     `int&&` -> `const int&`,
+//     `const int&` -> `const int&`,
+//     `OwnedWrapper<int>&` -> `int* const &`.
+template <bool is_once, typename T>
+using TransformToUnwrappedType =
+    typename TransformToUnwrappedTypeImpl<is_once, T>::Unwrapped;
+
+// Transforms |Args| into `Unwrapped` types, and packs them into a TypeList.
+// If |is_method| is true, tries to dereference the first argument to support
+// smart pointers.
+template <bool is_once, bool is_method, typename... Args>
+struct MakeUnwrappedTypeListImpl {
+  using Type = TypeList<TransformToUnwrappedType<is_once, Args>...>;
+};
+
+// Performs special handling for this pointers.
+// Example:
+//   int* -> int*,
+//   std::unique_ptr<int> -> int*.
+template <bool is_once, typename Receiver, typename... Args>
+struct MakeUnwrappedTypeListImpl<is_once, true, Receiver, Args...> {
+  using UnwrappedReceiver = TransformToUnwrappedType<is_once, Receiver>;
+  using Type = TypeList<decltype(&*std::declval<UnwrappedReceiver>()),
+                        TransformToUnwrappedType<is_once, Args>...>;
+};
+
+template <bool is_once, bool is_method, typename... Args>
+using MakeUnwrappedTypeList =
+    typename MakeUnwrappedTypeListImpl<is_once, is_method, Args...>::Type;
+
+// IsOnceCallback<T> is a std::true_type if |T| is a OnceCallback.
+template <typename T>
+struct IsOnceCallback : std::false_type {};
+
+template <typename Signature>
+struct IsOnceCallback<OnceCallback<Signature>> : std::true_type {};
+
+// Helpers to make error messages slightly more readable.
+template <int i>
+struct BindArgument {
+  template <typename ForwardingType>
+  struct ForwardedAs {
+    template <typename FunctorParamType>
+    struct ToParamWithType {
+      static constexpr bool kCanBeForwardedToBoundFunctor =
+          std::is_constructible<FunctorParamType, ForwardingType>::value;
+
+      // If the bound type can't be forwarded then test if `FunctorParamType` is
+      // a non-const lvalue reference and a reference to the unwrapped type
+      // *could* have been successfully forwarded.
+      static constexpr bool kNonConstRefParamMustBeWrapped =
+          kCanBeForwardedToBoundFunctor ||
+          !(std::is_lvalue_reference<FunctorParamType>::value &&
+            !std::is_const<std::remove_reference_t<FunctorParamType>>::value &&
+            std::is_convertible<std::decay_t<ForwardingType>&,
+                                FunctorParamType>::value);
+
+      // Note that this intentionally drops the const qualifier from
+      // `ForwardingType`, to test if it *could* have been successfully
+      // forwarded if `Passed()` had been used.
+      static constexpr bool kMoveOnlyTypeMustUseBasePassed =
+          kCanBeForwardedToBoundFunctor ||
+          !std::is_constructible<FunctorParamType,
+                                 std::decay_t<ForwardingType>&&>::value;
+    };
+  };
+
+  template <typename BoundAsType>
+  struct BoundAs {
+    template <typename StorageType>
+    struct StoredAs {
+      static constexpr bool kBindArgumentCanBeCaptured =
+          std::is_constructible<StorageType, BoundAsType>::value;
+      // Note that this intentionally drops the const qualifier from
+      // `BoundAsType`, to test if it *could* have been successfully bound if
+      // `std::move()` had been used.
+      static constexpr bool kMoveOnlyTypeMustUseStdMove =
+          kBindArgumentCanBeCaptured ||
+          !std::is_constructible<StorageType,
+                                 std::decay_t<BoundAsType>&&>::value;
+    };
+  };
+};
+
+// Helper to assert that parameter |i| of type |Arg| can be bound, which means:
+// - |Arg| can be retained internally as |Storage|.
+// - |Arg| can be forwarded as |Unwrapped| to |Param|.
+template <int i,
+          typename Arg,
+          typename Storage,
+          typename Unwrapped,
+          typename Param>
+struct AssertConstructible {
+ private:
+  // With `BindRepeating`, there are two decision points for how to handle a
+  // move-only type:
+  //
+  // 1. Whether the move-only argument should be moved into the internal
+  //    `BindState`. Either `std::move()` or `Passed` is sufficient to trigger
+  //    move-only semantics.
+  // 2. Whether or not the bound, move-only argument should be moved to the
+  //    bound functor when invoked. When the argument is bound with `Passed`,
+  //    invoking the callback will destructively move the bound, move-only
+  //    argument to the bound functor. In contrast, if the argument is bound
+  //    with `std::move()`, `RepeatingCallback` will attempt to call the bound
+  //    functor with a constant reference to the bound, move-only argument. This
+  //    will fail if the bound functor accepts that argument by value, since the
+  //    argument cannot be copied. It is this latter case that this
+  //    static_assert aims to catch.
+  //
+  // In contrast, `BindOnce()` only has one decision point. Once a move-only
+  // type is captured by value into the internal `BindState`, the bound,
+  // move-only argument will always be moved to the functor when invoked.
+  // Failure to use std::move will simply fail the `kMoveOnlyTypeMustUseStdMove`
+  // assert below instead.
+  //
+  // Note: `Passed()` is a legacy of supporting move-only types when repeating
+  // callbacks were the only callback type. A `RepeatingCallback` with a
+  // `Passed()` argument is really a `OnceCallback` and should eventually be
+  // migrated.
+  static_assert(
+      BindArgument<i>::template ForwardedAs<Unwrapped>::
+          template ToParamWithType<Param>::kMoveOnlyTypeMustUseBasePassed,
+      "base::BindRepeating() argument is a move-only type. Use base::Passed() "
+      "instead of std::move() to transfer ownership from the callback to the "
+      "bound functor.");
+  static_assert(
+      BindArgument<i>::template ForwardedAs<Unwrapped>::
+          template ToParamWithType<Param>::kNonConstRefParamMustBeWrapped,
+      "Bound argument for non-const reference parameter must be wrapped in "
+      "std::ref() or base::OwnedRef().");
+  static_assert(
+      BindArgument<i>::template ForwardedAs<Unwrapped>::
+          template ToParamWithType<Param>::kCanBeForwardedToBoundFunctor,
+      "Type mismatch between bound argument and bound functor's parameter.");
+
+  static_assert(BindArgument<i>::template BoundAs<Arg>::template StoredAs<
+                    Storage>::kMoveOnlyTypeMustUseStdMove,
+                "Attempting to bind a move-only type. Use std::move() to "
+                "transfer ownership to the created callback.");
+  // In practice, this static_assert should be quite rare as the storage type
+  // is deduced from the arguments passed to `BindOnce()`/`BindRepeating()`.
+  static_assert(
+      BindArgument<i>::template BoundAs<Arg>::template StoredAs<
+          Storage>::kBindArgumentCanBeCaptured,
+      "Cannot capture argument: is the argument copyable or movable?");
+};
+
+// Takes three same-length TypeLists, and applies AssertConstructible for each
+// triples.
+template <typename Index,
+          typename Args,
+          typename UnwrappedTypeList,
+          typename ParamsList>
+struct AssertBindArgsValidity;
+
+template <size_t... Ns,
+          typename... Args,
+          typename... Unwrapped,
+          typename... Params>
+struct AssertBindArgsValidity<std::index_sequence<Ns...>,
+                              TypeList<Args...>,
+                              TypeList<Unwrapped...>,
+                              TypeList<Params...>>
+    : AssertConstructible<static_cast<int>(Ns),
+                          Args,
+                          std::decay_t<Args>,
+                          Unwrapped,
+                          Params>... {
+  static constexpr bool ok = true;
 };
 
-// Arity 7 -> 7.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<0, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X1>::ForwardType,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X1, X2, X3, X4, X5, X6, X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X1>::ForwardType x1,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename CallbackParamTraits<X1>::ForwardType x1,
-             typename CallbackParamTraits<X2>::ForwardType x2,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType x6,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
-  }
-};
+template <typename T>
+struct AssertBindArgIsNotBasePassed : public std::true_type {};
 
-// Arity 7 -> 6.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<1, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X2>::ForwardType,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X2, X3, X4, X5, X6, X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X2>::ForwardType x2,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
+template <typename T>
+struct AssertBindArgIsNotBasePassed<PassedWrapper<T>> : public std::false_type {
+};
+
+// Used below in BindImpl to determine whether to use Invoker::Run or
+// Invoker::RunOnce.
+// Note: Simply using `kIsOnce ? &Invoker::RunOnce : &Invoker::Run` does not
+// work, since the compiler needs to check whether both expressions are
+// well-formed. Using `Invoker::Run` with a OnceCallback triggers a
+// static_assert, which is why the ternary expression does not compile.
+// TODO(crbug.com/752720): Remove this indirection once we have `if constexpr`.
+template <typename Invoker>
+constexpr auto GetInvokeFunc(std::true_type) {
+  return Invoker::RunOnce;
+}
 
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X2>::ForwardType x2,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType x6,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
-  }
-};
+template <typename Invoker>
+constexpr auto GetInvokeFunc(std::false_type) {
+  return Invoker::Run;
+}
 
-// Arity 7 -> 5.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<2, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X3>::ForwardType,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X3, X4, X5, X6, X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X3>::ForwardType x3,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
+template <template <typename> class CallbackT,
+          typename Functor,
+          typename... Args>
+decltype(auto) BindImpl(Functor&& functor, Args&&... args) {
+  // This block checks if each |args| matches to the corresponding params of the
+  // target function. This check does not affect the behavior of Bind, but its
+  // error message should be more readable.
+  static constexpr bool kIsOnce = IsOnceCallback<CallbackT<void()>>::value;
+  using Helper = BindTypeHelper<Functor, Args...>;
+  using FunctorTraits = typename Helper::FunctorTraits;
+  using BoundArgsList = typename Helper::BoundArgsList;
+  using UnwrappedArgsList =
+      MakeUnwrappedTypeList<kIsOnce, FunctorTraits::is_method, Args&&...>;
+  using BoundParamsList = typename Helper::BoundParamsList;
+  static_assert(
+      AssertBindArgsValidity<std::make_index_sequence<Helper::num_bounds>,
+                             BoundArgsList, UnwrappedArgsList,
+                             BoundParamsList>::ok,
+      "The bound args need to be convertible to the target params.");
+
+  using BindState = MakeBindStateType<Functor, Args...>;
+  using UnboundRunType = MakeUnboundRunType<Functor, Args...>;
+  using Invoker = Invoker<BindState, UnboundRunType>;
+  using CallbackType = CallbackT<UnboundRunType>;
+
+  // Store the invoke func into PolymorphicInvoke before casting it to
+  // InvokeFuncStorage, so that we can ensure its type matches to
+  // PolymorphicInvoke, to which CallbackType will cast back.
+  using PolymorphicInvoke = typename CallbackType::PolymorphicInvoke;
+  PolymorphicInvoke invoke_func =
+      GetInvokeFunc<Invoker>(std::bool_constant<kIsOnce>());
+
+  using InvokeFuncStorage = BindStateBase::InvokeFuncStorage;
+  return CallbackType(BindState::Create(
+      reinterpret_cast<InvokeFuncStorage>(invoke_func),
+      std::forward<Functor>(functor), std::forward<Args>(args)...));
+}
 
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X3>::ForwardType x3,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType x6,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
-  }
-};
+}  // namespace cef_internal
 
-// Arity 7 -> 4.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<3, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X4>::ForwardType,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X4, X5, X6, X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X4>::ForwardType x4,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
+// An injection point to control |this| pointer behavior on a method invocation.
+// If IsWeakReceiver<> is true_type for |T| and |T| is used for a receiver of a
+// method, base::Bind cancels the method invocation if the receiver is tested as
+// false.
+// E.g. Foo::bar() is not called:
+//   struct Foo : base::SupportsWeakPtr<Foo> {
+//     void bar() {}
+//   };
+//
+//   WeakPtr<Foo> oo = nullptr;
+//   base::BindOnce(&Foo::bar, oo).Run();
+template <typename T>
+struct IsWeakReceiver : std::false_type {};
 
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X4>::ForwardType x4,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType x6,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
-  }
-};
+template <typename T>
+struct IsWeakReceiver<std::reference_wrapper<T>> : IsWeakReceiver<T> {};
 
-// Arity 7 -> 3.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<4, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X5>::ForwardType,
-                     typename CallbackParamTraits<X6>::ForwardType,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X5, X6, X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X5>::ForwardType x5,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
+template <typename T>
+struct IsWeakReceiver<WeakPtr<T>> : std::true_type {};
 
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename Bound4UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X5>::ForwardType x5,
-             typename CallbackParamTraits<X6>::ForwardType x6,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
+// An injection point to control how objects are checked for maybe validity,
+// which is an optimistic thread-safe check for full validity.
+template <typename>
+struct MaybeValidTraits {
+  template <typename T>
+  static bool MaybeValid(const T& o) {
+    return o.MaybeValid();
   }
 };
 
-// Arity 7 -> 2.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<5, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X6>::ForwardType,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X6, X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X6>::ForwardType x6,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-    typedef typename StorageType::Bound5UnwrapTraits Bound5UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    typename Bound5UnwrapTraits::ForwardType x5 =
-        Bound5UnwrapTraits::Unwrap(storage->p5_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename Bound4UnwrapTraits::ForwardType,
-             typename Bound5UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X6>::ForwardType x6,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
+// An injection point to control how bound objects passed to the target
+// function. BindUnwrapTraits<>::Unwrap() is called for each bound objects right
+// before the target function is invoked.
+template <typename>
+struct BindUnwrapTraits {
+  template <typename T>
+  static T&& Unwrap(T&& o) {
+    return std::forward<T>(o);
   }
 };
 
-// Arity 7 -> 1.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<6, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*,
-                     typename CallbackParamTraits<X7>::ForwardType);
-
-  typedef R(UnboundRunType)(X7);
-
-  static R Run(BindStateBase* base,
-               typename CallbackParamTraits<X7>::ForwardType x7) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-    typedef typename StorageType::Bound5UnwrapTraits Bound5UnwrapTraits;
-    typedef typename StorageType::Bound6UnwrapTraits Bound6UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    typename Bound5UnwrapTraits::ForwardType x5 =
-        Bound5UnwrapTraits::Unwrap(storage->p5_);
-    typename Bound6UnwrapTraits::ForwardType x6 =
-        Bound6UnwrapTraits::Unwrap(storage->p6_);
-    return InvokeHelper<
-        StorageType::IsWeakCall::value, R, typename StorageType::RunnableType,
-        void(typename Bound1UnwrapTraits::ForwardType,
-             typename Bound2UnwrapTraits::ForwardType,
-             typename Bound3UnwrapTraits::ForwardType,
-             typename Bound4UnwrapTraits::ForwardType,
-             typename Bound5UnwrapTraits::ForwardType,
-             typename Bound6UnwrapTraits::ForwardType,
-             typename CallbackParamTraits<X7>::ForwardType
-                 x7)>::MakeItSo(storage->runnable_, CallbackForward(x1),
-                                CallbackForward(x2), CallbackForward(x3),
-                                CallbackForward(x4), CallbackForward(x5),
-                                CallbackForward(x6), CallbackForward(x7));
+template <typename T>
+struct BindUnwrapTraits<cef_internal::UnretainedWrapper<T>> {
+  static T* Unwrap(const cef_internal::UnretainedWrapper<T>& o) {
+    return o.get();
   }
 };
 
-// Arity 7 -> 0.
-template <typename StorageType,
-          typename R,
-          typename X1,
-          typename X2,
-          typename X3,
-          typename X4,
-          typename X5,
-          typename X6,
-          typename X7>
-struct Invoker<7, StorageType, R(X1, X2, X3, X4, X5, X6, X7)> {
-  typedef R(RunType)(BindStateBase*);
-
-  typedef R(UnboundRunType)();
-
-  static R Run(BindStateBase* base) {
-    StorageType* storage = static_cast<StorageType*>(base);
-
-    // Local references to make debugger stepping easier. If in a debugger,
-    // you really want to warp ahead and step through the
-    // InvokeHelper<>::MakeItSo() call below.
-    typedef typename StorageType::Bound1UnwrapTraits Bound1UnwrapTraits;
-    typedef typename StorageType::Bound2UnwrapTraits Bound2UnwrapTraits;
-    typedef typename StorageType::Bound3UnwrapTraits Bound3UnwrapTraits;
-    typedef typename StorageType::Bound4UnwrapTraits Bound4UnwrapTraits;
-    typedef typename StorageType::Bound5UnwrapTraits Bound5UnwrapTraits;
-    typedef typename StorageType::Bound6UnwrapTraits Bound6UnwrapTraits;
-    typedef typename StorageType::Bound7UnwrapTraits Bound7UnwrapTraits;
-
-    typename Bound1UnwrapTraits::ForwardType x1 =
-        Bound1UnwrapTraits::Unwrap(storage->p1_);
-    typename Bound2UnwrapTraits::ForwardType x2 =
-        Bound2UnwrapTraits::Unwrap(storage->p2_);
-    typename Bound3UnwrapTraits::ForwardType x3 =
-        Bound3UnwrapTraits::Unwrap(storage->p3_);
-    typename Bound4UnwrapTraits::ForwardType x4 =
-        Bound4UnwrapTraits::Unwrap(storage->p4_);
-    typename Bound5UnwrapTraits::ForwardType x5 =
-        Bound5UnwrapTraits::Unwrap(storage->p5_);
-    typename Bound6UnwrapTraits::ForwardType x6 =
-        Bound6UnwrapTraits::Unwrap(storage->p6_);
-    typename Bound7UnwrapTraits::ForwardType x7 =
-        Bound7UnwrapTraits::Unwrap(storage->p7_);
-    return InvokeHelper<StorageType::IsWeakCall::value, R,
-                        typename StorageType::RunnableType,
-                        void(typename Bound1UnwrapTraits::ForwardType,
-                             typename Bound2UnwrapTraits::ForwardType,
-                             typename Bound3UnwrapTraits::ForwardType,
-                             typename Bound4UnwrapTraits::ForwardType,
-                             typename Bound5UnwrapTraits::ForwardType,
-                             typename Bound6UnwrapTraits::ForwardType,
-                             typename Bound7UnwrapTraits::ForwardType)>::
-        MakeItSo(storage->runnable_, CallbackForward(x1), CallbackForward(x2),
-                 CallbackForward(x3), CallbackForward(x4), CallbackForward(x5),
-                 CallbackForward(x6), CallbackForward(x7));
+template <typename T>
+struct BindUnwrapTraits<cef_internal::RetainedRefWrapper<T>> {
+  static T* Unwrap(const cef_internal::RetainedRefWrapper<T>& o) {
+    return o.get();
   }
 };
 
-// BindState<>
-//
-// This stores all the state passed into Bind() and is also where most
-// of the template resolution magic occurs.
-//
-// Runnable is the functor we are binding arguments to.
-// RunType is type of the Run() function that the Invoker<> should use.
-// Normally, this is the same as the RunType of the Runnable, but it can
-// be different if an adapter like IgnoreResult() has been used.
-//
-// BoundArgsType contains the storage type for all the bound arguments by
-// (ab)using a function type.
-template <typename Runnable, typename RunType, typename BoundArgsType>
-struct BindState;
-
-template <typename Runnable, typename RunType>
-struct BindState<Runnable, RunType, void()> : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef false_type IsWeakCall;
-  typedef Invoker<0, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-  explicit BindState(const Runnable& runnable)
-      : BindStateBase(&Destroy), runnable_(runnable) {}
-
-  ~BindState() {}
-
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
+template <typename T, typename Deleter>
+struct BindUnwrapTraits<cef_internal::OwnedWrapper<T, Deleter>> {
+  static T* Unwrap(const cef_internal::OwnedWrapper<T, Deleter>& o) {
+    return o.get();
   }
-
-  RunnableType runnable_;
 };
 
-template <typename Runnable, typename RunType, typename P1>
-struct BindState<Runnable, RunType, void(P1)> : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<1, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-
-  BindState(const Runnable& runnable, const P1& p1)
-      : BindStateBase(&Destroy), runnable_(runnable), p1_(p1) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
-
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
-  }
-
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
+template <typename T>
+struct BindUnwrapTraits<cef_internal::OwnedRefWrapper<T>> {
+  static T& Unwrap(const cef_internal::OwnedRefWrapper<T>& o) {
+    return o.get();
   }
-
-  RunnableType runnable_;
-  P1 p1_;
 };
 
-template <typename Runnable, typename RunType, typename P1, typename P2>
-struct BindState<Runnable, RunType, void(P1, P2)> : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<2, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-  typedef UnwrapTraits<P2> Bound2UnwrapTraits;
-
-  BindState(const Runnable& runnable, const P1& p1, const P2& p2)
-      : BindStateBase(&Destroy), runnable_(runnable), p1_(p1), p2_(p2) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
-
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
-  }
-
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
-  }
-
-  RunnableType runnable_;
-  P1 p1_;
-  P2 p2_;
+template <typename T>
+struct BindUnwrapTraits<cef_internal::PassedWrapper<T>> {
+  static T Unwrap(const cef_internal::PassedWrapper<T>& o) { return o.Take(); }
 };
 
-template <typename Runnable,
-          typename RunType,
-          typename P1,
-          typename P2,
-          typename P3>
-struct BindState<Runnable, RunType, void(P1, P2, P3)> : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<3, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-  typedef UnwrapTraits<P2> Bound2UnwrapTraits;
-  typedef UnwrapTraits<P3> Bound3UnwrapTraits;
-
-  BindState(const Runnable& runnable, const P1& p1, const P2& p2, const P3& p3)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1),
-        p2_(p2),
-        p3_(p3) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
-
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
-  }
-
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
-  }
-
-  RunnableType runnable_;
-  P1 p1_;
-  P2 p2_;
-  P3 p3_;
+#if defined(OS_WIN)
+template <typename T>
+struct BindUnwrapTraits<Microsoft::WRL::ComPtr<T>> {
+  static T* Unwrap(const Microsoft::WRL::ComPtr<T>& ptr) { return ptr.Get(); }
 };
+#endif
 
-template <typename Runnable,
-          typename RunType,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4)>
-    : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<4, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-  typedef UnwrapTraits<P2> Bound2UnwrapTraits;
-  typedef UnwrapTraits<P3> Bound3UnwrapTraits;
-  typedef UnwrapTraits<P4> Bound4UnwrapTraits;
-
-  BindState(const Runnable& runnable,
-            const P1& p1,
-            const P2& p2,
-            const P3& p3,
-            const P4& p4)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1),
-        p2_(p2),
-        p3_(p3),
-        p4_(p4) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
-
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
-  }
-
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
-  }
-
-  RunnableType runnable_;
-  P1 p1_;
-  P2 p2_;
-  P3 p3_;
-  P4 p4_;
+// CallbackCancellationTraits allows customization of Callback's cancellation
+// semantics. By default, callbacks are not cancellable. A specialization should
+// set is_cancellable = true and implement an IsCancelled() that returns if the
+// callback should be cancelled.
+template <typename Functor, typename BoundArgsTuple, typename SFINAE>
+struct CallbackCancellationTraits {
+  static constexpr bool is_cancellable = false;
 };
 
-template <typename Runnable,
-          typename RunType,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4,
-          typename P5>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5)>
-    : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<5, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-  typedef UnwrapTraits<P2> Bound2UnwrapTraits;
-  typedef UnwrapTraits<P3> Bound3UnwrapTraits;
-  typedef UnwrapTraits<P4> Bound4UnwrapTraits;
-  typedef UnwrapTraits<P5> Bound5UnwrapTraits;
-
-  BindState(const Runnable& runnable,
-            const P1& p1,
-            const P2& p2,
-            const P3& p3,
-            const P4& p4,
-            const P5& p5)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1),
-        p2_(p2),
-        p3_(p3),
-        p4_(p4),
-        p5_(p5) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
+// Specialization for method bound to weak pointer receiver.
+template <typename Functor, typename... BoundArgs>
+struct CallbackCancellationTraits<
+    Functor,
+    std::tuple<BoundArgs...>,
+    std::enable_if_t<cef_internal::IsWeakMethod<
+        cef_internal::FunctorTraits<Functor>::is_method,
+        BoundArgs...>::value>> {
+  static constexpr bool is_cancellable = true;
 
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  template <typename Receiver, typename... Args>
+  static bool IsCancelled(const Functor&,
+                          const Receiver& receiver,
+                          const Args&...) {
+    return !receiver;
   }
 
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
+  template <typename Receiver, typename... Args>
+  static bool MaybeValid(const Functor&,
+                         const Receiver& receiver,
+                         const Args&...) {
+    return MaybeValidTraits<Receiver>::MaybeValid(receiver);
   }
-
-  RunnableType runnable_;
-  P1 p1_;
-  P2 p2_;
-  P3 p3_;
-  P4 p4_;
-  P5 p5_;
 };
 
-template <typename Runnable,
-          typename RunType,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4,
-          typename P5,
-          typename P6>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6)>
-    : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<6, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-  typedef UnwrapTraits<P2> Bound2UnwrapTraits;
-  typedef UnwrapTraits<P3> Bound3UnwrapTraits;
-  typedef UnwrapTraits<P4> Bound4UnwrapTraits;
-  typedef UnwrapTraits<P5> Bound5UnwrapTraits;
-  typedef UnwrapTraits<P6> Bound6UnwrapTraits;
-
-  BindState(const Runnable& runnable,
-            const P1& p1,
-            const P2& p2,
-            const P3& p3,
-            const P4& p4,
-            const P5& p5,
-            const P6& p6)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1),
-        p2_(p2),
-        p3_(p3),
-        p4_(p4),
-        p5_(p5),
-        p6_(p6) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
+// Specialization for a nested bind.
+template <typename Signature, typename... BoundArgs>
+struct CallbackCancellationTraits<OnceCallback<Signature>,
+                                  std::tuple<BoundArgs...>> {
+  static constexpr bool is_cancellable = true;
 
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  template <typename Functor>
+  static bool IsCancelled(const Functor& functor, const BoundArgs&...) {
+    return functor.IsCancelled();
   }
 
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
+  template <typename Functor>
+  static bool MaybeValid(const Functor& functor, const BoundArgs&...) {
+    return MaybeValidTraits<Functor>::MaybeValid(functor);
   }
-
-  RunnableType runnable_;
-  P1 p1_;
-  P2 p2_;
-  P3 p3_;
-  P4 p4_;
-  P5 p5_;
-  P6 p6_;
 };
 
-template <typename Runnable,
-          typename RunType,
-          typename P1,
-          typename P2,
-          typename P3,
-          typename P4,
-          typename P5,
-          typename P6,
-          typename P7>
-struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6, P7)>
-    : public BindStateBase {
-  typedef Runnable RunnableType;
-  typedef IsWeakMethod<HasIsMethodTag<Runnable>::value, P1> IsWeakCall;
-  typedef Invoker<7, BindState, RunType> InvokerType;
-  typedef typename InvokerType::UnboundRunType UnboundRunType;
-
-  // Convenience typedefs for bound argument types.
-  typedef UnwrapTraits<P1> Bound1UnwrapTraits;
-  typedef UnwrapTraits<P2> Bound2UnwrapTraits;
-  typedef UnwrapTraits<P3> Bound3UnwrapTraits;
-  typedef UnwrapTraits<P4> Bound4UnwrapTraits;
-  typedef UnwrapTraits<P5> Bound5UnwrapTraits;
-  typedef UnwrapTraits<P6> Bound6UnwrapTraits;
-  typedef UnwrapTraits<P7> Bound7UnwrapTraits;
-
-  BindState(const Runnable& runnable,
-            const P1& p1,
-            const P2& p2,
-            const P3& p3,
-            const P4& p4,
-            const P5& p5,
-            const P6& p6,
-            const P7& p7)
-      : BindStateBase(&Destroy),
-        runnable_(runnable),
-        p1_(p1),
-        p2_(p2),
-        p3_(p3),
-        p4_(p4),
-        p5_(p5),
-        p6_(p6),
-        p7_(p7) {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
-  }
+template <typename Signature, typename... BoundArgs>
+struct CallbackCancellationTraits<RepeatingCallback<Signature>,
+                                  std::tuple<BoundArgs...>> {
+  static constexpr bool is_cancellable = true;
 
-  ~BindState() {
-    MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::Release(p1_);
+  template <typename Functor>
+  static bool IsCancelled(const Functor& functor, const BoundArgs&...) {
+    return functor.IsCancelled();
   }
 
-  static void Destroy(BindStateBase* self) {
-    delete static_cast<BindState*>(self);
+  template <typename Functor>
+  static bool MaybeValid(const Functor& functor, const BoundArgs&...) {
+    return MaybeValidTraits<Functor>::MaybeValid(functor);
   }
-
-  RunnableType runnable_;
-  P1 p1_;
-  P2 p2_;
-  P3 p3_;
-  P4 p4_;
-  P5 p5_;
-  P6 p6_;
-  P7 p7_;
 };
 
-}  // namespace cef_internal
 }  // namespace base
 
 #endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_H_
diff --git a/src/include/base/internal/cef_bind_internal_win.h b/src/include/base/internal/cef_bind_internal_win.h
deleted file mode 100644
index 4a363def8..000000000
--- a/src/include/base/internal/cef_bind_internal_win.h
+++ /dev/null
@@ -1,396 +0,0 @@
-// Copyright (c) 2011 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Do not include this header file directly. Use base/cef_bind.h instead.
-
-// Specializations of RunnableAdapter<> for Windows specific calling
-// conventions.  Please see base/bind_internal.h for more info.
-
-#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_
-#define CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_
-
-// In the x64 architecture in Windows, __fastcall, __stdcall, etc, are all
-// the same as __cdecl which would turn the following specializations into
-// multiple definitions.
-#if !defined(ARCH_CPU_X86_64)
-
-namespace base {
-namespace cef_internal {
-
-template <typename Functor>
-class RunnableAdapter;
-
-// __stdcall Function: Arity 0.
-template <typename R>
-class RunnableAdapter<R(__stdcall*)()> {
- public:
-  typedef R(RunType)();
-
-  explicit RunnableAdapter(R(__stdcall* function)()) : function_(function) {}
-
-  R Run() { return function_(); }
-
- private:
-  R(__stdcall* function_)();
-};
-
-// __fastcall Function: Arity 0.
-template <typename R>
-class RunnableAdapter<R(__fastcall*)()> {
- public:
-  typedef R(RunType)();
-
-  explicit RunnableAdapter(R(__fastcall* function)()) : function_(function) {}
-
-  R Run() { return function_(); }
-
- private:
-  R(__fastcall* function_)();
-};
-
-// __stdcall Function: Arity 1.
-template <typename R, typename A1>
-class RunnableAdapter<R(__stdcall*)(A1)> {
- public:
-  typedef R(RunType)(A1);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1)) : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
-    return function_(a1);
-  }
-
- private:
-  R(__stdcall* function_)(A1);
-};
-
-// __fastcall Function: Arity 1.
-template <typename R, typename A1>
-class RunnableAdapter<R(__fastcall*)(A1)> {
- public:
-  typedef R(RunType)(A1);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1)) : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
-    return function_(a1);
-  }
-
- private:
-  R(__fastcall* function_)(A1);
-};
-
-// __stdcall Function: Arity 2.
-template <typename R, typename A1, typename A2>
-class RunnableAdapter<R(__stdcall*)(A1, A2)> {
- public:
-  typedef R(RunType)(A1, A2);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1, A2))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2) {
-    return function_(a1, a2);
-  }
-
- private:
-  R(__stdcall* function_)(A1, A2);
-};
-
-// __fastcall Function: Arity 2.
-template <typename R, typename A1, typename A2>
-class RunnableAdapter<R(__fastcall*)(A1, A2)> {
- public:
-  typedef R(RunType)(A1, A2);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1, A2))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2) {
-    return function_(a1, a2);
-  }
-
- private:
-  R(__fastcall* function_)(A1, A2);
-};
-
-// __stdcall Function: Arity 3.
-template <typename R, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(__stdcall*)(A1, A2, A3)> {
- public:
-  typedef R(RunType)(A1, A2, A3);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3) {
-    return function_(a1, a2, a3);
-  }
-
- private:
-  R(__stdcall* function_)(A1, A2, A3);
-};
-
-// __fastcall Function: Arity 3.
-template <typename R, typename A1, typename A2, typename A3>
-class RunnableAdapter<R(__fastcall*)(A1, A2, A3)> {
- public:
-  typedef R(RunType)(A1, A2, A3);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3) {
-    return function_(a1, a2, a3);
-  }
-
- private:
-  R(__fastcall* function_)(A1, A2, A3);
-};
-
-// __stdcall Function: Arity 4.
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4) {
-    return function_(a1, a2, a3, a4);
-  }
-
- private:
-  R(__stdcall* function_)(A1, A2, A3, A4);
-};
-
-// __fastcall Function: Arity 4.
-template <typename R, typename A1, typename A2, typename A3, typename A4>
-class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4) {
-    return function_(a1, a2, a3, a4);
-  }
-
- private:
-  R(__fastcall* function_)(A1, A2, A3, A4);
-};
-
-// __stdcall Function: Arity 5.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5) {
-    return function_(a1, a2, a3, a4, a5);
-  }
-
- private:
-  R(__stdcall* function_)(A1, A2, A3, A4, A5);
-};
-
-// __fastcall Function: Arity 5.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5>
-class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5) {
-    return function_(a1, a2, a3, a4, a5);
-  }
-
- private:
-  R(__fastcall* function_)(A1, A2, A3, A4, A5);
-};
-
-// __stdcall Function: Arity 6.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5, A6)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5, A6))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6) {
-    return function_(a1, a2, a3, a4, a5, a6);
-  }
-
- private:
-  R(__stdcall* function_)(A1, A2, A3, A4, A5, A6);
-};
-
-// __fastcall Function: Arity 6.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6>
-class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5, A6)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5, A6))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6) {
-    return function_(a1, a2, a3, a4, a5, a6);
-  }
-
- private:
-  R(__fastcall* function_)(A1, A2, A3, A4, A5, A6);
-};
-
-// __stdcall Function: Arity 7.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class RunnableAdapter<R(__stdcall*)(A1, A2, A3, A4, A5, A6, A7)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
-
-  explicit RunnableAdapter(R(__stdcall* function)(A1, A2, A3, A4, A5, A6, A7))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6,
-        typename CallbackParamTraits<A7>::ForwardType a7) {
-    return function_(a1, a2, a3, a4, a5, a6, a7);
-  }
-
- private:
-  R(__stdcall* function_)(A1, A2, A3, A4, A5, A6, A7);
-};
-
-// __fastcall Function: Arity 7.
-template <typename R,
-          typename A1,
-          typename A2,
-          typename A3,
-          typename A4,
-          typename A5,
-          typename A6,
-          typename A7>
-class RunnableAdapter<R(__fastcall*)(A1, A2, A3, A4, A5, A6, A7)> {
- public:
-  typedef R(RunType)(A1, A2, A3, A4, A5, A6, A7);
-
-  explicit RunnableAdapter(R(__fastcall* function)(A1, A2, A3, A4, A5, A6, A7))
-      : function_(function) {}
-
-  R Run(typename CallbackParamTraits<A1>::ForwardType a1,
-        typename CallbackParamTraits<A2>::ForwardType a2,
-        typename CallbackParamTraits<A3>::ForwardType a3,
-        typename CallbackParamTraits<A4>::ForwardType a4,
-        typename CallbackParamTraits<A5>::ForwardType a5,
-        typename CallbackParamTraits<A6>::ForwardType a6,
-        typename CallbackParamTraits<A7>::ForwardType a7) {
-    return function_(a1, a2, a3, a4, a5, a6, a7);
-  }
-
- private:
-  R(__fastcall* function_)(A1, A2, A3, A4, A5, A6, A7);
-};
-
-}  // namespace cef_internal
-}  // namespace base
-
-#endif  // !defined(ARCH_CPU_X86_64)
-
-#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_BIND_INTERNAL_WIN_H_
diff --git a/src/include/base/internal/cef_callback_internal.h b/src/include/base/internal/cef_callback_internal.h
index 1f2e16c97..f3435e9f7 100644
--- a/src/include/base/internal/cef_callback_internal.h
+++ b/src/include/base/internal/cef_callback_internal.h
@@ -36,72 +36,156 @@
 #ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_
 #define CEF_INCLUDE_BASE_INTERNAL_CEF_CALLBACK_INTERNAL_H_
 
-#include <stddef.h>
-
-#include "include/base/cef_atomic_ref_count.h"
-#include "include/base/cef_macros.h"
+#include "include/base/cef_callback_forward.h"
 #include "include/base/cef_ref_counted.h"
-#include "include/base/cef_scoped_ptr.h"
-#include "include/base/cef_template_util.h"
-
-template <typename T>
-class ScopedVector;
 
 namespace base {
+
+struct FakeBindState;
+
 namespace cef_internal {
+
+class BindStateBase;
+class FinallyExecutorCommon;
+class ThenAndCatchExecutorCommon;
+
+template <typename ReturnType>
+class PostTaskExecutor;
+
+template <typename Functor, typename... BoundArgs>
+struct BindState;
+
 class CallbackBase;
+class CallbackBaseCopyable;
 
-// At the base level, the only task is to add reference counting data. Don't use
-// RefCountedThreadSafe since it requires the destructor to be a virtual method.
-// Creating a vtable for every BindState template instantiation results in a lot
-// of bloat. Its only task is to call the destructor which can be done with a
-// function pointer.
-class BindStateBase {
- protected:
-  explicit BindStateBase(void (*destructor)(BindStateBase*))
-      : ref_count_(0), destructor_(destructor) {}
-  ~BindStateBase() {}
+struct BindStateBaseRefCountTraits {
+  static void Destruct(const BindStateBase*);
+};
+
+template <typename T>
+using PassingType = std::conditional_t<std::is_scalar<T>::value, T, T&&>;
+
+// BindStateBase is used to provide an opaque handle that the Callback
+// class can use to represent a function object with bound arguments.  It
+// behaves as an existential type that is used by a corresponding
+// DoInvoke function to perform the function execution.  This allows
+// us to shield the Callback class from the types of the bound argument via
+// "type erasure."
+// At the base level, the only task is to add reference counting data. Avoid
+// using or inheriting any virtual functions. Creating a vtable for every
+// BindState template instantiation results in a lot of bloat. Its only task is
+// to call the destructor which can be done with a function pointer.
+class BindStateBase
+    : public RefCountedThreadSafe<BindStateBase, BindStateBaseRefCountTraits> {
+ public:
+  REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE();
+
+  enum CancellationQueryMode {
+    IS_CANCELLED,
+    MAYBE_VALID,
+  };
+
+  using InvokeFuncStorage = void (*)();
+
+  BindStateBase(const BindStateBase&) = delete;
+  BindStateBase& operator=(const BindStateBase&) = delete;
 
  private:
-  friend class scoped_refptr<BindStateBase>;
+  BindStateBase(InvokeFuncStorage polymorphic_invoke,
+                void (*destructor)(const BindStateBase*));
+  BindStateBase(InvokeFuncStorage polymorphic_invoke,
+                void (*destructor)(const BindStateBase*),
+                bool (*query_cancellation_traits)(const BindStateBase*,
+                                                  CancellationQueryMode mode));
+
+  ~BindStateBase() = default;
+
+  friend struct BindStateBaseRefCountTraits;
+  friend class RefCountedThreadSafe<BindStateBase, BindStateBaseRefCountTraits>;
+
   friend class CallbackBase;
+  friend class CallbackBaseCopyable;
 
-  void AddRef();
-  void Release();
+  // Allowlist subclasses that access the destructor of BindStateBase.
+  template <typename Functor, typename... BoundArgs>
+  friend struct BindState;
+  friend struct ::base::FakeBindState;
 
-  AtomicRefCount ref_count_;
+  bool IsCancelled() const {
+    return query_cancellation_traits_(this, IS_CANCELLED);
+  }
 
-  // Pointer to a function that will properly destroy |this|.
-  void (*destructor_)(BindStateBase*);
+  bool MaybeValid() const {
+    return query_cancellation_traits_(this, MAYBE_VALID);
+  }
+
+  // In C++, it is safe to cast function pointers to function pointers of
+  // another type. It is not okay to use void*. We create a InvokeFuncStorage
+  // that that can store our function pointer, and then cast it back to
+  // the original type on usage.
+  InvokeFuncStorage polymorphic_invoke_;
 
-  DISALLOW_COPY_AND_ASSIGN(BindStateBase);
+  // Pointer to a function that will properly destroy |this|.
+  void (*destructor_)(const BindStateBase*);
+  bool (*query_cancellation_traits_)(const BindStateBase*,
+                                     CancellationQueryMode mode);
 };
 
 // Holds the Callback methods that don't require specialization to reduce
 // template bloat.
+// CallbackBase<MoveOnly> is a direct base class of MoveOnly callbacks, and
+// CallbackBase<Copyable> uses CallbackBase<MoveOnly> for its implementation.
 class CallbackBase {
  public:
+  inline CallbackBase(CallbackBase&& c) noexcept;
+  CallbackBase& operator=(CallbackBase&& c) noexcept;
+
+  explicit CallbackBase(const CallbackBaseCopyable& c);
+  CallbackBase& operator=(const CallbackBaseCopyable& c);
+
+  explicit CallbackBase(CallbackBaseCopyable&& c) noexcept;
+  CallbackBase& operator=(CallbackBaseCopyable&& c) noexcept;
+
   // Returns true if Callback is null (doesn't refer to anything).
-  bool is_null() const { return bind_state_.get() == NULL; }
+  bool is_null() const { return !bind_state_; }
+  explicit operator bool() const { return !is_null(); }
+
+  // Returns true if the callback invocation will be nop due to an cancellation.
+  // It's invalid to call this on uninitialized callback.
+  //
+  // Must be called on the Callback's destination sequence.
+  bool IsCancelled() const;
+
+  // If this returns false, the callback invocation will be a nop due to a
+  // cancellation. This may(!) still return true, even on a cancelled callback.
+  //
+  // This function is thread-safe.
+  bool MaybeValid() const;
 
   // Returns the Callback into an uninitialized state.
   void Reset();
 
  protected:
-  // In C++, it is safe to cast function pointers to function pointers of
-  // another type. It is not okay to use void*. We create a InvokeFuncStorage
-  // that that can store our function pointer, and then cast it back to
-  // the original type on usage.
-  typedef void (*InvokeFuncStorage)(void);
+  friend class FinallyExecutorCommon;
+  friend class ThenAndCatchExecutorCommon;
+
+  template <typename ReturnType>
+  friend class PostTaskExecutor;
+
+  using InvokeFuncStorage = BindStateBase::InvokeFuncStorage;
 
   // Returns true if this callback equals |other|. |other| may be null.
-  bool Equals(const CallbackBase& other) const;
+  bool EqualsInternal(const CallbackBase& other) const;
+
+  constexpr inline CallbackBase();
 
   // Allow initializing of |bind_state_| via the constructor to avoid default
-  // initialization of the scoped_refptr.  We do not also initialize
-  // |polymorphic_invoke_| here because doing a normal assignment in the
-  // derived Callback templates makes for much nicer compiler errors.
-  explicit CallbackBase(BindStateBase* bind_state);
+  // initialization of the scoped_refptr.
+  explicit inline CallbackBase(BindStateBase* bind_state);
+
+  InvokeFuncStorage polymorphic_invoke() const {
+    return bind_state_->polymorphic_invoke_;
+  }
 
   // Force the destructor to be instantiated inside this translation unit so
   // that our subclasses will not get inlined versions.  Avoids more template
@@ -109,115 +193,82 @@ class CallbackBase {
   ~CallbackBase();
 
   scoped_refptr<BindStateBase> bind_state_;
-  InvokeFuncStorage polymorphic_invoke_;
-};
-
-// A helper template to determine if given type is non-const move-only-type,
-// i.e. if a value of the given type should be passed via .Pass() in a
-// destructive way.
-template <typename T>
-struct IsMoveOnlyType {
-  template <typename U>
-  static YesType Test(const typename U::MoveOnlyTypeForCPP03*);
-
-  template <typename U>
-  static NoType Test(...);
-
-  static const bool value =
-      sizeof(Test<T>(0)) == sizeof(YesType) && !is_const<T>::value;
 };
 
-// This is a typetraits object that's used to take an argument type, and
-// extract a suitable type for storing and forwarding arguments.
-//
-// In particular, it strips off references, and converts arrays to
-// pointers for storage; and it avoids accidentally trying to create a
-// "reference of a reference" if the argument is a reference type.
-//
-// This array type becomes an issue for storage because we are passing bound
-// parameters by const reference. In this case, we end up passing an actual
-// array type in the initializer list which C++ does not allow.  This will
-// break passing of C-string literals.
-template <typename T, bool is_move_only = IsMoveOnlyType<T>::value>
-struct CallbackParamTraits {
-  typedef const T& ForwardType;
-  typedef T StorageType;
-};
+constexpr CallbackBase::CallbackBase() = default;
+CallbackBase::CallbackBase(CallbackBase&&) noexcept = default;
+CallbackBase::CallbackBase(BindStateBase* bind_state)
+    : bind_state_(AdoptRef(bind_state)) {}
 
-// The Storage should almost be impossible to trigger unless someone manually
-// specifies type of the bind parameters.  However, in case they do,
-// this will guard against us accidentally storing a reference parameter.
-//
-// The ForwardType should only be used for unbound arguments.
-template <typename T>
-struct CallbackParamTraits<T&, false> {
-  typedef T& ForwardType;
-  typedef T StorageType;
-};
+// CallbackBase<Copyable> is a direct base class of Copyable Callbacks.
+class CallbackBaseCopyable : public CallbackBase {
+ public:
+  CallbackBaseCopyable(const CallbackBaseCopyable& c);
+  CallbackBaseCopyable(CallbackBaseCopyable&& c) noexcept = default;
+  CallbackBaseCopyable& operator=(const CallbackBaseCopyable& c);
+  CallbackBaseCopyable& operator=(CallbackBaseCopyable&& c) noexcept;
 
-// Note that for array types, we implicitly add a const in the conversion. This
-// means that it is not possible to bind array arguments to functions that take
-// a non-const pointer. Trying to specialize the template based on a "const
-// T[n]" does not seem to match correctly, so we are stuck with this
-// restriction.
-template <typename T, size_t n>
-struct CallbackParamTraits<T[n], false> {
-  typedef const T* ForwardType;
-  typedef const T* StorageType;
+ protected:
+  constexpr CallbackBaseCopyable() = default;
+  explicit CallbackBaseCopyable(BindStateBase* bind_state)
+      : CallbackBase(bind_state) {}
+  ~CallbackBaseCopyable() = default;
 };
 
-// See comment for CallbackParamTraits<T[n]>.
-template <typename T>
-struct CallbackParamTraits<T[], false> {
-  typedef const T* ForwardType;
-  typedef const T* StorageType;
+// Helpers for the `Then()` implementation.
+template <typename OriginalCallback, typename ThenCallback>
+struct ThenHelper;
+
+// Specialization when original callback returns `void`.
+template <template <typename> class OriginalCallback,
+          template <typename>
+          class ThenCallback,
+          typename... OriginalArgs,
+          typename ThenR,
+          typename... ThenArgs>
+struct ThenHelper<OriginalCallback<void(OriginalArgs...)>,
+                  ThenCallback<ThenR(ThenArgs...)>> {
+  static_assert(sizeof...(ThenArgs) == 0,
+                "|then| callback cannot accept parameters if |this| has a "
+                "void return type.");
+
+  static auto CreateTrampoline() {
+    return [](OriginalCallback<void(OriginalArgs...)> c1,
+              ThenCallback<ThenR(ThenArgs...)> c2, OriginalArgs... c1_args) {
+      std::move(c1).Run(std::forward<OriginalArgs>(c1_args)...);
+      return std::move(c2).Run();
+    };
+  }
 };
 
-// Parameter traits for movable-but-not-copyable scopers.
-//
-// Callback<>/Bind() understands movable-but-not-copyable semantics where
-// the type cannot be copied but can still have its state destructively
-// transferred (aka. moved) to another instance of the same type by calling a
-// helper function.  When used with Bind(), this signifies transferal of the
-// object's state to the target function.
-//
-// For these types, the ForwardType must not be a const reference, or a
-// reference.  A const reference is inappropriate, and would break const
-// correctness, because we are implementing a destructive move.  A non-const
-// reference cannot be used with temporaries which means the result of a
-// function or a cast would not be usable with Callback<> or Bind().
-template <typename T>
-struct CallbackParamTraits<T, true> {
-  typedef T ForwardType;
-  typedef T StorageType;
+// Specialization when original callback returns a non-void type.
+template <template <typename> class OriginalCallback,
+          template <typename>
+          class ThenCallback,
+          typename OriginalR,
+          typename... OriginalArgs,
+          typename ThenR,
+          typename... ThenArgs>
+struct ThenHelper<OriginalCallback<OriginalR(OriginalArgs...)>,
+                  ThenCallback<ThenR(ThenArgs...)>> {
+  static_assert(sizeof...(ThenArgs) == 1,
+                "|then| callback must accept exactly one parameter if |this| "
+                "has a non-void return type.");
+  // TODO(dcheng): This should probably check is_convertible as well (same with
+  // `AssertBindArgsValidity`).
+  static_assert(std::is_constructible<ThenArgs..., OriginalR&&>::value,
+                "|then| callback's parameter must be constructible from "
+                "return type of |this|.");
+
+  static auto CreateTrampoline() {
+    return [](OriginalCallback<OriginalR(OriginalArgs...)> c1,
+              ThenCallback<ThenR(ThenArgs...)> c2, OriginalArgs... c1_args) {
+      return std::move(c2).Run(
+          std::move(c1).Run(std::forward<OriginalArgs>(c1_args)...));
+    };
+  }
 };
 
-// CallbackForward() is a very limited simulation of C++11's std::forward()
-// used by the Callback/Bind system for a set of movable-but-not-copyable
-// types.  It is needed because forwarding a movable-but-not-copyable
-// argument to another function requires us to invoke the proper move
-// operator to create a rvalue version of the type.  The supported types are
-// whitelisted below as overloads of the CallbackForward() function. The
-// default template compiles out to be a no-op.
-//
-// In C++11, std::forward would replace all uses of this function.  However, it
-// is impossible to implement a general std::forward with C++11 due to a lack
-// of rvalue references.
-//
-// In addition to Callback/Bind, this is used by PostTaskAndReplyWithResult to
-// simulate std::forward() and forward the result of one Callback as a
-// parameter to another callback. This is to support Callbacks that return
-// the movable-but-not-copyable types whitelisted above.
-template <typename T>
-typename enable_if<!IsMoveOnlyType<T>::value, T>::type& CallbackForward(T& t) {
-  return t;
-}
-
-template <typename T>
-typename enable_if<IsMoveOnlyType<T>::value, T>::type CallbackForward(T& t) {
-  return t.Pass();
-}
-
 }  // namespace cef_internal
 }  // namespace base
 
diff --git a/src/include/base/internal/cef_lock_impl.h b/src/include/base/internal/cef_lock_impl.h
index 470547fe0..606e58605 100644
--- a/src/include/base/internal/cef_lock_impl.h
+++ b/src/include/base/internal/cef_lock_impl.h
@@ -40,8 +40,6 @@
 #include <pthread.h>
 #endif
 
-#include "include/base/cef_macros.h"
-
 namespace base {
 namespace cef_internal {
 
@@ -57,6 +55,10 @@ class LockImpl {
 #endif
 
   LockImpl();
+
+  LockImpl(const LockImpl&) = delete;
+  LockImpl& operator=(const LockImpl&) = delete;
+
   ~LockImpl();
 
   // If the lock is not held, take it and return true.  If the lock is already
@@ -77,8 +79,6 @@ class LockImpl {
 
  private:
   NativeHandle native_handle_;
-
-  DISALLOW_COPY_AND_ASSIGN(LockImpl);
 };
 
 }  // namespace cef_internal
diff --git a/src/include/base/internal/cef_net_error_list.h b/src/include/base/internal/cef_net_error_list.h
new file mode 100644
index 000000000..a3ef0f3a9
--- /dev/null
+++ b/src/include/base/internal/cef_net_error_list.h
@@ -0,0 +1,1041 @@
+// Copyright 2012 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file intentionally does not have header guards, it's included
+// inside a macro to generate enum values. The following line silences a
+// presubmit and Tricium warning that would otherwise be triggered by this:
+// no-include-guard-because-multiply-included
+// NOLINT(build/header_guard)
+
+// This file contains the list of network errors.
+
+//
+// Ranges:
+//     0- 99 System related errors
+//   100-199 Connection related errors
+//   200-299 Certificate errors
+//   300-399 HTTP errors
+//   400-499 Cache errors
+//   500-599 ?
+//   600-699 FTP errors
+//   700-799 Certificate manager errors
+//   800-899 DNS resolver errors
+
+// An asynchronous IO operation is not yet complete.  This usually does not
+// indicate a fatal error.  Typically this error will be generated as a
+// notification to wait for some external notification that the IO operation
+// finally completed.
+NET_ERROR(IO_PENDING, -1)
+
+// A generic failure occurred.
+NET_ERROR(FAILED, -2)
+
+// An operation was aborted (due to user action).
+NET_ERROR(ABORTED, -3)
+
+// An argument to the function is incorrect.
+NET_ERROR(INVALID_ARGUMENT, -4)
+
+// The handle or file descriptor is invalid.
+NET_ERROR(INVALID_HANDLE, -5)
+
+// The file or directory cannot be found.
+NET_ERROR(FILE_NOT_FOUND, -6)
+
+// An operation timed out.
+NET_ERROR(TIMED_OUT, -7)
+
+// The file is too large.
+NET_ERROR(FILE_TOO_BIG, -8)
+
+// An unexpected error.  This may be caused by a programming mistake or an
+// invalid assumption.
+NET_ERROR(UNEXPECTED, -9)
+
+// Permission to access a resource, other than the network, was denied.
+NET_ERROR(ACCESS_DENIED, -10)
+
+// The operation failed because of unimplemented functionality.
+NET_ERROR(NOT_IMPLEMENTED, -11)
+
+// There were not enough resources to complete the operation.
+NET_ERROR(INSUFFICIENT_RESOURCES, -12)
+
+// Memory allocation failed.
+NET_ERROR(OUT_OF_MEMORY, -13)
+
+// The file upload failed because the file's modification time was different
+// from the expectation.
+NET_ERROR(UPLOAD_FILE_CHANGED, -14)
+
+// The socket is not connected.
+NET_ERROR(SOCKET_NOT_CONNECTED, -15)
+
+// The file already exists.
+NET_ERROR(FILE_EXISTS, -16)
+
+// The path or file name is too long.
+NET_ERROR(FILE_PATH_TOO_LONG, -17)
+
+// Not enough room left on the disk.
+NET_ERROR(FILE_NO_SPACE, -18)
+
+// The file has a virus.
+NET_ERROR(FILE_VIRUS_INFECTED, -19)
+
+// The client chose to block the request.
+NET_ERROR(BLOCKED_BY_CLIENT, -20)
+
+// The network changed.
+NET_ERROR(NETWORK_CHANGED, -21)
+
+// The request was blocked by the URL block list configured by the domain
+// administrator.
+NET_ERROR(BLOCKED_BY_ADMINISTRATOR, -22)
+
+// The socket is already connected.
+NET_ERROR(SOCKET_IS_CONNECTED, -23)
+
+// Error -24 was removed (BLOCKED_ENROLLMENT_CHECK_PENDING)
+
+// The upload failed because the upload stream needed to be re-read, due to a
+// retry or a redirect, but the upload stream doesn't support that operation.
+NET_ERROR(UPLOAD_STREAM_REWIND_NOT_SUPPORTED, -25)
+
+// The request failed because the URLRequestContext is shutting down, or has
+// been shut down.
+NET_ERROR(CONTEXT_SHUT_DOWN, -26)
+
+// The request failed because the response was delivered along with requirements
+// which are not met ('X-Frame-Options' and 'Content-Security-Policy' ancestor
+// checks and 'Cross-Origin-Resource-Policy' for instance).
+NET_ERROR(BLOCKED_BY_RESPONSE, -27)
+
+// Error -28 was removed (BLOCKED_BY_XSS_AUDITOR).
+
+// The request was blocked by system policy disallowing some or all cleartext
+// requests. Used for NetworkSecurityPolicy on Android.
+NET_ERROR(CLEARTEXT_NOT_PERMITTED, -29)
+
+// The request was blocked by a Content Security Policy
+NET_ERROR(BLOCKED_BY_CSP, -30)
+
+// The request was blocked because of no H/2 or QUIC session.
+NET_ERROR(H2_OR_QUIC_REQUIRED, -31)
+
+// The request was blocked by CORB or ORB.
+NET_ERROR(BLOCKED_BY_ORB, -32)
+
+// A connection was closed (corresponding to a TCP FIN).
+NET_ERROR(CONNECTION_CLOSED, -100)
+
+// A connection was reset (corresponding to a TCP RST).
+NET_ERROR(CONNECTION_RESET, -101)
+
+// A connection attempt was refused.
+NET_ERROR(CONNECTION_REFUSED, -102)
+
+// A connection timed out as a result of not receiving an ACK for data sent.
+// This can include a FIN packet that did not get ACK'd.
+NET_ERROR(CONNECTION_ABORTED, -103)
+
+// A connection attempt failed.
+NET_ERROR(CONNECTION_FAILED, -104)
+
+// The host name could not be resolved.
+NET_ERROR(NAME_NOT_RESOLVED, -105)
+
+// The Internet connection has been lost.
+NET_ERROR(INTERNET_DISCONNECTED, -106)
+
+// An SSL protocol error occurred.
+NET_ERROR(SSL_PROTOCOL_ERROR, -107)
+
+// The IP address or port number is invalid (e.g., cannot connect to the IP
+// address 0 or the port 0).
+NET_ERROR(ADDRESS_INVALID, -108)
+
+// The IP address is unreachable.  This usually means that there is no route to
+// the specified host or network.
+NET_ERROR(ADDRESS_UNREACHABLE, -109)
+
+// The server requested a client certificate for SSL client authentication.
+NET_ERROR(SSL_CLIENT_AUTH_CERT_NEEDED, -110)
+
+// A tunnel connection through the proxy could not be established.
+NET_ERROR(TUNNEL_CONNECTION_FAILED, -111)
+
+// No SSL protocol versions are enabled.
+NET_ERROR(NO_SSL_VERSIONS_ENABLED, -112)
+
+// The client and server don't support a common SSL protocol version or
+// cipher suite.
+NET_ERROR(SSL_VERSION_OR_CIPHER_MISMATCH, -113)
+
+// The server requested a renegotiation (rehandshake).
+NET_ERROR(SSL_RENEGOTIATION_REQUESTED, -114)
+
+// The proxy requested authentication (for tunnel establishment) with an
+// unsupported method.
+NET_ERROR(PROXY_AUTH_UNSUPPORTED, -115)
+
+// Error -116 was removed (CERT_ERROR_IN_SSL_RENEGOTIATION)
+
+// The SSL handshake failed because of a bad or missing client certificate.
+NET_ERROR(BAD_SSL_CLIENT_AUTH_CERT, -117)
+
+// A connection attempt timed out.
+NET_ERROR(CONNECTION_TIMED_OUT, -118)
+
+// There are too many pending DNS resolves, so a request in the queue was
+// aborted.
+NET_ERROR(HOST_RESOLVER_QUEUE_TOO_LARGE, -119)
+
+// Failed establishing a connection to the SOCKS proxy server for a target host.
+NET_ERROR(SOCKS_CONNECTION_FAILED, -120)
+
+// The SOCKS proxy server failed establishing connection to the target host
+// because that host is unreachable.
+NET_ERROR(SOCKS_CONNECTION_HOST_UNREACHABLE, -121)
+
+// The request to negotiate an alternate protocol failed.
+NET_ERROR(ALPN_NEGOTIATION_FAILED, -122)
+
+// The peer sent an SSL no_renegotiation alert message.
+NET_ERROR(SSL_NO_RENEGOTIATION, -123)
+
+// Winsock sometimes reports more data written than passed.  This is probably
+// due to a broken LSP.
+NET_ERROR(WINSOCK_UNEXPECTED_WRITTEN_BYTES, -124)
+
+// An SSL peer sent us a fatal decompression_failure alert. This typically
+// occurs when a peer selects DEFLATE compression in the mistaken belief that
+// it supports it.
+NET_ERROR(SSL_DECOMPRESSION_FAILURE_ALERT, -125)
+
+// An SSL peer sent us a fatal bad_record_mac alert. This has been observed
+// from servers with buggy DEFLATE support.
+NET_ERROR(SSL_BAD_RECORD_MAC_ALERT, -126)
+
+// The proxy requested authentication (for tunnel establishment).
+NET_ERROR(PROXY_AUTH_REQUESTED, -127)
+
+// Error -129 was removed (SSL_WEAK_SERVER_EPHEMERAL_DH_KEY).
+
+// Could not create a connection to the proxy server. An error occurred
+// either in resolving its name, or in connecting a socket to it.
+// Note that this does NOT include failures during the actual "CONNECT" method
+// of an HTTP proxy.
+NET_ERROR(PROXY_CONNECTION_FAILED, -130)
+
+// A mandatory proxy configuration could not be used. Currently this means
+// that a mandatory PAC script could not be fetched, parsed or executed.
+NET_ERROR(MANDATORY_PROXY_CONFIGURATION_FAILED, -131)
+
+// -132 was formerly ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION
+
+// We've hit the max socket limit for the socket pool while preconnecting.  We
+// don't bother trying to preconnect more sockets.
+NET_ERROR(PRECONNECT_MAX_SOCKET_LIMIT, -133)
+
+// The permission to use the SSL client certificate's private key was denied.
+NET_ERROR(SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED, -134)
+
+// The SSL client certificate has no private key.
+NET_ERROR(SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY, -135)
+
+// The certificate presented by the HTTPS Proxy was invalid.
+NET_ERROR(PROXY_CERTIFICATE_INVALID, -136)
+
+// An error occurred when trying to do a name resolution (DNS).
+NET_ERROR(NAME_RESOLUTION_FAILED, -137)
+
+// Permission to access the network was denied. This is used to distinguish
+// errors that were most likely caused by a firewall from other access denied
+// errors. See also ERR_ACCESS_DENIED.
+NET_ERROR(NETWORK_ACCESS_DENIED, -138)
+
+// The request throttler module cancelled this request to avoid DDOS.
+NET_ERROR(TEMPORARILY_THROTTLED, -139)
+
+// A request to create an SSL tunnel connection through the HTTPS proxy
+// received a 302 (temporary redirect) response.  The response body might
+// include a description of why the request failed.
+//
+// TODO(https://crbug.com/928551): This is deprecated and should not be used by
+// new code.
+NET_ERROR(HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT, -140)
+
+// We were unable to sign the CertificateVerify data of an SSL client auth
+// handshake with the client certificate's private key.
+//
+// Possible causes for this include the user implicitly or explicitly
+// denying access to the private key, the private key may not be valid for
+// signing, the key may be relying on a cached handle which is no longer
+// valid, or the CSP won't allow arbitrary data to be signed.
+NET_ERROR(SSL_CLIENT_AUTH_SIGNATURE_FAILED, -141)
+
+// The message was too large for the transport.  (for example a UDP message
+// which exceeds size threshold).
+NET_ERROR(MSG_TOO_BIG, -142)
+
+// Error -143 was removed (SPDY_SESSION_ALREADY_EXISTS)
+
+// Error -144 was removed (LIMIT_VIOLATION).
+
+// Websocket protocol error. Indicates that we are terminating the connection
+// due to a malformed frame or other protocol violation.
+NET_ERROR(WS_PROTOCOL_ERROR, -145)
+
+// Error -146 was removed (PROTOCOL_SWITCHED)
+
+// Returned when attempting to bind an address that is already in use.
+NET_ERROR(ADDRESS_IN_USE, -147)
+
+// An operation failed because the SSL handshake has not completed.
+NET_ERROR(SSL_HANDSHAKE_NOT_COMPLETED, -148)
+
+// SSL peer's public key is invalid.
+NET_ERROR(SSL_BAD_PEER_PUBLIC_KEY, -149)
+
+// The certificate didn't match the built-in public key pins for the host name.
+// The pins are set in net/http/transport_security_state.cc and require that
+// one of a set of public keys exist on the path from the leaf to the root.
+NET_ERROR(SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, -150)
+
+// Server request for client certificate did not contain any types we support.
+NET_ERROR(CLIENT_AUTH_CERT_TYPE_UNSUPPORTED, -151)
+
+// Error -152 was removed (ORIGIN_BOUND_CERT_GENERATION_TYPE_MISMATCH)
+
+// An SSL peer sent us a fatal decrypt_error alert. This typically occurs when
+// a peer could not correctly verify a signature (in CertificateVerify or
+// ServerKeyExchange) or validate a Finished message.
+NET_ERROR(SSL_DECRYPT_ERROR_ALERT, -153)
+
+// There are too many pending WebSocketJob instances, so the new job was not
+// pushed to the queue.
+NET_ERROR(WS_THROTTLE_QUEUE_TOO_LARGE, -154)
+
+// Error -155 was removed (TOO_MANY_SOCKET_STREAMS)
+
+// The SSL server certificate changed in a renegotiation.
+NET_ERROR(SSL_SERVER_CERT_CHANGED, -156)
+
+// Error -157 was removed (SSL_INAPPROPRIATE_FALLBACK).
+
+// Error -158 was removed (CT_NO_SCTS_VERIFIED_OK).
+
+// The SSL server sent us a fatal unrecognized_name alert.
+NET_ERROR(SSL_UNRECOGNIZED_NAME_ALERT, -159)
+
+// Failed to set the socket's receive buffer size as requested.
+NET_ERROR(SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR, -160)
+
+// Failed to set the socket's send buffer size as requested.
+NET_ERROR(SOCKET_SET_SEND_BUFFER_SIZE_ERROR, -161)
+
+// Failed to set the socket's receive buffer size as requested, despite success
+// return code from setsockopt.
+NET_ERROR(SOCKET_RECEIVE_BUFFER_SIZE_UNCHANGEABLE, -162)
+
+// Failed to set the socket's send buffer size as requested, despite success
+// return code from setsockopt.
+NET_ERROR(SOCKET_SEND_BUFFER_SIZE_UNCHANGEABLE, -163)
+
+// Failed to import a client certificate from the platform store into the SSL
+// library.
+NET_ERROR(SSL_CLIENT_AUTH_CERT_BAD_FORMAT, -164)
+
+// Error -165 was removed (SSL_FALLBACK_BEYOND_MINIMUM_VERSION).
+
+// Resolving a hostname to an IP address list included the IPv4 address
+// "127.0.53.53". This is a special IP address which ICANN has recommended to
+// indicate there was a name collision, and alert admins to a potential
+// problem.
+NET_ERROR(ICANN_NAME_COLLISION, -166)
+
+// The SSL server presented a certificate which could not be decoded. This is
+// not a certificate error code as no X509Certificate object is available. This
+// error is fatal.
+NET_ERROR(SSL_SERVER_CERT_BAD_FORMAT, -167)
+
+// Certificate Transparency: Received a signed tree head that failed to parse.
+NET_ERROR(CT_STH_PARSING_FAILED, -168)
+
+// Certificate Transparency: Received a signed tree head whose JSON parsing was
+// OK but was missing some of the fields.
+NET_ERROR(CT_STH_INCOMPLETE, -169)
+
+// The attempt to reuse a connection to send proxy auth credentials failed
+// before the AuthController was used to generate credentials. The caller should
+// reuse the controller with a new connection. This error is only used
+// internally by the network stack.
+NET_ERROR(UNABLE_TO_REUSE_CONNECTION_FOR_PROXY_AUTH, -170)
+
+// Certificate Transparency: Failed to parse the received consistency proof.
+NET_ERROR(CT_CONSISTENCY_PROOF_PARSING_FAILED, -171)
+
+// The SSL server required an unsupported cipher suite that has since been
+// removed. This error will temporarily be signaled on a fallback for one or two
+// releases immediately following a cipher suite's removal, after which the
+// fallback will be removed.
+NET_ERROR(SSL_OBSOLETE_CIPHER, -172)
+
+// When a WebSocket handshake is done successfully and the connection has been
+// upgraded, the URLRequest is cancelled with this error code.
+NET_ERROR(WS_UPGRADE, -173)
+
+// Socket ReadIfReady support is not implemented. This error should not be user
+// visible, because the normal Read() method is used as a fallback.
+NET_ERROR(READ_IF_READY_NOT_IMPLEMENTED, -174)
+
+// Error -175 was removed (SSL_VERSION_INTERFERENCE).
+
+// No socket buffer space is available.
+NET_ERROR(NO_BUFFER_SPACE, -176)
+
+// There were no common signature algorithms between our client certificate
+// private key and the server's preferences.
+NET_ERROR(SSL_CLIENT_AUTH_NO_COMMON_ALGORITHMS, -177)
+
+// TLS 1.3 early data was rejected by the server. This will be received before
+// any data is returned from the socket. The request should be retried with
+// early data disabled.
+NET_ERROR(EARLY_DATA_REJECTED, -178)
+
+// TLS 1.3 early data was offered, but the server responded with TLS 1.2 or
+// earlier. This is an internal error code to account for a
+// backwards-compatibility issue with early data and TLS 1.2. It will be
+// received before any data is returned from the socket. The request should be
+// retried with early data disabled.
+//
+// See https://tools.ietf.org/html/rfc8446#appendix-D.3 for details.
+NET_ERROR(WRONG_VERSION_ON_EARLY_DATA, -179)
+
+// TLS 1.3 was enabled, but a lower version was negotiated and the server
+// returned a value indicating it supported TLS 1.3. This is part of a security
+// check in TLS 1.3, but it may also indicate the user is behind a buggy
+// TLS-terminating proxy which implemented TLS 1.2 incorrectly. (See
+// https://crbug.com/boringssl/226.)
+NET_ERROR(TLS13_DOWNGRADE_DETECTED, -180)
+
+// The server's certificate has a keyUsage extension incompatible with the
+// negotiated TLS key exchange method.
+NET_ERROR(SSL_KEY_USAGE_INCOMPATIBLE, -181)
+
+// The ECHConfigList fetched over DNS cannot be parsed.
+NET_ERROR(INVALID_ECH_CONFIG_LIST, -182)
+
+// ECH was enabled, but the server was unable to decrypt the encrypted
+// ClientHello.
+NET_ERROR(ECH_NOT_NEGOTIATED, -183)
+
+// ECH was enabled, the server was unable to decrypt the encrypted ClientHello,
+// and additionally did not present a certificate valid for the public name.
+NET_ERROR(ECH_FALLBACK_CERTIFICATE_INVALID, -184)
+
+// Certificate error codes
+//
+// The values of certificate error codes must be consecutive.
+
+// The server responded with a certificate whose common name did not match
+// the host name.  This could mean:
+//
+// 1. An attacker has redirected our traffic to their server and is
+//    presenting a certificate for which they know the private key.
+//
+// 2. The server is misconfigured and responding with the wrong cert.
+//
+// 3. The user is on a wireless network and is being redirected to the
+//    network's login page.
+//
+// 4. The OS has used a DNS search suffix and the server doesn't have
+//    a certificate for the abbreviated name in the address bar.
+//
+NET_ERROR(CERT_COMMON_NAME_INVALID, -200)
+
+// The server responded with a certificate that, by our clock, appears to
+// either not yet be valid or to have expired.  This could mean:
+//
+// 1. An attacker is presenting an old certificate for which they have
+//    managed to obtain the private key.
+//
+// 2. The server is misconfigured and is not presenting a valid cert.
+//
+// 3. Our clock is wrong.
+//
+NET_ERROR(CERT_DATE_INVALID, -201)
+
+// The server responded with a certificate that is signed by an authority
+// we don't trust.  The could mean:
+//
+// 1. An attacker has substituted the real certificate for a cert that
+//    contains their public key and is signed by their cousin.
+//
+// 2. The server operator has a legitimate certificate from a CA we don't
+//    know about, but should trust.
+//
+// 3. The server is presenting a self-signed certificate, providing no
+//    defense against active attackers (but foiling passive attackers).
+//
+NET_ERROR(CERT_AUTHORITY_INVALID, -202)
+
+// The server responded with a certificate that contains errors.
+// This error is not recoverable.
+//
+// MSDN describes this error as follows:
+//   "The SSL certificate contains errors."
+// NOTE: It's unclear how this differs from ERR_CERT_INVALID. For consistency,
+// use that code instead of this one from now on.
+//
+NET_ERROR(CERT_CONTAINS_ERRORS, -203)
+
+// The certificate has no mechanism for determining if it is revoked.  In
+// effect, this certificate cannot be revoked.
+NET_ERROR(CERT_NO_REVOCATION_MECHANISM, -204)
+
+// Revocation information for the security certificate for this site is not
+// available.  This could mean:
+//
+// 1. An attacker has compromised the private key in the certificate and is
+//    blocking our attempt to find out that the cert was revoked.
+//
+// 2. The certificate is unrevoked, but the revocation server is busy or
+//    unavailable.
+//
+NET_ERROR(CERT_UNABLE_TO_CHECK_REVOCATION, -205)
+
+// The server responded with a certificate has been revoked.
+// We have the capability to ignore this error, but it is probably not the
+// thing to do.
+NET_ERROR(CERT_REVOKED, -206)
+
+// The server responded with a certificate that is invalid.
+// This error is not recoverable.
+//
+// MSDN describes this error as follows:
+//   "The SSL certificate is invalid."
+//
+NET_ERROR(CERT_INVALID, -207)
+
+// The server responded with a certificate that is signed using a weak
+// signature algorithm.
+NET_ERROR(CERT_WEAK_SIGNATURE_ALGORITHM, -208)
+
+// -209 is available: was CERT_NOT_IN_DNS.
+
+// The host name specified in the certificate is not unique.
+NET_ERROR(CERT_NON_UNIQUE_NAME, -210)
+
+// The server responded with a certificate that contains a weak key (e.g.
+// a too-small RSA key).
+NET_ERROR(CERT_WEAK_KEY, -211)
+
+// The certificate claimed DNS names that are in violation of name constraints.
+NET_ERROR(CERT_NAME_CONSTRAINT_VIOLATION, -212)
+
+// The certificate's validity period is too long.
+NET_ERROR(CERT_VALIDITY_TOO_LONG, -213)
+
+// Certificate Transparency was required for this connection, but the server
+// did not provide CT information that complied with the policy.
+NET_ERROR(CERTIFICATE_TRANSPARENCY_REQUIRED, -214)
+
+// The certificate chained to a legacy Symantec root that is no longer trusted.
+// https://g.co/chrome/symantecpkicerts
+NET_ERROR(CERT_SYMANTEC_LEGACY, -215)
+
+// -216 was QUIC_CERT_ROOT_NOT_KNOWN which has been renumbered to not be in the
+// certificate error range.
+
+// The certificate is known to be used for interception by an entity other
+// the device owner.
+NET_ERROR(CERT_KNOWN_INTERCEPTION_BLOCKED, -217)
+
+// -218 was SSL_OBSOLETE_VERSION which is not longer used. TLS 1.0/1.1 instead
+// cause SSL_VERSION_OR_CIPHER_MISMATCH now.
+
+// Add new certificate error codes here.
+//
+// Update the value of CERT_END whenever you add a new certificate error
+// code.
+
+// The value immediately past the last certificate error code.
+NET_ERROR(CERT_END, -219)
+
+// The URL is invalid.
+NET_ERROR(INVALID_URL, -300)
+
+// The scheme of the URL is disallowed.
+NET_ERROR(DISALLOWED_URL_SCHEME, -301)
+
+// The scheme of the URL is unknown.
+NET_ERROR(UNKNOWN_URL_SCHEME, -302)
+
+// Attempting to load an URL resulted in a redirect to an invalid URL.
+NET_ERROR(INVALID_REDIRECT, -303)
+
+// Attempting to load an URL resulted in too many redirects.
+NET_ERROR(TOO_MANY_REDIRECTS, -310)
+
+// Attempting to load an URL resulted in an unsafe redirect (e.g., a redirect
+// to file:// is considered unsafe).
+NET_ERROR(UNSAFE_REDIRECT, -311)
+
+// Attempting to load an URL with an unsafe port number.  These are port
+// numbers that correspond to services, which are not robust to spurious input
+// that may be constructed as a result of an allowed web construct (e.g., HTTP
+// looks a lot like SMTP, so form submission to port 25 is denied).
+NET_ERROR(UNSAFE_PORT, -312)
+
+// The server's response was invalid.
+NET_ERROR(INVALID_RESPONSE, -320)
+
+// Error in chunked transfer encoding.
+NET_ERROR(INVALID_CHUNKED_ENCODING, -321)
+
+// The server did not support the request method.
+NET_ERROR(METHOD_NOT_SUPPORTED, -322)
+
+// The response was 407 (Proxy Authentication Required), yet we did not send
+// the request to a proxy.
+NET_ERROR(UNEXPECTED_PROXY_AUTH, -323)
+
+// The server closed the connection without sending any data.
+NET_ERROR(EMPTY_RESPONSE, -324)
+
+// The headers section of the response is too large.
+NET_ERROR(RESPONSE_HEADERS_TOO_BIG, -325)
+
+// Error -326 was removed (PAC_STATUS_NOT_OK)
+
+// The evaluation of the PAC script failed.
+NET_ERROR(PAC_SCRIPT_FAILED, -327)
+
+// The response was 416 (Requested range not satisfiable) and the server cannot
+// satisfy the range requested.
+NET_ERROR(REQUEST_RANGE_NOT_SATISFIABLE, -328)
+
+// The identity used for authentication is invalid.
+NET_ERROR(MALFORMED_IDENTITY, -329)
+
+// Content decoding of the response body failed.
+NET_ERROR(CONTENT_DECODING_FAILED, -330)
+
+// An operation could not be completed because all network IO
+// is suspended.
+NET_ERROR(NETWORK_IO_SUSPENDED, -331)
+
+// FLIP data received without receiving a SYN_REPLY on the stream.
+NET_ERROR(SYN_REPLY_NOT_RECEIVED, -332)
+
+// Converting the response to target encoding failed.
+NET_ERROR(ENCODING_CONVERSION_FAILED, -333)
+
+// The server sent an FTP directory listing in a format we do not understand.
+NET_ERROR(UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT, -334)
+
+// Obsolete.  Was only logged in NetLog when an HTTP/2 pushed stream expired.
+// NET_ERROR(INVALID_SPDY_STREAM, -335)
+
+// There are no supported proxies in the provided list.
+NET_ERROR(NO_SUPPORTED_PROXIES, -336)
+
+// There is an HTTP/2 protocol error.
+NET_ERROR(HTTP2_PROTOCOL_ERROR, -337)
+
+// Credentials could not be established during HTTP Authentication.
+NET_ERROR(INVALID_AUTH_CREDENTIALS, -338)
+
+// An HTTP Authentication scheme was tried which is not supported on this
+// machine.
+NET_ERROR(UNSUPPORTED_AUTH_SCHEME, -339)
+
+// Detecting the encoding of the response failed.
+NET_ERROR(ENCODING_DETECTION_FAILED, -340)
+
+// (GSSAPI) No Kerberos credentials were available during HTTP Authentication.
+NET_ERROR(MISSING_AUTH_CREDENTIALS, -341)
+
+// An unexpected, but documented, SSPI or GSSAPI status code was returned.
+NET_ERROR(UNEXPECTED_SECURITY_LIBRARY_STATUS, -342)
+
+// The environment was not set up correctly for authentication (for
+// example, no KDC could be found or the principal is unknown.
+NET_ERROR(MISCONFIGURED_AUTH_ENVIRONMENT, -343)
+
+// An undocumented SSPI or GSSAPI status code was returned.
+NET_ERROR(UNDOCUMENTED_SECURITY_LIBRARY_STATUS, -344)
+
+// The HTTP response was too big to drain.
+NET_ERROR(RESPONSE_BODY_TOO_BIG_TO_DRAIN, -345)
+
+// The HTTP response contained multiple distinct Content-Length headers.
+NET_ERROR(RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH, -346)
+
+// HTTP/2 headers have been received, but not all of them - status or version
+// headers are missing, so we're expecting additional frames to complete them.
+NET_ERROR(INCOMPLETE_HTTP2_HEADERS, -347)
+
+// No PAC URL configuration could be retrieved from DHCP. This can indicate
+// either a failure to retrieve the DHCP configuration, or that there was no
+// PAC URL configured in DHCP.
+NET_ERROR(PAC_NOT_IN_DHCP, -348)
+
+// The HTTP response contained multiple Content-Disposition headers.
+NET_ERROR(RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION, -349)
+
+// The HTTP response contained multiple Location headers.
+NET_ERROR(RESPONSE_HEADERS_MULTIPLE_LOCATION, -350)
+
+// HTTP/2 server refused the request without processing, and sent either a
+// GOAWAY frame with error code NO_ERROR and Last-Stream-ID lower than the
+// stream id corresponding to the request indicating that this request has not
+// been processed yet, or a RST_STREAM frame with error code REFUSED_STREAM.
+// Client MAY retry (on a different connection).  See RFC7540 Section 8.1.4.
+NET_ERROR(HTTP2_SERVER_REFUSED_STREAM, -351)
+
+// HTTP/2 server didn't respond to the PING message.
+NET_ERROR(HTTP2_PING_FAILED, -352)
+
+// Obsolete.  Kept here to avoid reuse, as the old error can still appear on
+// histograms.
+// NET_ERROR(PIPELINE_EVICTION, -353)
+
+// The HTTP response body transferred fewer bytes than were advertised by the
+// Content-Length header when the connection is closed.
+NET_ERROR(CONTENT_LENGTH_MISMATCH, -354)
+
+// The HTTP response body is transferred with Chunked-Encoding, but the
+// terminating zero-length chunk was never sent when the connection is closed.
+NET_ERROR(INCOMPLETE_CHUNKED_ENCODING, -355)
+
+// There is a QUIC protocol error.
+NET_ERROR(QUIC_PROTOCOL_ERROR, -356)
+
+// The HTTP headers were truncated by an EOF.
+NET_ERROR(RESPONSE_HEADERS_TRUNCATED, -357)
+
+// The QUIC crypto handshake failed.  This means that the server was unable
+// to read any requests sent, so they may be resent.
+NET_ERROR(QUIC_HANDSHAKE_FAILED, -358)
+
+// Obsolete.  Kept here to avoid reuse, as the old error can still appear on
+// histograms.
+// NET_ERROR(REQUEST_FOR_SECURE_RESOURCE_OVER_INSECURE_QUIC, -359)
+
+// Transport security is inadequate for the HTTP/2 version.
+NET_ERROR(HTTP2_INADEQUATE_TRANSPORT_SECURITY, -360)
+
+// The peer violated HTTP/2 flow control.
+NET_ERROR(HTTP2_FLOW_CONTROL_ERROR, -361)
+
+// The peer sent an improperly sized HTTP/2 frame.
+NET_ERROR(HTTP2_FRAME_SIZE_ERROR, -362)
+
+// Decoding or encoding of compressed HTTP/2 headers failed.
+NET_ERROR(HTTP2_COMPRESSION_ERROR, -363)
+
+// Proxy Auth Requested without a valid Client Socket Handle.
+NET_ERROR(PROXY_AUTH_REQUESTED_WITH_NO_CONNECTION, -364)
+
+// HTTP_1_1_REQUIRED error code received on HTTP/2 session.
+NET_ERROR(HTTP_1_1_REQUIRED, -365)
+
+// HTTP_1_1_REQUIRED error code received on HTTP/2 session to proxy.
+NET_ERROR(PROXY_HTTP_1_1_REQUIRED, -366)
+
+// The PAC script terminated fatally and must be reloaded.
+NET_ERROR(PAC_SCRIPT_TERMINATED, -367)
+
+// Obsolete. Kept here to avoid reuse.
+// Request is throttled because of a Backoff header.
+// See: crbug.com/486891.
+// NET_ERROR(TEMPORARY_BACKOFF, -369)
+
+// The server was expected to return an HTTP/1.x response, but did not. Rather
+// than treat it as HTTP/0.9, this error is returned.
+NET_ERROR(INVALID_HTTP_RESPONSE, -370)
+
+// Initializing content decoding failed.
+NET_ERROR(CONTENT_DECODING_INIT_FAILED, -371)
+
+// Received HTTP/2 RST_STREAM frame with NO_ERROR error code.  This error should
+// be handled internally by HTTP/2 code, and should not make it above the
+// SpdyStream layer.
+NET_ERROR(HTTP2_RST_STREAM_NO_ERROR_RECEIVED, -372)
+
+// Obsolete. HTTP/2 push is removed.
+// NET_ERROR(HTTP2_PUSHED_STREAM_NOT_AVAILABLE, -373)
+
+// Obsolete. HTTP/2 push is removed.
+// NET_ERROR(HTTP2_CLAIMED_PUSHED_STREAM_RESET_BY_SERVER, -374)
+
+// An HTTP transaction was retried too many times due for authentication or
+// invalid certificates. This may be due to a bug in the net stack that would
+// otherwise infinite loop, or if the server or proxy continually requests fresh
+// credentials or presents a fresh invalid certificate.
+NET_ERROR(TOO_MANY_RETRIES, -375)
+
+// Received an HTTP/2 frame on a closed stream.
+NET_ERROR(HTTP2_STREAM_CLOSED, -376)
+
+// Obsolete. HTTP/2 push is removed.
+// NET_ERROR(HTTP2_CLIENT_REFUSED_STREAM, -377)
+
+// Obsolete. HTTP/2 push is removed.
+// NET_ERROR(HTTP2_PUSHED_RESPONSE_DOES_NOT_MATCH, -378)
+
+// The server returned a non-2xx HTTP response code.
+//
+// Note that this error is only used by certain APIs that interpret the HTTP
+// response itself. URLRequest for instance just passes most non-2xx
+// response back as success.
+NET_ERROR(HTTP_RESPONSE_CODE_FAILURE, -379)
+
+// The certificate presented on a QUIC connection does not chain to a known root
+// and the origin connected to is not on a list of domains where unknown roots
+// are allowed.
+NET_ERROR(QUIC_CERT_ROOT_NOT_KNOWN, -380)
+
+// A GOAWAY frame has been received indicating that the request has not been
+// processed and is therefore safe to retry on a different connection.
+NET_ERROR(QUIC_GOAWAY_REQUEST_CAN_BE_RETRIED, -381)
+
+// The ACCEPT_CH restart has been triggered too many times
+NET_ERROR(TOO_MANY_ACCEPT_CH_RESTARTS, -382)
+
+// The IP address space of the remote endpoint differed from the previous
+// observed value during the same request. Any cache entry for the affected
+// request should be invalidated.
+NET_ERROR(INCONSISTENT_IP_ADDRESS_SPACE, -383)
+
+// The IP address space of the cached remote endpoint is blocked by private
+// network access check.
+NET_ERROR(CACHED_IP_ADDRESS_SPACE_BLOCKED_BY_PRIVATE_NETWORK_ACCESS_POLICY,
+          -384)
+
+// The connection is blocked by private network access checks.
+NET_ERROR(BLOCKED_BY_PRIVATE_NETWORK_ACCESS_CHECKS, -385)
+
+// Content decoding failed due to the zstd window size being too big (over 8MB).
+NET_ERROR(ZSTD_WINDOW_SIZE_TOO_BIG, -386)
+
+// The cache does not have the requested entry.
+NET_ERROR(CACHE_MISS, -400)
+
+// Unable to read from the disk cache.
+NET_ERROR(CACHE_READ_FAILURE, -401)
+
+// Unable to write to the disk cache.
+NET_ERROR(CACHE_WRITE_FAILURE, -402)
+
+// The operation is not supported for this entry.
+NET_ERROR(CACHE_OPERATION_NOT_SUPPORTED, -403)
+
+// The disk cache is unable to open this entry.
+NET_ERROR(CACHE_OPEN_FAILURE, -404)
+
+// The disk cache is unable to create this entry.
+NET_ERROR(CACHE_CREATE_FAILURE, -405)
+
+// Multiple transactions are racing to create disk cache entries. This is an
+// internal error returned from the HttpCache to the HttpCacheTransaction that
+// tells the transaction to restart the entry-creation logic because the state
+// of the cache has changed.
+NET_ERROR(CACHE_RACE, -406)
+
+// The cache was unable to read a checksum record on an entry. This can be
+// returned from attempts to read from the cache. It is an internal error,
+// returned by the SimpleCache backend, but not by any URLRequest methods
+// or members.
+NET_ERROR(CACHE_CHECKSUM_READ_FAILURE, -407)
+
+// The cache found an entry with an invalid checksum. This can be returned from
+// attempts to read from the cache. It is an internal error, returned by the
+// SimpleCache backend, but not by any URLRequest methods or members.
+NET_ERROR(CACHE_CHECKSUM_MISMATCH, -408)
+
+// Internal error code for the HTTP cache. The cache lock timeout has fired.
+NET_ERROR(CACHE_LOCK_TIMEOUT, -409)
+
+// Received a challenge after the transaction has read some data, and the
+// credentials aren't available.  There isn't a way to get them at that point.
+NET_ERROR(CACHE_AUTH_FAILURE_AFTER_READ, -410)
+
+// Internal not-quite error code for the HTTP cache. In-memory hints suggest
+// that the cache entry would not have been usable with the transaction's
+// current configuration (e.g. load flags, mode, etc.)
+NET_ERROR(CACHE_ENTRY_NOT_SUITABLE, -411)
+
+// The disk cache is unable to doom this entry.
+NET_ERROR(CACHE_DOOM_FAILURE, -412)
+
+// The disk cache is unable to open or create this entry.
+NET_ERROR(CACHE_OPEN_OR_CREATE_FAILURE, -413)
+
+// The server's response was insecure (e.g. there was a cert error).
+NET_ERROR(INSECURE_RESPONSE, -501)
+
+// An attempt to import a client certificate failed, as the user's key
+// database lacked a corresponding private key.
+NET_ERROR(NO_PRIVATE_KEY_FOR_CERT, -502)
+
+// An error adding a certificate to the OS certificate database.
+NET_ERROR(ADD_USER_CERT_FAILED, -503)
+
+// An error occurred while handling a signed exchange.
+NET_ERROR(INVALID_SIGNED_EXCHANGE, -504)
+
+// An error occurred while handling a Web Bundle source.
+NET_ERROR(INVALID_WEB_BUNDLE, -505)
+
+// A Trust Tokens protocol operation-executing request failed for one of a
+// number of reasons (precondition failure, internal error, bad response).
+NET_ERROR(TRUST_TOKEN_OPERATION_FAILED, -506)
+
+// When handling a Trust Tokens protocol operation-executing request, the system
+// was able to execute the request's Trust Tokens operation without sending the
+// request to its destination: for instance, the results could have been present
+// in a local cache (for redemption) or the operation could have been diverted
+// to a local provider (for "platform-provided" issuance).
+NET_ERROR(TRUST_TOKEN_OPERATION_SUCCESS_WITHOUT_SENDING_REQUEST, -507)
+
+// *** Code -600 is reserved (was FTP_PASV_COMMAND_FAILED). ***
+
+// A generic error for failed FTP control connection command.
+// If possible, please use or add a more specific error code.
+NET_ERROR(FTP_FAILED, -601)
+
+// The server cannot fulfill the request at this point. This is a temporary
+// error.
+// FTP response code 421.
+NET_ERROR(FTP_SERVICE_UNAVAILABLE, -602)
+
+// The server has aborted the transfer.
+// FTP response code 426.
+NET_ERROR(FTP_TRANSFER_ABORTED, -603)
+
+// The file is busy, or some other temporary error condition on opening
+// the file.
+// FTP response code 450.
+NET_ERROR(FTP_FILE_BUSY, -604)
+
+// Server rejected our command because of syntax errors.
+// FTP response codes 500, 501.
+NET_ERROR(FTP_SYNTAX_ERROR, -605)
+
+// Server does not support the command we issued.
+// FTP response codes 502, 504.
+NET_ERROR(FTP_COMMAND_NOT_SUPPORTED, -606)
+
+// Server rejected our command because we didn't issue the commands in right
+// order.
+// FTP response code 503.
+NET_ERROR(FTP_BAD_COMMAND_SEQUENCE, -607)
+
+// PKCS #12 import failed due to incorrect password.
+NET_ERROR(PKCS12_IMPORT_BAD_PASSWORD, -701)
+
+// PKCS #12 import failed due to other error.
+NET_ERROR(PKCS12_IMPORT_FAILED, -702)
+
+// CA import failed - not a CA cert.
+NET_ERROR(IMPORT_CA_CERT_NOT_CA, -703)
+
+// Import failed - certificate already exists in database.
+// Note it's a little weird this is an error but reimporting a PKCS12 is ok
+// (no-op).  That's how Mozilla does it, though.
+NET_ERROR(IMPORT_CERT_ALREADY_EXISTS, -704)
+
+// CA import failed due to some other error.
+NET_ERROR(IMPORT_CA_CERT_FAILED, -705)
+
+// Server certificate import failed due to some internal error.
+NET_ERROR(IMPORT_SERVER_CERT_FAILED, -706)
+
+// PKCS #12 import failed due to invalid MAC.
+NET_ERROR(PKCS12_IMPORT_INVALID_MAC, -707)
+
+// PKCS #12 import failed due to invalid/corrupt file.
+NET_ERROR(PKCS12_IMPORT_INVALID_FILE, -708)
+
+// PKCS #12 import failed due to unsupported features.
+NET_ERROR(PKCS12_IMPORT_UNSUPPORTED, -709)
+
+// Key generation failed.
+NET_ERROR(KEY_GENERATION_FAILED, -710)
+
+// Error -711 was removed (ORIGIN_BOUND_CERT_GENERATION_FAILED)
+
+// Failure to export private key.
+NET_ERROR(PRIVATE_KEY_EXPORT_FAILED, -712)
+
+// Self-signed certificate generation failed.
+NET_ERROR(SELF_SIGNED_CERT_GENERATION_FAILED, -713)
+
+// The certificate database changed in some way.
+NET_ERROR(CERT_DATABASE_CHANGED, -714)
+
+// Error -715 was removed (CHANNEL_ID_IMPORT_FAILED)
+
+// The certificate verifier configuration changed in some way.
+NET_ERROR(CERT_VERIFIER_CHANGED, -716)
+
+// DNS error codes.
+
+// DNS resolver received a malformed response.
+NET_ERROR(DNS_MALFORMED_RESPONSE, -800)
+
+// DNS server requires TCP
+NET_ERROR(DNS_SERVER_REQUIRES_TCP, -801)
+
+// DNS server failed.  This error is returned for all of the following
+// error conditions:
+// 1 - Format error - The name server was unable to interpret the query.
+// 2 - Server failure - The name server was unable to process this query
+//     due to a problem with the name server.
+// 4 - Not Implemented - The name server does not support the requested
+//     kind of query.
+// 5 - Refused - The name server refuses to perform the specified
+//     operation for policy reasons.
+NET_ERROR(DNS_SERVER_FAILED, -802)
+
+// DNS transaction timed out.
+NET_ERROR(DNS_TIMED_OUT, -803)
+
+// The entry was not found in cache or other local sources, for lookups where
+// only local sources were queried.
+// TODO(ericorth): Consider renaming to DNS_LOCAL_MISS or something like that as
+// the cache is not necessarily queried either.
+NET_ERROR(DNS_CACHE_MISS, -804)
+
+// Suffix search list rules prevent resolution of the given host name.
+NET_ERROR(DNS_SEARCH_EMPTY, -805)
+
+// Failed to sort addresses according to RFC3484.
+NET_ERROR(DNS_SORT_ERROR, -806)
+
+// Error -807 was removed (DNS_HTTP_FAILED)
+
+// Failed to resolve the hostname of a DNS-over-HTTPS server.
+NET_ERROR(DNS_SECURE_RESOLVER_HOSTNAME_RESOLUTION_FAILED, -808)
+
+// DNS identified the request as disallowed for insecure connection (http/ws).
+// Error should be handled as if an HTTP redirect was received to redirect to
+// https or wss.
+NET_ERROR(DNS_NAME_HTTPS_ONLY, -809)
+
+// All DNS requests associated with this job have been cancelled.
+NET_ERROR(DNS_REQUEST_CANCELLED, -810)
+
+// The hostname resolution of HTTPS record was expected to be resolved with
+// alpn values of supported protocols, but did not.
+NET_ERROR(DNS_NO_MATCHING_SUPPORTED_ALPN, -811)
+
+// The compression dictionary cannot be loaded.
+NET_ERROR(DICTIONARY_LOAD_FAILED, -812)
+
+// Error -813 was removed (DICTIONARY_ORIGIN_CHECK_FAILED)
diff --git a/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h b/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
index 9f2f932fe..078d89c92 100644
--- a/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
+++ b/src/include/base/internal/cef_raw_scoped_refptr_mismatch_checker.h
@@ -32,10 +32,7 @@
 #ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
 #define CEF_INCLUDE_BASE_INTERNAL_CEF_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
 
-#include "include/base/cef_build.h"
-#include "include/base/cef_ref_counted.h"
-#include "include/base/cef_template_util.h"
-#include "include/base/cef_tuple.h"
+#include <type_traits>
 
 // It is dangerous to post a task with a T* argument where T is a subtype of
 // RefCounted(Base|ThreadSafeBase), since by the time the parameter is used, the
@@ -46,132 +43,27 @@
 
 namespace base {
 
+// This is a base internal implementation file used by task.h and callback.h.
+// Not for public consumption, so we wrap it in namespace internal.
 namespace cef_internal {
 
-template <typename T>
-struct NeedsScopedRefptrButGetsRawPtr {
-#if defined(OS_WIN)
-  enum { value = base::false_type::value };
-#else
-  enum {
-    // Human readable translation: you needed to be a scoped_refptr if you are a
-    // raw pointer type and are convertible to a RefCounted(Base|ThreadSafeBase)
-    // type.
-    value = (is_pointer<T>::value &&
-             (is_convertible<T, subtle::RefCountedBase*>::value ||
-              is_convertible<T, subtle::RefCountedThreadSafeBase*>::value))
-  };
-#endif
-};
-
-template <typename Params>
-struct ParamsUseScopedRefptrCorrectly {
-  enum { value = 0 };
-};
-
-template <>
-struct ParamsUseScopedRefptrCorrectly<Tuple0> {
-  enum { value = 1 };
-};
+template <typename T, typename = void>
+struct IsRefCountedType : std::false_type {};
 
-template <typename A>
-struct ParamsUseScopedRefptrCorrectly<Tuple1<A>> {
-  enum { value = !NeedsScopedRefptrButGetsRawPtr<A>::value };
-};
-
-template <typename A, typename B>
-struct ParamsUseScopedRefptrCorrectly<Tuple2<A, B>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value)
-  };
-};
-
-template <typename A, typename B, typename C>
-struct ParamsUseScopedRefptrCorrectly<Tuple3<A, B, C>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value ||
-              NeedsScopedRefptrButGetsRawPtr<C>::value)
-  };
-};
-
-template <typename A, typename B, typename C, typename D>
-struct ParamsUseScopedRefptrCorrectly<Tuple4<A, B, C, D>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value ||
-              NeedsScopedRefptrButGetsRawPtr<C>::value ||
-              NeedsScopedRefptrButGetsRawPtr<D>::value)
-  };
-};
-
-template <typename A, typename B, typename C, typename D, typename E>
-struct ParamsUseScopedRefptrCorrectly<Tuple5<A, B, C, D, E>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value ||
-              NeedsScopedRefptrButGetsRawPtr<C>::value ||
-              NeedsScopedRefptrButGetsRawPtr<D>::value ||
-              NeedsScopedRefptrButGetsRawPtr<E>::value)
-  };
-};
-
-template <typename A,
-          typename B,
-          typename C,
-          typename D,
-          typename E,
-          typename F>
-struct ParamsUseScopedRefptrCorrectly<Tuple6<A, B, C, D, E, F>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value ||
-              NeedsScopedRefptrButGetsRawPtr<C>::value ||
-              NeedsScopedRefptrButGetsRawPtr<D>::value ||
-              NeedsScopedRefptrButGetsRawPtr<E>::value ||
-              NeedsScopedRefptrButGetsRawPtr<F>::value)
-  };
-};
-
-template <typename A,
-          typename B,
-          typename C,
-          typename D,
-          typename E,
-          typename F,
-          typename G>
-struct ParamsUseScopedRefptrCorrectly<Tuple7<A, B, C, D, E, F, G>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value ||
-              NeedsScopedRefptrButGetsRawPtr<C>::value ||
-              NeedsScopedRefptrButGetsRawPtr<D>::value ||
-              NeedsScopedRefptrButGetsRawPtr<E>::value ||
-              NeedsScopedRefptrButGetsRawPtr<F>::value ||
-              NeedsScopedRefptrButGetsRawPtr<G>::value)
-  };
-};
+template <typename T>
+struct IsRefCountedType<T,
+                        std::void_t<decltype(std::declval<T*>()->AddRef()),
+                                    decltype(std::declval<T*>()->Release())>>
+    : std::true_type {};
 
-template <typename A,
-          typename B,
-          typename C,
-          typename D,
-          typename E,
-          typename F,
-          typename G,
-          typename H>
-struct ParamsUseScopedRefptrCorrectly<Tuple8<A, B, C, D, E, F, G, H>> {
-  enum {
-    value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
-              NeedsScopedRefptrButGetsRawPtr<B>::value ||
-              NeedsScopedRefptrButGetsRawPtr<C>::value ||
-              NeedsScopedRefptrButGetsRawPtr<D>::value ||
-              NeedsScopedRefptrButGetsRawPtr<E>::value ||
-              NeedsScopedRefptrButGetsRawPtr<F>::value ||
-              NeedsScopedRefptrButGetsRawPtr<G>::value ||
-              NeedsScopedRefptrButGetsRawPtr<H>::value)
-  };
+// Human readable translation: you needed to be a scoped_refptr if you are a raw
+// pointer type and are convertible to a RefCounted(Base|ThreadSafeBase) type.
+template <typename T>
+struct NeedsScopedRefptrButGetsRawPtr
+    : std::conjunction<std::is_pointer<T>,
+                       IsRefCountedType<std::remove_pointer_t<T>>> {
+  static_assert(!std::is_reference<T>::value,
+                "NeedsScopedRefptrButGetsRawPtr requires non-reference type.");
 };
 
 }  // namespace cef_internal
diff --git a/src/include/base/internal/cef_scoped_policy.h b/src/include/base/internal/cef_scoped_policy.h
new file mode 100644
index 000000000..8ef4fb2c2
--- /dev/null
+++ b/src/include/base/internal/cef_scoped_policy.h
@@ -0,0 +1,53 @@
+// Copyright (c) 2012 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Do not include this header file directly. Use base/memory/scoped_policy.h
+// instead.
+
+#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
+#define CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
+
+namespace base {
+namespace scoped_policy {
+
+// Defines the ownership policy for a scoped object.
+enum OwnershipPolicy {
+  // The scoped object takes ownership of an object by taking over an existing
+  // ownership claim.
+  ASSUME,
+
+  // The scoped object will retain the object and any initial ownership is
+  // not changed.
+  RETAIN
+};
+
+}  // namespace scoped_policy
+}  // namespace base
+
+#endif  // CEF_INCLUDE_BASE_INTERNAL_CEF_SCOPED_POLICY_H_
diff --git a/src/include/cef_accessibility_handler.h b/src/include/cef_accessibility_handler.h
index c34e0c577..2b1719a57 100644
--- a/src/include/cef_accessibility_handler.h
+++ b/src/include/cef_accessibility_handler.h
@@ -41,23 +41,23 @@
 #include "include/cef_values.h"
 
 ///
-// Implement this interface to receive accessibility notification when
-// accessibility events have been registered. The methods of this class will
-// be called on the UI thread.
+/// Implement this interface to receive accessibility notification when
+/// accessibility events have been registered. The methods of this class will
+/// be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefAccessibilityHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called after renderer process sends accessibility tree changes to the
-  // browser process.
+  /// Called after renderer process sends accessibility tree changes to the
+  /// browser process.
   ///
   /*--cef()--*/
   virtual void OnAccessibilityTreeChange(CefRefPtr<CefValue> value) = 0;
 
   ///
-  // Called after renderer process sends accessibility location changes to the
-  // browser process.
+  /// Called after renderer process sends accessibility location changes to the
+  /// browser process.
   ///
   /*--cef()--*/
   virtual void OnAccessibilityLocationChange(CefRefPtr<CefValue> value) = 0;
diff --git a/src/include/cef_api_hash.h b/src/include/cef_api_hash.h
new file mode 100644
index 000000000..f852a2d7a
--- /dev/null
+++ b/src/include/cef_api_hash.h
@@ -0,0 +1,71 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the make_api_hash_header.py tool.
+//
+
+#ifndef CEF_INCLUDE_API_HASH_H_
+#define CEF_INCLUDE_API_HASH_H_
+
+#include "include/internal/cef_export.h"
+
+// The API hash is created by analyzing CEF header files for C API type
+// definitions. The hash value will change when header files are modified in a
+// way that may cause binary incompatibility with other builds. The universal
+// hash value will change if any platform is affected whereas the platform hash
+// values will change only if that particular platform is affected.
+#define CEF_API_HASH_UNIVERSAL "93050a5111ee3131f5589bd7d3be5376539a64c2"
+#if defined(OS_WIN)
+#define CEF_API_HASH_PLATFORM "ebcca93f53d935802a4cd02606864ff1eb1a1baa"
+#elif defined(OS_MAC)
+#define CEF_API_HASH_PLATFORM "a2c1ee5ae59a181773019412084903e4824aa300"
+#elif defined(OS_LINUX)
+#define CEF_API_HASH_PLATFORM "915ea22829d9814cb6481891de4619f0aafda72f"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///
+// Returns CEF API hashes for the libcef library. The returned string is owned
+// by the library and should not be freed. The |entry| parameter describes which
+// hash value will be returned:
+// 0 - CEF_API_HASH_PLATFORM
+// 1 - CEF_API_HASH_UNIVERSAL
+// 2 - CEF_COMMIT_HASH (from cef_version.h)
+///
+CEF_EXPORT const char* cef_api_hash(int entry);
+
+#ifdef __cplusplus
+}
+#endif
+#endif  // CEF_INCLUDE_API_HASH_H_
diff --git a/src/include/cef_app.h b/src/include/cef_app.h
index 3962a09c0..f52280cf1 100644
--- a/src/include/cef_app.h
+++ b/src/include/cef_app.h
@@ -48,16 +48,16 @@
 class CefApp;
 
 ///
-// This function should be called from the application entry point function to
-// execute a secondary process. It can be used to run secondary processes from
-// the browser client executable (default behavior) or from a separate
-// executable specified by the CefSettings.browser_subprocess_path value. If
-// called for the browser process (identified by no "type" command-line value)
-// it will return immediately with a value of -1. If called for a recognized
-// secondary process it will block until the process should exit and then return
-// the process exit code. The |application| parameter may be empty. The
-// |windows_sandbox_info| parameter is only used on Windows and may be NULL (see
-// cef_sandbox_win.h for details).
+/// This function should be called from the application entry point function to
+/// execute a secondary process. It can be used to run secondary processes from
+/// the browser client executable (default behavior) or from a separate
+/// executable specified by the cef_settings_t.browser_subprocess_path value. If
+/// called for the browser process (identified by no "type" command-line value)
+/// it will return immediately with a value of -1. If called for a recognized
+/// secondary process it will block until the process should exit and then
+/// return the process exit code. The |application| parameter may be empty. The
+/// |windows_sandbox_info| parameter is only used on Windows and may be NULL
+/// (see cef_sandbox_win.h for details).
 ///
 /*--cef(api_hash_check,optional_param=application,
         optional_param=windows_sandbox_info)--*/
@@ -66,11 +66,14 @@ int CefExecuteProcess(const CefMainArgs& args,
                       void* windows_sandbox_info);
 
 ///
-// This function should be called on the main application thread to initialize
-// the CEF browser process. The |application| parameter may be empty. A return
-// value of true indicates that it succeeded and false indicates that it failed.
-// The |windows_sandbox_info| parameter is only used on Windows and may be NULL
-// (see cef_sandbox_win.h for details).
+/// This function should be called on the main application thread to initialize
+/// the CEF browser process. The |application| parameter may be empty. Returns
+/// true if initialization succeeds. Returns false if initialization fails or if
+/// early exit is desired (for example, due to process singleton relaunch
+/// behavior). If this function returns false then the application should exit
+/// immediately without calling any other CEF functions. The
+/// |windows_sandbox_info| parameter is only used on Windows and may be NULL
+/// (see cef_sandbox_win.h for details).
 ///
 /*--cef(api_hash_check,optional_param=application,
         optional_param=windows_sandbox_info)--*/
@@ -80,80 +83,68 @@ bool CefInitialize(const CefMainArgs& args,
                    void* windows_sandbox_info);
 
 ///
-// This function should be called on the main application thread to shut down
-// the CEF browser process before the application exits.
+/// This function should be called on the main application thread to shut down
+/// the CEF browser process before the application exits. Do not call any
+/// other CEF functions after calling this function.
 ///
 /*--cef()--*/
 void CefShutdown();
 
 ///
-// Perform a single iteration of CEF message loop processing. This function is
-// provided for cases where the CEF message loop must be integrated into an
-// existing application message loop. Use of this function is not recommended
-// for most users; use either the CefRunMessageLoop() function or
-// CefSettings.multi_threaded_message_loop if possible. When using this function
-// care must be taken to balance performance against excessive CPU usage. It is
-// recommended to enable the CefSettings.external_message_pump option when using
-// this function so that CefBrowserProcessHandler::OnScheduleMessagePumpWork()
-// callbacks can facilitate the scheduling process. This function should only be
-// called on the main application thread and only if CefInitialize() is called
-// with a CefSettings.multi_threaded_message_loop value of false. This function
-// will not block.
+/// Perform a single iteration of CEF message loop processing. This function is
+/// provided for cases where the CEF message loop must be integrated into an
+/// existing application message loop. Use of this function is not recommended
+/// for most users; use either the CefRunMessageLoop() function or
+/// cef_settings_t.multi_threaded_message_loop if possible. When using this
+/// function care must be taken to balance performance against excessive CPU
+/// usage. It is recommended to enable the cef_settings_t.external_message_pump
+/// option when using this function so that
+/// CefBrowserProcessHandler::OnScheduleMessagePumpWork() callbacks can
+/// facilitate the scheduling process. This function should only be called on
+/// the main application thread and only if CefInitialize() is called with a
+/// cef_settings_t.multi_threaded_message_loop value of false. This function
+/// will not block.
 ///
 /*--cef()--*/
 void CefDoMessageLoopWork();
 
 ///
-// Run the CEF message loop. Use this function instead of an application-
-// provided message loop to get the best balance between performance and CPU
-// usage. This function should only be called on the main application thread and
-// only if CefInitialize() is called with a
-// CefSettings.multi_threaded_message_loop value of false. This function will
-// block until a quit message is received by the system.
+/// Run the CEF message loop. Use this function instead of an application-
+/// provided message loop to get the best balance between performance and CPU
+/// usage. This function should only be called on the main application thread
+/// and only if CefInitialize() is called with a
+/// cef_settings_t.multi_threaded_message_loop value of false. This function
+/// will block until a quit message is received by the system.
 ///
 /*--cef()--*/
 void CefRunMessageLoop();
 
 ///
-// Quit the CEF message loop that was started by calling CefRunMessageLoop().
-// This function should only be called on the main application thread and only
-// if CefRunMessageLoop() was used.
+/// Quit the CEF message loop that was started by calling CefRunMessageLoop().
+/// This function should only be called on the main application thread and only
+/// if CefRunMessageLoop() was used.
 ///
 /*--cef()--*/
 void CefQuitMessageLoop();
 
 ///
-// Set to true before calling Windows APIs like TrackPopupMenu that enter a
-// modal message loop. Set to false after exiting the modal message loop.
-///
-/*--cef()--*/
-void CefSetOSModalLoop(bool osModalLoop);
-
-///
-// Call during process startup to enable High-DPI support on Windows 7 or newer.
-// Older versions of Windows should be left DPI-unaware because they do not
-// support DirectWrite and GDI fonts are kerned very badly.
-///
-/*--cef(capi_name=cef_enable_highdpi_support)--*/
-void CefEnableHighDPISupport();
-
-///
-// Implement this interface to provide handler implementations. Methods will be
-// called by the process and/or thread indicated.
+/// Implement this interface to provide handler implementations. Methods will be
+/// called by the process and/or thread indicated.
 ///
 /*--cef(source=client,no_debugct_check)--*/
 class CefApp : public virtual CefBaseRefCounted {
  public:
   ///
-  // Provides an opportunity to view and/or modify command-line arguments before
-  // processing by CEF and Chromium. The |process_type| value will be empty for
-  // the browser process. Do not keep a reference to the CefCommandLine object
-  // passed to this method. The CefSettings.command_line_args_disabled value
-  // can be used to start with an empty command-line object. Any values
-  // specified in CefSettings that equate to command-line arguments will be set
-  // before this method is called. Be cautious when using this method to modify
-  // command-line arguments for non-browser processes as this may result in
-  // undefined behavior including crashes.
+  /// Provides an opportunity to view and/or modify command-line arguments
+  /// before processing by CEF and Chromium. The |process_type| value will be
+  /// empty for the browser process. Do not keep a reference to the
+  /// CefCommandLine object passed to this method. The
+  /// cef_settings_t.command_line_args_disabled value can be used to start with
+  /// an empty command-line object. Any values specified in CefSettings that
+  /// equate to command-line arguments will be set before this method is called.
+  /// Be cautious when using this method to modify command-line arguments for
+  /// non-browser processes as this may result in undefined behavior including
+  /// crashes.
   ///
   /*--cef(optional_param=process_type)--*/
   virtual void OnBeforeCommandLineProcessing(
@@ -161,42 +152,42 @@ class CefApp : public virtual CefBaseRefCounted {
       CefRefPtr<CefCommandLine> command_line) {}
 
   ///
-  // Provides an opportunity to register custom schemes. Do not keep a reference
-  // to the |registrar| object. This method is called on the main thread for
-  // each process and the registered schemes should be the same across all
-  // processes.
+  /// Provides an opportunity to register custom schemes. Do not keep a
+  /// reference to the |registrar| object. This method is called on the main
+  /// thread for each process and the registered schemes should be the same
+  /// across all processes.
   ///
   /*--cef()--*/
   virtual void OnRegisterCustomSchemes(
       CefRawPtr<CefSchemeRegistrar> registrar) {}
 
   ///
-  // Return the handler for resource bundle events. If
-  // CefSettings.pack_loading_disabled is true a handler must be returned. If no
-  // handler is returned resources will be loaded from pack files. This method
-  // is called by the browser and render processes on multiple threads.
+  /// Return the handler for resource bundle events. If
+  /// cef_settings_t.pack_loading_disabled is true a handler must be returned.
+  /// If no handler is returned resources will be loaded from pack files. This
+  /// method is called by the browser and render processes on multiple threads.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefResourceBundleHandler> GetResourceBundleHandler() {
-    return NULL;
+    return nullptr;
   }
 
   ///
-  // Return the handler for functionality specific to the browser process. This
-  // method is called on multiple threads in the browser process.
+  /// Return the handler for functionality specific to the browser process. This
+  /// method is called on multiple threads in the browser process.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() {
-    return NULL;
+    return nullptr;
   }
 
   ///
-  // Return the handler for functionality specific to the render process. This
-  // method is called on the render process main thread.
+  /// Return the handler for functionality specific to the render process. This
+  /// method is called on the render process main thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() {
-    return NULL;
+    return nullptr;
   }
 };
 
diff --git a/src/include/cef_application_mac.h b/src/include/cef_application_mac.h
deleted file mode 100644
index e2858c48e..000000000
--- a/src/include/cef_application_mac.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CEF_INCLUDE_CEF_APPLICATION_MAC_H_
-#define CEF_INCLUDE_CEF_APPLICATION_MAC_H_
-#pragma once
-
-#ifdef __cplusplus
-#include "include/cef_base.h"
-#endif  // __cplusplus
-
-#if defined(OS_MACOSX) && defined(__OBJC__)
-
-#ifdef USING_CHROMIUM_INCLUDES
-
-// Use the existing CrAppControlProtocol definition.
-#import "base/mac/scoped_sending_event.h"
-
-// Use the existing CrAppProtocol definition.
-#import "base/message_loop/message_pump_mac.h"
-
-// Use the existing UnderlayableSurface definition.
-#import "ui/base/cocoa/underlay_opengl_hosting_window.h"
-
-// Use the existing empty protocol definitions.
-#import "base/mac/cocoa_protocols.h"
-
-// Use the existing empty protocol definitions.
-#import "base/mac/sdk_forward_declarations.h"
-
-#else  // USING_CHROMIUM_INCLUDES
-
-#import <AppKit/AppKit.h>
-#import <Cocoa/Cocoa.h>
-
-// Copy of definition from base/message_loop/message_pump_mac.h.
-@protocol CrAppProtocol
-// Must return true if -[NSApplication sendEvent:] is currently on the stack.
-- (BOOL)isHandlingSendEvent;
-@end
-
-// Copy of definition from base/mac/scoped_sending_event.h.
-@protocol CrAppControlProtocol<CrAppProtocol>
-- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;
-@end
-
-// Copy of definition from ui/base/cocoa/underlay_opengl_hosting_window.h.
-// Common base class for windows that host a OpenGL surface that renders under
-// the window. Contains methods relating to hole punching so that the OpenGL
-// surface is visible through the window.
-@interface UnderlayOpenGLHostingWindow : NSWindow
-@end
-
-#endif  // USING_CHROMIUM_INCLUDES
-
-// All CEF client applications must subclass NSApplication and implement this
-// protocol.
-@protocol CefAppProtocol<CrAppControlProtocol>
-@end
-
-#ifdef __cplusplus
-
-// Controls the state of |isHandlingSendEvent| in the event loop so that it is
-// reset properly.
-class CefScopedSendingEvent {
- public:
-  CefScopedSendingEvent()
-      : app_(static_cast<NSApplication<CefAppProtocol>*>(
-            [NSApplication sharedApplication])),
-        handling_([app_ isHandlingSendEvent]) {
-    [app_ setHandlingSendEvent:YES];
-  }
-  ~CefScopedSendingEvent() { [app_ setHandlingSendEvent:handling_]; }
-
- private:
-  NSApplication<CefAppProtocol>* app_;
-  BOOL handling_;
-};
-
-#endif  // __cplusplus
-
-#endif  // defined(OS_MACOSX) && defined(__OBJC__)
-
-#endif  // CEF_INCLUDE_CEF_APPLICATION_MAC_H_
diff --git a/src/include/cef_audio_handler.h b/src/include/cef_audio_handler.h
new file mode 100644
index 000000000..5211cba74
--- /dev/null
+++ b/src/include/cef_audio_handler.h
@@ -0,0 +1,111 @@
+// Copyright (c) 2019 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_AUDIO_HANDLER_H_
+#define CEF_INCLUDE_CEF_AUDIO_HANDLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+
+///
+/// Implement this interface to handle audio events.
+///
+/*--cef(source=client)--*/
+class CefAudioHandler : public virtual CefBaseRefCounted {
+ public:
+  typedef cef_channel_layout_t ChannelLayout;
+
+  ///
+  /// Called on the UI thread to allow configuration of audio stream parameters.
+  /// Return true to proceed with audio stream capture, or false to cancel it.
+  /// All members of |params| can optionally be configured here, but they are
+  /// also pre-filled with some sensible defaults.
+  ///
+  /*--cef()--*/
+  virtual bool GetAudioParameters(CefRefPtr<CefBrowser> browser,
+                                  CefAudioParameters& params) {
+    return true;
+  }
+
+  ///
+  /// Called on a browser audio capture thread when the browser starts
+  /// streaming audio. OnAudioStreamStopped will always be called after
+  /// OnAudioStreamStarted; both methods may be called multiple times
+  /// for the same browser. |params| contains the audio parameters like
+  /// sample rate and channel layout. |channels| is the number of channels.
+  ///
+  /*--cef()--*/
+  virtual void OnAudioStreamStarted(CefRefPtr<CefBrowser> browser,
+                                    const CefAudioParameters& params,
+                                    int channels) = 0;
+
+  ///
+  /// Called on the audio stream thread when a PCM packet is received for the
+  /// stream. |data| is an array representing the raw PCM data as a floating
+  /// point type, i.e. 4-byte value(s). |frames| is the number of frames in the
+  /// PCM packet. |pts| is the presentation timestamp (in milliseconds since the
+  /// Unix Epoch) and represents the time at which the decompressed packet
+  /// should be presented to the user. Based on |frames| and the
+  /// |channel_layout| value passed to OnAudioStreamStarted you can calculate
+  /// the size of the |data| array in bytes.
+  ///
+  /*--cef()--*/
+  virtual void OnAudioStreamPacket(CefRefPtr<CefBrowser> browser,
+                                   const float** data,
+                                   int frames,
+                                   int64_t pts) = 0;
+
+  ///
+  /// Called on the UI thread when the stream has stopped. OnAudioSteamStopped
+  /// will always be called after OnAudioStreamStarted; both methods may be
+  /// called multiple times for the same stream.
+  ///
+  /*--cef()--*/
+  virtual void OnAudioStreamStopped(CefRefPtr<CefBrowser> browser) = 0;
+
+  ///
+  /// Called on the UI or audio stream thread when an error occurred. During the
+  /// stream creation phase this callback will be called on the UI thread while
+  /// in the capturing phase it will be called on the audio stream thread. The
+  /// stream will be stopped immediately.
+  ///
+  /*--cef()--*/
+  virtual void OnAudioStreamError(CefRefPtr<CefBrowser> browser,
+                                  const CefString& message) = 0;
+};
+
+#endif  // CEF_INCLUDE_CEF_AUDIO_HANDLER_H_
diff --git a/src/include/cef_auth_callback.h b/src/include/cef_auth_callback.h
index fc8a10a9e..3372a726b 100644
--- a/src/include/cef_auth_callback.h
+++ b/src/include/cef_auth_callback.h
@@ -41,21 +41,21 @@
 #include "include/cef_base.h"
 
 ///
-// Callback interface used for asynchronous continuation of authentication
-// requests.
+/// Callback interface used for asynchronous continuation of authentication
+/// requests.
 ///
 /*--cef(source=library)--*/
 class CefAuthCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Continue the authentication request.
+  /// Continue the authentication request.
   ///
   /*--cef(capi_name=cont,optional_param=username,optional_param=password)--*/
   virtual void Continue(const CefString& username,
                         const CefString& password) = 0;
 
   ///
-  // Cancel the authentication request.
+  /// Cancel the authentication request.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
diff --git a/src/include/cef_base.h b/src/include/cef_base.h
index 816108e2a..bd8f11ed4 100644
--- a/src/include/cef_base.h
+++ b/src/include/cef_base.h
@@ -37,43 +37,49 @@
 
 // Bring in common C++ type definitions used by CEF consumers.
 #include "include/internal/cef_ptr.h"
+#include "include/internal/cef_time_wrappers.h"
 #include "include/internal/cef_types_wrappers.h"
 #if defined(OS_WIN)
 #include "include/internal/cef_win.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "include/internal/cef_mac.h"
 #elif defined(OS_LINUX)
 #include "include/internal/cef_linux.h"
 #endif
 
 ///
-// All ref-counted framework classes must extend this class.
+/// All ref-counted framework classes must extend this class.
 ///
 class CefBaseRefCounted {
  public:
   ///
-  // Called to increment the reference count for the object. Should be called
-  // for every new copy of a pointer to a given object.
+  /// Called to increment the reference count for the object. Should be called
+  /// for every new copy of a pointer to a given object.
   ///
   virtual void AddRef() const = 0;
 
   ///
-  // Called to decrement the reference count for the object. Returns true if
-  // the reference count is 0, in which case the object should self-delete.
+  /// Called to decrement the reference count for the object. Returns true if
+  /// the reference count is 0, in which case the object should self-delete.
   ///
   virtual bool Release() const = 0;
 
   ///
-  // Returns true if the reference count is 1.
+  /// Returns true if the reference count is 1.
   ///
   virtual bool HasOneRef() const = 0;
 
+  ///
+  /// Returns true if the reference count is at least 1.
+  ///
+  virtual bool HasAtLeastOneRef() const = 0;
+
  protected:
   virtual ~CefBaseRefCounted() {}
 };
 
 ///
-// All scoped framework classes must extend this class.
+/// All scoped framework classes must extend this class.
 ///
 class CefBaseScoped {
  public:
@@ -81,99 +87,63 @@ class CefBaseScoped {
 };
 
 ///
-// Class that implements atomic reference counting.
+/// Class that implements atomic reference counting.
 ///
 class CefRefCount {
  public:
-  CefRefCount() : ref_count_(0) {}
+  CefRefCount() = default;
+
+  CefRefCount(const CefRefCount&) = delete;
+  CefRefCount& operator=(const CefRefCount&) = delete;
+
+  ///
+  /// Increment the reference count.
+  ///
+  void AddRef() const { ref_count_.Increment(); }
 
   ///
-  // Increment the reference count.
+  /// Decrement the reference count. Returns true if the reference count is 0.
   ///
-  void AddRef() const { base::AtomicRefCountInc(&ref_count_); }
+  bool Release() const { return !ref_count_.Decrement(); }
 
   ///
-  // Decrement the reference count. Returns true if the reference count is 0.
+  /// Returns true if the reference count is 1.
   ///
-  bool Release() const { return !base::AtomicRefCountDec(&ref_count_); }
+  bool HasOneRef() const { return ref_count_.IsOne(); }
 
   ///
-  // Returns true if the reference count is 1.
+  /// Returns true if the reference count is at least 1.
   ///
-  bool HasOneRef() const { return base::AtomicRefCountIsOne(&ref_count_); }
+  bool HasAtLeastOneRef() const { return !ref_count_.IsZero(); }
 
  private:
-  mutable base::AtomicRefCount ref_count_;
-  DISALLOW_COPY_AND_ASSIGN(CefRefCount);
+  mutable base::AtomicRefCount ref_count_{0};
 };
 
 ///
-// Macro that provides a reference counting implementation for classes extending
-// CefBase.
-///
-#define IMPLEMENT_REFCOUNTING(ClassName)                             \
- public:                                                             \
-  void AddRef() const OVERRIDE { ref_count_.AddRef(); }              \
-  bool Release() const OVERRIDE {                                    \
-    if (ref_count_.Release()) {                                      \
-      delete static_cast<const ClassName*>(this);                    \
-      return true;                                                   \
-    }                                                                \
-    return false;                                                    \
-  }                                                                  \
-  bool HasOneRef() const OVERRIDE { return ref_count_.HasOneRef(); } \
-                                                                     \
- private:                                                            \
-  CefRefCount ref_count_;
-
-///
-// Macro that provides a locking implementation. Use the Lock() and Unlock()
-// methods to protect a section of code from simultaneous access by multiple
-// threads. The AutoLock class is a helper that will hold the lock while in
-// scope.
-//
-// THIS MACRO IS DEPRECATED. Use an explicit base::Lock member variable and
-// base::AutoLock instead. For example:
-//
-// #include "include/base/cef_lock.h"
-//
-// // Class declaration.
-// class MyClass : public CefBaseRefCounted {
-//  public:
-//   MyClass() : value_(0) {}
-//   // Method that may be called on multiple threads.
-//   void IncrementValue();
-//  private:
-//   // Value that may be accessed on multiple theads.
-//   int value_;
-//   // Lock used to protect access to |value_|.
-//   base::Lock lock_;
-//   IMPLEMENT_REFCOUNTING(MyClass);
-// };
-//
-// // Class implementation.
-// void MyClass::IncrementValue() {
-//   // Acquire the lock for the scope of this method.
-//   base::AutoLock lock_scope(lock_);
-//   // |value_| can now be modified safely.
-//   value_++;
-// }
+/// Macro that provides a reference counting implementation for classes
+/// extending CefBase.
 ///
-#define IMPLEMENT_LOCKING(ClassName)                                    \
- public:                                                                \
-  class AutoLock {                                                      \
-   public:                                                              \
-    explicit AutoLock(ClassName* base) : base_(base) { base_->Lock(); } \
-    ~AutoLock() { base_->Unlock(); }                                    \
-                                                                        \
-   private:                                                             \
-    ClassName* base_;                                                   \
-    DISALLOW_COPY_AND_ASSIGN(AutoLock);                                 \
-  };                                                                    \
-  void Lock() { lock_.Acquire(); }                                      \
-  void Unlock() { lock_.Release(); }                                    \
-                                                                        \
- private:                                                               \
-  base::Lock lock_;
+#define IMPLEMENT_REFCOUNTING(ClassName)          \
+ public:                                          \
+  void AddRef() const override {                  \
+    ref_count_.AddRef();                          \
+  }                                               \
+  bool Release() const override {                 \
+    if (ref_count_.Release()) {                   \
+      delete static_cast<const ClassName*>(this); \
+      return true;                                \
+    }                                             \
+    return false;                                 \
+  }                                               \
+  bool HasOneRef() const override {               \
+    return ref_count_.HasOneRef();                \
+  }                                               \
+  bool HasAtLeastOneRef() const override {        \
+    return ref_count_.HasAtLeastOneRef();         \
+  }                                               \
+                                                  \
+ private:                                         \
+  CefRefCount ref_count_
 
 #endif  // CEF_INCLUDE_CEF_BASE_H_
diff --git a/src/include/cef_browser.h b/src/include/cef_browser.h
index 72d9b3bae..4082b96c4 100644
--- a/src/include/cef_browser.h
+++ b/src/include/cef_browser.h
@@ -40,190 +40,194 @@
 
 #include <vector>
 #include "include/cef_base.h"
+#include "include/cef_devtools_message_observer.h"
 #include "include/cef_drag_data.h"
 #include "include/cef_frame.h"
 #include "include/cef_image.h"
 #include "include/cef_navigation_entry.h"
-#include "include/cef_process_message.h"
+#include "include/cef_registration.h"
 #include "include/cef_request_context.h"
 
 class CefBrowserHost;
 class CefClient;
 
 ///
-// Class used to represent a browser window. When used in the browser process
-// the methods of this class may be called on any thread unless otherwise
-// indicated in the comments. When used in the render process the methods of
-// this class may only be called on the main thread.
+/// Class used to represent a browser. When used in the browser process the
+/// methods of this class may be called on any thread unless otherwise indicated
+/// in the comments. When used in the render process the methods of this class
+/// may only be called on the main thread.
 ///
 /*--cef(source=library)--*/
 class CefBrowser : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns the browser host object. This method can only be called in the
-  // browser process.
+  /// True if this object is currently valid. This will return false after
+  /// CefLifeSpanHandler::OnBeforeClose is called.
+  ///
+  /*--cef()--*/
+  virtual bool IsValid() = 0;
+
+  ///
+  /// Returns the browser host object. This method can only be called in the
+  /// browser process.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowserHost> GetHost() = 0;
 
   ///
-  // Returns true if the browser can navigate backwards.
+  /// Returns true if the browser can navigate backwards.
   ///
   /*--cef()--*/
   virtual bool CanGoBack() = 0;
 
   ///
-  // Navigate backwards.
+  /// Navigate backwards.
   ///
   /*--cef()--*/
   virtual void GoBack() = 0;
 
   ///
-  // Returns true if the browser can navigate forwards.
+  /// Returns true if the browser can navigate forwards.
   ///
   /*--cef()--*/
   virtual bool CanGoForward() = 0;
 
   ///
-  // Navigate forwards.
+  /// Navigate forwards.
   ///
   /*--cef()--*/
   virtual void GoForward() = 0;
 
   ///
-  // Returns true if the browser is currently loading.
+  /// Returns true if the browser is currently loading.
   ///
   /*--cef()--*/
   virtual bool IsLoading() = 0;
 
   ///
-  // Reload the current page.
+  /// Reload the current page.
   ///
   /*--cef()--*/
   virtual void Reload() = 0;
 
   ///
-  // Reload the current page ignoring any cached data.
+  /// Reload the current page ignoring any cached data.
   ///
   /*--cef()--*/
   virtual void ReloadIgnoreCache() = 0;
 
   ///
-  // Stop loading the page.
+  /// Stop loading the page.
   ///
   /*--cef()--*/
   virtual void StopLoad() = 0;
 
   ///
-  // Returns the globally unique identifier for this browser. This value is also
-  // used as the tabId for extension APIs.
+  /// Returns the globally unique identifier for this browser. This value is
+  /// also used as the tabId for extension APIs.
   ///
   /*--cef()--*/
   virtual int GetIdentifier() = 0;
 
   ///
-  // Returns true if this object is pointing to the same handle as |that|
-  // object.
+  /// Returns true if this object is pointing to the same handle as |that|
+  /// object.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefBrowser> that) = 0;
 
   ///
-  // Returns true if the window is a popup window.
+  /// Returns true if the browser is a popup.
   ///
   /*--cef()--*/
   virtual bool IsPopup() = 0;
 
   ///
-  // Returns true if a document has been loaded in the browser.
+  /// Returns true if a document has been loaded in the browser.
   ///
   /*--cef()--*/
   virtual bool HasDocument() = 0;
 
   ///
-  // Returns the main (top-level) frame for the browser window.
+  /// Returns the main (top-level) frame for the browser. In the browser process
+  /// this will return a valid object until after
+  /// CefLifeSpanHandler::OnBeforeClose is called. In the renderer process this
+  /// will return NULL if the main frame is hosted in a different renderer
+  /// process (e.g. for cross-origin sub-frames). The main frame object will
+  /// change during cross-origin navigation or re-navigation after renderer
+  /// process termination (due to crashes, etc).
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefFrame> GetMainFrame() = 0;
 
   ///
-  // Returns the focused frame for the browser window.
+  /// Returns the focused frame for the browser.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefFrame> GetFocusedFrame() = 0;
 
   ///
-  // Returns the frame with the specified identifier, or NULL if not found.
+  /// Returns the frame with the specified identifier, or NULL if not found.
   ///
-  /*--cef(capi_name=get_frame_byident)--*/
-  virtual CefRefPtr<CefFrame> GetFrame(int64 identifier) = 0;
+  /*--cef()--*/
+  virtual CefRefPtr<CefFrame> GetFrameByIdentifier(
+      const CefString& identifier) = 0;
 
   ///
-  // Returns the frame with the specified name, or NULL if not found.
+  /// Returns the frame with the specified name, or NULL if not found.
   ///
   /*--cef(optional_param=name)--*/
-  virtual CefRefPtr<CefFrame> GetFrame(const CefString& name) = 0;
+  virtual CefRefPtr<CefFrame> GetFrameByName(const CefString& name) = 0;
 
   ///
-  // Returns the number of frames that currently exist.
+  /// Returns the number of frames that currently exist.
   ///
   /*--cef()--*/
   virtual size_t GetFrameCount() = 0;
 
   ///
-  // Returns the identifiers of all existing frames.
+  /// Returns the identifiers of all existing frames.
   ///
   /*--cef(count_func=identifiers:GetFrameCount)--*/
-  virtual void GetFrameIdentifiers(std::vector<int64>& identifiers) = 0;
+  virtual void GetFrameIdentifiers(std::vector<CefString>& identifiers) = 0;
 
   ///
-  // Returns the names of all existing frames.
+  /// Returns the names of all existing frames.
   ///
   /*--cef()--*/
   virtual void GetFrameNames(std::vector<CefString>& names) = 0;
-
-  ///
-  // Send a message to the specified |target_process|. Returns true if the
-  // message was sent successfully.
-  ///
-  /*--cef()--*/
-  virtual bool SendProcessMessage(CefProcessId target_process,
-                                  CefRefPtr<CefProcessMessage> message) = 0;
 };
 
 ///
-// Callback interface for CefBrowserHost::RunFileDialog. The methods of this
-// class will be called on the browser process UI thread.
+/// Callback interface for CefBrowserHost::RunFileDialog. The methods of this
+/// class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefRunFileDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called asynchronously after the file dialog is dismissed.
-  // |selected_accept_filter| is the 0-based index of the value selected from
-  // the accept filters array passed to CefBrowserHost::RunFileDialog.
-  // |file_paths| will be a single value or a list of values depending on the
-  // dialog mode. If the selection was cancelled |file_paths| will be empty.
+  /// Called asynchronously after the file dialog is dismissed.
+  /// |file_paths| will be a single value or a list of values depending on the
+  /// dialog mode. If the selection was cancelled |file_paths| will be empty.
   ///
-  /*--cef(index_param=selected_accept_filter,optional_param=file_paths)--*/
+  /*--cef(optional_param=file_paths)--*/
   virtual void OnFileDialogDismissed(
-      int selected_accept_filter,
       const std::vector<CefString>& file_paths) = 0;
 };
 
 ///
-// Callback interface for CefBrowserHost::GetNavigationEntries. The methods of
-// this class will be called on the browser process UI thread.
+/// Callback interface for CefBrowserHost::GetNavigationEntries. The methods of
+/// this class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be executed. Do not keep a reference to |entry| outside of
-  // this callback. Return true to continue visiting entries or false to stop.
-  // |current| is true if this entry is the currently loaded navigation entry.
-  // |index| is the 0-based index of this entry and |total| is the total number
-  // of entries.
+  /// Method that will be executed. Do not keep a reference to |entry| outside
+  /// of this callback. Return true to continue visiting entries or false to
+  /// stop. |current| is true if this entry is the currently loaded navigation
+  /// entry. |index| is the 0-based index of this entry and |total| is the total
+  /// number of entries.
   ///
   /*--cef()--*/
   virtual bool Visit(CefRefPtr<CefNavigationEntry> entry,
@@ -233,33 +237,33 @@ class CefNavigationEntryVisitor : public virtual CefBaseRefCounted {
 };
 
 ///
-// Callback interface for CefBrowserHost::PrintToPDF. The methods of this class
-// will be called on the browser process UI thread.
+/// Callback interface for CefBrowserHost::PrintToPDF. The methods of this class
+/// will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefPdfPrintCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be executed when the PDF printing has completed. |path|
-  // is the output path. |ok| will be true if the printing completed
-  // successfully or false otherwise.
+  /// Method that will be executed when the PDF printing has completed. |path|
+  /// is the output path. |ok| will be true if the printing completed
+  /// successfully or false otherwise.
   ///
   /*--cef()--*/
   virtual void OnPdfPrintFinished(const CefString& path, bool ok) = 0;
 };
 
 ///
-// Callback interface for CefBrowserHost::DownloadImage. The methods of this
-// class will be called on the browser process UI thread.
+/// Callback interface for CefBrowserHost::DownloadImage. The methods of this
+/// class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefDownloadImageCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be executed when the image download has completed.
-  // |image_url| is the URL that was downloaded and |http_status_code| is the
-  // resulting HTTP status code. |image| is the resulting image, possibly at
-  // multiple scale factors, or empty if the download failed.
+  /// Method that will be executed when the image download has completed.
+  /// |image_url| is the URL that was downloaded and |http_status_code| is the
+  /// resulting HTTP status code. |image| is the resulting image, possibly at
+  /// multiple scale factors, or empty if the download failed.
   ///
   /*--cef(optional_param=image)--*/
   virtual void OnDownloadImageFinished(const CefString& image_url,
@@ -268,10 +272,10 @@ class CefDownloadImageCallback : public virtual CefBaseRefCounted {
 };
 
 ///
-// Class used to represent the browser process aspects of a browser window. The
-// methods of this class can only be called in the browser process. They may be
-// called on any thread in that process unless otherwise indicated in the
-// comments.
+/// Class used to represent the browser process aspects of a browser. The
+/// methods of this class can only be called in the browser process. They may be
+/// called on any thread in that process unless otherwise indicated in the
+/// comments.
 ///
 /*--cef(source=library)--*/
 class CefBrowserHost : public virtual CefBaseRefCounted {
@@ -282,183 +286,215 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
   typedef cef_paint_element_type_t PaintElementType;
 
   ///
-  // Create a new browser window using the window parameters specified by
-  // |windowInfo|. All values will be copied internally and the actual window
-  // will be created on the UI thread. If |request_context| is empty the
-  // global request context will be used. This method can be called on any
-  // browser process thread and will not block.
+  /// Create a new browser using the window parameters specified by
+  /// |windowInfo|. All values will be copied internally and the actual window
+  /// (if any) will be created on the UI thread. If |request_context| is empty
+  /// the global request context will be used. This method can be called on any
+  /// browser process thread and will not block. The optional |extra_info|
+  /// parameter provides an opportunity to specify extra information specific to
+  /// the created browser that will be passed to
+  /// CefRenderProcessHandler::OnBrowserCreated() in the render process.
   ///
   /*--cef(optional_param=client,optional_param=url,
-          optional_param=request_context)--*/
+          optional_param=request_context,optional_param=extra_info)--*/
   static bool CreateBrowser(const CefWindowInfo& windowInfo,
                             CefRefPtr<CefClient> client,
                             const CefString& url,
                             const CefBrowserSettings& settings,
+                            CefRefPtr<CefDictionaryValue> extra_info,
                             CefRefPtr<CefRequestContext> request_context);
 
   ///
-  // Create a new browser window using the window parameters specified by
-  // |windowInfo|. If |request_context| is empty the global request context
-  // will be used. This method can only be called on the browser process UI
-  // thread.
+  /// Create a new browser using the window parameters specified by
+  /// |windowInfo|. If |request_context| is empty the global request context
+  /// will be used. This method can only be called on the browser process UI
+  /// thread. The optional |extra_info| parameter provides an opportunity to
+  /// specify extra information specific to the created browser that will be
+  /// passed to CefRenderProcessHandler::OnBrowserCreated() in the render
+  /// process.
   ///
   /*--cef(optional_param=client,optional_param=url,
-          optional_param=request_context)--*/
+          optional_param=request_context,optional_param=extra_info)--*/
   static CefRefPtr<CefBrowser> CreateBrowserSync(
       const CefWindowInfo& windowInfo,
       CefRefPtr<CefClient> client,
       const CefString& url,
       const CefBrowserSettings& settings,
+      CefRefPtr<CefDictionaryValue> extra_info,
       CefRefPtr<CefRequestContext> request_context);
 
   ///
-  // Returns the hosted browser object.
+  /// Returns the hosted browser object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
-  // Request that the browser close. The JavaScript 'onbeforeunload' event will
-  // be fired. If |force_close| is false the event handler, if any, will be
-  // allowed to prompt the user and the user can optionally cancel the close.
-  // If |force_close| is true the prompt will not be displayed and the close
-  // will proceed. Results in a call to CefLifeSpanHandler::DoClose() if the
-  // event handler allows the close or if |force_close| is true. See
-  // CefLifeSpanHandler::DoClose() documentation for additional usage
-  // information.
+  /// Request that the browser close. The JavaScript 'onbeforeunload' event will
+  /// be fired. If |force_close| is false the event handler, if any, will be
+  /// allowed to prompt the user and the user can optionally cancel the close.
+  /// If |force_close| is true the prompt will not be displayed and the close
+  /// will proceed. Results in a call to CefLifeSpanHandler::DoClose() if the
+  /// event handler allows the close or if |force_close| is true. See
+  /// CefLifeSpanHandler::DoClose() documentation for additional usage
+  /// information.
   ///
   /*--cef()--*/
   virtual void CloseBrowser(bool force_close) = 0;
 
   ///
-  // Helper for closing a browser. Call this method from the top-level window
-  // close handler. Internally this calls CloseBrowser(false) if the close has
-  // not yet been initiated. This method returns false while the close is
-  // pending and true after the close has completed. See CloseBrowser() and
-  // CefLifeSpanHandler::DoClose() documentation for additional usage
-  // information. This method must be called on the browser process UI thread.
+  /// Helper for closing a browser. Call this method from the top-level window
+  /// close handler (if any). Internally this calls CloseBrowser(false) if the
+  /// close has not yet been initiated. This method returns false while the
+  /// close is pending and true after the close has completed. See
+  /// CloseBrowser() and CefLifeSpanHandler::DoClose() documentation for
+  /// additional usage information. This method must be called on the browser
+  /// process UI thread.
   ///
   /*--cef()--*/
   virtual bool TryCloseBrowser() = 0;
 
   ///
-  // Set whether the browser is focused.
+  /// Set whether the browser is focused.
   ///
   /*--cef()--*/
   virtual void SetFocus(bool focus) = 0;
 
   ///
-  // Retrieve the window handle for this browser. If this browser is wrapped in
-  // a CefBrowserView this method should be called on the browser process UI
-  // thread and it will return the handle for the top-level native window.
+  /// Retrieve the window handle (if any) for this browser. If this browser is
+  /// wrapped in a CefBrowserView this method should be called on the browser
+  /// process UI thread and it will return the handle for the top-level native
+  /// window.
   ///
   /*--cef()--*/
   virtual CefWindowHandle GetWindowHandle() = 0;
 
   ///
-  // Retrieve the window handle of the browser that opened this browser. Will
-  // return NULL for non-popup windows or if this browser is wrapped in a
-  // CefBrowserView. This method can be used in combination with custom handling
-  // of modal windows.
+  /// Retrieve the window handle (if any) of the browser that opened this
+  /// browser. Will return NULL for non-popup browsers or if this browser is
+  /// wrapped in a CefBrowserView. This method can be used in combination with
+  /// custom handling of modal windows.
   ///
   /*--cef()--*/
   virtual CefWindowHandle GetOpenerWindowHandle() = 0;
 
   ///
-  // Returns true if this browser is wrapped in a CefBrowserView.
+  /// Returns true if this browser is wrapped in a CefBrowserView.
   ///
   /*--cef()--*/
   virtual bool HasView() = 0;
 
   ///
-  // Returns the client for this browser.
+  /// Returns the client for this browser.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefClient> GetClient() = 0;
 
   ///
-  // Returns the request context for this browser.
+  /// Returns the request context for this browser.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefRequestContext> GetRequestContext() = 0;
 
   ///
-  // Get the current zoom level. The default zoom level is 0.0. This method can
-  // only be called on the UI thread.
+  /// Returns true if this browser can execute the specified zoom command. This
+  /// method can only be called on the UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool CanZoom(cef_zoom_command_t command) = 0;
+
+  ///
+  /// Execute a zoom command in this browser. If called on the UI thread the
+  /// change will be applied immediately. Otherwise, the change will be applied
+  /// asynchronously on the UI thread.
+  ///
+  /*--cef()--*/
+  virtual void Zoom(cef_zoom_command_t command) = 0;
+
+  ///
+  /// Get the default zoom level. This value will be 0.0 by default but can be
+  /// configured with the Chrome runtime. This method can only be called on the
+  /// UI thread.
+  ///
+  /*--cef()--*/
+  virtual double GetDefaultZoomLevel() = 0;
+
+  ///
+  /// Get the current zoom level. This method can only be called on the UI
+  /// thread.
   ///
   /*--cef()--*/
   virtual double GetZoomLevel() = 0;
 
   ///
-  // Change the zoom level to the specified value. Specify 0.0 to reset the
-  // zoom level. If called on the UI thread the change will be applied
-  // immediately. Otherwise, the change will be applied asynchronously on the
-  // UI thread.
+  /// Change the zoom level to the specified value. Specify 0.0 to reset the
+  /// zoom level to the default. If called on the UI thread the change will be
+  /// applied immediately. Otherwise, the change will be applied asynchronously
+  /// on the UI thread.
   ///
   /*--cef()--*/
   virtual void SetZoomLevel(double zoomLevel) = 0;
 
   ///
-  // Call to run a file chooser dialog. Only a single file chooser dialog may be
-  // pending at any given time. |mode| represents the type of dialog to display.
-  // |title| to the title to be used for the dialog and may be empty to show the
-  // default title ("Open" or "Save" depending on the mode). |default_file_path|
-  // is the path with optional directory and/or file name component that will be
-  // initially selected in the dialog. |accept_filters| are used to restrict the
-  // selectable file types and may any combination of (a) valid lower-cased MIME
-  // types (e.g. "text/*" or "image/*"), (b) individual file extensions (e.g.
-  // ".txt" or ".png"), or (c) combined description and file extension delimited
-  // using "|" and ";" (e.g. "Image Types|.png;.gif;.jpg").
-  // |selected_accept_filter| is the 0-based index of the filter that will be
-  // selected by default. |callback| will be executed after the dialog is
-  // dismissed or immediately if another dialog is already pending. The dialog
-  // will be initiated asynchronously on the UI thread.
+  /// Call to run a file chooser dialog. Only a single file chooser dialog may
+  /// be pending at any given time. |mode| represents the type of dialog to
+  /// display. |title| to the title to be used for the dialog and may be empty
+  /// to show the default title ("Open" or "Save" depending on the mode).
+  /// |default_file_path| is the path with optional directory and/or file name
+  /// component that will be initially selected in the dialog. |accept_filters|
+  /// are used to restrict the selectable file types and may any combination of
+  /// (a) valid lower-cased MIME types (e.g. "text/*" or "image/*"), (b)
+  /// individual file extensions (e.g.
+  /// ".txt" or ".png"), or (c) combined description and file extension
+  /// delimited using "|" and ";" (e.g. "Image Types|.png;.gif;.jpg").
+  /// |callback| will be executed after the dialog is dismissed or immediately
+  /// if another dialog is already pending. The dialog will be initiated
+  /// asynchronously on the UI thread.
   ///
   /*--cef(optional_param=title,optional_param=default_file_path,
-          optional_param=accept_filters,index_param=selected_accept_filter)--*/
+          optional_param=accept_filters)--*/
   virtual void RunFileDialog(FileDialogMode mode,
                              const CefString& title,
                              const CefString& default_file_path,
                              const std::vector<CefString>& accept_filters,
-                             int selected_accept_filter,
                              CefRefPtr<CefRunFileDialogCallback> callback) = 0;
 
   ///
-  // Download the file at |url| using CefDownloadHandler.
+  /// Download the file at |url| using CefDownloadHandler.
   ///
   /*--cef()--*/
   virtual void StartDownload(const CefString& url) = 0;
 
   ///
-  // Download |image_url| and execute |callback| on completion with the images
-  // received from the renderer. If |is_favicon| is true then cookies are not
-  // sent and not accepted during download. Images with density independent
-  // pixel (DIP) sizes larger than |max_image_size| are filtered out from the
-  // image results. Versions of the image at different scale factors may be
-  // downloaded up to the maximum scale factor supported by the system. If there
-  // are no image results <= |max_image_size| then the smallest image is resized
-  // to |max_image_size| and is the only result. A |max_image_size| of 0 means
-  // unlimited. If |bypass_cache| is true then |image_url| is requested from the
-  // server even if it is present in the browser cache.
+  /// Download |image_url| and execute |callback| on completion with the images
+  /// received from the renderer. If |is_favicon| is true then cookies are not
+  /// sent and not accepted during download. Images with density independent
+  /// pixel (DIP) sizes larger than |max_image_size| are filtered out from the
+  /// image results. Versions of the image at different scale factors may be
+  /// downloaded up to the maximum scale factor supported by the system. If
+  /// there are no image results <= |max_image_size| then the smallest image is
+  /// resized to |max_image_size| and is the only result. A |max_image_size| of
+  /// 0 means unlimited. If |bypass_cache| is true then |image_url| is requested
+  /// from the server even if it is present in the browser cache.
   ///
   /*--cef()--*/
   virtual void DownloadImage(const CefString& image_url,
                              bool is_favicon,
-                             uint32 max_image_size,
+                             uint32_t max_image_size,
                              bool bypass_cache,
                              CefRefPtr<CefDownloadImageCallback> callback) = 0;
 
   ///
-  // Print the current browser contents.
+  /// Print the current browser contents.
   ///
   /*--cef()--*/
   virtual void Print() = 0;
 
   ///
-  // Print the current browser contents to the PDF file specified by |path| and
-  // execute |callback| on completion. The caller is responsible for deleting
-  // |path| when done. For PDF printing to work on Linux you must implement the
-  // CefPrintHandler::GetPdfPaperSize method.
+  /// Print the current browser contents to the PDF file specified by |path| and
+  /// execute |callback| on completion. The caller is responsible for deleting
+  /// |path| when done. For PDF printing to work on Linux you must implement the
+  /// CefPrintHandler::GetPdfPaperSize method.
   ///
   /*--cef(optional_param=callback)--*/
   virtual void PrintToPDF(const CefString& path,
@@ -466,37 +502,34 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                           CefRefPtr<CefPdfPrintCallback> callback) = 0;
 
   ///
-  // Search for |searchText|. |identifier| must be a unique ID and these IDs
-  // must strictly increase so that newer requests always have greater IDs than
-  // older requests. If |identifier| is zero or less than the previous ID value
-  // then it will be automatically assigned a new valid ID. |forward| indicates
-  // whether to search forward or backward within the page. |matchCase|
-  // indicates whether the search should be case-sensitive. |findNext| indicates
-  // whether this is the first request or a follow-up. The CefFindHandler
-  // instance, if any, returned via CefClient::GetFindHandler will be called to
-  // report find results.
+  /// Search for |searchText|. |forward| indicates whether to search forward or
+  /// backward within the page. |matchCase| indicates whether the search should
+  /// be case-sensitive. |findNext| indicates whether this is the first request
+  /// or a follow-up. The search will be restarted if |searchText| or
+  /// |matchCase| change. The search will be stopped if |searchText| is empty.
+  /// The CefFindHandler instance, if any, returned via
+  /// CefClient::GetFindHandler will be called to report find results.
   ///
   /*--cef()--*/
-  virtual void Find(int identifier,
-                    const CefString& searchText,
+  virtual void Find(const CefString& searchText,
                     bool forward,
                     bool matchCase,
                     bool findNext) = 0;
 
   ///
-  // Cancel all searches that are currently going on.
+  /// Cancel all searches that are currently going on.
   ///
   /*--cef()--*/
   virtual void StopFinding(bool clearSelection) = 0;
 
   ///
-  // Open developer tools (DevTools) in its own browser. The DevTools browser
-  // will remain associated with this browser. If the DevTools browser is
-  // already open then it will be focused, in which case the |windowInfo|,
-  // |client| and |settings| parameters will be ignored. If |inspect_element_at|
-  // is non-empty then the element at the specified (x,y) location will be
-  // inspected. The |windowInfo| parameter will be ignored if this browser is
-  // wrapped in a CefBrowserView.
+  /// Open developer tools (DevTools) in its own browser. The DevTools browser
+  /// will remain associated with this browser. If the DevTools browser is
+  /// already open then it will be focused, in which case the |windowInfo|,
+  /// |client| and |settings| parameters will be ignored. If
+  /// |inspect_element_at| is non-empty then the element at the specified (x,y)
+  /// location will be inspected. The |windowInfo| parameter will be ignored if
+  /// this browser is wrapped in a CefBrowserView.
   ///
   /*--cef(optional_param=windowInfo,optional_param=client,
           optional_param=settings,optional_param=inspect_element_at)--*/
@@ -506,104 +539,162 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                             const CefPoint& inspect_element_at) = 0;
 
   ///
-  // Explicitly close the associated DevTools browser, if any.
+  /// Explicitly close the associated DevTools browser, if any.
   ///
   /*--cef()--*/
   virtual void CloseDevTools() = 0;
 
   ///
-  // Returns true if this browser currently has an associated DevTools browser.
-  // Must be called on the browser process UI thread.
+  /// Returns true if this browser currently has an associated DevTools browser.
+  /// Must be called on the browser process UI thread.
   ///
   /*--cef()--*/
   virtual bool HasDevTools() = 0;
 
   ///
-  // Retrieve a snapshot of current navigation entries as values sent to the
-  // specified visitor. If |current_only| is true only the current navigation
-  // entry will be sent, otherwise all navigation entries will be sent.
+  /// Send a method call message over the DevTools protocol. |message| must be a
+  /// UTF8-encoded JSON dictionary that contains "id" (int), "method" (string)
+  /// and "params" (dictionary, optional) values. See the DevTools protocol
+  /// documentation at https://chromedevtools.github.io/devtools-protocol/ for
+  /// details of supported methods and the expected "params" dictionary
+  /// contents. |message| will be copied if necessary. This method will return
+  /// true if called on the UI thread and the message was successfully submitted
+  /// for validation, otherwise false. Validation will be applied asynchronously
+  /// and any messages that fail due to formatting errors or missing parameters
+  /// may be discarded without notification. Prefer ExecuteDevToolsMethod if a
+  /// more structured approach to message formatting is desired.
+  ///
+  /// Every valid method call will result in an asynchronous method result or
+  /// error message that references the sent message "id". Event messages are
+  /// received while notifications are enabled (for example, between method
+  /// calls for "Page.enable" and "Page.disable"). All received messages will be
+  /// delivered to the observer(s) registered with AddDevToolsMessageObserver.
+  /// See CefDevToolsMessageObserver::OnDevToolsMessage documentation for
+  /// details of received message contents.
+  ///
+  /// Usage of the SendDevToolsMessage, ExecuteDevToolsMethod and
+  /// AddDevToolsMessageObserver methods does not require an active DevTools
+  /// front-end or remote-debugging session. Other active DevTools sessions will
+  /// continue to function independently. However, any modification of global
+  /// browser state by one session may not be reflected in the UI of other
+  /// sessions.
+  ///
+  /// Communication with the DevTools front-end (when displayed) can be logged
+  /// for development purposes by passing the
+  /// `--devtools-protocol-log-file=<path>` command-line flag.
   ///
   /*--cef()--*/
-  virtual void GetNavigationEntries(
-      CefRefPtr<CefNavigationEntryVisitor> visitor,
-      bool current_only) = 0;
+  virtual bool SendDevToolsMessage(const void* message,
+                                   size_t message_size) = 0;
+
+  ///
+  /// Execute a method call over the DevTools protocol. This is a more
+  /// structured version of SendDevToolsMessage. |message_id| is an incremental
+  /// number that uniquely identifies the message (pass 0 to have the next
+  /// number assigned automatically based on previous values). |method| is the
+  /// method name. |params| are the method parameters, which may be empty. See
+  /// the DevTools protocol documentation (linked above) for details of
+  /// supported methods and the expected |params| dictionary contents. This
+  /// method will return the assigned message ID if called on the UI thread and
+  /// the message was successfully submitted for validation, otherwise 0. See
+  /// the SendDevToolsMessage documentation for additional usage information.
+  ///
+  /*--cef(optional_param=params)--*/
+  virtual int ExecuteDevToolsMethod(int message_id,
+                                    const CefString& method,
+                                    CefRefPtr<CefDictionaryValue> params) = 0;
 
   ///
-  // Set whether mouse cursor change is disabled.
+  /// Add an observer for DevTools protocol messages (method results and
+  /// events). The observer will remain registered until the returned
+  /// Registration object is destroyed. See the SendDevToolsMessage
+  /// documentation for additional usage information.
   ///
   /*--cef()--*/
-  virtual void SetMouseCursorChangeDisabled(bool disabled) = 0;
+  virtual CefRefPtr<CefRegistration> AddDevToolsMessageObserver(
+      CefRefPtr<CefDevToolsMessageObserver> observer) = 0;
 
   ///
-  // Returns true if mouse cursor change is disabled.
+  /// Retrieve a snapshot of current navigation entries as values sent to the
+  /// specified visitor. If |current_only| is true only the current navigation
+  /// entry will be sent, otherwise all navigation entries will be sent.
   ///
   /*--cef()--*/
-  virtual bool IsMouseCursorChangeDisabled() = 0;
+  virtual void GetNavigationEntries(
+      CefRefPtr<CefNavigationEntryVisitor> visitor,
+      bool current_only) = 0;
 
   ///
-  // If a misspelled word is currently selected in an editable node calling
-  // this method will replace it with the specified |word|.
+  /// If a misspelled word is currently selected in an editable node calling
+  /// this method will replace it with the specified |word|.
   ///
   /*--cef()--*/
   virtual void ReplaceMisspelling(const CefString& word) = 0;
 
   ///
-  // Add the specified |word| to the spelling dictionary.
+  /// Add the specified |word| to the spelling dictionary.
   ///
   /*--cef()--*/
   virtual void AddWordToDictionary(const CefString& word) = 0;
 
   ///
-  // Returns true if window rendering is disabled.
+  /// Returns true if window rendering is disabled.
   ///
   /*--cef()--*/
   virtual bool IsWindowRenderingDisabled() = 0;
 
   ///
-  // Notify the browser that the widget has been resized. The browser will first
-  // call CefRenderHandler::GetViewRect to get the new size and then call
-  // CefRenderHandler::OnPaint asynchronously with the updated regions. This
-  // method is only used when window rendering is disabled.
+  /// Notify the browser that the widget has been resized. The browser will
+  /// first call CefRenderHandler::GetViewRect to get the new size and then call
+  /// CefRenderHandler::OnPaint asynchronously with the updated regions. This
+  /// method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void WasResized() = 0;
 
   ///
-  // Notify the browser that it has been hidden or shown. Layouting and
-  // CefRenderHandler::OnPaint notification will stop when the browser is
-  // hidden. This method is only used when window rendering is disabled.
+  /// Notify the browser that it has been hidden or shown. Layouting and
+  /// CefRenderHandler::OnPaint notification will stop when the browser is
+  /// hidden. This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void WasHidden(bool hidden) = 0;
 
   ///
-  // Send a notification to the browser that the screen info has changed. The
-  // browser will then call CefRenderHandler::GetScreenInfo to update the
-  // screen information with the new values. This simulates moving the webview
-  // window from one display to another, or changing the properties of the
-  // current display. This method is only used when window rendering is
-  // disabled.
+  /// Send a notification to the browser that the screen info has changed. The
+  /// browser will then call CefRenderHandler::GetScreenInfo to update the
+  /// screen information with the new values. This simulates moving the webview
+  /// window from one display to another, or changing the properties of the
+  /// current display. This method is only used when window rendering is
+  /// disabled.
   ///
   /*--cef()--*/
   virtual void NotifyScreenInfoChanged() = 0;
 
   ///
-  // Invalidate the view. The browser will call CefRenderHandler::OnPaint
-  // asynchronously. This method is only used when window rendering is
-  // disabled.
+  /// Invalidate the view. The browser will call CefRenderHandler::OnPaint
+  /// asynchronously. This method is only used when window rendering is
+  /// disabled.
   ///
   /*--cef()--*/
   virtual void Invalidate(PaintElementType type) = 0;
 
   ///
-  // Send a key event to the browser.
+  /// Issue a BeginFrame request to Chromium.  Only valid when
+  /// CefWindowInfo::external_begin_frame_enabled is set to true.
+  ///
+  /*--cef()--*/
+  virtual void SendExternalBeginFrame() = 0;
+
+  ///
+  /// Send a key event to the browser.
   ///
   /*--cef()--*/
   virtual void SendKeyEvent(const CefKeyEvent& event) = 0;
 
   ///
-  // Send a mouse click event to the browser. The |x| and |y| coordinates are
-  // relative to the upper-left corner of the view.
+  /// Send a mouse click event to the browser. The |x| and |y| coordinates are
+  /// relative to the upper-left corner of the view.
   ///
   /*--cef()--*/
   virtual void SendMouseClickEvent(const CefMouseEvent& event,
@@ -612,19 +703,20 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                                    int clickCount) = 0;
 
   ///
-  // Send a mouse move event to the browser. The |x| and |y| coordinates are
-  // relative to the upper-left corner of the view.
+  /// Send a mouse move event to the browser. The |x| and |y| coordinates are
+  /// relative to the upper-left corner of the view.
   ///
   /*--cef()--*/
   virtual void SendMouseMoveEvent(const CefMouseEvent& event,
                                   bool mouseLeave) = 0;
 
   ///
-  // Send a mouse wheel event to the browser. The |x| and |y| coordinates are
-  // relative to the upper-left corner of the view. The |deltaX| and |deltaY|
-  // values represent the movement delta in the X and Y directions respectively.
-  // In order to scroll inside select popups with window rendering disabled
-  // CefRenderHandler::GetScreenPoint should be implemented properly.
+  /// Send a mouse wheel event to the browser. The |x| and |y| coordinates are
+  /// relative to the upper-left corner of the view. The |deltaX| and |deltaY|
+  /// values represent the movement delta in the X and Y directions
+  /// respectively. In order to scroll inside select popups with window
+  /// rendering disabled CefRenderHandler::GetScreenPoint should be implemented
+  /// properly.
   ///
   /*--cef()--*/
   virtual void SendMouseWheelEvent(const CefMouseEvent& event,
@@ -632,66 +724,68 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                                    int deltaY) = 0;
 
   ///
-  // Send a focus event to the browser.
+  /// Send a touch event to the browser for a windowless browser.
   ///
   /*--cef()--*/
-  virtual void SendFocusEvent(bool setFocus) = 0;
+  virtual void SendTouchEvent(const CefTouchEvent& event) = 0;
 
   ///
-  // Send a capture lost event to the browser.
+  /// Send a capture lost event to the browser.
   ///
   /*--cef()--*/
   virtual void SendCaptureLostEvent() = 0;
 
   ///
-  // Notify the browser that the window hosting it is about to be moved or
-  // resized. This method is only used on Windows and Linux.
+  /// Notify the browser that the window hosting it is about to be moved or
+  /// resized. This method is only used on Windows and Linux.
   ///
   /*--cef()--*/
   virtual void NotifyMoveOrResizeStarted() = 0;
 
   ///
-  // Returns the maximum rate in frames per second (fps) that CefRenderHandler::
-  // OnPaint will be called for a windowless browser. The actual fps may be
-  // lower if the browser cannot generate frames at the requested rate. The
-  // minimum value is 1 and the maximum value is 60 (default 30). This method
-  // can only be called on the UI thread.
+  /// Returns the maximum rate in frames per second (fps) that
+  /// CefRenderHandler::OnPaint will be called for a windowless browser. The
+  /// actual fps may be lower if the browser cannot generate frames at the
+  /// requested rate. The minimum value is 1 and the maximum value is 60
+  /// (default 30). This method can only be called on the UI thread.
   ///
   /*--cef()--*/
   virtual int GetWindowlessFrameRate() = 0;
 
   ///
-  // Set the maximum rate in frames per second (fps) that CefRenderHandler::
-  // OnPaint will be called for a windowless browser. The actual fps may be
-  // lower if the browser cannot generate frames at the requested rate. The
-  // minimum value is 1 and the maximum value is 60 (default 30). Can also be
-  // set at browser creation via CefBrowserSettings.windowless_frame_rate.
+  /// Set the maximum rate in frames per second (fps) that CefRenderHandler::
+  /// OnPaint will be called for a windowless browser. The actual fps may be
+  /// lower if the browser cannot generate frames at the requested rate. The
+  /// minimum value is 1 and the maximum value is 60 (default 30). Can also be
+  /// set at browser creation via CefBrowserSettings.windowless_frame_rate.
   ///
   /*--cef()--*/
   virtual void SetWindowlessFrameRate(int frame_rate) = 0;
 
   ///
-  // Begins a new composition or updates the existing composition. Blink has a
-  // special node (a composition node) that allows the input method to change
-  // text without affecting other DOM nodes. |text| is the optional text that
-  // will be inserted into the composition node. |underlines| is an optional set
-  // of ranges that will be underlined in the resulting text.
-  // |replacement_range| is an optional range of the existing text that will be
-  // replaced. |selection_range| is an optional range of the resulting text that
-  // will be selected after insertion or replacement. The |replacement_range|
-  // value is only used on OS X.
-  //
-  // This method may be called multiple times as the composition changes. When
-  // the client is done making changes the composition should either be canceled
-  // or completed. To cancel the composition call ImeCancelComposition. To
-  // complete the composition call either ImeCommitText or
-  // ImeFinishComposingText. Completion is usually signaled when:
-  //   A. The client receives a WM_IME_COMPOSITION message with a GCS_RESULTSTR
-  //      flag (on Windows), or;
-  //   B. The client receives a "commit" signal of GtkIMContext (on Linux), or;
-  //   C. insertText of NSTextInput is called (on Mac).
-  //
-  // This method is only used when window rendering is disabled.
+  /// Begins a new composition or updates the existing composition. Blink has a
+  /// special node (a composition node) that allows the input method to change
+  /// text without affecting other DOM nodes. |text| is the optional text that
+  /// will be inserted into the composition node. |underlines| is an optional
+  /// set of ranges that will be underlined in the resulting text.
+  /// |replacement_range| is an optional range of the existing text that will be
+  /// replaced. |selection_range| is an optional range of the resulting text
+  /// that will be selected after insertion or replacement. The
+  /// |replacement_range| value is only used on OS X.
+  ///
+  /// This method may be called multiple times as the composition changes. When
+  /// the client is done making changes the composition should either be
+  /// canceled or completed. To cancel the composition call
+  /// ImeCancelComposition. To complete the composition call either
+  /// ImeCommitText or ImeFinishComposingText. Completion is usually signaled
+  /// when:
+  ///
+  /// 1. The client receives a WM_IME_COMPOSITION message with a GCS_RESULTSTR
+  ///    flag (on Windows), or;
+  /// 2. The client receives a "commit" signal of GtkIMContext (on Linux), or;
+  /// 3. insertText of NSTextInput is called (on Mac).
+  ///
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef(optional_param=text, optional_param=underlines)--*/
   virtual void ImeSetComposition(
@@ -701,13 +795,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
       const CefRange& selection_range) = 0;
 
   ///
-  // Completes the existing composition by optionally inserting the specified
-  // |text| into the composition node. |replacement_range| is an optional range
-  // of the existing text that will be replaced. |relative_cursor_pos| is where
-  // the cursor will be positioned relative to the current cursor position. See
-  // comments on ImeSetComposition for usage. The |replacement_range| and
-  // |relative_cursor_pos| values are only used on OS X.
-  // This method is only used when window rendering is disabled.
+  /// Completes the existing composition by optionally inserting the specified
+  /// |text| into the composition node. |replacement_range| is an optional range
+  /// of the existing text that will be replaced. |relative_cursor_pos| is where
+  /// the cursor will be positioned relative to the current cursor position. See
+  /// comments on ImeSetComposition for usage. The |replacement_range| and
+  /// |relative_cursor_pos| values are only used on OS X.
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef(optional_param=text)--*/
   virtual void ImeCommitText(const CefString& text,
@@ -715,31 +809,31 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                              int relative_cursor_pos) = 0;
 
   ///
-  // Completes the existing composition by applying the current composition node
-  // contents. If |keep_selection| is false the current selection, if any, will
-  // be discarded. See comments on ImeSetComposition for usage.
-  // This method is only used when window rendering is disabled.
+  /// Completes the existing composition by applying the current composition
+  /// node contents. If |keep_selection| is false the current selection, if any,
+  /// will be discarded. See comments on ImeSetComposition for usage. This
+  /// method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void ImeFinishComposingText(bool keep_selection) = 0;
 
   ///
-  // Cancels the existing composition and discards the composition node
-  // contents without applying them. See comments on ImeSetComposition for
-  // usage.
-  // This method is only used when window rendering is disabled.
+  /// Cancels the existing composition and discards the composition node
+  /// contents without applying them. See comments on ImeSetComposition for
+  /// usage.
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void ImeCancelComposition() = 0;
 
   ///
-  // Call this method when the user drags the mouse into the web view (before
-  // calling DragTargetDragOver/DragTargetLeave/DragTargetDrop).
-  // |drag_data| should not contain file contents as this type of data is not
-  // allowed to be dragged into the web view. File contents can be removed using
-  // CefDragData::ResetFileContents (for example, if |drag_data| comes from
-  // CefRenderHandler::StartDragging).
-  // This method is only used when window rendering is disabled.
+  /// Call this method when the user drags the mouse into the web view (before
+  /// calling DragTargetDragOver/DragTargetLeave/DragTargetDrop).
+  /// |drag_data| should not contain file contents as this type of data is not
+  /// allowed to be dragged into the web view. File contents can be removed
+  /// using CefDragData::ResetFileContents (for example, if |drag_data| comes
+  /// from CefRenderHandler::StartDragging). This method is only used when
+  /// window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void DragTargetDragEnter(CefRefPtr<CefDragData> drag_data,
@@ -747,97 +841,97 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                                    DragOperationsMask allowed_ops) = 0;
 
   ///
-  // Call this method each time the mouse is moved across the web view during
-  // a drag operation (after calling DragTargetDragEnter and before calling
-  // DragTargetDragLeave/DragTargetDrop).
-  // This method is only used when window rendering is disabled.
+  /// Call this method each time the mouse is moved across the web view during
+  /// a drag operation (after calling DragTargetDragEnter and before calling
+  /// DragTargetDragLeave/DragTargetDrop).
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void DragTargetDragOver(const CefMouseEvent& event,
                                   DragOperationsMask allowed_ops) = 0;
 
   ///
-  // Call this method when the user drags the mouse out of the web view (after
-  // calling DragTargetDragEnter).
-  // This method is only used when window rendering is disabled.
+  /// Call this method when the user drags the mouse out of the web view (after
+  /// calling DragTargetDragEnter).
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void DragTargetDragLeave() = 0;
 
   ///
-  // Call this method when the user completes the drag operation by dropping
-  // the object onto the web view (after calling DragTargetDragEnter).
-  // The object being dropped is |drag_data|, given as an argument to
-  // the previous DragTargetDragEnter call.
-  // This method is only used when window rendering is disabled.
+  /// Call this method when the user completes the drag operation by dropping
+  /// the object onto the web view (after calling DragTargetDragEnter).
+  /// The object being dropped is |drag_data|, given as an argument to
+  /// the previous DragTargetDragEnter call.
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void DragTargetDrop(const CefMouseEvent& event) = 0;
 
   ///
-  // Call this method when the drag operation started by a
-  // CefRenderHandler::StartDragging call has ended either in a drop or
-  // by being cancelled. |x| and |y| are mouse coordinates relative to the
-  // upper-left corner of the view. If the web view is both the drag source
-  // and the drag target then all DragTarget* methods should be called before
-  // DragSource* mthods.
-  // This method is only used when window rendering is disabled.
+  /// Call this method when the drag operation started by a
+  /// CefRenderHandler::StartDragging call has ended either in a drop or
+  /// by being cancelled. |x| and |y| are mouse coordinates relative to the
+  /// upper-left corner of the view. If the web view is both the drag source
+  /// and the drag target then all DragTarget* methods should be called before
+  /// DragSource* mthods.
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void DragSourceEndedAt(int x, int y, DragOperationsMask op) = 0;
 
   ///
-  // Call this method when the drag operation started by a
-  // CefRenderHandler::StartDragging call has completed. This method may be
-  // called immediately without first calling DragSourceEndedAt to cancel a
-  // drag operation. If the web view is both the drag source and the drag
-  // target then all DragTarget* methods should be called before DragSource*
-  // mthods.
-  // This method is only used when window rendering is disabled.
+  /// Call this method when the drag operation started by a
+  /// CefRenderHandler::StartDragging call has completed. This method may be
+  /// called immediately without first calling DragSourceEndedAt to cancel a
+  /// drag operation. If the web view is both the drag source and the drag
+  /// target then all DragTarget* methods should be called before DragSource*
+  /// mthods.
+  /// This method is only used when window rendering is disabled.
   ///
   /*--cef()--*/
   virtual void DragSourceSystemDragEnded() = 0;
 
   ///
-  // Returns the current visible navigation entry for this browser. This method
-  // can only be called on the UI thread.
+  /// Returns the current visible navigation entry for this browser. This method
+  /// can only be called on the UI thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefNavigationEntry> GetVisibleNavigationEntry() = 0;
 
   ///
-  // Set accessibility state for all frames. |accessibility_state| may be
-  // default, enabled or disabled. If |accessibility_state| is STATE_DEFAULT
-  // then accessibility will be disabled by default and the state may be further
-  // controlled with the "force-renderer-accessibility" and
-  // "disable-renderer-accessibility" command-line switches. If
-  // |accessibility_state| is STATE_ENABLED then accessibility will be enabled.
-  // If |accessibility_state| is STATE_DISABLED then accessibility will be
-  // completely disabled.
-  //
-  // For windowed browsers accessibility will be enabled in Complete mode (which
-  // corresponds to kAccessibilityModeComplete in Chromium). In this mode all
-  // platform accessibility objects will be created and managed by Chromium's
-  // internal implementation. The client needs only to detect the screen reader
-  // and call this method appropriately. For example, on macOS the client can
-  // handle the @"AXEnhancedUserInterface" accessibility attribute to detect
-  // VoiceOver state changes and on Windows the client can handle WM_GETOBJECT
-  // with OBJID_CLIENT to detect accessibility readers.
-  //
-  // For windowless browsers accessibility will be enabled in TreeOnly mode
-  // (which corresponds to kAccessibilityModeWebContentsOnly in Chromium). In
-  // this mode renderer accessibility is enabled, the full tree is computed, and
-  // events are passed to CefAccessibiltyHandler, but platform accessibility
-  // objects are not created. The client may implement platform accessibility
-  // objects using CefAccessibiltyHandler callbacks if desired.
+  /// Set accessibility state for all frames. |accessibility_state| may be
+  /// default, enabled or disabled. If |accessibility_state| is STATE_DEFAULT
+  /// then accessibility will be disabled by default and the state may be
+  /// further controlled with the "force-renderer-accessibility" and
+  /// "disable-renderer-accessibility" command-line switches. If
+  /// |accessibility_state| is STATE_ENABLED then accessibility will be enabled.
+  /// If |accessibility_state| is STATE_DISABLED then accessibility will be
+  /// completely disabled.
+  ///
+  /// For windowed browsers accessibility will be enabled in Complete mode
+  /// (which corresponds to kAccessibilityModeComplete in Chromium). In this
+  /// mode all platform accessibility objects will be created and managed by
+  /// Chromium's internal implementation. The client needs only to detect the
+  /// screen reader and call this method appropriately. For example, on macOS
+  /// the client can handle the @"AXEnhancedUserInterface" accessibility
+  /// attribute to detect VoiceOver state changes and on Windows the client can
+  /// handle WM_GETOBJECT with OBJID_CLIENT to detect accessibility readers.
+  ///
+  /// For windowless browsers accessibility will be enabled in TreeOnly mode
+  /// (which corresponds to kAccessibilityModeWebContentsOnly in Chromium). In
+  /// this mode renderer accessibility is enabled, the full tree is computed,
+  /// and events are passed to CefAccessibiltyHandler, but platform
+  /// accessibility objects are not created. The client may implement platform
+  /// accessibility objects using CefAccessibiltyHandler callbacks if desired.
   ///
   /*--cef()--*/
   virtual void SetAccessibilityState(cef_state_t accessibility_state) = 0;
 
   ///
-  // Enable notifications of auto resize via CefDisplayHandler::OnAutoResize.
-  // Notifications are disabled by default. |min_size| and |max_size| define the
-  // range of allowed sizes.
+  /// Enable notifications of auto resize via CefDisplayHandler::OnAutoResize.
+  /// Notifications are disabled by default. |min_size| and |max_size| define
+  /// the range of allowed sizes.
   ///
   /*--cef()--*/
   virtual void SetAutoResizeEnabled(bool enabled,
@@ -845,19 +939,74 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
                                     const CefSize& max_size) = 0;
 
   ///
-  // Returns the extension hosted in this browser or NULL if no extension is
-  // hosted. See CefRequestContext::LoadExtension for details.
+  /// Returns the extension hosted in this browser or NULL if no extension is
+  /// hosted. See CefRequestContext::LoadExtension for details.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefExtension> GetExtension() = 0;
 
   ///
-  // Returns true if this browser is hosting an extension background script.
-  // Background hosts do not have a window and are not displayable. See
-  // CefRequestContext::LoadExtension for details.
+  /// Returns true if this browser is hosting an extension background script.
+  /// Background hosts do not have a window and are not displayable. See
+  /// CefRequestContext::LoadExtension for details.
   ///
   /*--cef()--*/
   virtual bool IsBackgroundHost() = 0;
+
+  ///
+  /// Set whether the browser's audio is muted.
+  ///
+  /*--cef()--*/
+  virtual void SetAudioMuted(bool mute) = 0;
+
+  ///
+  /// Returns true if the browser's audio is muted.  This method can only be
+  /// called on the UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool IsAudioMuted() = 0;
+
+  ///
+  /// Returns true if the renderer is currently in browser fullscreen. This
+  /// differs from window fullscreen in that browser fullscreen is entered using
+  /// the JavaScript Fullscreen API and modifies CSS attributes such as the
+  /// ::backdrop pseudo-element and :fullscreen pseudo-class. This method can
+  /// only be called on the UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool IsFullscreen() = 0;
+
+  ///
+  /// Requests the renderer to exit browser fullscreen. In most cases exiting
+  /// window fullscreen should also exit browser fullscreen. With the Alloy
+  /// runtime this method should be called in response to a user action such as
+  /// clicking the green traffic light button on MacOS
+  /// (CefWindowDelegate::OnWindowFullscreenTransition callback) or pressing the
+  /// "ESC" key (CefKeyboardHandler::OnPreKeyEvent callback). With the Chrome
+  /// runtime these standard exit actions are handled internally but
+  /// new/additional user actions can use this method. Set |will_cause_resize|
+  /// to true if exiting browser fullscreen will cause a view resize.
+  ///
+  /*--cef()--*/
+  virtual void ExitFullscreen(bool will_cause_resize) = 0;
+
+  ///
+  /// Returns true if a Chrome command is supported and enabled. Values for
+  /// |command_id| can be found in the cef_command_ids.h file. This method can
+  /// only be called on the UI thread. Only used with the Chrome runtime.
+  ///
+  /*--cef()--*/
+  virtual bool CanExecuteChromeCommand(int command_id) = 0;
+
+  ///
+  /// Execute a Chrome command. Values for |command_id| can be found in the
+  /// cef_command_ids.h file. |disposition| provides information about the
+  /// intended command target. Only used with the Chrome runtime.
+  ///
+  /*--cef()--*/
+  virtual void ExecuteChromeCommand(
+      int command_id,
+      cef_window_open_disposition_t disposition) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_BROWSER_H_
diff --git a/src/include/cef_browser_process_handler.h b/src/include/cef_browser_process_handler.h
index fb770997b..088df8ef9 100644
--- a/src/include/cef_browser_process_handler.h
+++ b/src/include/cef_browser_process_handler.h
@@ -39,68 +39,129 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_client.h"
 #include "include/cef_command_line.h"
-#include "include/cef_print_handler.h"
+#include "include/cef_preference.h"
+#include "include/cef_request_context_handler.h"
 #include "include/cef_values.h"
 
 ///
-// Class used to implement browser process callbacks. The methods of this class
-// will be called on the browser process main thread unless otherwise indicated.
+/// Class used to implement browser process callbacks. The methods of this class
+/// will be called on the browser process main thread unless otherwise
+/// indicated.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called on the browser process UI thread immediately after the CEF context
-  // has been initialized.
+  /// Provides an opportunity to register custom preferences prior to
+  /// global and request context initialization.
+  ///
+  /// If |type| is CEF_PREFERENCES_TYPE_GLOBAL the registered preferences can be
+  /// accessed via CefPreferenceManager::GetGlobalPreferences after
+  /// OnContextInitialized is called. Global preferences are registered a single
+  /// time at application startup. See related cef_settings_t.cache_path and
+  /// cef_settings_t.persist_user_preferences configuration.
+  ///
+  /// If |type| is CEF_PREFERENCES_TYPE_REQUEST_CONTEXT the preferences can be
+  /// accessed via the CefRequestContext after
+  /// CefRequestContextHandler::OnRequestContextInitialized is called. Request
+  /// context preferences are registered each time a new CefRequestContext is
+  /// created. It is intended but not required that all request contexts have
+  /// the same registered preferences. See related
+  /// cef_request_context_settings_t.cache_path and
+  /// cef_request_context_settings_t.persist_user_preferences configuration.
+  ///
+  /// Do not keep a reference to the |registrar| object. This method is called
+  /// on the browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual void OnRegisterCustomPreferences(
+      cef_preferences_type_t type,
+      CefRawPtr<CefPreferenceRegistrar> registrar) {}
+
+  ///
+  /// Called on the browser process UI thread immediately after the CEF context
+  /// has been initialized.
   ///
   /*--cef()--*/
   virtual void OnContextInitialized() {}
 
   ///
-  // Called before a child process is launched. Will be called on the browser
-  // process UI thread when launching a render process and on the browser
-  // process IO thread when launching a GPU or plugin process. Provides an
-  // opportunity to modify the child process command line. Do not keep a
-  // reference to |command_line| outside of this method.
+  /// Called before a child process is launched. Will be called on the browser
+  /// process UI thread when launching a render process and on the browser
+  /// process IO thread when launching a GPU process. Provides an opportunity to
+  /// modify the child process command line. Do not keep a reference to
+  /// |command_line| outside of this method.
   ///
   /*--cef()--*/
   virtual void OnBeforeChildProcessLaunch(
       CefRefPtr<CefCommandLine> command_line) {}
 
   ///
-  // Called on the browser process IO thread after the main thread has been
-  // created for a new render process. Provides an opportunity to specify extra
-  // information that will be passed to
-  // CefRenderProcessHandler::OnRenderThreadCreated() in the render process. Do
-  // not keep a reference to |extra_info| outside of this method.
+  /// Implement this method to provide app-specific behavior when an already
+  /// running app is relaunched with the same CefSettings.root_cache_path value.
+  /// For example, activate an existing app window or create a new app window.
+  /// |command_line| will be read-only. Do not keep a reference to
+  /// |command_line| outside of this method. Return true if the relaunch is
+  /// handled or false for default relaunch behavior. Default behavior will
+  /// create a new default styled Chrome window.
+  ///
+  /// To avoid cache corruption only a single app instance is allowed to run for
+  /// a given CefSettings.root_cache_path value. On relaunch the app checks a
+  /// process singleton lock and then forwards the new launch arguments to the
+  /// already running app process before exiting early. Client apps should
+  /// therefore check the CefInitialize() return value for early exit before
+  /// proceeding.
+  ///
+  /// This method will be called on the browser process UI thread.
+  ///
+  /*--cef(optional_param=current_directory)--*/
+  virtual bool OnAlreadyRunningAppRelaunch(
+      CefRefPtr<CefCommandLine> command_line,
+      const CefString& current_directory) {
+    return false;
+  }
+
+  ///
+  /// Called from any thread when work has been scheduled for the browser
+  /// process main (UI) thread. This callback is used in combination with
+  /// cef_settings_t.external_message_pump and CefDoMessageLoopWork() in cases
+  /// where the CEF message loop must be integrated into an existing application
+  /// message loop (see additional comments and warnings on
+  /// CefDoMessageLoopWork). This callback should schedule a
+  /// CefDoMessageLoopWork() call to happen on the main (UI) thread. |delay_ms|
+  /// is the requested delay in milliseconds. If |delay_ms| is <= 0 then the
+  /// call should happen reasonably soon. If |delay_ms| is > 0 then the call
+  /// should be scheduled to happen after the specified delay and any currently
+  /// pending scheduled call should be cancelled.
   ///
   /*--cef()--*/
-  virtual void OnRenderProcessThreadCreated(
-      CefRefPtr<CefListValue> extra_info) {}
+  virtual void OnScheduleMessagePumpWork(int64_t delay_ms) {}
 
   ///
-  // Return the handler for printing on Linux. If a print handler is not
-  // provided then printing will not be supported on the Linux platform.
+  /// Return the default client for use with a newly created browser window
+  /// (CefBrowser object). If null is returned the CefBrowser will be unmanaged
+  /// (no callbacks will be executed for that CefBrowser) and application
+  /// shutdown will be blocked until the browser window is closed manually. This
+  /// method is currently only used with the Chrome runtime when creating new
+  /// browser windows via Chrome UI.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefPrintHandler> GetPrintHandler() { return NULL; }
+  virtual CefRefPtr<CefClient> GetDefaultClient() { return nullptr; }
 
   ///
-  // Called from any thread when work has been scheduled for the browser process
-  // main (UI) thread. This callback is used in combination with CefSettings.
-  // external_message_pump and CefDoMessageLoopWork() in cases where the CEF
-  // message loop must be integrated into an existing application message loop
-  // (see additional comments and warnings on CefDoMessageLoopWork). This
-  // callback should schedule a CefDoMessageLoopWork() call to happen on the
-  // main (UI) thread. |delay_ms| is the requested delay in milliseconds. If
-  // |delay_ms| is <= 0 then the call should happen reasonably soon. If
-  // |delay_ms| is > 0 then the call should be scheduled to happen after the
-  // specified delay and any currently pending scheduled call should be
-  // cancelled.
+  /// Return the default handler for use with a new user or incognito profile
+  /// (CefRequestContext object). If null is returned the CefRequestContext will
+  /// be unmanaged (no callbacks will be executed for that CefRequestContext).
+  /// This method is currently only used with the Chrome runtime when creating
+  /// new browser windows via Chrome UI.
   ///
   /*--cef()--*/
-  virtual void OnScheduleMessagePumpWork(int64 delay_ms) {}
+  virtual CefRefPtr<CefRequestContextHandler>
+  GetDefaultRequestContextHandler() {
+    return nullptr;
+  }
 };
 
 #endif  // CEF_INCLUDE_CEF_BROWSER_PROCESS_HANDLER_H_
diff --git a/src/include/cef_callback.h b/src/include/cef_callback.h
index e206cb976..b9e1111dd 100644
--- a/src/include/cef_callback.h
+++ b/src/include/cef_callback.h
@@ -41,32 +41,32 @@
 #include "include/cef_base.h"
 
 ///
-// Generic callback interface used for asynchronous continuation.
+/// Generic callback interface used for asynchronous continuation.
 ///
 /*--cef(source=library)--*/
 class CefCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Continue processing.
+  /// Continue processing.
   ///
   /*--cef(capi_name=cont)--*/
   virtual void Continue() = 0;
 
   ///
-  // Cancel processing.
+  /// Cancel processing.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 };
 
 ///
-// Generic callback interface used for asynchronous completion.
+/// Generic callback interface used for asynchronous completion.
 ///
 /*--cef(source=client)--*/
 class CefCompletionCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be called once the task is complete.
+  /// Method that will be called once the task is complete.
   ///
   /*--cef()--*/
   virtual void OnComplete() = 0;
diff --git a/src/include/cef_client.h b/src/include/cef_client.h
index 59173c778..758c75f93 100644
--- a/src/include/cef_client.h
+++ b/src/include/cef_client.h
@@ -38,7 +38,9 @@
 #define CEF_INCLUDE_CEF_CLIENT_H_
 #pragma once
 
+#include "include/cef_audio_handler.h"
 #include "include/cef_base.h"
+#include "include/cef_command_handler.h"
 #include "include/cef_context_menu_handler.h"
 #include "include/cef_dialog_handler.h"
 #include "include/cef_display_handler.h"
@@ -46,111 +48,151 @@
 #include "include/cef_drag_handler.h"
 #include "include/cef_find_handler.h"
 #include "include/cef_focus_handler.h"
+#include "include/cef_frame_handler.h"
 #include "include/cef_jsdialog_handler.h"
 #include "include/cef_keyboard_handler.h"
 #include "include/cef_life_span_handler.h"
 #include "include/cef_load_handler.h"
+#include "include/cef_permission_handler.h"
+#include "include/cef_print_handler.h"
 #include "include/cef_process_message.h"
 #include "include/cef_render_handler.h"
 #include "include/cef_request_handler.h"
 
 ///
-// Implement this interface to provide handler implementations.
+/// Implement this interface to provide handler implementations.
 ///
 /*--cef(source=client,no_debugct_check)--*/
 class CefClient : public virtual CefBaseRefCounted {
  public:
   ///
-  // Return the handler for context menus. If no handler is provided the default
-  // implementation will be used.
+  /// Return the handler for audio rendering events.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefAudioHandler> GetAudioHandler() { return nullptr; }
+
+  ///
+  /// Return the handler for commands. If no handler is provided the default
+  /// implementation will be used.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefCommandHandler> GetCommandHandler() { return nullptr; }
+
+  ///
+  /// Return the handler for context menus. If no handler is provided the
+  /// default implementation will be used.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() {
-    return NULL;
+    return nullptr;
   }
 
   ///
-  // Return the handler for dialogs. If no handler is provided the default
-  // implementation will be used.
+  /// Return the handler for dialogs. If no handler is provided the default
+  /// implementation will be used.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDialogHandler> GetDialogHandler() { return NULL; }
+  virtual CefRefPtr<CefDialogHandler> GetDialogHandler() { return nullptr; }
 
   ///
-  // Return the handler for browser display state events.
+  /// Return the handler for browser display state events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() { return NULL; }
+  virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() { return nullptr; }
 
   ///
-  // Return the handler for download events. If no handler is returned downloads
-  // will not be allowed.
+  /// Return the handler for download events. If no handler is returned
+  /// downloads will not be allowed.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() { return NULL; }
+  virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() { return nullptr; }
 
   ///
-  // Return the handler for drag events.
+  /// Return the handler for drag events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefDragHandler> GetDragHandler() { return NULL; }
+  virtual CefRefPtr<CefDragHandler> GetDragHandler() { return nullptr; }
 
   ///
-  // Return the handler for find result events.
+  /// Return the handler for find result events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFindHandler> GetFindHandler() { return NULL; }
+  virtual CefRefPtr<CefFindHandler> GetFindHandler() { return nullptr; }
+
+  ///
+  /// Return the handler for focus events.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefFocusHandler> GetFocusHandler() { return nullptr; }
+
+  ///
+  /// Return the handler for events related to CefFrame lifespan. This method
+  /// will be called once during CefBrowser creation and the result will be
+  /// cached for performance reasons.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefFrameHandler> GetFrameHandler() { return nullptr; }
+
+  ///
+  /// Return the handler for permission requests.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefPermissionHandler> GetPermissionHandler() {
+    return nullptr;
+  }
 
   ///
-  // Return the handler for focus events.
+  /// Return the handler for JavaScript dialogs. If no handler is provided the
+  /// default implementation will be used.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefFocusHandler> GetFocusHandler() { return NULL; }
+  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() { return nullptr; }
 
   ///
-  // Return the handler for JavaScript dialogs. If no handler is provided the
-  // default implementation will be used.
+  /// Return the handler for keyboard events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() { return NULL; }
+  virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() { return nullptr; }
 
   ///
-  // Return the handler for keyboard events.
+  /// Return the handler for browser life span events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() { return NULL; }
+  virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() { return nullptr; }
 
   ///
-  // Return the handler for browser life span events.
+  /// Return the handler for browser load status events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() { return NULL; }
+  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return nullptr; }
 
   ///
-  // Return the handler for browser load status events.
+  /// Return the handler for printing on Linux. If a print handler is not
+  /// provided then printing will not be supported on the Linux platform.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return NULL; }
+  virtual CefRefPtr<CefPrintHandler> GetPrintHandler() { return nullptr; }
 
   ///
-  // Return the handler for off-screen rendering events.
+  /// Return the handler for off-screen rendering events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() { return NULL; }
+  virtual CefRefPtr<CefRenderHandler> GetRenderHandler() { return nullptr; }
 
   ///
-  // Return the handler for browser request events.
+  /// Return the handler for browser request events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefRequestHandler> GetRequestHandler() { return NULL; }
+  virtual CefRefPtr<CefRequestHandler> GetRequestHandler() { return nullptr; }
 
   ///
-  // Called when a new message is received from a different process. Return true
-  // if the message was handled or false otherwise. Do not keep a reference to
-  // or attempt to access the message outside of this callback.
+  /// Called when a new message is received from a different process. Return
+  /// true if the message was handled or false otherwise.  It is safe to keep a
+  /// reference to |message| outside of this callback.
   ///
   /*--cef()--*/
   virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+                                        CefRefPtr<CefFrame> frame,
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message) {
     return false;
diff --git a/src/include/cef_command_handler.h b/src/include/cef_command_handler.h
new file mode 100644
index 000000000..eed05a0a1
--- /dev/null
+++ b/src/include/cef_command_handler.h
@@ -0,0 +1,114 @@
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_COMMAND_HANDLER_H_
+#define CEF_INCLUDE_CEF_COMMAND_HANDLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+
+///
+/// Implement this interface to handle events related to commands. The methods
+/// of this class will be called on the UI thread.
+///
+/*--cef(source=client)--*/
+class CefCommandHandler : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Called to execute a Chrome command triggered via menu selection or
+  /// keyboard shortcut. Values for |command_id| can be found in the
+  /// cef_command_ids.h file. |disposition| provides information about the
+  /// intended command target. Return true if the command was handled or false
+  /// for the default implementation. For context menu commands this will be
+  /// called after CefContextMenuHandler::OnContextMenuCommand. Only used with
+  /// the Chrome runtime.
+  ///
+  /*--cef()--*/
+  virtual bool OnChromeCommand(CefRefPtr<CefBrowser> browser,
+                               int command_id,
+                               cef_window_open_disposition_t disposition) {
+    return false;
+  }
+
+  ///
+  /// Called to check if a Chrome app menu item should be visible. Values for
+  /// |command_id| can be found in the cef_command_ids.h file. Only called for
+  /// menu items that would be visible by default. Only used with the Chrome
+  /// runtime.
+  ///
+  /*--cef()--*/
+  virtual bool IsChromeAppMenuItemVisible(CefRefPtr<CefBrowser> browser,
+                                          int command_id) {
+    return true;
+  }
+
+  ///
+  /// Called to check if a Chrome app menu item should be enabled. Values for
+  /// |command_id| can be found in the cef_command_ids.h file. Only called for
+  /// menu items that would be enabled by default. Only used with the Chrome
+  /// runtime.
+  ///
+  /*--cef()--*/
+  virtual bool IsChromeAppMenuItemEnabled(CefRefPtr<CefBrowser> browser,
+                                          int command_id) {
+    return true;
+  }
+
+  ///
+  /// Called during browser creation to check if a Chrome page action icon
+  /// should be visible. Only called for icons that would be visible by default.
+  /// Only used with the Chrome runtime.
+  ///
+  /*--cef(optional_param=browser)--*/
+  virtual bool IsChromePageActionIconVisible(
+      cef_chrome_page_action_icon_type_t icon_type) {
+    return true;
+  }
+
+  ///
+  /// Called during browser creation to check if a Chrome toolbar button
+  /// should be visible. Only called for buttons that would be visible by
+  /// default. Only used with the Chrome runtime.
+  ///
+  /*--cef(optional_param=browser)--*/
+  virtual bool IsChromeToolbarButtonVisible(
+      cef_chrome_toolbar_button_type_t button_type) {
+    return true;
+  }
+};
+
+#endif  // CEF_INCLUDE_CEF_COMMAND_HANDLER_H_
diff --git a/src/include/cef_command_ids.h b/src/include/cef_command_ids.h
new file mode 100644
index 000000000..9b1a284fb
--- /dev/null
+++ b/src/include/cef_command_ids.h
@@ -0,0 +1,432 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file is generated by the make_pack_header.py tool.
+//
+
+#ifndef CEF_INCLUDE_CEF_COMMAND_IDS_H_
+#define CEF_INCLUDE_CEF_COMMAND_IDS_H_
+#pragma once
+
+// ---------------------------------------------------------------------------
+// From chrome_command_ids.h:
+
+#define IDC_MinimumLabelValue 4000
+#define IDC_BACK 33000
+#define IDC_FORWARD 33001
+#define IDC_RELOAD 33002
+#define IDC_HOME 33003
+#define IDC_OPEN_CURRENT_URL 33004
+#define IDC_STOP 33006
+#define IDC_RELOAD_BYPASSING_CACHE 33007
+#define IDC_RELOAD_CLEARING_CACHE 33009
+#define IDC_NEW_WINDOW 34000
+#define IDC_NEW_INCOGNITO_WINDOW 34001
+#define IDC_CLOSE_WINDOW 34012
+#define IDC_ALWAYS_ON_TOP 34013
+#define IDC_NEW_TAB 34014
+#define IDC_CLOSE_TAB 34015
+#define IDC_SELECT_NEXT_TAB 34016
+#define IDC_SELECT_PREVIOUS_TAB 34017
+#define IDC_SELECT_TAB_0 34018
+#define IDC_SELECT_TAB_1 34019
+#define IDC_SELECT_TAB_2 34020
+#define IDC_SELECT_TAB_3 34021
+#define IDC_SELECT_TAB_4 34022
+#define IDC_SELECT_TAB_5 34023
+#define IDC_SELECT_TAB_6 34024
+#define IDC_SELECT_TAB_7 34025
+#define IDC_SELECT_LAST_TAB 34026
+#define IDC_DUPLICATE_TAB 34027
+#define IDC_RESTORE_TAB 34028
+#define IDC_SHOW_AS_TAB 34029
+#define IDC_FULLSCREEN 34030
+#define IDC_EXIT 34031
+#define IDC_MOVE_TAB_NEXT 34032
+#define IDC_MOVE_TAB_PREVIOUS 34033
+#define IDC_SEARCH 34035
+#define IDC_WINDOW_MENU 34045
+#define IDC_MINIMIZE_WINDOW 34046
+#define IDC_MAXIMIZE_WINDOW 34047
+#define IDC_ALL_WINDOWS_FRONT 34048
+#define IDC_NAME_WINDOW 34049
+#define IDC_TOGGLE_MULTITASK_MENU 34050
+#define IDC_USE_SYSTEM_TITLE_BAR 34051
+#define IDC_RESTORE_WINDOW 34052
+#define IDC_OPEN_IN_PWA_WINDOW 34053
+#define IDC_MOVE_TAB_TO_NEW_WINDOW 34054
+#define IDC_COPY_URL 34060
+#define IDC_OPEN_IN_CHROME 34061
+#define IDC_WEB_APP_SETTINGS 34062
+#define IDC_WEB_APP_MENU_APP_INFO 34063
+#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34080
+#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34081
+#define IDC_VISIT_DESKTOP_OF_LRU_USER_4 34082
+#define IDC_VISIT_DESKTOP_OF_LRU_USER_5 34083
+#define IDC_BOOKMARK_THIS_TAB 35000
+#define IDC_BOOKMARK_ALL_TABS 35001
+#define IDC_VIEW_SOURCE 35002
+#define IDC_PRINT 35003
+#define IDC_SAVE_PAGE 35004
+#define IDC_EMAIL_PAGE_LOCATION 35006
+#define IDC_BASIC_PRINT 35007
+#define IDC_SAVE_CREDIT_CARD_FOR_PAGE 35008
+#define IDC_SHOW_TRANSLATE 35009
+#define IDC_MANAGE_PASSWORDS_FOR_PAGE 35010
+#define IDC_ROUTE_MEDIA 35011
+#define IDC_WINDOW_MUTE_SITE 35012
+#define IDC_WINDOW_PIN_TAB 35013
+#define IDC_WINDOW_GROUP_TAB 35014
+#define IDC_MIGRATE_LOCAL_CREDIT_CARD_FOR_PAGE 35015
+#define IDC_SEND_TAB_TO_SELF 35016
+#define IDC_FOCUS_THIS_TAB 35017
+#define IDC_QRCODE_GENERATOR 35021
+#define IDC_WINDOW_CLOSE_TABS_TO_RIGHT 35022
+#define IDC_WINDOW_CLOSE_OTHER_TABS 35023
+#define IDC_NEW_TAB_TO_RIGHT 35024
+#define IDC_SAVE_AUTOFILL_ADDRESS 35025
+#define IDC_OFFERS_AND_REWARDS_FOR_PAGE 35026
+#define IDC_WEBAUTHN 35027
+#define IDC_SHARING_HUB 35028
+#define IDC_SHARING_HUB_MENU 35029
+#define IDC_VIRTUAL_CARD_MANUAL_FALLBACK 35030
+#define IDC_SHARING_HUB_SCREENSHOT 35031
+#define IDC_VIRTUAL_CARD_ENROLL 35032
+#define IDC_FOLLOW 35033
+#define IDC_UNFOLLOW 35034
+#define IDC_SAVE_IBAN_FOR_PAGE 35035
+#define IDC_AUTOFILL_MANDATORY_REAUTH 35036
+#define IDC_PROFILE_MENU_IN_APP_MENU 35039
+#define IDC_PASSWORDS_AND_AUTOFILL_MENU 35040
+#define IDC_SHOW_PASSWORD_MANAGER 35041
+#define IDC_SHOW_PAYMENT_METHODS 35042
+#define IDC_SHOW_ADDRESSES 35043
+#define IDC_ORGANIZE_TABS 35044
+#define IDC_MUTE_TARGET_SITE 35050
+#define IDC_PIN_TARGET_TAB 35051
+#define IDC_GROUP_TARGET_TAB 35052
+#define IDC_DUPLICATE_TARGET_TAB 35053
+#define IDC_CUT 36000
+#define IDC_COPY 36001
+#define IDC_PASTE 36003
+#define IDC_EDIT_MENU 36004
+#define IDC_FIND 37000
+#define IDC_FIND_NEXT 37001
+#define IDC_FIND_PREVIOUS 37002
+#define IDC_CLOSE_FIND_OR_STOP 37003
+#define IDC_FIND_MENU 37100
+#define IDC_FIND_AND_EDIT_MENU 37200
+#define IDC_SAVE_AND_SHARE_MENU 37300
+#define IDC_CUSTOMIZE_CHROME 37350
+#define IDC_CLOSE_PROFILE 35351
+#define IDC_MANAGE_GOOGLE_ACCOUNT 35352
+#define IDC_SHOW_SYNC_SETTINGS 35353
+#define IDC_TURN_ON_SYNC 35354
+#define IDC_SHOW_SIGNIN_WHEN_PAUSED 35355
+#define IDC_OPEN_GUEST_PROFILE 35356
+#define IDC_ADD_NEW_PROFILE 35357
+#define IDC_MANAGE_CHROME_PROFILES 35358
+#define IDC_ZOOM_MENU 38000
+#define IDC_ZOOM_PLUS 38001
+#define IDC_ZOOM_NORMAL 38002
+#define IDC_ZOOM_MINUS 38003
+#define IDC_FOCUS_TOOLBAR 39000
+#define IDC_FOCUS_LOCATION 39001
+#define IDC_FOCUS_SEARCH 39002
+#define IDC_FOCUS_MENU_BAR 39003
+#define IDC_FOCUS_NEXT_PANE 39004
+#define IDC_FOCUS_PREVIOUS_PANE 39005
+#define IDC_FOCUS_BOOKMARKS 39006
+#define IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY 39007
+#define IDC_FOCUS_WEB_CONTENTS_PANE 39009
+#define IDC_OPEN_FILE 40000
+#define IDC_CREATE_SHORTCUT 40002
+#define IDC_DEVELOPER_MENU 40003
+#define IDC_DEV_TOOLS 40004
+#define IDC_DEV_TOOLS_CONSOLE 40005
+#define IDC_TASK_MANAGER 40006
+#define IDC_DEV_TOOLS_DEVICES 40007
+#define IDC_FEEDBACK 40008
+#define IDC_SHOW_BOOKMARK_BAR 40009
+#define IDC_SHOW_HISTORY 40010
+#define IDC_SHOW_BOOKMARK_MANAGER 40011
+#define IDC_SHOW_DOWNLOADS 40012
+#define IDC_CLEAR_BROWSING_DATA 40013
+#define IDC_IMPORT_SETTINGS 40014
+#define IDC_OPTIONS 40015
+#define IDC_EDIT_SEARCH_ENGINES 40016
+#define IDC_VIEW_PASSWORDS 40017
+#define IDC_ABOUT 40018
+#define IDC_HELP_PAGE_VIA_KEYBOARD 40019
+#define IDC_HELP_PAGE_VIA_MENU 40020
+#define IDC_SHOW_APP_MENU 40021
+#define IDC_MANAGE_EXTENSIONS 40022
+#define IDC_DEV_TOOLS_INSPECT 40023
+#define IDC_UPGRADE_DIALOG 40024
+#define IDC_SHOW_HISTORY_CLUSTERS_SIDE_PANEL 40025
+#define IDC_PROFILING_ENABLED 40028
+#define IDC_BOOKMARKS_MENU 40029
+#define IDC_EXTENSION_ERRORS 40031
+#define IDC_SHOW_SETTINGS_CHANGE_FIRST 40033
+#define IDC_SHOW_SETTINGS_CHANGE_LAST 40133
+#define IDC_SHOW_AVATAR_MENU 40134
+#define IDC_EXTENSION_INSTALL_ERROR_FIRST 40135
+#define IDC_EXTENSION_INSTALL_ERROR_LAST 40235
+#define IDC_TOGGLE_REQUEST_TABLET_SITE 40236
+#define IDC_DEV_TOOLS_TOGGLE 40237
+#define IDC_RECENT_TABS_MENU 40239
+#define IDC_RECENT_TABS_NO_DEVICE_TABS 40240
+#define IDC_SHOW_SETTINGS_RESET_BUBBLE 40241
+#define IDC_DISTILL_PAGE 40243
+#define IDC_HELP_MENU 40244
+#define IDC_SHOW_SRT_BUBBLE 40246
+#define IDC_ELEVATED_RECOVERY_DIALOG 40247
+#define IDC_TAKE_SCREENSHOT 40248
+#define IDC_MORE_TOOLS_MENU 40249
+#define IDC_TOGGLE_FULLSCREEN_TOOLBAR 40250
+#define IDC_CUSTOMIZE_TOUCH_BAR 40251
+#define IDC_SHOW_BETA_FORUM 40252
+#define IDC_TOGGLE_JAVASCRIPT_APPLE_EVENTS 40253
+#define IDC_INSTALL_PWA 40254
+#define IDC_SHOW_MANAGEMENT_PAGE 40255
+#define IDC_PASTE_AND_GO 40256
+#define IDC_SHOW_SAVE_LOCAL_CARD_SIGN_IN_PROMO_IF_APPLICABLE 40257
+#define IDC_CLOSE_SIGN_IN_PROMO 40258
+#define IDC_SHOW_FULL_URLS 40259
+#define IDC_CARET_BROWSING_TOGGLE 40260
+#define IDC_CHROME_TIPS 40263
+#define IDC_CHROME_WHATS_NEW 40264
+#define IDC_LACROS_DATA_MIGRATION 40265
+#define IDC_PERFORMANCE 40266
+#define IDC_EXTENSIONS_SUBMENU 40267
+#define IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS 40268
+#define IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE 40269
+#define IDC_READING_LIST_MENU 40270
+#define IDC_READING_LIST_MENU_ADD_TAB 40271
+#define IDC_READING_LIST_MENU_SHOW_UI 40272
+#define IDC_SHOW_READING_MODE_SIDE_PANEL 40273
+#define IDC_SHOW_BOOKMARK_SIDE_PANEL 40274
+#define IDC_SHOW_SEARCH_COMPANION 40275
+#define IDC_SHOW_CHROME_LABS 40276
+#define IDC_RECENT_TABS_LOGIN_FOR_DEVICE_TABS 40277
+#define IDC_OPEN_RECENT_TAB 40278
+#define IDC_OPEN_SAFETY_HUB 40279
+#define IDC_SHOW_PASSWORD_CHECKUP 40280
+#define IDC_SPELLCHECK_SUGGESTION_0 41000
+#define IDC_SPELLCHECK_SUGGESTION_1 41001
+#define IDC_SPELLCHECK_SUGGESTION_2 41002
+#define IDC_SPELLCHECK_SUGGESTION_3 41003
+#define IDC_SPELLCHECK_SUGGESTION_4 41004
+#define IDC_SPELLCHECK_MENU 41005
+#define IDC_SPELLCHECK_LANGUAGES_FIRST 41006
+#define IDC_SPELLCHECK_LANGUAGES_LAST 41106
+#define IDC_CHECK_SPELLING_WHILE_TYPING 41107
+#define IDC_SPELLPANEL_TOGGLE 41109
+#define IDC_SPELLCHECK_ADD_TO_DICTIONARY 41110
+#define IDC_SPELLCHECK_MULTI_LINGUAL 41111
+#define IDC_WRITING_DIRECTION_MENU 41120
+#define IDC_WRITING_DIRECTION_DEFAULT 41121
+#define IDC_WRITING_DIRECTION_LTR 41122
+#define IDC_WRITING_DIRECTION_RTL 41123
+#define IDC_TRANSLATE_ORIGINAL_LANGUAGE_BASE 42100
+#define IDC_TRANSLATE_TARGET_LANGUAGE_BASE 42400
+#define IDC_VIEW_MENU 44000
+#define IDC_FILE_MENU 44001
+#define IDC_CHROME_MENU 44002
+#define IDC_HIDE_APP 44003
+#define IDC_HISTORY_MENU 46000
+#define IDC_TAB_MENU 46001
+#define IDC_PROFILE_MAIN_MENU 46100
+#define IDC_INPUT_METHODS_MENU 46300
+#define IDC_CONTENT_CONTEXT_CUSTOM_FIRST 47000
+#define IDC_CONTENT_CONTEXT_CUSTOM_LAST 48000
+#define IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST 49000
+#define IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST 50000
+#define IDC_CONTENT_CONTEXT_OPENLINKNEWTAB 50100
+#define IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW 50101
+#define IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD 50102
+#define IDC_CONTENT_CONTEXT_SAVELINKAS 50103
+#define IDC_CONTENT_CONTEXT_COPYLINKLOCATION 50104
+#define IDC_CONTENT_CONTEXT_COPYEMAILADDRESS 50105
+#define IDC_CONTENT_CONTEXT_OPENLINKWITH 50106
+#define IDC_CONTENT_CONTEXT_COPYLINKTEXT 50107
+#define IDC_CONTENT_CONTEXT_OPENLINKINPROFILE 50108
+#define IDC_CONTENT_CONTEXT_OPENLINKBOOKMARKAPP 50109
+#define IDC_CONTENT_CONTEXT_OPENLINKPREVIEW 50110
+#define IDC_CONTENT_CONTEXT_SAVEIMAGEAS 50120
+#define IDC_CONTENT_CONTEXT_COPYIMAGELOCATION 50121
+#define IDC_CONTENT_CONTEXT_COPYIMAGE 50122
+#define IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB 50123
+#define IDC_CONTENT_CONTEXT_SEARCHWEBFORIMAGE 50124
+#define IDC_CONTENT_CONTEXT_OPEN_ORIGINAL_IMAGE_NEW_TAB 50125
+#define IDC_CONTENT_CONTEXT_LOAD_IMAGE 50126
+#define IDC_CONTENT_CONTEXT_SEARCHLENSFORIMAGE 50127
+#define IDC_CONTENT_CONTEXT_TRANSLATEIMAGEWITHWEB 50128
+#define IDC_CONTENT_CONTEXT_TRANSLATEIMAGEWITHLENS 50129
+#define IDC_CONTENT_CONTEXT_SAVEVIDEOFRAMEAS 50130
+#define IDC_CONTENT_CONTEXT_SAVEAVAS 50131
+#define IDC_CONTENT_CONTEXT_COPYAVLOCATION 50132
+#define IDC_CONTENT_CONTEXT_COPYVIDEOFRAME 50133
+#define IDC_CONTENT_CONTEXT_SEARCHLENSFORVIDEOFRAME 50134
+#define IDC_CONTENT_CONTEXT_SEARCHWEBFORVIDEOFRAME 50135
+#define IDC_CONTENT_CONTEXT_OPENAVNEWTAB 50136
+#define IDC_CONTENT_CONTEXT_PICTUREINPICTURE 50137
+#define IDC_CONTENT_CONTEXT_LOOP 50140
+#define IDC_CONTENT_CONTEXT_CONTROLS 50141
+#define IDC_CONTENT_CONTEXT_ROTATECW 50142
+#define IDC_CONTENT_CONTEXT_ROTATECCW 50143
+#define IDC_CONTENT_CONTEXT_COPY 50150
+#define IDC_CONTENT_CONTEXT_CUT 50151
+#define IDC_CONTENT_CONTEXT_PASTE 50152
+#define IDC_CONTENT_CONTEXT_DELETE 50153
+#define IDC_CONTENT_CONTEXT_UNDO 50154
+#define IDC_CONTENT_CONTEXT_REDO 50155
+#define IDC_CONTENT_CONTEXT_SELECTALL 50156
+#define IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE 50157
+#define IDC_CONTENT_CONTEXT_COPYLINKTOTEXT 50158
+#define IDC_CONTENT_CONTEXT_RESHARELINKTOTEXT 50159
+#define IDC_CONTENT_CONTEXT_REMOVELINKTOTEXT 50160
+#define IDC_CONTENT_CONTEXT_TRANSLATE 50161
+#define IDC_CONTENT_CONTEXT_INSPECTELEMENT 50162
+#define IDC_CONTENT_CONTEXT_VIEWPAGEINFO 50163
+#define IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS 50164
+#define IDC_CONTENT_CONTEXT_LOOK_UP 50165
+#define IDC_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS 50166
+#define IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION 50167
+#define IDC_CONTENT_CONTEXT_SPELLING_TOGGLE 50168
+#define IDC_CONTENT_CONTEXT_OPEN_IN_READING_MODE 50169
+#define IDC_CONTENT_CONTEXT_SAVEPLUGINAS 50170
+#define IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE 50171
+#define IDC_CONTENT_CONTEXT_RELOAD_PACKAGED_APP 50172
+#define IDC_CONTENT_CONTEXT_RESTART_PACKAGED_APP 50173
+#define IDC_CONTENT_CONTEXT_LENS_REGION_SEARCH 50174
+#define IDC_CONTENT_CONTEXT_WEB_REGION_SEARCH 50175
+#define IDC_CONTENT_CONTEXT_GENERATEPASSWORD 50176
+#define IDC_CONTENT_CONTEXT_EXIT_FULLSCREEN 50177
+#define IDC_CONTENT_CONTEXT_SHOWALLSAVEDPASSWORDS 50178
+#define IDC_CONTENT_CONTEXT_PARTIAL_TRANSLATE 50179
+#define IDC_CONTENT_CONTEXT_RELOADFRAME 50180
+#define IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE 50181
+#define IDC_CONTENT_CONTEXT_VIEWFRAMEINFO 50182
+#define IDC_CONTENT_CONTEXT_ADD_A_NOTE 50185
+#define IDC_CONTENT_CONTEXT_GOTOURL 50190
+#define IDC_CONTENT_CONTEXT_SEARCHWEBFOR 50191
+#define IDC_CONTENT_CONTEXT_SEARCHWEBFORNEWTAB 50192
+#define IDC_CONTENT_CONTEXT_OPEN_WITH1 50200
+#define IDC_CONTENT_CONTEXT_OPEN_WITH2 50201
+#define IDC_CONTENT_CONTEXT_OPEN_WITH3 50202
+#define IDC_CONTENT_CONTEXT_OPEN_WITH4 50203
+#define IDC_CONTENT_CONTEXT_OPEN_WITH5 50204
+#define IDC_CONTENT_CONTEXT_OPEN_WITH6 50205
+#define IDC_CONTENT_CONTEXT_OPEN_WITH7 50206
+#define IDC_CONTENT_CONTEXT_OPEN_WITH8 50207
+#define IDC_CONTENT_CONTEXT_OPEN_WITH9 50208
+#define IDC_CONTENT_CONTEXT_OPEN_WITH10 50209
+#define IDC_CONTENT_CONTEXT_OPEN_WITH11 50210
+#define IDC_CONTENT_CONTEXT_OPEN_WITH12 50211
+#define IDC_CONTENT_CONTEXT_OPEN_WITH13 50212
+#define IDC_CONTENT_CONTEXT_OPEN_WITH14 50213
+#define IDC_CONTENT_CONTEXT_EMOJI 50220
+#define IDC_CONTEXT_COMPOSE 50230
+#define IDC_BOOKMARK_BAR_OPEN_ALL 51000
+#define IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW 51001
+#define IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO 51002
+#define IDC_BOOKMARK_BAR_OPEN_INCOGNITO 51003
+#define IDC_BOOKMARK_BAR_OPEN_ALL_NEW_TAB_GROUP 51004
+#define IDC_BOOKMARK_BAR_RENAME_FOLDER 51005
+#define IDC_BOOKMARK_BAR_EDIT 51006
+#define IDC_BOOKMARK_BAR_REMOVE 51007
+#define IDC_BOOKMARK_BAR_UNDO 51008
+#define IDC_BOOKMARK_BAR_REDO 51009
+#define IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK 51010
+#define IDC_BOOKMARK_BAR_NEW_FOLDER 51011
+#define IDC_BOOKMARK_MANAGER 51012
+#define IDC_BOOKMARK_BAR_ALWAYS_SHOW 51013
+#define IDC_BOOKMARK_BAR_SHOW_APPS_SHORTCUT 51014
+#define IDC_BOOKMARK_BAR_SHOW_READING_LIST 51015
+#define IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS 51016
+#define IDC_BOOKMARK_BAR_TRACK_PRICE_FOR_SHOPPING_BOOKMARK 51017
+#define IDC_BOOKMARK_BAR_UNTRACK_PRICE_FOR_SHOPPING_BOOKMARK 51018
+#define IDC_BOOKMARK_BAR_ADD_TO_BOOKMARKS_BAR 51019
+#define IDC_BOOKMARK_BAR_REMOVE_FROM_BOOKMARKS_BAR 51020
+#define IDC_CONTENT_CONTEXT_SHARING_CLICK_TO_CALL_SINGLE_DEVICE 51030
+#define IDC_CONTENT_CONTEXT_SHARING_CLICK_TO_CALL_MULTIPLE_DEVICES 51031
+#define IDC_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_SINGLE_DEVICE 51032
+#define IDC_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_MULTIPLE_DEVICES 51033
+#define IDC_CONTENT_CONTEXT_GENERATE_QR_CODE 51034
+#define IDC_CONTENT_CONTEXT_SHARING_SUBMENU 51035
+#define IDC_CONTENT_CLIPBOARD_HISTORY_MENU 51036
+#define IDC_CONTENT_PASTE_FROM_CLIPBOARD 51037
+#define IDC_STATUS_TRAY_KEEP_CHROME_RUNNING_IN_BACKGROUND 51100
+#define IDC_MEDIA_ROUTER_ABOUT 51200
+#define IDC_MEDIA_ROUTER_HELP 51201
+#define IDC_MEDIA_ROUTER_LEARN_MORE 51202
+#define IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 51204
+#define IDC_MEDIA_ROUTER_SHOWN_BY_POLICY 51206
+#define IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR 51207
+#define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
+#define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
+#define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
+#define IDC_UPDATE_SIDE_PANEL_PIN_STATE 51211
+#define IDC_MEDIA_STREAM_DEVICE_STATUS_TRAY 51300
+#define IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_FIRST 51301
+#define IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_LAST 51399
+#define IDC_MEDIA_STREAM_DEVICE_ALWAYS_ALLOW 51400
+#define IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_FIRST 52000
+#define IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_LAST 52199
+#define IDC_CONTENT_CONTEXT_PROTOCOL_HANDLER_SETTINGS 52200
+#define IDC_OPEN_LINK_IN_PROFILE_FIRST 52300
+#define IDC_OPEN_LINK_IN_PROFILE_LAST 52399
+#define IDC_CONTENT_CONTEXT_START_SMART_SELECTION_ACTION1 52400
+#define IDC_CONTENT_CONTEXT_START_SMART_SELECTION_ACTION2 52401
+#define IDC_CONTENT_CONTEXT_START_SMART_SELECTION_ACTION3 52402
+#define IDC_CONTENT_CONTEXT_START_SMART_SELECTION_ACTION4 52403
+#define IDC_CONTENT_CONTEXT_START_SMART_SELECTION_ACTION5 52404
+#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE 52410
+#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
+#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
+#define IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER 52413
+#define IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY 52414
+#define IDC_CONTENT_CONTEXT_RUN_LAYOUT_EXTRACTION 52420
+#define IDC_CONTENT_CONTEXT_PDF_OCR 52421
+#define IDC_TAB_SEARCH 52500
+#define IDC_TAB_SEARCH_CLOSE 52501
+#define IDC_DEBUG_TOGGLE_TABLET_MODE 52510
+#define IDC_DEBUG_PRINT_VIEW_TREE 52511
+#define IDC_DEBUG_PRINT_VIEW_TREE_DETAILS 52512
+#define IDC_CONTENT_CONTEXT_AUTOFILL_FEEDBACK 52990
+#define IDC_CONTENT_CONTEXT_AUTOFILL_FALLBACK_ADDRESS 52995
+#define IDC_CONTENT_CONTEXT_AUTOFILL_FALLBACK_PAYMENTS 52996
+#define IDC_LIVE_CAPTION 53251
+#define IDC_DEVICE_SYSTEM_TRAY_ICON_FIRST 53260
+#define IDC_DEVICE_SYSTEM_TRAY_ICON_LAST 53299
+
+#endif  // CEF_INCLUDE_CEF_COMMAND_IDS_H_
diff --git a/src/include/cef_command_line.h b/src/include/cef_command_line.h
index dd5491cd2..9ae6ee644 100644
--- a/src/include/cef_command_line.h
+++ b/src/include/cef_command_line.h
@@ -43,14 +43,15 @@
 #include "include/cef_base.h"
 
 ///
-// Class used to create and/or parse command line arguments. Arguments with
-// '--', '-' and, on Windows, '/' prefixes are considered switches. Switches
-// will always precede any arguments without switch prefixes. Switches can
-// optionally have a value specified using the '=' delimiter (e.g.
-// "-switch=value"). An argument of "--" will terminate switch parsing with all
-// subsequent tokens, regardless of prefix, being interpreted as non-switch
-// arguments. Switch names are considered case-insensitive. This class can be
-// used before CefInitialize() is called.
+/// Class used to create and/or parse command line arguments. Arguments with
+/// "--", "-" and, on Windows, "/" prefixes are considered switches. Switches
+/// will always precede any arguments without switch prefixes. Switches can
+/// optionally have a value specified using the "=" delimiter (e.g.
+/// "-switch=value"). An argument of "--" will terminate switch parsing with all
+/// subsequent tokens, regardless of prefix, being interpreted as non-switch
+/// arguments. Switch names should be lowercase ASCII and will be converted to
+/// such if necessary. Switch values will retain the original case and UTF8
+/// encoding. This class can be used before CefInitialize() is called.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefCommandLine : public virtual CefBaseRefCounted {
@@ -59,147 +60,148 @@ class CefCommandLine : public virtual CefBaseRefCounted {
   typedef std::map<CefString, CefString> SwitchMap;
 
   ///
-  // Create a new CefCommandLine instance.
+  /// Create a new CefCommandLine instance.
   ///
   /*--cef(api_hash_check)--*/
   static CefRefPtr<CefCommandLine> CreateCommandLine();
 
   ///
-  // Returns the singleton global CefCommandLine object. The returned object
-  // will be read-only.
+  /// Returns the singleton global CefCommandLine object. The returned object
+  /// will be read-only.
   ///
   /*--cef(api_hash_check)--*/
   static CefRefPtr<CefCommandLine> GetGlobalCommandLine();
 
   ///
-  // Returns true if this object is valid. Do not call any other methods if this
-  // function returns false.
+  /// Returns true if this object is valid. Do not call any other methods if
+  /// this function returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
+  /// Returns true if the values of this object are read-only. Some APIs may
+  /// expose read-only objects.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns a writable copy of this object.
+  /// Returns a writable copy of this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefCommandLine> Copy() = 0;
 
   ///
-  // Initialize the command line with the specified |argc| and |argv| values.
-  // The first argument must be the name of the program. This method is only
-  // supported on non-Windows platforms.
+  /// Initialize the command line with the specified |argc| and |argv| values.
+  /// The first argument must be the name of the program. This method is only
+  /// supported on non-Windows platforms.
   ///
   /*--cef()--*/
   virtual void InitFromArgv(int argc, const char* const* argv) = 0;
 
   ///
-  // Initialize the command line with the string returned by calling
-  // GetCommandLineW(). This method is only supported on Windows.
+  /// Initialize the command line with the string returned by calling
+  /// GetCommandLineW(). This method is only supported on Windows.
   ///
   /*--cef()--*/
   virtual void InitFromString(const CefString& command_line) = 0;
 
   ///
-  // Reset the command-line switches and arguments but leave the program
-  // component unchanged.
+  /// Reset the command-line switches and arguments but leave the program
+  /// component unchanged.
   ///
   /*--cef()--*/
   virtual void Reset() = 0;
 
   ///
-  // Retrieve the original command line string as a vector of strings.
-  // The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
+  /// Retrieve the original command line string as a vector of strings.
+  /// The argv array:
+  /// `{ program, [(--|-|/)switch[=value]]*, [--], [argument]* }`
   ///
   /*--cef()--*/
   virtual void GetArgv(std::vector<CefString>& argv) = 0;
 
   ///
-  // Constructs and returns the represented command line string. Use this method
-  // cautiously because quoting behavior is unclear.
+  /// Constructs and returns the represented command line string. Use this
+  /// method cautiously because quoting behavior is unclear.
   ///
   /*--cef()--*/
   virtual CefString GetCommandLineString() = 0;
 
   ///
-  // Get the program part of the command line string (the first item).
+  /// Get the program part of the command line string (the first item).
   ///
   /*--cef()--*/
   virtual CefString GetProgram() = 0;
 
   ///
-  // Set the program part of the command line string (the first item).
+  /// Set the program part of the command line string (the first item).
   ///
   /*--cef()--*/
   virtual void SetProgram(const CefString& program) = 0;
 
   ///
-  // Returns true if the command line has switches.
+  /// Returns true if the command line has switches.
   ///
   /*--cef()--*/
   virtual bool HasSwitches() = 0;
 
   ///
-  // Returns true if the command line contains the given switch.
+  /// Returns true if the command line contains the given switch.
   ///
   /*--cef()--*/
   virtual bool HasSwitch(const CefString& name) = 0;
 
   ///
-  // Returns the value associated with the given switch. If the switch has no
-  // value or isn't present this method returns the empty string.
+  /// Returns the value associated with the given switch. If the switch has no
+  /// value or isn't present this method returns the empty string.
   ///
   /*--cef()--*/
   virtual CefString GetSwitchValue(const CefString& name) = 0;
 
   ///
-  // Returns the map of switch names and values. If a switch has no value an
-  // empty string is returned.
+  /// Returns the map of switch names and values. If a switch has no value an
+  /// empty string is returned.
   ///
   /*--cef()--*/
   virtual void GetSwitches(SwitchMap& switches) = 0;
 
   ///
-  // Add a switch to the end of the command line. If the switch has no value
-  // pass an empty value string.
+  /// Add a switch to the end of the command line.
   ///
   /*--cef()--*/
   virtual void AppendSwitch(const CefString& name) = 0;
 
   ///
-  // Add a switch with the specified value to the end of the command line.
+  /// Add a switch with the specified value to the end of the command line. If
+  /// the switch has no value pass an empty value string.
   ///
   /*--cef()--*/
   virtual void AppendSwitchWithValue(const CefString& name,
                                      const CefString& value) = 0;
 
   ///
-  // True if there are remaining command line arguments.
+  /// True if there are remaining command line arguments.
   ///
   /*--cef()--*/
   virtual bool HasArguments() = 0;
 
   ///
-  // Get the remaining command line arguments.
+  /// Get the remaining command line arguments.
   ///
   /*--cef()--*/
   virtual void GetArguments(ArgumentList& arguments) = 0;
 
   ///
-  // Add an argument to the end of the command line.
+  /// Add an argument to the end of the command line.
   ///
   /*--cef()--*/
   virtual void AppendArgument(const CefString& argument) = 0;
 
   ///
-  // Insert a command before the current command.
-  // Common for debuggers, like "valgrind" or "gdb --args".
+  /// Insert a command before the current command.
+  /// Common for debuggers, like "valgrind" or "gdb --args".
   ///
   /*--cef()--*/
   virtual void PrependWrapper(const CefString& wrapper) = 0;
diff --git a/src/include/cef_config.h b/src/include/cef_config.h
new file mode 100644
index 000000000..b5cc4511f
--- /dev/null
+++ b/src/include/cef_config.h
@@ -0,0 +1,40 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file is generated by the make_config_header.py tool.
+//
+
+#ifndef CEF_INCLUDE_CEF_CONFIG_H_
+#define CEF_INCLUDE_CEF_CONFIG_H_
+
+
+
+#endif  // CEF_INCLUDE_CEF_CONFIG_H_
diff --git a/src/include/cef_context_menu_handler.h b/src/include/cef_context_menu_handler.h
index 2a2a73e61..d499592ab 100644
--- a/src/include/cef_context_menu_handler.h
+++ b/src/include/cef_context_menu_handler.h
@@ -46,42 +46,61 @@
 class CefContextMenuParams;
 
 ///
-// Callback interface used for continuation of custom context menu display.
+/// Callback interface used for continuation of custom context menu display.
 ///
 /*--cef(source=library)--*/
 class CefRunContextMenuCallback : public virtual CefBaseRefCounted {
  public:
-  typedef cef_event_flags_t EventFlags;
+  ///
+  /// Complete context menu display by selecting the specified |command_id| and
+  /// |event_flags|.
+  ///
+  /*--cef(capi_name=cont)--*/
+  virtual void Continue(int command_id, cef_event_flags_t event_flags) = 0;
 
   ///
-  // Complete context menu display by selecting the specified |command_id| and
-  // |event_flags|.
+  /// Cancel context menu display.
+  ///
+  /*--cef()--*/
+  virtual void Cancel() = 0;
+};
+
+///
+/// Callback interface used for continuation of custom quick menu display.
+///
+/*--cef(source=library)--*/
+class CefRunQuickMenuCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Complete quick menu display by selecting the specified |command_id| and
+  /// |event_flags|.
   ///
   /*--cef(capi_name=cont)--*/
-  virtual void Continue(int command_id, EventFlags event_flags) = 0;
+  virtual void Continue(int command_id, cef_event_flags_t event_flags) = 0;
 
   ///
-  // Cancel context menu display.
+  /// Cancel quick menu display.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 };
 
 ///
-// Implement this interface to handle context menu events. The methods of this
-// class will be called on the UI thread.
+/// Implement this interface to handle context menu events. The methods of this
+/// class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefContextMenuHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_event_flags_t EventFlags;
+  typedef cef_quick_menu_edit_state_flags_t QuickMenuEditStateFlags;
 
   ///
-  // Called before a context menu is displayed. |params| provides information
-  // about the context menu state. |model| initially contains the default
-  // context menu. The |model| can be cleared to show no context menu or
-  // modified to show a custom menu. Do not keep references to |params| or
-  // |model| outside of this callback.
+  /// Called before a context menu is displayed. |params| provides information
+  /// about the context menu state. |model| initially contains the default
+  /// context menu. The |model| can be cleared to show no context menu or
+  /// modified to show a custom menu. Do not keep references to |params| or
+  /// |model| outside of this callback.
   ///
   /*--cef()--*/
   virtual void OnBeforeContextMenu(CefRefPtr<CefBrowser> browser,
@@ -90,12 +109,12 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted {
                                    CefRefPtr<CefMenuModel> model) {}
 
   ///
-  // Called to allow custom display of the context menu. |params| provides
-  // information about the context menu state. |model| contains the context menu
-  // model resulting from OnBeforeContextMenu. For custom display return true
-  // and execute |callback| either synchronously or asynchronously with the
-  // selected command ID. For default display return false. Do not keep
-  // references to |params| or |model| outside of this callback.
+  /// Called to allow custom display of the context menu. |params| provides
+  /// information about the context menu state. |model| contains the context
+  /// menu model resulting from OnBeforeContextMenu. For custom display return
+  /// true and execute |callback| either synchronously or asynchronously with
+  /// the selected command ID. For default display return false. Do not keep
+  /// references to |params| or |model| outside of this callback.
   ///
   /*--cef()--*/
   virtual bool RunContextMenu(CefRefPtr<CefBrowser> browser,
@@ -107,13 +126,13 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called to execute a command selected from the context menu. Return true if
-  // the command was handled or false for the default implementation. See
-  // cef_menu_id_t for the command ids that have default implementations. All
-  // user-defined command ids should be between MENU_ID_USER_FIRST and
-  // MENU_ID_USER_LAST. |params| will have the same values as what was passed to
-  // OnBeforeContextMenu(). Do not keep a reference to |params| outside of this
-  // callback.
+  /// Called to execute a command selected from the context menu. Return true if
+  /// the command was handled or false for the default implementation. See
+  /// cef_menu_id_t for the command ids that have default implementations. All
+  /// user-defined command ids should be between MENU_ID_USER_FIRST and
+  /// MENU_ID_USER_LAST. |params| will have the same values as what was passed
+  /// to OnBeforeContextMenu(). Do not keep a reference to |params| outside of
+  /// this callback.
   ///
   /*--cef()--*/
   virtual bool OnContextMenuCommand(CefRefPtr<CefBrowser> browser,
@@ -125,17 +144,57 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the context menu is dismissed irregardless of whether the menu
-  // was empty or a command was selected.
+  /// Called when the context menu is dismissed irregardless of whether the menu
+  /// was canceled or a command was selected.
   ///
   /*--cef()--*/
   virtual void OnContextMenuDismissed(CefRefPtr<CefBrowser> browser,
                                       CefRefPtr<CefFrame> frame) {}
+
+  ///
+  /// Called to allow custom display of the quick menu for a windowless browser.
+  /// |location| is the top left corner of the selected region. |size| is the
+  /// size of the selected region. |edit_state_flags| is a combination of flags
+  /// that represent the state of the quick menu. Return true if the menu will
+  /// be handled and execute |callback| either synchronously or asynchronously
+  /// with the selected command ID. Return false to cancel the menu.
+  ///
+  /*--cef()--*/
+  virtual bool RunQuickMenu(CefRefPtr<CefBrowser> browser,
+                            CefRefPtr<CefFrame> frame,
+                            const CefPoint& location,
+                            const CefSize& size,
+                            QuickMenuEditStateFlags edit_state_flags,
+                            CefRefPtr<CefRunQuickMenuCallback> callback) {
+    return false;
+  }
+
+  ///
+  /// Called to execute a command selected from the quick menu for a windowless
+  /// browser. Return true if the command was handled or false for the default
+  /// implementation. See cef_menu_id_t for command IDs that have default
+  /// implementations.
+  ///
+  /*--cef()--*/
+  virtual bool OnQuickMenuCommand(CefRefPtr<CefBrowser> browser,
+                                  CefRefPtr<CefFrame> frame,
+                                  int command_id,
+                                  EventFlags event_flags) {
+    return false;
+  }
+
+  ///
+  /// Called when the quick menu for a windowless browser is dismissed
+  /// irregardless of whether the menu was canceled or a command was selected.
+  ///
+  /*--cef()--*/
+  virtual void OnQuickMenuDismissed(CefRefPtr<CefBrowser> browser,
+                                    CefRefPtr<CefFrame> frame) {}
 };
 
 ///
-// Provides information about the context menu state. The ethods of this class
-// can only be accessed on browser process the UI thread.
+/// Provides information about the context menu state. The methods of this class
+/// can only be accessed on browser process the UI thread.
 ///
 /*--cef(source=library)--*/
 class CefContextMenuParams : public virtual CefBaseRefCounted {
@@ -146,147 +205,143 @@ class CefContextMenuParams : public virtual CefBaseRefCounted {
   typedef cef_context_menu_edit_state_flags_t EditStateFlags;
 
   ///
-  // Returns the X coordinate of the mouse where the context menu was invoked.
-  // Coords are relative to the associated RenderView's origin.
+  /// Returns the X coordinate of the mouse where the context menu was invoked.
+  /// Coords are relative to the associated RenderView's origin.
   ///
   /*--cef()--*/
   virtual int GetXCoord() = 0;
 
   ///
-  // Returns the Y coordinate of the mouse where the context menu was invoked.
-  // Coords are relative to the associated RenderView's origin.
+  /// Returns the Y coordinate of the mouse where the context menu was invoked.
+  /// Coords are relative to the associated RenderView's origin.
   ///
   /*--cef()--*/
   virtual int GetYCoord() = 0;
 
   ///
-  // Returns flags representing the type of node that the context menu was
-  // invoked on.
+  /// Returns flags representing the type of node that the context menu was
+  /// invoked on.
   ///
   /*--cef(default_retval=CM_TYPEFLAG_NONE)--*/
   virtual TypeFlags GetTypeFlags() = 0;
 
   ///
-  // Returns the URL of the link, if any, that encloses the node that the
-  // context menu was invoked on.
+  /// Returns the URL of the link, if any, that encloses the node that the
+  /// context menu was invoked on.
   ///
   /*--cef()--*/
   virtual CefString GetLinkUrl() = 0;
 
   ///
-  // Returns the link URL, if any, to be used ONLY for "copy link address". We
-  // don't validate this field in the frontend process.
+  /// Returns the link URL, if any, to be used ONLY for "copy link address". We
+  /// don't validate this field in the frontend process.
   ///
   /*--cef()--*/
   virtual CefString GetUnfilteredLinkUrl() = 0;
 
   ///
-  // Returns the source URL, if any, for the element that the context menu was
-  // invoked on. Example of elements with source URLs are img, audio, and video.
+  /// Returns the source URL, if any, for the element that the context menu was
+  /// invoked on. Example of elements with source URLs are img, audio, and
+  /// video.
   ///
   /*--cef()--*/
   virtual CefString GetSourceUrl() = 0;
 
   ///
-  // Returns true if the context menu was invoked on an image which has
-  // non-empty contents.
+  /// Returns true if the context menu was invoked on an image which has
+  /// non-empty contents.
   ///
   /*--cef()--*/
   virtual bool HasImageContents() = 0;
 
   ///
-  // Returns the title text or the alt text if the context menu was invoked on
-  // an image.
+  /// Returns the title text or the alt text if the context menu was invoked on
+  /// an image.
   ///
   /*--cef()--*/
   virtual CefString GetTitleText() = 0;
 
   ///
-  // Returns the URL of the top level page that the context menu was invoked on.
+  /// Returns the URL of the top level page that the context menu was invoked
+  /// on.
   ///
   /*--cef()--*/
   virtual CefString GetPageUrl() = 0;
 
   ///
-  // Returns the URL of the subframe that the context menu was invoked on.
+  /// Returns the URL of the subframe that the context menu was invoked on.
   ///
   /*--cef()--*/
   virtual CefString GetFrameUrl() = 0;
 
   ///
-  // Returns the character encoding of the subframe that the context menu was
-  // invoked on.
+  /// Returns the character encoding of the subframe that the context menu was
+  /// invoked on.
   ///
   /*--cef()--*/
   virtual CefString GetFrameCharset() = 0;
 
   ///
-  // Returns the type of context node that the context menu was invoked on.
+  /// Returns the type of context node that the context menu was invoked on.
   ///
   /*--cef(default_retval=CM_MEDIATYPE_NONE)--*/
   virtual MediaType GetMediaType() = 0;
 
   ///
-  // Returns flags representing the actions supported by the media element, if
-  // any, that the context menu was invoked on.
+  /// Returns flags representing the actions supported by the media element, if
+  /// any, that the context menu was invoked on.
   ///
   /*--cef(default_retval=CM_MEDIAFLAG_NONE)--*/
   virtual MediaStateFlags GetMediaStateFlags() = 0;
 
   ///
-  // Returns the text of the selection, if any, that the context menu was
-  // invoked on.
+  /// Returns the text of the selection, if any, that the context menu was
+  /// invoked on.
   ///
   /*--cef()--*/
   virtual CefString GetSelectionText() = 0;
 
   ///
-  // Returns the text of the misspelled word, if any, that the context menu was
-  // invoked on.
+  /// Returns the text of the misspelled word, if any, that the context menu was
+  /// invoked on.
   ///
   /*--cef()--*/
   virtual CefString GetMisspelledWord() = 0;
 
   ///
-  // Returns true if suggestions exist, false otherwise. Fills in |suggestions|
-  // from the spell check service for the misspelled word if there is one.
+  /// Returns true if suggestions exist, false otherwise. Fills in |suggestions|
+  /// from the spell check service for the misspelled word if there is one.
   ///
   /*--cef()--*/
   virtual bool GetDictionarySuggestions(
       std::vector<CefString>& suggestions) = 0;
 
   ///
-  // Returns true if the context menu was invoked on an editable node.
+  /// Returns true if the context menu was invoked on an editable node.
   ///
   /*--cef()--*/
   virtual bool IsEditable() = 0;
 
   ///
-  // Returns true if the context menu was invoked on an editable node where
-  // spell-check is enabled.
+  /// Returns true if the context menu was invoked on an editable node where
+  /// spell-check is enabled.
   ///
   /*--cef()--*/
   virtual bool IsSpellCheckEnabled() = 0;
 
   ///
-  // Returns flags representing the actions supported by the editable node, if
-  // any, that the context menu was invoked on.
+  /// Returns flags representing the actions supported by the editable node, if
+  /// any, that the context menu was invoked on.
   ///
   /*--cef(default_retval=CM_EDITFLAG_NONE)--*/
   virtual EditStateFlags GetEditStateFlags() = 0;
 
   ///
-  // Returns true if the context menu contains items specified by the renderer
-  // process (for example, plugin placeholder or pepper plugin menu items).
+  /// Returns true if the context menu contains items specified by the renderer
+  /// process.
   ///
   /*--cef()--*/
   virtual bool IsCustomMenu() = 0;
-
-  ///
-  // Returns true if the context menu was invoked from a pepper plugin.
-  ///
-  /*--cef()--*/
-  virtual bool IsPepperMenu() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_CONTEXT_MENU_HANDLER_H_
diff --git a/src/include/cef_cookie.h b/src/include/cef_cookie.h
index eb57630ab..e3a682077 100644
--- a/src/include/cef_cookie.h
+++ b/src/include/cef_cookie.h
@@ -47,74 +47,38 @@ class CefSetCookieCallback;
 class CefDeleteCookiesCallback;
 
 ///
-// Class used for managing cookies. The methods of this class may be called on
-// any thread unless otherwise indicated.
+/// Class used for managing cookies. The methods of this class may be called on
+/// any thread unless otherwise indicated.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefCookieManager : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns the global cookie manager. By default data will be stored at
-  // CefSettings.cache_path if specified or in memory otherwise. If |callback|
-  // is non-NULL it will be executed asnychronously on the IO thread after the
-  // manager's storage has been initialized. Using this method is equivalent to
-  // calling CefRequestContext::GetGlobalContext()->GetDefaultCookieManager().
+  /// Returns the global cookie manager. By default data will be stored at
+  /// cef_settings_t.cache_path if specified or in memory otherwise. If
+  /// |callback| is non-NULL it will be executed asnychronously on the UI thread
+  /// after the manager's storage has been initialized. Using this method is
+  /// equivalent to calling
+  /// CefRequestContext::GetGlobalContext()->GetDefaultCookieManager().
   ///
   /*--cef(optional_param=callback)--*/
   static CefRefPtr<CefCookieManager> GetGlobalManager(
       CefRefPtr<CefCompletionCallback> callback);
 
   ///
-  // Returns a cookie manager that neither stores nor retrieves cookies. All
-  // usage of cookies will be blocked including cookies accessed via the network
-  // (request/response headers), via JavaScript (document.cookie), and via
-  // CefCookieManager methods. No cookies will be displayed in DevTools. If you
-  // wish to only block cookies sent via the network use the CefRequestHandler
-  // CanGetCookies and CanSetCookie methods instead.
-  ///
-  /*--cef()--*/
-  static CefRefPtr<CefCookieManager> GetBlockingManager();
-
-  ///
-  // Creates a new cookie manager. If |path| is empty data will be stored in
-  // memory only. Otherwise, data will be stored at the specified |path|. To
-  // persist session cookies (cookies without an expiry date or validity
-  // interval) set |persist_session_cookies| to true. Session cookies are
-  // generally intended to be transient and most Web browsers do not persist
-  // them. If |callback| is non-NULL it will be executed asnychronously on the
-  // IO thread after the manager's storage has been initialized.
-  ///
-  /*--cef(optional_param=path,optional_param=callback)--*/
-  static CefRefPtr<CefCookieManager> CreateManager(
-      const CefString& path,
-      bool persist_session_cookies,
-      CefRefPtr<CefCompletionCallback> callback);
-
-  ///
-  // Set the schemes supported by this manager. The default schemes ("http",
-  // "https", "ws" and "wss") will always be supported. If |callback| is non-
-  // NULL it will be executed asnychronously on the IO thread after the change
-  // has been applied. Must be called before any cookies are accessed.
-  ///
-  /*--cef(optional_param=callback)--*/
-  virtual void SetSupportedSchemes(
-      const std::vector<CefString>& schemes,
-      CefRefPtr<CefCompletionCallback> callback) = 0;
-
-  ///
-  // Visit all cookies on the IO thread. The returned cookies are ordered by
-  // longest path, then by earliest creation date. Returns false if cookies
-  // cannot be accessed.
+  /// Visit all cookies on the UI thread. The returned cookies are ordered by
+  /// longest path, then by earliest creation date. Returns false if cookies
+  /// cannot be accessed.
   ///
   /*--cef()--*/
   virtual bool VisitAllCookies(CefRefPtr<CefCookieVisitor> visitor) = 0;
 
   ///
-  // Visit a subset of cookies on the IO thread. The results are filtered by the
-  // given url scheme, host, domain and path. If |includeHttpOnly| is true
-  // HTTP-only cookies will also be included in the results. The returned
-  // cookies are ordered by longest path, then by earliest creation date.
-  // Returns false if cookies cannot be accessed.
+  /// Visit a subset of cookies on the UI thread. The results are filtered by
+  /// the given url scheme, host, domain and path. If |includeHttpOnly| is true
+  /// HTTP-only cookies will also be included in the results. The returned
+  /// cookies are ordered by longest path, then by earliest creation date.
+  /// Returns false if cookies cannot be accessed.
   ///
   /*--cef()--*/
   virtual bool VisitUrlCookies(const CefString& url,
@@ -122,13 +86,13 @@ class CefCookieManager : public virtual CefBaseRefCounted {
                                CefRefPtr<CefCookieVisitor> visitor) = 0;
 
   ///
-  // Sets a cookie given a valid URL and explicit user-provided cookie
-  // attributes. This function expects each attribute to be well-formed. It will
-  // check for disallowed characters (e.g. the ';' character is disallowed
-  // within the cookie value attribute) and fail without setting the cookie if
-  // such characters are found. If |callback| is non-NULL it will be executed
-  // asnychronously on the IO thread after the cookie has been set. Returns
-  // false if an invalid URL is specified or if cookies cannot be accessed.
+  /// Sets a cookie given a valid URL and explicit user-provided cookie
+  /// attributes. This function expects each attribute to be well-formed. It
+  /// will check for disallowed characters (e.g. the ';' character is disallowed
+  /// within the cookie value attribute) and fail without setting the cookie if
+  /// such characters are found. If |callback| is non-NULL it will be executed
+  /// asnychronously on the UI thread after the cookie has been set. Returns
+  /// false if an invalid URL is specified or if cookies cannot be accessed.
   ///
   /*--cef(optional_param=callback)--*/
   virtual bool SetCookie(const CefString& url,
@@ -136,15 +100,15 @@ class CefCookieManager : public virtual CefBaseRefCounted {
                          CefRefPtr<CefSetCookieCallback> callback) = 0;
 
   ///
-  // Delete all cookies that match the specified parameters. If both |url| and
-  // |cookie_name| values are specified all host and domain cookies matching
-  // both will be deleted. If only |url| is specified all host cookies (but not
-  // domain cookies) irrespective of path will be deleted. If |url| is empty all
-  // cookies for all hosts and domains will be deleted. If |callback| is
-  // non-NULL it will be executed asnychronously on the IO thread after the
-  // cookies have been deleted. Returns false if a non-empty invalid URL is
-  // specified or if cookies cannot be accessed. Cookies can alternately be
-  // deleted using the Visit*Cookies() methods.
+  /// Delete all cookies that match the specified parameters. If both |url| and
+  /// |cookie_name| values are specified all host and domain cookies matching
+  /// both will be deleted. If only |url| is specified all host cookies (but not
+  /// domain cookies) irrespective of path will be deleted. If |url| is empty
+  /// all cookies for all hosts and domains will be deleted. If |callback| is
+  /// non-NULL it will be executed asnychronously on the UI thread after the
+  /// cookies have been deleted. Returns false if a non-empty invalid URL is
+  /// specified or if cookies cannot be accessed. Cookies can alternately be
+  /// deleted using the Visit*Cookies() methods.
   ///
   /*--cef(optional_param=url,optional_param=cookie_name,
           optional_param=callback)--*/
@@ -153,42 +117,27 @@ class CefCookieManager : public virtual CefBaseRefCounted {
                              CefRefPtr<CefDeleteCookiesCallback> callback) = 0;
 
   ///
-  // Sets the directory path that will be used for storing cookie data. If
-  // |path| is empty data will be stored in memory only. Otherwise, data will be
-  // stored at the specified |path|. To persist session cookies (cookies without
-  // an expiry date or validity interval) set |persist_session_cookies| to true.
-  // Session cookies are generally intended to be transient and most Web
-  // browsers do not persist them. If |callback| is non-NULL it will be executed
-  // asnychronously on the IO thread after the manager's storage has been
-  // initialized. Returns false if cookies cannot be accessed.
-  ///
-  /*--cef(optional_param=path,optional_param=callback)--*/
-  virtual bool SetStoragePath(const CefString& path,
-                              bool persist_session_cookies,
-                              CefRefPtr<CefCompletionCallback> callback) = 0;
-
-  ///
-  // Flush the backing store (if any) to disk. If |callback| is non-NULL it will
-  // be executed asnychronously on the IO thread after the flush is complete.
-  // Returns false if cookies cannot be accessed.
+  /// Flush the backing store (if any) to disk. If |callback| is non-NULL it
+  /// will be executed asnychronously on the UI thread after the flush is
+  /// complete. Returns false if cookies cannot be accessed.
   ///
   /*--cef(optional_param=callback)--*/
   virtual bool FlushStore(CefRefPtr<CefCompletionCallback> callback) = 0;
 };
 
 ///
-// Interface to implement for visiting cookie values. The methods of this class
-// will always be called on the IO thread.
+/// Interface to implement for visiting cookie values. The methods of this class
+/// will always be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefCookieVisitor : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be called once for each cookie. |count| is the 0-based
-  // index for the current cookie. |total| is the total number of cookies.
-  // Set |deleteCookie| to true to delete the cookie currently being visited.
-  // Return false to stop visiting cookies. This method may never be called if
-  // no cookies are found.
+  /// Method that will be called once for each cookie. |count| is the 0-based
+  /// index for the current cookie. |total| is the total number of cookies.
+  /// Set |deleteCookie| to true to delete the cookie currently being visited.
+  /// Return false to stop visiting cookies. This method may never be called if
+  /// no cookies are found.
   ///
   /*--cef()--*/
   virtual bool Visit(const CefCookie& cookie,
@@ -198,30 +147,30 @@ class CefCookieVisitor : public virtual CefBaseRefCounted {
 };
 
 ///
-// Interface to implement to be notified of asynchronous completion via
-// CefCookieManager::SetCookie().
+/// Interface to implement to be notified of asynchronous completion via
+/// CefCookieManager::SetCookie().
 ///
 /*--cef(source=client)--*/
 class CefSetCookieCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be called upon completion. |success| will be true if the
-  // cookie was set successfully.
+  /// Method that will be called upon completion. |success| will be true if the
+  /// cookie was set successfully.
   ///
   /*--cef()--*/
   virtual void OnComplete(bool success) = 0;
 };
 
 ///
-// Interface to implement to be notified of asynchronous completion via
-// CefCookieManager::DeleteCookies().
+/// Interface to implement to be notified of asynchronous completion via
+/// CefCookieManager::DeleteCookies().
 ///
 /*--cef(source=client)--*/
 class CefDeleteCookiesCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be called upon completion. |num_deleted| will be the
-  // number of cookies that were deleted or -1 if unknown.
+  /// Method that will be called upon completion. |num_deleted| will be the
+  /// number of cookies that were deleted.
   ///
   /*--cef()--*/
   virtual void OnComplete(int num_deleted) = 0;
diff --git a/src/include/cef_crash_util.h b/src/include/cef_crash_util.h
index e569df74a..956b5ffbc 100644
--- a/src/include/cef_crash_util.h
+++ b/src/include/cef_crash_util.h
@@ -39,94 +39,97 @@
 #pragma once
 
 ///
-// Crash reporting is configured using an INI-style config file named
-// "crash_reporter.cfg". On Windows and Linux this file must be placed next to
-// the main application executable. On macOS this file must be placed in the
-// top-level app bundle Resources directory (e.g.
-// "<appname>.app/Contents/Resources"). File contents are as follows:
-//
-//  # Comments start with a hash character and must be on their own line.
-//
-//  [Config]
-//  ProductName=<Value of the "prod" crash key; defaults to "cef">
-//  ProductVersion=<Value of the "ver" crash key; defaults to the CEF version>
-//  AppName=<Windows only; App-specific folder name component for storing crash
-//           information; default to "CEF">
-//  ExternalHandler=<Windows only; Name of the external handler exe to use
-//                   instead of re-launching the main exe; default to empty>
-//  BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes
-//                                 should be forwarded to the system crash
-//                                 reporter; default to false>
-//  ServerURL=<crash server URL; default to empty>
-//  RateLimitEnabled=<True if uploads should be rate limited; default to true>
-//  MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled;
-//                    default to 5>
-//  MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value
-//                       will cause older reports to be deleted; default to 20>
-//  MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted;
-//                        default to 5>
-//
-//  [CrashKeys]
-//  my_key1=<small|medium|large>
-//  my_key2=<small|medium|large>
-//
-// Config section:
-//
-// If "ProductName" and/or "ProductVersion" are set then the specified values
-// will be included in the crash dump metadata. On macOS if these values are set
-// to empty then they will be retrieved from the Info.plist file using the
-// "CFBundleName" and "CFBundleShortVersionString" keys respectively.
-//
-// If "AppName" is set on Windows then crash report information (metrics,
-// database and dumps) will be stored locally on disk under the
-// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other
-// platforms the CefSettings.user_data_path value will be used.
-//
-// If "ExternalHandler" is set on Windows then the specified exe will be
-// launched as the crashpad-handler instead of re-launching the main process
-// exe. The value can be an absolute path or a path relative to the main exe
-// directory. On Linux the CefSettings.browser_subprocess_path value will be
-// used. On macOS the existing subprocess app bundle will be used.
-//
-// If "BrowserCrashForwardingEnabled" is set to true on macOS then browser
-// process crashes will be forwarded to the system crash reporter. This results
-// in the crash UI dialog being displayed to the user and crash reports being
-// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports
-// from non-browser processes and Debug builds is always disabled.
-//
-// If "ServerURL" is set then crashes will be uploaded as a multi-part POST
-// request to the specified URL. Otherwise, reports will only be stored locally
-// on disk.
-//
-// If "RateLimitEnabled" is set to true then crash report uploads will be rate
-// limited as follows:
-//  1. If "MaxUploadsPerDay" is set to a positive value then at most the
-//     specified number of crashes will be uploaded in each 24 hour period.
-//  2. If crash upload fails due to a network or server error then an
-//     incremental backoff delay up to a maximum of 24 hours will be applied for
-//     retries.
-//  3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the
-//     "MaxUploadsPerDay" value will be reduced to 1 until the client is
-//     restarted. This helps to avoid an upload flood when the network or
-//     server error is resolved.
-// Rate limiting is not supported on Linux.
-//
-// If "MaxDatabaseSizeInMb" is set to a positive value then crash report storage
-// on disk will be limited to that size in megabytes. For example, on Windows
-// each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20 equates to
-// about 34 crash reports stored on disk. Not supported on Linux.
-//
-// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports older
-// than the specified age in days will be deleted. Not supported on Linux.
-//
-// CrashKeys section:
-//
-// A maximum of 26 crash keys of each size can be specified for use by the
-// application. Crash key values will be truncated based on the specified size
-// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
-// crash keys can be set from any thread or process using the
-// CefSetCrashKeyValue function. These key/value pairs will be sent to the crash
-// server along with the crash dump file.
+/// Crash reporting is configured using an INI-style config file named
+/// "crash_reporter.cfg". On Windows and Linux this file must be placed next to
+/// the main application executable. On macOS this file must be placed in the
+/// top-level app bundle Resources directory (e.g.
+/// "<appname>.app/Contents/Resources"). File contents are as follows:
+///
+/// <pre>
+///  # Comments start with a hash character and must be on their own line.
+///
+///  [Config]
+///  ProductName=<Value of the "prod" crash key; defaults to "cef">
+///  ProductVersion=<Value of the "ver" crash key; defaults to the CEF version>
+///  AppName=<Windows only; App-specific folder name component for storing crash
+///           information; default to "CEF">
+///  ExternalHandler=<Windows only; Name of the external handler exe to use
+///                   instead of re-launching the main exe; default to empty>
+///  BrowserCrashForwardingEnabled=<macOS only; True if browser process crashes
+///                                 should be forwarded to the system crash
+///                                 reporter; default to false>
+///  ServerURL=<crash server URL; default to empty>
+///  RateLimitEnabled=<True if uploads should be rate limited; default to true>
+///  MaxUploadsPerDay=<Max uploads per 24 hours, used if rate limit is enabled;
+///                    default to 5>
+///  MaxDatabaseSizeInMb=<Total crash report disk usage greater than this value
+///                       will cause older reports to be deleted; default to 20>
+///  MaxDatabaseAgeInDays=<Crash reports older than this value will be deleted;
+///                        default to 5>
+///
+///  [CrashKeys]
+///  my_key1=<small|medium|large>
+///  my_key2=<small|medium|large>
+/// </pre>
+///
+/// <b>Config section:</b>
+///
+/// If "ProductName" and/or "ProductVersion" are set then the specified values
+/// will be included in the crash dump metadata. On macOS if these values are
+/// set to empty then they will be retrieved from the Info.plist file using the
+/// "CFBundleName" and "CFBundleShortVersionString" keys respectively.
+///
+/// If "AppName" is set on Windows then crash report information (metrics,
+/// database and dumps) will be stored locally on disk under the
+/// "C:\Users\[CurrentUser]\AppData\Local\[AppName]\User Data" folder. On other
+/// platforms the cef_settings_t.root_cache_path value will be used.
+///
+/// If "ExternalHandler" is set on Windows then the specified exe will be
+/// launched as the crashpad-handler instead of re-launching the main process
+/// exe. The value can be an absolute path or a path relative to the main exe
+/// directory. On Linux the cef_settings_t.browser_subprocess_path value will be
+/// used. On macOS the existing subprocess app bundle will be used.
+///
+/// If "BrowserCrashForwardingEnabled" is set to true on macOS then browser
+/// process crashes will be forwarded to the system crash reporter. This results
+/// in the crash UI dialog being displayed to the user and crash reports being
+/// logged under "~/Library/Logs/DiagnosticReports". Forwarding of crash reports
+/// from non-browser processes and Debug builds is always disabled.
+///
+/// If "ServerURL" is set then crashes will be uploaded as a multi-part POST
+/// request to the specified URL. Otherwise, reports will only be stored locally
+/// on disk.
+///
+/// If "RateLimitEnabled" is set to true then crash report uploads will be rate
+/// limited as follows:
+///  1. If "MaxUploadsPerDay" is set to a positive value then at most the
+///     specified number of crashes will be uploaded in each 24 hour period.
+///  2. If crash upload fails due to a network or server error then an
+///     incremental backoff delay up to a maximum of 24 hours will be applied
+///     for retries.
+///  3. If a backoff delay is applied and "MaxUploadsPerDay" is > 1 then the
+///     "MaxUploadsPerDay" value will be reduced to 1 until the client is
+///     restarted. This helps to avoid an upload flood when the network or
+///     server error is resolved.
+/// Rate limiting is not supported on Linux.
+///
+/// If "MaxDatabaseSizeInMb" is set to a positive value then crash report
+/// storage on disk will be limited to that size in megabytes. For example, on
+/// Windows each dump is about 600KB so a "MaxDatabaseSizeInMb" value of 20
+/// equates to about 34 crash reports stored on disk. Not supported on Linux.
+///
+/// If "MaxDatabaseAgeInDays" is set to a positive value then crash reports
+/// older than the specified age in days will be deleted. Not supported on
+/// Linux.
+///
+/// <b>CrashKeys section:</b>
+///
+/// A maximum of 26 crash keys of each size can be specified for use by the
+/// application. Crash key values will be truncated based on the specified size
+/// (small = 64 bytes, medium = 256 bytes, large = 1024 bytes). The value of
+/// crash keys can be set from any thread or process using the
+/// CefSetCrashKeyValue function. These key/value pairs will be sent to the
+/// crash server along with the crash dump file.
 ///
 /*--cef()--*/
 bool CefCrashReportingEnabled();
@@ -134,7 +137,7 @@ bool CefCrashReportingEnabled();
 #include "include/cef_base.h"
 
 ///
-// Sets or clears a specific key-value pair from the crash metadata.
+/// Sets or clears a specific key-value pair from the crash metadata.
 ///
 /*--cef(optional_param=value)--*/
 void CefSetCrashKeyValue(const CefString& key, const CefString& value);
diff --git a/src/include/cef_devtools_message_observer.h b/src/include/cef_devtools_message_observer.h
new file mode 100644
index 000000000..757c607cc
--- /dev/null
+++ b/src/include/cef_devtools_message_observer.h
@@ -0,0 +1,132 @@
+// Copyright (c) 2020 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_DEVTOOLS_MESSAGE_OBSERVER_H_
+#define CEF_INCLUDE_CEF_DEVTOOLS_MESSAGE_OBSERVER_H_
+#pragma once
+
+#include "include/cef_base.h"
+
+class CefBrowser;
+
+///
+/// Callback interface for CefBrowserHost::AddDevToolsMessageObserver. The
+/// methods of this class will be called on the browser process UI thread.
+///
+/*--cef(source=client)--*/
+class CefDevToolsMessageObserver : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Method that will be called on receipt of a DevTools protocol message.
+  /// |browser| is the originating browser instance. |message| is a UTF8-encoded
+  /// JSON dictionary representing either a method result or an event. |message|
+  /// is only valid for the scope of this callback and should be copied if
+  /// necessary. Return true if the message was handled or false if the message
+  /// should be further processed and passed to the OnDevToolsMethodResult or
+  /// OnDevToolsEvent methods as appropriate.
+  ///
+  /// Method result dictionaries include an "id" (int) value that identifies the
+  /// orginating method call sent from CefBrowserHost::SendDevToolsMessage, and
+  /// optionally either a "result" (dictionary) or "error" (dictionary) value.
+  /// The "error" dictionary will contain "code" (int) and "message" (string)
+  /// values. Event dictionaries include a "method" (string) value and
+  /// optionally a "params" (dictionary) value. See the DevTools protocol
+  /// documentation at https://chromedevtools.github.io/devtools-protocol/ for
+  /// details of supported method calls and the expected "result" or "params"
+  /// dictionary contents. JSON dictionaries can be parsed using the
+  /// CefParseJSON function if desired, however be aware of performance
+  /// considerations when parsing large messages (some of which may exceed 1MB
+  /// in size).
+  ///
+  /*--cef()--*/
+  virtual bool OnDevToolsMessage(CefRefPtr<CefBrowser> browser,
+                                 const void* message,
+                                 size_t message_size) {
+    return false;
+  }
+
+  ///
+  /// Method that will be called after attempted execution of a DevTools
+  /// protocol method. |browser| is the originating browser instance.
+  /// |message_id| is the "id" value that identifies the originating method call
+  /// message. If the method succeeded |success| will be true and |result| will
+  /// be the UTF8-encoded JSON "result" dictionary value (which may be empty).
+  /// If the method failed |success| will be false and |result| will be the
+  /// UTF8-encoded JSON "error" dictionary value. |result| is only valid for the
+  /// scope of this callback and should be copied if necessary. See the
+  /// OnDevToolsMessage documentation for additional details on |result|
+  /// contents.
+  ///
+  /*--cef(optional_param=result)--*/
+  virtual void OnDevToolsMethodResult(CefRefPtr<CefBrowser> browser,
+                                      int message_id,
+                                      bool success,
+                                      const void* result,
+                                      size_t result_size) {}
+
+  ///
+  /// Method that will be called on receipt of a DevTools protocol event.
+  /// |browser| is the originating browser instance. |method| is the "method"
+  /// value. |params| is the UTF8-encoded JSON "params" dictionary value (which
+  /// may be empty). |params| is only valid for the scope of this callback and
+  /// should be copied if necessary. See the OnDevToolsMessage documentation for
+  /// additional details on |params| contents.
+  ///
+  /*--cef(optional_param=params)--*/
+  virtual void OnDevToolsEvent(CefRefPtr<CefBrowser> browser,
+                               const CefString& method,
+                               const void* params,
+                               size_t params_size) {}
+
+  ///
+  /// Method that will be called when the DevTools agent has attached. |browser|
+  /// is the originating browser instance. This will generally occur in response
+  /// to the first message sent while the agent is detached.
+  ///
+  /*--cef()--*/
+  virtual void OnDevToolsAgentAttached(CefRefPtr<CefBrowser> browser) {}
+
+  ///
+  /// Method that will be called when the DevTools agent has detached. |browser|
+  /// is the originating browser instance. Any method results that were pending
+  /// before the agent became detached will not be delivered, and any active
+  /// event subscriptions will be canceled.
+  ///
+  /*--cef()--*/
+  virtual void OnDevToolsAgentDetached(CefRefPtr<CefBrowser> browser) {}
+};
+
+#endif  // CEF_INCLUDE_CEF_DEVTOOLS_MESSAGE_OBSERVER_H_
diff --git a/src/include/cef_dialog_handler.h b/src/include/cef_dialog_handler.h
index 3ce02e6c1..30fd3a16d 100644
--- a/src/include/cef_dialog_handler.h
+++ b/src/include/cef_dialog_handler.h
@@ -42,33 +42,29 @@
 #include "include/cef_browser.h"
 
 ///
-// Callback interface for asynchronous continuation of file dialog requests.
+/// Callback interface for asynchronous continuation of file dialog requests.
 ///
 /*--cef(source=library)--*/
 class CefFileDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Continue the file selection. |selected_accept_filter| should be the 0-based
-  // index of the value selected from the accept filters array passed to
-  // CefDialogHandler::OnFileDialog. |file_paths| should be a single value or a
-  // list of values depending on the dialog mode. An empty |file_paths| value is
-  // treated the same as calling Cancel().
+  /// Continue the file selection. |file_paths| should be a single value or a
+  /// list of values depending on the dialog mode. An empty |file_paths| value
+  /// is treated the same as calling Cancel().
   ///
-  /*--cef(capi_name=cont,index_param=selected_accept_filter,
-          optional_param=file_paths)--*/
-  virtual void Continue(int selected_accept_filter,
-                        const std::vector<CefString>& file_paths) = 0;
+  /*--cef(capi_name=cont,optional_param=file_paths)--*/
+  virtual void Continue(const std::vector<CefString>& file_paths) = 0;
 
   ///
-  // Cancel the file selection.
+  /// Cancel the file selection.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 };
 
 ///
-// Implement this interface to handle dialog events. The methods of this class
-// will be called on the browser process UI thread.
+/// Implement this interface to handle dialog events. The methods of this class
+/// will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefDialogHandler : public virtual CefBaseRefCounted {
@@ -76,28 +72,26 @@ class CefDialogHandler : public virtual CefBaseRefCounted {
   typedef cef_file_dialog_mode_t FileDialogMode;
 
   ///
-  // Called to run a file chooser dialog. |mode| represents the type of dialog
-  // to display. |title| to the title to be used for the dialog and may be empty
-  // to show the default title ("Open" or "Save" depending on the mode).
-  // |default_file_path| is the path with optional directory and/or file name
-  // component that should be initially selected in the dialog. |accept_filters|
-  // are used to restrict the selectable file types and may any combination of
-  // (a) valid lower-cased MIME types (e.g. "text/*" or "image/*"),
-  // (b) individual file extensions (e.g. ".txt" or ".png"), or (c) combined
-  // description and file extension delimited using "|" and ";" (e.g.
-  // "Image Types|.png;.gif;.jpg"). |selected_accept_filter| is the 0-based
-  // index of the filter that should be selected by default. To display a custom
-  // dialog return true and execute |callback| either inline or at a later time.
-  // To display the default dialog return false.
+  /// Called to run a file chooser dialog. |mode| represents the type of dialog
+  /// to display. |title| to the title to be used for the dialog and may be
+  /// empty to show the default title ("Open" or "Save" depending on the mode).
+  /// |default_file_path| is the path with optional directory and/or file name
+  /// component that should be initially selected in the dialog.
+  /// |accept_filters| are used to restrict the selectable file types and may
+  /// any combination of (a) valid lower-cased MIME types (e.g. "text/*" or
+  /// "image/*"), (b) individual file extensions (e.g. ".txt" or ".png"), or (c)
+  /// combined description and file extension delimited using "|" and ";" (e.g.
+  /// "Image Types|.png;.gif;.jpg"). To display a custom dialog return true and
+  /// execute |callback| either inline or at a later time. To display the
+  /// default dialog return false.
   ///
   /*--cef(optional_param=title,optional_param=default_file_path,
-          optional_param=accept_filters,index_param=selected_accept_filter)--*/
+          optional_param=accept_filters)--*/
   virtual bool OnFileDialog(CefRefPtr<CefBrowser> browser,
                             FileDialogMode mode,
                             const CefString& title,
                             const CefString& default_file_path,
                             const std::vector<CefString>& accept_filters,
-                            int selected_accept_filter,
                             CefRefPtr<CefFileDialogCallback> callback) {
     return false;
   }
diff --git a/src/include/cef_display_handler.h b/src/include/cef_display_handler.h
index 4fdc3c312..3b776b416 100644
--- a/src/include/cef_display_handler.h
+++ b/src/include/cef_display_handler.h
@@ -43,14 +43,14 @@
 #include "include/cef_frame.h"
 
 ///
-// Implement this interface to handle events related to browser display state.
-// The methods of this class will be called on the UI thread.
+/// Implement this interface to handle events related to browser display state.
+/// The methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefDisplayHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called when a frame's address has changed.
+  /// Called when a frame's address has changed.
   ///
   /*--cef()--*/
   virtual void OnAddressChange(CefRefPtr<CefBrowser> browser,
@@ -58,37 +58,41 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
                                const CefString& url) {}
 
   ///
-  // Called when the page title changes.
+  /// Called when the page title changes.
   ///
   /*--cef(optional_param=title)--*/
   virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
                              const CefString& title) {}
 
   ///
-  // Called when the page icon changes.
+  /// Called when the page icon changes.
   ///
   /*--cef(optional_param=icon_urls)--*/
   virtual void OnFaviconURLChange(CefRefPtr<CefBrowser> browser,
                                   const std::vector<CefString>& icon_urls) {}
 
   ///
-  // Called when web content in the page has toggled fullscreen mode. If
-  // |fullscreen| is true the content will automatically be sized to fill the
-  // browser content area. If |fullscreen| is false the content will
-  // automatically return to its original size and position. The client is
-  // responsible for resizing the browser if desired.
+  /// Called when web content in the page has toggled fullscreen mode. If
+  /// |fullscreen| is true the content will automatically be sized to fill the
+  /// browser content area. If |fullscreen| is false the content will
+  /// automatically return to its original size and position. With the Alloy
+  /// runtime the client is responsible for triggering the fullscreen transition
+  /// (for example, by calling CefWindow::SetFullscreen when using Views). With
+  /// the Chrome runtime the fullscreen transition will be triggered
+  /// automatically. The CefWindowDelegate::OnWindowFullscreenTransition method
+  /// will be called during the fullscreen transition for notification purposes.
   ///
   /*--cef()--*/
   virtual void OnFullscreenModeChange(CefRefPtr<CefBrowser> browser,
                                       bool fullscreen) {}
 
   ///
-  // Called when the browser is about to display a tooltip. |text| contains the
-  // text that will be displayed in the tooltip. To handle the display of the
-  // tooltip yourself return true. Otherwise, you can optionally modify |text|
-  // and then return false to allow the browser to display the tooltip.
-  // When window rendering is disabled the application is responsible for
-  // drawing tooltips and the return value is ignored.
+  /// Called when the browser is about to display a tooltip. |text| contains the
+  /// text that will be displayed in the tooltip. To handle the display of the
+  /// tooltip yourself return true. Otherwise, you can optionally modify |text|
+  /// and then return false to allow the browser to display the tooltip.
+  /// When window rendering is disabled the application is responsible for
+  /// drawing tooltips and the return value is ignored.
   ///
   /*--cef(optional_param=text)--*/
   virtual bool OnTooltip(CefRefPtr<CefBrowser> browser, CefString& text) {
@@ -96,16 +100,16 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the browser receives a status message. |value| contains the
-  // text that will be displayed in the status message.
+  /// Called when the browser receives a status message. |value| contains the
+  /// text that will be displayed in the status message.
   ///
   /*--cef(optional_param=value)--*/
   virtual void OnStatusMessage(CefRefPtr<CefBrowser> browser,
                                const CefString& value) {}
 
   ///
-  // Called to display a console message. Return true to stop the message from
-  // being output to the console.
+  /// Called to display a console message. Return true to stop the message from
+  /// being output to the console.
   ///
   /*--cef(optional_param=message,optional_param=source)--*/
   virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
@@ -117,10 +121,10 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when auto-resize is enabled via CefBrowserHost::SetAutoResizeEnabled
-  // and the contents have auto-resized. |new_size| will be the desired size in
-  // view coordinates. Return true if the resize was handled or false for
-  // default handling.
+  /// Called when auto-resize is enabled via
+  /// CefBrowserHost::SetAutoResizeEnabled and the contents have auto-resized.
+  /// |new_size| will be the desired size in view coordinates. Return true if
+  /// the resize was handled or false for default handling.
   ///
   /*--cef()--*/
   virtual bool OnAutoResize(CefRefPtr<CefBrowser> browser,
@@ -129,12 +133,35 @@ class CefDisplayHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the overall page loading progress has changed. |progress|
-  // ranges from 0.0 to 1.0.
+  /// Called when the overall page loading progress has changed. |progress|
+  /// ranges from 0.0 to 1.0.
   ///
   /*--cef()--*/
   virtual void OnLoadingProgressChange(CefRefPtr<CefBrowser> browser,
                                        double progress) {}
+
+  ///
+  /// Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
+  /// |custom_cursor_info| will be populated with the custom cursor information.
+  /// Return true if the cursor change was handled or false for default
+  /// handling.
+  ///
+  /*--cef()--*/
+  virtual bool OnCursorChange(CefRefPtr<CefBrowser> browser,
+                              CefCursorHandle cursor,
+                              cef_cursor_type_t type,
+                              const CefCursorInfo& custom_cursor_info) {
+    return false;
+  }
+
+  ///
+  /// Called when the browser's access to an audio and/or video source has
+  /// changed.
+  ///
+  /*--cef()--*/
+  virtual void OnMediaAccessChange(CefRefPtr<CefBrowser> browser,
+                                   bool has_video_access,
+                                   bool has_audio_access) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_DISPLAY_HANDLER_H_
diff --git a/src/include/cef_dom.h b/src/include/cef_dom.h
index 382b19305..8ddb8f646 100644
--- a/src/include/cef_dom.h
+++ b/src/include/cef_dom.h
@@ -45,26 +45,26 @@ class CefDOMDocument;
 class CefDOMNode;
 
 ///
-// Interface to implement for visiting the DOM. The methods of this class will
-// be called on the render process main thread.
+/// Interface to implement for visiting the DOM. The methods of this class will
+/// be called on the render process main thread.
 ///
 /*--cef(source=client)--*/
 class CefDOMVisitor : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method executed for visiting the DOM. The document object passed to this
-  // method represents a snapshot of the DOM at the time this method is
-  // executed. DOM objects are only valid for the scope of this method. Do not
-  // keep references to or attempt to access any DOM objects outside the scope
-  // of this method.
+  /// Method executed for visiting the DOM. The document object passed to this
+  /// method represents a snapshot of the DOM at the time this method is
+  /// executed. DOM objects are only valid for the scope of this method. Do not
+  /// keep references to or attempt to access any DOM objects outside the scope
+  /// of this method.
   ///
   /*--cef()--*/
   virtual void Visit(CefRefPtr<CefDOMDocument> document) = 0;
 };
 
 ///
-// Class used to represent a DOM document. The methods of this class should only
-// be called on the render process main thread thread.
+/// Class used to represent a DOM document. The methods of this class should
+/// only be called on the render process main thread thread.
 ///
 /*--cef(source=library)--*/
 class CefDOMDocument : public virtual CefBaseRefCounted {
@@ -72,206 +72,207 @@ class CefDOMDocument : public virtual CefBaseRefCounted {
   typedef cef_dom_document_type_t Type;
 
   ///
-  // Returns the document type.
+  /// Returns the document type.
   ///
   /*--cef(default_retval=DOM_DOCUMENT_TYPE_UNKNOWN)--*/
   virtual Type GetType() = 0;
 
   ///
-  // Returns the root document node.
+  /// Returns the root document node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetDocument() = 0;
 
   ///
-  // Returns the BODY node of an HTML document.
+  /// Returns the BODY node of an HTML document.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetBody() = 0;
 
   ///
-  // Returns the HEAD node of an HTML document.
+  /// Returns the HEAD node of an HTML document.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetHead() = 0;
 
   ///
-  // Returns the title of an HTML document.
+  /// Returns the title of an HTML document.
   ///
   /*--cef()--*/
   virtual CefString GetTitle() = 0;
 
   ///
-  // Returns the document element with the specified ID value.
+  /// Returns the document element with the specified ID value.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetElementById(const CefString& id) = 0;
 
   ///
-  // Returns the node that currently has keyboard focus.
+  /// Returns the node that currently has keyboard focus.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetFocusedNode() = 0;
 
   ///
-  // Returns true if a portion of the document is selected.
+  /// Returns true if a portion of the document is selected.
   ///
   /*--cef()--*/
   virtual bool HasSelection() = 0;
 
   ///
-  // Returns the selection offset within the start node.
+  /// Returns the selection offset within the start node.
   ///
   /*--cef()--*/
   virtual int GetSelectionStartOffset() = 0;
 
   ///
-  // Returns the selection offset within the end node.
+  /// Returns the selection offset within the end node.
   ///
   /*--cef()--*/
   virtual int GetSelectionEndOffset() = 0;
 
   ///
-  // Returns the contents of this selection as markup.
+  /// Returns the contents of this selection as markup.
   ///
   /*--cef()--*/
   virtual CefString GetSelectionAsMarkup() = 0;
 
   ///
-  // Returns the contents of this selection as text.
+  /// Returns the contents of this selection as text.
   ///
   /*--cef()--*/
   virtual CefString GetSelectionAsText() = 0;
 
   ///
-  // Returns the base URL for the document.
+  /// Returns the base URL for the document.
   ///
   /*--cef()--*/
   virtual CefString GetBaseURL() = 0;
 
   ///
-  // Returns a complete URL based on the document base URL and the specified
-  // partial URL.
+  /// Returns a complete URL based on the document base URL and the specified
+  /// partial URL.
   ///
   /*--cef()--*/
   virtual CefString GetCompleteURL(const CefString& partialURL) = 0;
 };
 
 ///
-// Class used to represent a DOM node. The methods of this class should only be
-// called on the render process main thread.
+/// Class used to represent a DOM node. The methods of this class should only be
+/// called on the render process main thread.
 ///
 /*--cef(source=library)--*/
 class CefDOMNode : public virtual CefBaseRefCounted {
  public:
   typedef std::map<CefString, CefString> AttributeMap;
   typedef cef_dom_node_type_t Type;
+  typedef cef_dom_form_control_type_t FormControlType;
 
   ///
-  // Returns the type for this node.
+  /// Returns the type for this node.
   ///
   /*--cef(default_retval=DOM_NODE_TYPE_UNSUPPORTED)--*/
   virtual Type GetType() = 0;
 
   ///
-  // Returns true if this is a text node.
+  /// Returns true if this is a text node.
   ///
   /*--cef()--*/
   virtual bool IsText() = 0;
 
   ///
-  // Returns true if this is an element node.
+  /// Returns true if this is an element node.
   ///
   /*--cef()--*/
   virtual bool IsElement() = 0;
 
   ///
-  // Returns true if this is an editable node.
+  /// Returns true if this is an editable node.
   ///
   /*--cef()--*/
   virtual bool IsEditable() = 0;
 
   ///
-  // Returns true if this is a form control element node.
+  /// Returns true if this is a form control element node.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=DOM_NODE_TYPE_UNSUPPORTED)--*/
   virtual bool IsFormControlElement() = 0;
 
   ///
-  // Returns the type of this form control element node.
+  /// Returns the type of this form control element node.
   ///
-  /*--cef()--*/
-  virtual CefString GetFormControlElementType() = 0;
+  /*--cef(default_retval=DOM_FORM_CONTROL_TYPE_UNSUPPORTED)--*/
+  virtual FormControlType GetFormControlElementType() = 0;
 
   ///
-  // Returns true if this object is pointing to the same handle as |that|
-  // object.
+  /// Returns true if this object is pointing to the same handle as |that|
+  /// object.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefDOMNode> that) = 0;
 
   ///
-  // Returns the name of this node.
+  /// Returns the name of this node.
   ///
   /*--cef()--*/
   virtual CefString GetName() = 0;
 
   ///
-  // Returns the value of this node.
+  /// Returns the value of this node.
   ///
   /*--cef()--*/
   virtual CefString GetValue() = 0;
 
   ///
-  // Set the value of this node. Returns true on success.
+  /// Set the value of this node. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetValue(const CefString& value) = 0;
 
   ///
-  // Returns the contents of this node as markup.
+  /// Returns the contents of this node as markup.
   ///
   /*--cef()--*/
   virtual CefString GetAsMarkup() = 0;
 
   ///
-  // Returns the document associated with this node.
+  /// Returns the document associated with this node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMDocument> GetDocument() = 0;
 
   ///
-  // Returns the parent node.
+  /// Returns the parent node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetParent() = 0;
 
   ///
-  // Returns the previous sibling node.
+  /// Returns the previous sibling node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetPreviousSibling() = 0;
 
   ///
-  // Returns the next sibling node.
+  /// Returns the next sibling node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetNextSibling() = 0;
 
   ///
-  // Returns true if this node has child nodes.
+  /// Returns true if this node has child nodes.
   ///
   /*--cef()--*/
   virtual bool HasChildren() = 0;
 
   ///
-  // Return the first child node.
+  /// Return the first child node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetFirstChild() = 0;
 
   ///
-  // Returns the last child node.
+  /// Returns the last child node.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDOMNode> GetLastChild() = 0;
@@ -279,51 +280,52 @@ class CefDOMNode : public virtual CefBaseRefCounted {
   // The following methods are valid only for element nodes.
 
   ///
-  // Returns the tag name of this element.
+  /// Returns the tag name of this element.
   ///
   /*--cef()--*/
   virtual CefString GetElementTagName() = 0;
 
   ///
-  // Returns true if this element has attributes.
+  /// Returns true if this element has attributes.
   ///
   /*--cef()--*/
   virtual bool HasElementAttributes() = 0;
 
   ///
-  // Returns true if this element has an attribute named |attrName|.
+  /// Returns true if this element has an attribute named |attrName|.
   ///
   /*--cef()--*/
   virtual bool HasElementAttribute(const CefString& attrName) = 0;
 
   ///
-  // Returns the element attribute named |attrName|.
+  /// Returns the element attribute named |attrName|.
   ///
   /*--cef()--*/
   virtual CefString GetElementAttribute(const CefString& attrName) = 0;
 
   ///
-  // Returns a map of all element attributes.
+  /// Returns a map of all element attributes.
   ///
   /*--cef()--*/
   virtual void GetElementAttributes(AttributeMap& attrMap) = 0;
 
   ///
-  // Set the value for the element attribute named |attrName|. Returns true on
-  // success.
+  /// Set the value for the element attribute named |attrName|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
   virtual bool SetElementAttribute(const CefString& attrName,
                                    const CefString& value) = 0;
 
   ///
-  // Returns the inner text of the element.
+  /// Returns the inner text of the element.
   ///
   /*--cef()--*/
   virtual CefString GetElementInnerText() = 0;
 
   ///
-  // Returns the bounds of the element.
+  /// Returns the bounds of the element in device pixels. Use
+  /// "window.devicePixelRatio" to convert to/from CSS pixels.
   ///
   /*--cef()--*/
   virtual CefRect GetElementBounds() = 0;
diff --git a/src/include/cef_download_handler.h b/src/include/cef_download_handler.h
index dfaeba500..de911b663 100644
--- a/src/include/cef_download_handler.h
+++ b/src/include/cef_download_handler.h
@@ -43,59 +43,73 @@
 #include "include/cef_download_item.h"
 
 ///
-// Callback interface used to asynchronously continue a download.
+/// Callback interface used to asynchronously continue a download.
 ///
 /*--cef(source=library)--*/
 class CefBeforeDownloadCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Call to continue the download. Set |download_path| to the full file path
-  // for the download including the file name or leave blank to use the
-  // suggested name and the default temp directory. Set |show_dialog| to true
-  // if you do wish to show the default "Save As" dialog.
+  /// Call to continue the download. Set |download_path| to the full file path
+  /// for the download including the file name or leave blank to use the
+  /// suggested name and the default temp directory. Set |show_dialog| to true
+  /// if you do wish to show the default "Save As" dialog.
   ///
   /*--cef(capi_name=cont,optional_param=download_path)--*/
   virtual void Continue(const CefString& download_path, bool show_dialog) = 0;
 };
 
 ///
-// Callback interface used to asynchronously cancel a download.
+/// Callback interface used to asynchronously cancel a download.
 ///
 /*--cef(source=library)--*/
 class CefDownloadItemCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Call to cancel the download.
+  /// Call to cancel the download.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 
   ///
-  // Call to pause the download.
+  /// Call to pause the download.
   ///
   /*--cef()--*/
   virtual void Pause() = 0;
 
   ///
-  // Call to resume the download.
+  /// Call to resume the download.
   ///
   /*--cef()--*/
   virtual void Resume() = 0;
 };
 
 ///
-// Class used to handle file downloads. The methods of this class will called
-// on the browser process UI thread.
+/// Class used to handle file downloads. The methods of this class will called
+/// on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefDownloadHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called before a download begins. |suggested_name| is the suggested name for
-  // the download file. By default the download will be canceled. Execute
-  // |callback| either asynchronously or in this method to continue the download
-  // if desired. Do not keep a reference to |download_item| outside of this
-  // method.
+  /// Called before a download begins in response to a user-initiated action
+  /// (e.g. alt + link click or link click that returns a `Content-Disposition:
+  /// attachment` response from the server). |url| is the target download URL
+  /// and |request_method| is the target method (GET, POST, etc). Return true to
+  /// proceed with the download or false to cancel the download.
+  ///
+  /*--cef()--*/
+  virtual bool CanDownload(CefRefPtr<CefBrowser> browser,
+                           const CefString& url,
+                           const CefString& request_method) {
+    return true;
+  }
+
+  ///
+  /// Called before a download begins. |suggested_name| is the suggested name
+  /// for the download file. By default the download will be canceled. Execute
+  /// |callback| either asynchronously or in this method to continue the
+  /// download if desired. Do not keep a reference to |download_item| outside of
+  /// this method.
   ///
   /*--cef()--*/
   virtual void OnBeforeDownload(
@@ -105,11 +119,11 @@ class CefDownloadHandler : public virtual CefBaseRefCounted {
       CefRefPtr<CefBeforeDownloadCallback> callback) = 0;
 
   ///
-  // Called when a download's status or progress information has been updated.
-  // This may be called multiple times before and after OnBeforeDownload().
-  // Execute |callback| either asynchronously or in this method to cancel the
-  // download if desired. Do not keep a reference to |download_item| outside of
-  // this method.
+  /// Called when a download's status or progress information has been updated.
+  /// This may be called multiple times before and after OnBeforeDownload().
+  /// Execute |callback| either asynchronously or in this method to cancel the
+  /// download if desired. Do not keep a reference to |download_item| outside of
+  /// this method.
   ///
   /*--cef()--*/
   virtual void OnDownloadUpdated(CefRefPtr<CefBrowser> browser,
diff --git a/src/include/cef_download_item.h b/src/include/cef_download_item.h
index 930f53bb4..bb4be2b1f 100644
--- a/src/include/cef_download_item.h
+++ b/src/include/cef_download_item.h
@@ -41,111 +41,123 @@
 #include "include/cef_base.h"
 
 ///
-// Class used to represent a download item.
+/// Class used to represent a download item.
 ///
 /*--cef(source=library)--*/
 class CefDownloadItem : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns true if this object is valid. Do not call any other methods if this
-  // function returns false.
+  /// Returns true if this object is valid. Do not call any other methods if
+  /// this function returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if the download is in progress.
+  /// Returns true if the download is in progress.
   ///
   /*--cef()--*/
   virtual bool IsInProgress() = 0;
 
   ///
-  // Returns true if the download is complete.
+  /// Returns true if the download is complete.
   ///
   /*--cef()--*/
   virtual bool IsComplete() = 0;
 
   ///
-  // Returns true if the download has been canceled or interrupted.
+  /// Returns true if the download has been canceled.
   ///
   /*--cef()--*/
   virtual bool IsCanceled() = 0;
 
   ///
-  // Returns a simple speed estimate in bytes/s.
+  /// Returns true if the download has been interrupted.
   ///
   /*--cef()--*/
-  virtual int64 GetCurrentSpeed() = 0;
+  virtual bool IsInterrupted() = 0;
 
   ///
-  // Returns the rough percent complete or -1 if the receive total size is
-  // unknown.
+  /// Returns the most recent interrupt reason.
+  ///
+  /*--cef(default_retval=CEF_DOWNLOAD_INTERRUPT_REASON_NONE)--*/
+  virtual cef_download_interrupt_reason_t GetInterruptReason() = 0;
+
+  ///
+  /// Returns a simple speed estimate in bytes/s.
+  ///
+  /*--cef()--*/
+  virtual int64_t GetCurrentSpeed() = 0;
+
+  ///
+  /// Returns the rough percent complete or -1 if the receive total size is
+  /// unknown.
   ///
   /*--cef()--*/
   virtual int GetPercentComplete() = 0;
 
   ///
-  // Returns the total number of bytes.
+  /// Returns the total number of bytes.
   ///
   /*--cef()--*/
-  virtual int64 GetTotalBytes() = 0;
+  virtual int64_t GetTotalBytes() = 0;
 
   ///
-  // Returns the number of received bytes.
+  /// Returns the number of received bytes.
   ///
   /*--cef()--*/
-  virtual int64 GetReceivedBytes() = 0;
+  virtual int64_t GetReceivedBytes() = 0;
 
   ///
-  // Returns the time that the download started.
+  /// Returns the time that the download started.
   ///
   /*--cef()--*/
-  virtual CefTime GetStartTime() = 0;
+  virtual CefBaseTime GetStartTime() = 0;
 
   ///
-  // Returns the time that the download ended.
+  /// Returns the time that the download ended.
   ///
   /*--cef()--*/
-  virtual CefTime GetEndTime() = 0;
+  virtual CefBaseTime GetEndTime() = 0;
 
   ///
-  // Returns the full path to the downloaded or downloading file.
+  /// Returns the full path to the downloaded or downloading file.
   ///
   /*--cef()--*/
   virtual CefString GetFullPath() = 0;
 
   ///
-  // Returns the unique identifier for this download.
+  /// Returns the unique identifier for this download.
   ///
   /*--cef()--*/
-  virtual uint32 GetId() = 0;
+  virtual uint32_t GetId() = 0;
 
   ///
-  // Returns the URL.
+  /// Returns the URL.
   ///
   /*--cef()--*/
   virtual CefString GetURL() = 0;
 
   ///
-  // Returns the original URL before any redirections.
+  /// Returns the original URL before any redirections.
   ///
   /*--cef()--*/
   virtual CefString GetOriginalUrl() = 0;
 
   ///
-  // Returns the suggested file name.
+  /// Returns the suggested file name.
   ///
   /*--cef()--*/
   virtual CefString GetSuggestedFileName() = 0;
 
   ///
-  // Returns the content disposition.
+  /// Returns the content disposition.
   ///
   /*--cef()--*/
   virtual CefString GetContentDisposition() = 0;
 
   ///
-  // Returns the mime type.
+  /// Returns the mime type.
   ///
   /*--cef()--*/
   virtual CefString GetMimeType() = 0;
diff --git a/src/include/cef_drag_data.h b/src/include/cef_drag_data.h
index 35661f870..735a64c4d 100644
--- a/src/include/cef_drag_data.h
+++ b/src/include/cef_drag_data.h
@@ -44,173 +44,186 @@
 #include "include/cef_stream.h"
 
 ///
-// Class used to represent drag data. The methods of this class may be called
-// on any thread.
+/// Class used to represent drag data. The methods of this class may be called
+/// on any thread.
 ///
 /*--cef(source=library)--*/
 class CefDragData : public virtual CefBaseRefCounted {
  public:
   ///
-  // Create a new CefDragData object.
+  /// Create a new CefDragData object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDragData> Create();
 
   ///
-  // Returns a copy of the current object.
+  /// Returns a copy of the current object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDragData> Clone() = 0;
 
   ///
-  // Returns true if this object is read-only.
+  /// Returns true if this object is read-only.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns true if the drag data is a link.
+  /// Returns true if the drag data is a link.
   ///
   /*--cef()--*/
   virtual bool IsLink() = 0;
 
   ///
-  // Returns true if the drag data is a text or html fragment.
+  /// Returns true if the drag data is a text or html fragment.
   ///
   /*--cef()--*/
   virtual bool IsFragment() = 0;
 
   ///
-  // Returns true if the drag data is a file.
+  /// Returns true if the drag data is a file.
   ///
   /*--cef()--*/
   virtual bool IsFile() = 0;
 
   ///
-  // Return the link URL that is being dragged.
+  /// Return the link URL that is being dragged.
   ///
   /*--cef()--*/
   virtual CefString GetLinkURL() = 0;
 
   ///
-  // Return the title associated with the link being dragged.
+  /// Return the title associated with the link being dragged.
   ///
   /*--cef()--*/
   virtual CefString GetLinkTitle() = 0;
 
   ///
-  // Return the metadata, if any, associated with the link being dragged.
+  /// Return the metadata, if any, associated with the link being dragged.
   ///
   /*--cef()--*/
   virtual CefString GetLinkMetadata() = 0;
 
   ///
-  // Return the plain text fragment that is being dragged.
+  /// Return the plain text fragment that is being dragged.
   ///
   /*--cef()--*/
   virtual CefString GetFragmentText() = 0;
 
   ///
-  // Return the text/html fragment that is being dragged.
+  /// Return the text/html fragment that is being dragged.
   ///
   /*--cef()--*/
   virtual CefString GetFragmentHtml() = 0;
 
   ///
-  // Return the base URL that the fragment came from. This value is used for
-  // resolving relative URLs and may be empty.
+  /// Return the base URL that the fragment came from. This value is used for
+  /// resolving relative URLs and may be empty.
   ///
   /*--cef()--*/
   virtual CefString GetFragmentBaseURL() = 0;
 
   ///
-  // Return the name of the file being dragged out of the browser window.
+  /// Return the name of the file being dragged out of the browser window.
   ///
   /*--cef()--*/
   virtual CefString GetFileName() = 0;
 
   ///
-  // Write the contents of the file being dragged out of the web view into
-  // |writer|. Returns the number of bytes sent to |writer|. If |writer| is
-  // NULL this method will return the size of the file contents in bytes.
-  // Call GetFileName() to get a suggested name for the file.
+  /// Write the contents of the file being dragged out of the web view into
+  /// |writer|. Returns the number of bytes sent to |writer|. If |writer| is
+  /// NULL this method will return the size of the file contents in bytes.
+  /// Call GetFileName() to get a suggested name for the file.
   ///
   /*--cef(optional_param=writer)--*/
   virtual size_t GetFileContents(CefRefPtr<CefStreamWriter> writer) = 0;
 
   ///
-  // Retrieve the list of file names that are being dragged into the browser
-  // window.
+  /// Retrieve the list of file names that are being dragged into the browser
+  /// window.
   ///
   /*--cef()--*/
   virtual bool GetFileNames(std::vector<CefString>& names) = 0;
 
   ///
-  // Set the link URL that is being dragged.
+  /// Retrieve the list of file paths that are being dragged into the browser
+  /// window.
+  ///
+  /*--cef()--*/
+  virtual bool GetFilePaths(std::vector<CefString>& paths) = 0;
+
+  ///
+  /// Set the link URL that is being dragged.
   ///
   /*--cef(optional_param=url)--*/
   virtual void SetLinkURL(const CefString& url) = 0;
 
   ///
-  // Set the title associated with the link being dragged.
+  /// Set the title associated with the link being dragged.
   ///
   /*--cef(optional_param=title)--*/
   virtual void SetLinkTitle(const CefString& title) = 0;
 
   ///
-  // Set the metadata associated with the link being dragged.
+  /// Set the metadata associated with the link being dragged.
   ///
   /*--cef(optional_param=data)--*/
   virtual void SetLinkMetadata(const CefString& data) = 0;
 
   ///
-  // Set the plain text fragment that is being dragged.
+  /// Set the plain text fragment that is being dragged.
   ///
   /*--cef(optional_param=text)--*/
   virtual void SetFragmentText(const CefString& text) = 0;
 
   ///
-  // Set the text/html fragment that is being dragged.
+  /// Set the text/html fragment that is being dragged.
   ///
   /*--cef(optional_param=html)--*/
   virtual void SetFragmentHtml(const CefString& html) = 0;
 
   ///
-  // Set the base URL that the fragment came from.
+  /// Set the base URL that the fragment came from.
   ///
   /*--cef(optional_param=base_url)--*/
   virtual void SetFragmentBaseURL(const CefString& base_url) = 0;
 
   ///
-  // Reset the file contents. You should do this before calling
-  // CefBrowserHost::DragTargetDragEnter as the web view does not allow us to
-  // drag in this kind of data.
+  /// Reset the file contents. You should do this before calling
+  /// CefBrowserHost::DragTargetDragEnter as the web view does not allow us to
+  /// drag in this kind of data.
   ///
   /*--cef()--*/
   virtual void ResetFileContents() = 0;
 
   ///
-  // Add a file that is being dragged into the webview.
+  /// Add a file that is being dragged into the webview.
   ///
   /*--cef(optional_param=display_name)--*/
   virtual void AddFile(const CefString& path,
                        const CefString& display_name) = 0;
 
   ///
-  // Get the image representation of drag data. May return NULL if no image
-  // representation is available.
+  /// Clear list of filenames.
+  ///
+  /*--cef()--*/
+  virtual void ClearFilenames() = 0;
+
+  ///
+  /// Get the image representation of drag data. May return NULL if no image
+  /// representation is available.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefImage> GetImage() = 0;
 
   ///
-  // Get the image hotspot (drag start location relative to image dimensions).
+  /// Get the image hotspot (drag start location relative to image dimensions).
   ///
   /*--cef()--*/
   virtual CefPoint GetImageHotspot() = 0;
 
   ///
-  // Returns true if an image representation of drag data is available.
+  /// Returns true if an image representation of drag data is available.
   ///
   /*--cef()--*/
   virtual bool HasImage() = 0;
diff --git a/src/include/cef_drag_handler.h b/src/include/cef_drag_handler.h
index 0410c0d8d..cd354d782 100644
--- a/src/include/cef_drag_handler.h
+++ b/src/include/cef_drag_handler.h
@@ -41,10 +41,11 @@
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
 #include "include/cef_drag_data.h"
+#include "include/cef_frame.h"
 
 ///
-// Implement this interface to handle events related to dragging. The methods of
-// this class will be called on the UI thread.
+/// Implement this interface to handle events related to dragging. The methods
+/// of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefDragHandler : public virtual CefBaseRefCounted {
@@ -52,10 +53,10 @@ class CefDragHandler : public virtual CefBaseRefCounted {
   typedef cef_drag_operations_mask_t DragOperationsMask;
 
   ///
-  // Called when an external drag event enters the browser window. |dragData|
-  // contains the drag event data and |mask| represents the type of drag
-  // operation. Return false for default drag handling behavior or true to
-  // cancel the drag event.
+  /// Called when an external drag event enters the browser window. |dragData|
+  /// contains the drag event data and |mask| represents the type of drag
+  /// operation. Return false for default drag handling behavior or true to
+  /// cancel the drag event.
   ///
   /*--cef()--*/
   virtual bool OnDragEnter(CefRefPtr<CefBrowser> browser,
@@ -65,15 +66,16 @@ class CefDragHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called whenever draggable regions for the browser window change. These can
-  // be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If
-  // draggable regions are never defined in a document this method will also
-  // never be called. If the last draggable region is removed from a document
-  // this method will be called with an empty vector.
+  /// Called whenever draggable regions for the browser window change. These can
+  /// be specified using the '-webkit-app-region: drag/no-drag' CSS-property. If
+  /// draggable regions are never defined in a document this method will also
+  /// never be called. If the last draggable region is removed from a document
+  /// this method will be called with an empty vector.
   ///
   /*--cef()--*/
   virtual void OnDraggableRegionsChanged(
       CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
       const std::vector<CefDraggableRegion>& regions) {}
 };
 
diff --git a/src/include/cef_extension.h b/src/include/cef_extension.h
index c34d01326..5d94192f5 100644
--- a/src/include/cef_extension.h
+++ b/src/include/cef_extension.h
@@ -45,70 +45,71 @@ class CefExtensionHandler;
 class CefRequestContext;
 
 ///
-// Object representing an extension. Methods may be called on any thread unless
-// otherwise indicated.
+/// Object representing an extension. Methods may be called on any thread unless
+/// otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefExtension : public CefBaseRefCounted {
  public:
   ///
-  // Returns the unique extension identifier. This is calculated based on the
-  // extension public key, if available, or on the extension path. See
-  // https://developer.chrome.com/extensions/manifest/key for details.
+  /// Returns the unique extension identifier. This is calculated based on the
+  /// extension public key, if available, or on the extension path. See
+  /// https://developer.chrome.com/extensions/manifest/key for details.
   ///
   /*--cef()--*/
   virtual CefString GetIdentifier() = 0;
 
   ///
-  // Returns the absolute path to the extension directory on disk. This value
-  // will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
-  // CefRequestContext::LoadExtension.
+  /// Returns the absolute path to the extension directory on disk. This value
+  /// will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
+  /// CefRequestContext::LoadExtension.
   ///
   /*--cef()--*/
   virtual CefString GetPath() = 0;
 
   ///
-  // Returns the extension manifest contents as a CefDictionaryValue object. See
-  // https://developer.chrome.com/extensions/manifest for details.
+  /// Returns the extension manifest contents as a CefDictionaryValue object.
+  /// See https://developer.chrome.com/extensions/manifest for details.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDictionaryValue> GetManifest() = 0;
 
   ///
-  // Returns true if this object is the same extension as |that| object.
-  // Extensions are considered the same if identifier, path and loader context
-  // match.
+  /// Returns true if this object is the same extension as |that| object.
+  /// Extensions are considered the same if identifier, path and loader context
+  /// match.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefExtension> that) = 0;
 
   ///
-  // Returns the handler for this extension. Will return NULL for internal
-  // extensions or if no handler was passed to CefRequestContext::LoadExtension.
+  /// Returns the handler for this extension. Will return NULL for internal
+  /// extensions or if no handler was passed to
+  /// CefRequestContext::LoadExtension.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefExtensionHandler> GetHandler() = 0;
 
   ///
-  // Returns the request context that loaded this extension. Will return NULL
-  // for internal extensions or if the extension has been unloaded. See the
-  // CefRequestContext::LoadExtension documentation for more information about
-  // loader contexts. Must be called on the browser process UI thread.
+  /// Returns the request context that loaded this extension. Will return NULL
+  /// for internal extensions or if the extension has been unloaded. See the
+  /// CefRequestContext::LoadExtension documentation for more information about
+  /// loader contexts. Must be called on the browser process UI thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefRequestContext> GetLoaderContext() = 0;
 
   ///
-  // Returns true if this extension is currently loaded. Must be called on the
-  // browser process UI thread.
+  /// Returns true if this extension is currently loaded. Must be called on the
+  /// browser process UI thread.
   ///
   /*--cef()--*/
   virtual bool IsLoaded() = 0;
 
   ///
-  // Unload this extension if it is not an internal extension and is currently
-  // loaded. Will result in a call to CefExtensionHandler::OnExtensionUnloaded
-  // on success.
+  /// Unload this extension if it is not an internal extension and is currently
+  /// loaded. Will result in a call to CefExtensionHandler::OnExtensionUnloaded
+  /// on success.
   ///
   /*--cef()--*/
   virtual void Unload() = 0;
diff --git a/src/include/cef_extension_handler.h b/src/include/cef_extension_handler.h
index 7b0b86a36..4b34fbc02 100644
--- a/src/include/cef_extension_handler.h
+++ b/src/include/cef_extension_handler.h
@@ -46,67 +46,67 @@
 class CefClient;
 
 ///
-// Callback interface used for asynchronous continuation of
-// CefExtensionHandler::GetExtensionResource.
+/// Callback interface used for asynchronous continuation of
+/// CefExtensionHandler::GetExtensionResource.
 ///
 /*--cef(source=library)--*/
 class CefGetExtensionResourceCallback : public CefBaseRefCounted {
  public:
   ///
-  // Continue the request. Read the resource contents from |stream|.
+  /// Continue the request. Read the resource contents from |stream|.
   ///
   /*--cef(capi_name=cont,optional_param=stream)--*/
   virtual void Continue(CefRefPtr<CefStreamReader> stream) = 0;
 
   ///
-  // Cancel the request.
+  /// Cancel the request.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 };
 
 ///
-// Implement this interface to handle events related to browser extensions.
-// The methods of this class will be called on the UI thread. See
-// CefRequestContext::LoadExtension for information about extension loading.
+/// Implement this interface to handle events related to browser extensions.
+/// The methods of this class will be called on the UI thread. See
+/// CefRequestContext::LoadExtension for information about extension loading.
 ///
 /*--cef(source=client)--*/
 class CefExtensionHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called if the CefRequestContext::LoadExtension request fails. |result| will
-  // be the error code.
+  /// Called if the CefRequestContext::LoadExtension request fails. |result|
+  /// will be the error code.
   ///
   /*--cef()--*/
   virtual void OnExtensionLoadFailed(cef_errorcode_t result) {}
 
   ///
-  // Called if the CefRequestContext::LoadExtension request succeeds.
-  // |extension| is the loaded extension.
+  /// Called if the CefRequestContext::LoadExtension request succeeds.
+  /// |extension| is the loaded extension.
   ///
   /*--cef()--*/
   virtual void OnExtensionLoaded(CefRefPtr<CefExtension> extension) {}
 
   ///
-  // Called after the CefExtension::Unload request has completed.
+  /// Called after the CefExtension::Unload request has completed.
   ///
   /*--cef()--*/
   virtual void OnExtensionUnloaded(CefRefPtr<CefExtension> extension) {}
 
   ///
-  // Called when an extension needs a browser to host a background script
-  // specified via the "background" manifest key. The browser will have no
-  // visible window and cannot be displayed. |extension| is the extension that
-  // is loading the background script. |url| is an internally generated
-  // reference to an HTML page that will be used to load the background script
-  // via a <script> src attribute. To allow creation of the browser optionally
-  // modify |client| and |settings| and return false. To cancel creation of the
-  // browser (and consequently cancel load of the background script) return
-  // true. Successful creation will be indicated by a call to
-  // CefLifeSpanHandler::OnAfterCreated, and CefBrowserHost::IsBackgroundHost
-  // will return true for the resulting browser. See
-  // https://developer.chrome.com/extensions/event_pages for more information
-  // about extension background script usage.
+  /// Called when an extension needs a browser to host a background script
+  /// specified via the "background" manifest key. The browser will have no
+  /// visible window and cannot be displayed. |extension| is the extension that
+  /// is loading the background script. |url| is an internally generated
+  /// reference to an HTML page that will be used to load the background script
+  /// via a "<script>" src attribute. To allow creation of the browser
+  /// optionally modify |client| and |settings| and return false. To cancel
+  /// creation of the browser (and consequently cancel load of the background
+  /// script) return true. Successful creation will be indicated by a call to
+  /// CefLifeSpanHandler::OnAfterCreated, and CefBrowserHost::IsBackgroundHost
+  /// will return true for the resulting browser. See
+  /// https://developer.chrome.com/extensions/event_pages for more information
+  /// about extension background script usage.
   ///
   /*--cef()--*/
   virtual bool OnBeforeBackgroundBrowser(CefRefPtr<CefExtension> extension,
@@ -117,18 +117,19 @@ class CefExtensionHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when an extension API (e.g. chrome.tabs.create) requests creation of
-  // a new browser. |extension| and |browser| are the source of the API call.
-  // |active_browser| may optionally be specified via the windowId property or
-  // returned via the GetActiveBrowser() callback and provides the default
-  // |client| and |settings| values for the new browser. |index| is the position
-  // value optionally specified via the index property. |url| is the URL that
-  // will be loaded in the browser. |active| is true if the new browser should
-  // be active when opened.  To allow creation of the browser optionally modify
-  // |windowInfo|, |client| and |settings| and return false. To cancel creation
-  // of the browser return true. Successful creation will be indicated by a call
-  // to CefLifeSpanHandler::OnAfterCreated. Any modifications to |windowInfo|
-  // will be ignored if |active_browser| is wrapped in a CefBrowserView.
+  /// Called when an extension API (e.g. chrome.tabs.create) requests creation
+  /// of a new browser. |extension| and |browser| are the source of the API
+  /// call. |active_browser| may optionally be specified via the windowId
+  /// property or returned via the GetActiveBrowser() callback and provides the
+  /// default |client| and |settings| values for the new browser. |index| is the
+  /// position value optionally specified via the index property. |url| is the
+  /// URL that will be loaded in the browser. |active| is true if the new
+  /// browser should be active when opened.  To allow creation of the browser
+  /// optionally modify |windowInfo|, |client| and |settings| and return false.
+  /// To cancel creation of the browser return true. Successful creation will be
+  /// indicated by a call to CefLifeSpanHandler::OnAfterCreated. Any
+  /// modifications to |windowInfo| will be ignored if |active_browser| is
+  /// wrapped in a CefBrowserView.
   ///
   /*--cef()--*/
   virtual bool OnBeforeBrowser(CefRefPtr<CefExtension> extension,
@@ -144,29 +145,29 @@ class CefExtensionHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when no tabId is specified to an extension API call that accepts a
-  // tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
-  // source of the API call. Return the browser that will be acted on by the API
-  // call or return NULL to act on |browser|. The returned browser must share
-  // the same CefRequestContext as |browser|. Incognito browsers should not be
-  // considered unless the source extension has incognito access enabled, in
-  // which case |include_incognito| will be true.
+  /// Called when no tabId is specified to an extension API call that accepts a
+  /// tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
+  /// source of the API call. Return the browser that will be acted on by the
+  /// API call or return NULL to act on |browser|. The returned browser must
+  /// share the same CefRequestContext as |browser|. Incognito browsers should
+  /// not be considered unless the source extension has incognito access
+  /// enabled, in which case |include_incognito| will be true.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowser> GetActiveBrowser(
       CefRefPtr<CefExtension> extension,
       CefRefPtr<CefBrowser> browser,
       bool include_incognito) {
-    return NULL;
+    return nullptr;
   }
 
   ///
-  // Called when the tabId associated with |target_browser| is specified to an
-  // extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-  // |extension| and |browser| are the source of the API call. Return true
-  // to allow access of false to deny access. Access to incognito browsers
-  // should not be allowed unless the source extension has incognito access
-  // enabled, in which case |include_incognito| will be true.
+  /// Called when the tabId associated with |target_browser| is specified to an
+  /// extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
+  /// |extension| and |browser| are the source of the API call. Return true
+  /// to allow access of false to deny access. Access to incognito browsers
+  /// should not be allowed unless the source extension has incognito access
+  /// enabled, in which case |include_incognito| will be true.
   ///
   /*--cef()--*/
   virtual bool CanAccessBrowser(CefRefPtr<CefExtension> extension,
@@ -177,14 +178,14 @@ class CefExtensionHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called to retrieve an extension resource that would normally be loaded from
-  // disk (e.g. if a file parameter is specified to chrome.tabs.executeScript).
-  // |extension| and |browser| are the source of the resource request. |file| is
-  // the requested relative file path. To handle the resource request return
-  // true and execute |callback| either synchronously or asynchronously. For the
-  // default behavior which reads the resource from the extension directory on
-  // disk return false. Localization substitutions will not be applied to
-  // resources handled via this method.
+  /// Called to retrieve an extension resource that would normally be loaded
+  /// from disk (e.g. if a file parameter is specified to
+  /// chrome.tabs.executeScript). |extension| and |browser| are the source of
+  /// the resource request. |file| is the requested relative file path. To
+  /// handle the resource request return true and execute |callback| either
+  /// synchronously or asynchronously. For the default behavior which reads the
+  /// resource from the extension directory on disk return false. Localization
+  /// substitutions will not be applied to resources handled via this method.
   ///
   /*--cef()--*/
   virtual bool GetExtensionResource(
diff --git a/src/include/cef_file_util.h b/src/include/cef_file_util.h
index 8dd1ff644..838bdc195 100644
--- a/src/include/cef_file_util.h
+++ b/src/include/cef_file_util.h
@@ -42,43 +42,43 @@
 #include "include/cef_base.h"
 
 ///
-// Creates a directory and all parent directories if they don't already exist.
-// Returns true on successful creation or if the directory already exists. The
-// directory is only readable by the current user. Calling this function on the
-// browser process UI or IO threads is not allowed.
+/// Creates a directory and all parent directories if they don't already exist.
+/// Returns true on successful creation or if the directory already exists. The
+/// directory is only readable by the current user. Calling this function on the
+/// browser process UI or IO threads is not allowed.
 ///
 /*--cef()--*/
 bool CefCreateDirectory(const CefString& full_path);
 
 ///
-// Get the temporary directory provided by the system.
-//
-// WARNING: In general, you should use the temp directory variants below instead
-// of this function. Those variants will ensure that the proper permissions are
-// set so that other users on the system can't edit them while they're open
-// (which could lead to security issues).
+/// Get the temporary directory provided by the system.
+///
+/// WARNING: In general, you should use the temp directory variants below
+/// instead of this function. Those variants will ensure that the proper
+/// permissions are set so that other users on the system can't edit them while
+/// they're open (which could lead to security issues).
 ///
 /*--cef()--*/
 bool CefGetTempDirectory(CefString& temp_dir);
 
 ///
-// Creates a new directory. On Windows if |prefix| is provided the new directory
-// name is in the format of "prefixyyyy". Returns true on success and sets
-// |new_temp_path| to the full path of the directory that was created. The
-// directory is only readable by the current user. Calling this function on the
-// browser process UI or IO threads is not allowed.
+/// Creates a new directory. On Windows if |prefix| is provided the new
+/// directory name is in the format of "prefixyyyy". Returns true on success and
+/// sets |new_temp_path| to the full path of the directory that was created. The
+/// directory is only readable by the current user. Calling this function on the
+/// browser process UI or IO threads is not allowed.
 ///
 /*--cef(optional_param=prefix)--*/
 bool CefCreateNewTempDirectory(const CefString& prefix,
                                CefString& new_temp_path);
 
 ///
-// Creates a directory within another directory. Extra characters will be
-// appended to |prefix| to ensure that the new directory does not have the same
-// name as an existing directory. Returns true on success and sets |new_dir| to
-// the full path of the directory that was created. The directory is only
-// readable by the current user. Calling this function on the browser process
-// UI or IO threads is not allowed.
+/// Creates a directory within another directory. Extra characters will be
+/// appended to |prefix| to ensure that the new directory does not have the same
+/// name as an existing directory. Returns true on success and sets |new_dir| to
+/// the full path of the directory that was created. The directory is only
+/// readable by the current user. Calling this function on the browser process
+/// UI or IO threads is not allowed.
 ///
 /*--cef(optional_param=prefix)--*/
 bool CefCreateTempDirectoryInDirectory(const CefString& base_dir,
@@ -86,29 +86,29 @@ bool CefCreateTempDirectoryInDirectory(const CefString& base_dir,
                                        CefString& new_dir);
 
 ///
-// Returns true if the given path exists and is a directory. Calling this
-// function on the browser process UI or IO threads is not allowed.
+/// Returns true if the given path exists and is a directory. Calling this
+/// function on the browser process UI or IO threads is not allowed.
 ///
 /*--cef()--*/
 bool CefDirectoryExists(const CefString& path);
 
 ///
-// Deletes the given path whether it's a file or a directory. If |path| is a
-// directory all contents will be deleted.  If |recursive| is true any sub-
-// directories and their contents will also be deleted (equivalent to executing
-// "rm -rf", so use with caution). On POSIX environments if |path| is a symbolic
-// link then only the symlink will be deleted. Returns true on successful
-// deletion or if |path| does not exist. Calling this function on the browser
-// process UI or IO threads is not allowed.
+/// Deletes the given path whether it's a file or a directory. If |path| is a
+/// directory all contents will be deleted.  If |recursive| is true any sub-
+/// directories and their contents will also be deleted (equivalent to executing
+/// "rm -rf", so use with caution). On POSIX environments if |path| is a
+/// symbolic link then only the symlink will be deleted. Returns true on
+/// successful deletion or if |path| does not exist. Calling this function on
+/// the browser process UI or IO threads is not allowed.
 ///
 /*--cef()--*/
 bool CefDeleteFile(const CefString& path, bool recursive);
 
 ///
-// Writes the contents of |src_dir| into a zip archive at |dest_file|. If
-// |include_hidden_files| is true files starting with "." will be included.
-// Returns true on success.  Calling this function on the browser process UI or
-// IO threads is not allowed.
+/// Writes the contents of |src_dir| into a zip archive at |dest_file|. If
+/// |include_hidden_files| is true files starting with "." will be included.
+/// Returns true on success.  Calling this function on the browser process UI or
+/// IO threads is not allowed.
 ///
 /*--cef()--*/
 bool CefZipDirectory(const CefString& src_dir,
@@ -116,12 +116,13 @@ bool CefZipDirectory(const CefString& src_dir,
                      bool include_hidden_files);
 
 ///
-// Loads the existing "Certificate Revocation Lists" file that is managed by
-// Google Chrome. This file can generally be found in Chrome's User Data
-// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
-// Windows) and is updated periodically by Chrome's component updater service.
-// Must be called in the browser process after the context has been initialized.
-// See https://dev.chromium.org/Home/chromium-security/crlsets for background.
+/// Loads the existing "Certificate Revocation Lists" file that is managed by
+/// Google Chrome. This file can generally be found in Chrome's User Data
+/// directory (e.g. "C:\Users\[User]\AppData\Local\Google\Chrome\User Data\" on
+/// Windows) and is updated periodically by Chrome's component updater service.
+/// Must be called in the browser process after the context has been
+/// initialized. See https://dev.chromium.org/Home/chromium-security/crlsets for
+/// background.
 ///
 /*--cef()--*/
 void CefLoadCRLSetsFile(const CefString& path);
diff --git a/src/include/cef_find_handler.h b/src/include/cef_find_handler.h
index a9cac0a1e..bd3a700c7 100644
--- a/src/include/cef_find_handler.h
+++ b/src/include/cef_find_handler.h
@@ -42,19 +42,19 @@
 #include "include/cef_browser.h"
 
 ///
-// Implement this interface to handle events related to find results. The
-// methods of this class will be called on the UI thread.
+/// Implement this interface to handle events related to find results. The
+/// methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefFindHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called to report find results returned by CefBrowserHost::Find().
-  // |identifer| is the identifier passed to Find(), |count| is the number of
-  // matches currently identified, |selectionRect| is the location of where the
-  // match was found (in window coordinates), |activeMatchOrdinal| is the
-  // current position in the search results, and |finalUpdate| is true if this
-  // is the last find notification.
+  /// Called to report find results returned by CefBrowserHost::Find().
+  /// |identifer| is a unique incremental identifier for the currently active
+  /// search, |count| is the number of matches currently identified,
+  /// |selectionRect| is the location of where the match was found (in window
+  /// coordinates), |activeMatchOrdinal| is the current position in the search
+  /// results, and |finalUpdate| is true if this is the last find notification.
   ///
   /*--cef()--*/
   virtual void OnFindResult(CefRefPtr<CefBrowser> browser,
diff --git a/src/include/cef_focus_handler.h b/src/include/cef_focus_handler.h
index 6fd44f5d1..5f05e5049 100644
--- a/src/include/cef_focus_handler.h
+++ b/src/include/cef_focus_handler.h
@@ -44,8 +44,8 @@
 #include "include/cef_frame.h"
 
 ///
-// Implement this interface to handle events related to focus. The methods of
-// this class will be called on the UI thread.
+/// Implement this interface to handle events related to focus. The methods of
+/// this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefFocusHandler : public virtual CefBaseRefCounted {
@@ -53,18 +53,18 @@ class CefFocusHandler : public virtual CefBaseRefCounted {
   typedef cef_focus_source_t FocusSource;
 
   ///
-  // Called when the browser component is about to loose focus. For instance, if
-  // focus was on the last HTML element and the user pressed the TAB key. |next|
-  // will be true if the browser is giving focus to the next component and false
-  // if the browser is giving focus to the previous component.
+  /// Called when the browser component is about to loose focus. For instance,
+  /// if focus was on the last HTML element and the user pressed the TAB key.
+  /// |next| will be true if the browser is giving focus to the next component
+  /// and false if the browser is giving focus to the previous component.
   ///
   /*--cef()--*/
   virtual void OnTakeFocus(CefRefPtr<CefBrowser> browser, bool next) {}
 
   ///
-  // Called when the browser component is requesting focus. |source| indicates
-  // where the focus request is originating from. Return false to allow the
-  // focus to be set or true to cancel setting the focus.
+  /// Called when the browser component is requesting focus. |source| indicates
+  /// where the focus request is originating from. Return false to allow the
+  /// focus to be set or true to cancel setting the focus.
   ///
   /*--cef()--*/
   virtual bool OnSetFocus(CefRefPtr<CefBrowser> browser, FocusSource source) {
@@ -72,7 +72,7 @@ class CefFocusHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the browser component has received focus.
+  /// Called when the browser component has received focus.
   ///
   /*--cef()--*/
   virtual void OnGotFocus(CefRefPtr<CefBrowser> browser) {}
diff --git a/src/include/cef_frame.h b/src/include/cef_frame.h
index 47f5888b8..4c8d414ba 100644
--- a/src/include/cef_frame.h
+++ b/src/include/cef_frame.h
@@ -40,119 +40,117 @@
 
 #include "include/cef_base.h"
 #include "include/cef_dom.h"
+#include "include/cef_process_message.h"
 #include "include/cef_request.h"
 #include "include/cef_stream.h"
 #include "include/cef_string_visitor.h"
 
 class CefBrowser;
+class CefURLRequest;
+class CefURLRequestClient;
 class CefV8Context;
 
 ///
-// Class used to represent a frame in the browser window. When used in the
-// browser process the methods of this class may be called on any thread unless
-// otherwise indicated in the comments. When used in the render process the
-// methods of this class may only be called on the main thread.
+/// Class used to represent a frame in the browser window. When used in the
+/// browser process the methods of this class may be called on any thread unless
+/// otherwise indicated in the comments. When used in the render process the
+/// methods of this class may only be called on the main thread.
 ///
 /*--cef(source=library)--*/
 class CefFrame : public virtual CefBaseRefCounted {
  public:
   ///
-  // True if this object is currently attached to a valid frame.
+  /// True if this object is currently attached to a valid frame.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Execute undo in this frame.
+  /// Execute undo in this frame.
   ///
   /*--cef()--*/
   virtual void Undo() = 0;
 
   ///
-  // Execute redo in this frame.
+  /// Execute redo in this frame.
   ///
   /*--cef()--*/
   virtual void Redo() = 0;
 
   ///
-  // Execute cut in this frame.
+  /// Execute cut in this frame.
   ///
   /*--cef()--*/
   virtual void Cut() = 0;
 
   ///
-  // Execute copy in this frame.
+  /// Execute copy in this frame.
   ///
   /*--cef()--*/
   virtual void Copy() = 0;
 
   ///
-  // Execute paste in this frame.
+  /// Execute paste in this frame.
   ///
   /*--cef()--*/
   virtual void Paste() = 0;
 
   ///
-  // Execute delete in this frame.
+  /// Execute delete in this frame.
   ///
   /*--cef(capi_name=del)--*/
   virtual void Delete() = 0;
 
   ///
-  // Execute select all in this frame.
+  /// Execute select all in this frame.
   ///
   /*--cef()--*/
   virtual void SelectAll() = 0;
 
   ///
-  // Save this frame's HTML source to a temporary file and open it in the
-  // default text viewing application. This method can only be called from the
-  // browser process.
+  /// Save this frame's HTML source to a temporary file and open it in the
+  /// default text viewing application. This method can only be called from the
+  /// browser process.
   ///
   /*--cef()--*/
   virtual void ViewSource() = 0;
 
   ///
-  // Retrieve this frame's HTML source as a string sent to the specified
-  // visitor.
+  /// Retrieve this frame's HTML source as a string sent to the specified
+  /// visitor.
   ///
   /*--cef()--*/
   virtual void GetSource(CefRefPtr<CefStringVisitor> visitor) = 0;
 
   ///
-  // Retrieve this frame's display text as a string sent to the specified
-  // visitor.
+  /// Retrieve this frame's display text as a string sent to the specified
+  /// visitor.
   ///
   /*--cef()--*/
   virtual void GetText(CefRefPtr<CefStringVisitor> visitor) = 0;
 
   ///
-  // Load the request represented by the |request| object.
+  /// Load the request represented by the |request| object.
+  ///
+  /// WARNING: This method will fail with "bad IPC message" reason
+  /// INVALID_INITIATOR_ORIGIN (213) unless you first navigate to the
+  /// request origin using some other mechanism (LoadURL, link click, etc).
   ///
   /*--cef()--*/
   virtual void LoadRequest(CefRefPtr<CefRequest> request) = 0;
 
   ///
-  // Load the specified |url|.
+  /// Load the specified |url|.
   ///
   /*--cef()--*/
   virtual void LoadURL(const CefString& url) = 0;
 
   ///
-  // Load the contents of |string_val| with the specified dummy |url|. |url|
-  // should have a standard scheme (for example, http scheme) or behaviors like
-  // link clicks and web security restrictions may not behave as expected.
-  ///
-  /*--cef()--*/
-  virtual void LoadString(const CefString& string_val,
-                          const CefString& url) = 0;
-
-  ///
-  // Execute a string of JavaScript code in this frame. The |script_url|
-  // parameter is the URL where the script in question can be found, if any.
-  // The renderer may request this URL to show the developer the source of the
-  // error.  The |start_line| parameter is the base line number to use for error
-  // reporting.
+  /// Execute a string of JavaScript code in this frame. The |script_url|
+  /// parameter is the URL where the script in question can be found, if any.
+  /// The renderer may request this URL to show the developer the source of the
+  /// error.  The |start_line| parameter is the base line number to use for
+  /// error reporting.
   ///
   /*--cef(optional_param=script_url)--*/
   virtual void ExecuteJavaScript(const CefString& code,
@@ -160,66 +158,98 @@ class CefFrame : public virtual CefBaseRefCounted {
                                  int start_line) = 0;
 
   ///
-  // Returns true if this is the main (top-level) frame.
+  /// Returns true if this is the main (top-level) frame.
   ///
   /*--cef()--*/
   virtual bool IsMain() = 0;
 
   ///
-  // Returns true if this is the focused frame.
+  /// Returns true if this is the focused frame.
   ///
   /*--cef()--*/
   virtual bool IsFocused() = 0;
 
   ///
-  // Returns the name for this frame. If the frame has an assigned name (for
-  // example, set via the iframe "name" attribute) then that value will be
-  // returned. Otherwise a unique name will be constructed based on the frame
-  // parent hierarchy. The main (top-level) frame will always have an empty name
-  // value.
+  /// Returns the name for this frame. If the frame has an assigned name (for
+  /// example, set via the iframe "name" attribute) then that value will be
+  /// returned. Otherwise a unique name will be constructed based on the frame
+  /// parent hierarchy. The main (top-level) frame will always have an empty
+  /// name value.
   ///
   /*--cef()--*/
   virtual CefString GetName() = 0;
 
   ///
-  // Returns the globally unique identifier for this frame or < 0 if the
-  // underlying frame does not yet exist.
+  /// Returns the globally unique identifier for this frame or empty if the
+  /// underlying frame does not yet exist.
   ///
   /*--cef()--*/
-  virtual int64 GetIdentifier() = 0;
+  virtual CefString GetIdentifier() = 0;
 
   ///
-  // Returns the parent of this frame or NULL if this is the main (top-level)
-  // frame.
+  /// Returns the parent of this frame or NULL if this is the main (top-level)
+  /// frame.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefFrame> GetParent() = 0;
 
   ///
-  // Returns the URL currently loaded in this frame.
+  /// Returns the URL currently loaded in this frame.
   ///
   /*--cef()--*/
   virtual CefString GetURL() = 0;
 
   ///
-  // Returns the browser that this frame belongs to.
+  /// Returns the browser that this frame belongs to.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
-  // Get the V8 context associated with the frame. This method can only be
-  // called from the render process.
+  /// Get the V8 context associated with the frame. This method can only be
+  /// called from the render process.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefV8Context> GetV8Context() = 0;
 
   ///
-  // Visit the DOM document. This method can only be called from the render
-  // process.
+  /// Visit the DOM document. This method can only be called from the render
+  /// process.
   ///
   /*--cef()--*/
   virtual void VisitDOM(CefRefPtr<CefDOMVisitor> visitor) = 0;
+
+  ///
+  /// Create a new URL request that will be treated as originating from this
+  /// frame and the associated browser. Use CefURLRequest::Create instead if you
+  /// do not want the request to have this association, in which case it may be
+  /// handled differently (see documentation on that method). A request created
+  /// with this method may only originate from the browser process, and will
+  /// behave as follows:
+  ///   - It may be intercepted by the client via CefResourceRequestHandler or
+  ///     CefSchemeHandlerFactory.
+  ///   - POST data may only contain a single element of type PDE_TYPE_FILE or
+  ///     PDE_TYPE_BYTES.
+  ///
+  /// The |request| object will be marked as read-only after calling this
+  /// method.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefURLRequest> CreateURLRequest(
+      CefRefPtr<CefRequest> request,
+      CefRefPtr<CefURLRequestClient> client) = 0;
+
+  ///
+  /// Send a message to the specified |target_process|. Ownership of the message
+  /// contents will be transferred and the |message| reference will be
+  /// invalidated. Message delivery is not guaranteed in all cases (for example,
+  /// if the browser is closing, navigating, or if the target process crashes).
+  /// Send an ACK message back from the target process if confirmation is
+  /// required.
+  ///
+  /*--cef()--*/
+  virtual void SendProcessMessage(CefProcessId target_process,
+                                  CefRefPtr<CefProcessMessage> message) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_FRAME_H_
diff --git a/src/include/cef_frame_handler.h b/src/include/cef_frame_handler.h
new file mode 100644
index 000000000..ce4e0fc97
--- /dev/null
+++ b/src/include/cef_frame_handler.h
@@ -0,0 +1,177 @@
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_FRAME_HANDLER_H_
+#define CEF_INCLUDE_CEF_FRAME_HANDLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+
+///
+/// Implement this interface to handle events related to CefFrame life span. The
+/// order of callbacks is:
+///
+/// (1) During initial CefBrowserHost creation and navigation of the main frame:
+/// - CefFrameHandler::OnFrameCreated => The initial main frame object has been
+///   created. Any commands will be queued until the frame is attached.
+/// - CefFrameHandler::OnMainFrameChanged => The initial main frame object has
+///   been assigned to the browser.
+/// - CefLifeSpanHandler::OnAfterCreated => The browser is now valid and can be
+///   used.
+/// - CefFrameHandler::OnFrameAttached => The initial main frame object is now
+///   connected to its peer in the renderer process. Commands can be routed.
+///
+/// (2) During further CefBrowserHost navigation/loading of the main frame
+///     and/or sub-frames:
+/// - CefFrameHandler::OnFrameCreated => A new main frame or sub-frame object
+///   has been created. Any commands will be queued until the frame is attached.
+/// - CefFrameHandler::OnFrameAttached => A new main frame or sub-frame object
+///   is now connected to its peer in the renderer process. Commands can be
+///   routed.
+/// - CefFrameHandler::OnFrameDetached => An existing main frame or sub-frame
+///   object has lost its connection to the renderer process. If multiple
+///   objects are detached at the same time then notifications will be sent for
+///   any sub-frame objects before the main frame object. Commands can no longer
+///   be routed and will be discarded.
+/// - CefFrameHandler::OnMainFrameChanged => A new main frame object has been
+///   assigned to the browser. This will only occur with cross-origin navigation
+///   or re-navigation after renderer process termination (due to crashes, etc).
+///
+/// (3) During final CefBrowserHost destruction of the main frame:
+/// - CefFrameHandler::OnFrameDetached => Any sub-frame objects have lost their
+///   connection to the renderer process. Commands can no longer be routed and
+///   will be discarded.
+/// - CefLifeSpanHandler::OnBeforeClose => The browser has been destroyed.
+/// - CefFrameHandler::OnFrameDetached => The main frame object have lost its
+///   connection to the renderer process. Notifications will be sent for any
+///   sub-frame objects before the main frame object. Commands can no longer be
+///   routed and will be discarded.
+/// - CefFrameHandler::OnMainFrameChanged => The final main frame object has
+///   been removed from the browser.
+///
+/// Cross-origin navigation and/or loading receives special handling.
+///
+/// When the main frame navigates to a different origin the OnMainFrameChanged
+/// callback (2) will be executed with the old and new main frame objects.
+///
+/// When a new sub-frame is loaded in, or an existing sub-frame is navigated to,
+/// a different origin from the parent frame, a temporary sub-frame object will
+/// first be created in the parent's renderer process. That temporary sub-frame
+/// will then be discarded after the real cross-origin sub-frame is created in
+/// the new/target renderer process. The client will receive cross-origin
+/// navigation callbacks (2) for the transition from the temporary sub-frame to
+/// the real sub-frame. The temporary sub-frame will not receive or execute
+/// commands during this transitional period (any sent commands will be
+/// discarded).
+///
+/// When a new popup browser is created in a different origin from the parent
+/// browser, a temporary main frame object for the popup will first be created
+/// in the parent's renderer process. That temporary main frame will then be
+/// discarded after the real cross-origin main frame is created in the
+/// new/target renderer process. The client will receive creation and initial
+/// navigation callbacks (1) for the temporary main frame, followed by
+/// cross-origin navigation callbacks (2) for the transition from the temporary
+/// main frame to the real main frame. The temporary main frame may receive and
+/// execute commands during this transitional period (any sent commands may be
+/// executed, but the behavior is potentially undesirable since they execute in
+/// the parent browser's renderer process and not the new/target renderer
+/// process).
+///
+/// Callbacks will not be executed for placeholders that may be created during
+/// pre-commit navigation for sub-frames that do not yet exist in the renderer
+/// process. Placeholders will have CefFrame::GetIdentifier() == -4.
+///
+/// The methods of this class will be called on the UI thread unless otherwise
+/// indicated.
+///
+/*--cef(source=client)--*/
+class CefFrameHandler : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Called when a new frame is created. This will be the first notification
+  /// that references |frame|. Any commands that require transport to the
+  /// associated renderer process (LoadRequest, SendProcessMessage, GetSource,
+  /// etc.) will be queued until OnFrameAttached is called for |frame|.
+  ///
+  /*--cef()--*/
+  virtual void OnFrameCreated(CefRefPtr<CefBrowser> browser,
+                              CefRefPtr<CefFrame> frame) {}
+
+  ///
+  /// Called when a frame can begin routing commands to/from the associated
+  /// renderer process. |reattached| will be true if the frame was re-attached
+  /// after exiting the BackForwardCache. Any commands that were queued have now
+  /// been dispatched.
+  ///
+  /*--cef()--*/
+  virtual void OnFrameAttached(CefRefPtr<CefBrowser> browser,
+                               CefRefPtr<CefFrame> frame,
+                               bool reattached) {}
+
+  ///
+  /// Called when a frame loses its connection to the renderer process and will
+  /// be destroyed. Any pending or future commands will be discarded and
+  /// CefFrame::IsValid() will now return false for |frame|. If called after
+  /// CefLifeSpanHandler::OnBeforeClose() during browser destruction then
+  /// CefBrowser::IsValid() will return false for |browser|.
+  ///
+  /*--cef()--*/
+  virtual void OnFrameDetached(CefRefPtr<CefBrowser> browser,
+                               CefRefPtr<CefFrame> frame) {}
+
+  ///
+  /// Called when the main frame changes due to (a) initial browser creation,
+  /// (b) final browser destruction, (c) cross-origin navigation or (d)
+  /// re-navigation after renderer process termination (due to crashes, etc).
+  /// |old_frame| will be NULL and |new_frame| will be non-NULL when a main
+  /// frame is assigned to |browser| for the first time. |old_frame| will be
+  /// non-NULL and |new_frame| will be NULL and  when a main frame is removed
+  /// from |browser| for the last time. Both |old_frame| and |new_frame| will be
+  /// non-NULL for cross-origin navigations or re-navigation after renderer
+  /// process termination. This method will be called after OnFrameCreated() for
+  /// |new_frame| and/or after OnFrameDetached() for |old_frame|. If called
+  /// after CefLifeSpanHandler::OnBeforeClose() during browser destruction then
+  /// CefBrowser::IsValid() will return false for |browser|.
+  ///
+  /*--cef(optional_param=old_frame,optional_param=new_frame)--*/
+  virtual void OnMainFrameChanged(CefRefPtr<CefBrowser> browser,
+                                  CefRefPtr<CefFrame> old_frame,
+                                  CefRefPtr<CefFrame> new_frame) {}
+};
+
+#endif  // CEF_INCLUDE_CEF_FRAME_HANDLER_H_
diff --git a/src/include/cef_i18n_util.h b/src/include/cef_i18n_util.h
new file mode 100644
index 000000000..5f9e1165e
--- /dev/null
+++ b/src/include/cef_i18n_util.h
@@ -0,0 +1,49 @@
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_I18N_UTIL_H_
+#define CEF_INCLUDE_CEF_I18N_UTIL_H_
+#pragma once
+
+#include "include/cef_base.h"
+
+///
+/// Returns true if the application text direction is right-to-left.
+///
+/*--cef()--*/
+bool CefIsRTL();
+
+#endif  // CEF_INCLUDE_CEF_I18N_UTIL_H_
diff --git a/src/include/cef_image.h b/src/include/cef_image.h
index 3507393ab..cbea565bd 100644
--- a/src/include/cef_image.h
+++ b/src/include/cef_image.h
@@ -42,42 +42,42 @@
 #include "include/cef_values.h"
 
 ///
-// Container for a single image represented at different scale factors. All
-// image representations should be the same size in density independent pixel
-// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
-// then the image at scale factor 2.0 should be 200x200 pixels -- both images
-// will display with a DIP size of 100x100 units. The methods of this class must
-// be called on the browser process UI thread.
+/// Container for a single image represented at different scale factors. All
+/// image representations should be the same size in density independent pixel
+/// (DIP) units. For example, if the image at scale factor 1.0 is 100x100 pixels
+/// then the image at scale factor 2.0 should be 200x200 pixels -- both images
+/// will display with a DIP size of 100x100 units. The methods of this class can
+/// be called on any browser process thread.
 ///
 /*--cef(source=library)--*/
 class CefImage : public virtual CefBaseRefCounted {
  public:
   ///
-  // Create a new CefImage. It will initially be empty. Use the Add*() methods
-  // to add representations at different scale factors.
+  /// Create a new CefImage. It will initially be empty. Use the Add*() methods
+  /// to add representations at different scale factors.
   ///
   /*--cef()--*/
   static CefRefPtr<CefImage> CreateImage();
 
   ///
-  // Returns true if this Image is empty.
+  /// Returns true if this Image is empty.
   ///
   /*--cef()--*/
   virtual bool IsEmpty() = 0;
 
   ///
-  // Returns true if this Image and |that| Image share the same underlying
-  // storage. Will also return true if both images are empty.
+  /// Returns true if this Image and |that| Image share the same underlying
+  /// storage. Will also return true if both images are empty.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefImage> that) = 0;
 
   ///
-  // Add a bitmap image representation for |scale_factor|. Only 32-bit RGBA/BGRA
-  // formats are supported. |pixel_width| and |pixel_height| are the bitmap
-  // representation size in pixel coordinates. |pixel_data| is the array of
-  // pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in size.
-  // |color_type| and |alpha_type| values specify the pixel format.
+  /// Add a bitmap image representation for |scale_factor|. Only 32-bit
+  /// RGBA/BGRA formats are supported. |pixel_width| and |pixel_height| are the
+  /// bitmap representation size in pixel coordinates. |pixel_data| is the array
+  /// of pixel data and should be |pixel_width| x |pixel_height| x 4 bytes in
+  /// size. |color_type| and |alpha_type| values specify the pixel format.
   ///
   /*--cef()--*/
   virtual bool AddBitmap(float scale_factor,
@@ -89,9 +89,9 @@ class CefImage : public virtual CefBaseRefCounted {
                          size_t pixel_data_size) = 0;
 
   ///
-  // Add a PNG image representation for |scale_factor|. |png_data| is the image
-  // data of size |png_data_size|. Any alpha transparency in the PNG data will
-  // be maintained.
+  /// Add a PNG image representation for |scale_factor|. |png_data| is the image
+  /// data of size |png_data_size|. Any alpha transparency in the PNG data will
+  /// be maintained.
   ///
   /*--cef()--*/
   virtual bool AddPNG(float scale_factor,
@@ -99,9 +99,9 @@ class CefImage : public virtual CefBaseRefCounted {
                       size_t png_data_size) = 0;
 
   ///
-  // Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
-  // image data of size |jpeg_data_size|. The JPEG format does not support
-  // transparency so the alpha byte will be set to 0xFF for all pixels.
+  /// Create a JPEG image representation for |scale_factor|. |jpeg_data| is the
+  /// image data of size |jpeg_data_size|. The JPEG format does not support
+  /// transparency so the alpha byte will be set to 0xFF for all pixels.
   ///
   /*--cef()--*/
   virtual bool AddJPEG(float scale_factor,
@@ -109,34 +109,34 @@ class CefImage : public virtual CefBaseRefCounted {
                        size_t jpeg_data_size) = 0;
 
   ///
-  // Returns the image width in density independent pixel (DIP) units.
+  /// Returns the image width in density independent pixel (DIP) units.
   ///
   /*--cef()--*/
   virtual size_t GetWidth() = 0;
 
   ///
-  // Returns the image height in density independent pixel (DIP) units.
+  /// Returns the image height in density independent pixel (DIP) units.
   ///
   /*--cef()--*/
   virtual size_t GetHeight() = 0;
 
   ///
-  // Returns true if this image contains a representation for |scale_factor|.
+  /// Returns true if this image contains a representation for |scale_factor|.
   ///
   /*--cef()--*/
   virtual bool HasRepresentation(float scale_factor) = 0;
 
   ///
-  // Removes the representation for |scale_factor|. Returns true on success.
+  /// Removes the representation for |scale_factor|. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool RemoveRepresentation(float scale_factor) = 0;
 
   ///
-  // Returns information for the representation that most closely matches
-  // |scale_factor|. |actual_scale_factor| is the actual scale factor for the
-  // representation. |pixel_width| and |pixel_height| are the representation
-  // size in pixel coordinates. Returns true on success.
+  /// Returns information for the representation that most closely matches
+  /// |scale_factor|. |actual_scale_factor| is the actual scale factor for the
+  /// representation. |pixel_width| and |pixel_height| are the representation
+  /// size in pixel coordinates. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool GetRepresentationInfo(float scale_factor,
@@ -145,12 +145,12 @@ class CefImage : public virtual CefBaseRefCounted {
                                      int& pixel_height) = 0;
 
   ///
-  // Returns the bitmap representation that most closely matches |scale_factor|.
-  // Only 32-bit RGBA/BGRA formats are supported. |color_type| and |alpha_type|
-  // values specify the desired output pixel format. |pixel_width| and
-  // |pixel_height| are the output representation size in pixel coordinates.
-  // Returns a CefBinaryValue containing the pixel data on success or NULL on
-  // failure.
+  /// Returns the bitmap representation that most closely matches
+  /// |scale_factor|. Only 32-bit RGBA/BGRA formats are supported. |color_type|
+  /// and |alpha_type| values specify the desired output pixel format.
+  /// |pixel_width| and |pixel_height| are the output representation size in
+  /// pixel coordinates. Returns a CefBinaryValue containing the pixel data on
+  /// success or NULL on failure.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetAsBitmap(float scale_factor,
@@ -160,11 +160,12 @@ class CefImage : public virtual CefBaseRefCounted {
                                                 int& pixel_height) = 0;
 
   ///
-  // Returns the PNG representation that most closely matches |scale_factor|. If
-  // |with_transparency| is true any alpha transparency in the image will be
-  // represented in the resulting PNG data. |pixel_width| and |pixel_height| are
-  // the output representation size in pixel coordinates. Returns a
-  // CefBinaryValue containing the PNG image data on success or NULL on failure.
+  /// Returns the PNG representation that most closely matches |scale_factor|.
+  /// If |with_transparency| is true any alpha transparency in the image will be
+  /// represented in the resulting PNG data. |pixel_width| and |pixel_height|
+  /// are the output representation size in pixel coordinates. Returns a
+  /// CefBinaryValue containing the PNG image data on success or NULL on
+  /// failure.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetAsPNG(float scale_factor,
@@ -173,13 +174,13 @@ class CefImage : public virtual CefBaseRefCounted {
                                              int& pixel_height) = 0;
 
   ///
-  // Returns the JPEG representation that most closely matches |scale_factor|.
-  // |quality| determines the compression level with 0 == lowest and 100 ==
-  // highest. The JPEG format does not support alpha transparency and the alpha
-  // channel, if any, will be discarded. |pixel_width| and |pixel_height| are
-  // the output representation size in pixel coordinates. Returns a
-  // CefBinaryValue containing the JPEG image data on success or NULL on
-  // failure.
+  /// Returns the JPEG representation that most closely matches |scale_factor|.
+  /// |quality| determines the compression level with 0 == lowest and 100 ==
+  /// highest. The JPEG format does not support alpha transparency and the alpha
+  /// channel, if any, will be discarded. |pixel_width| and |pixel_height| are
+  /// the output representation size in pixel coordinates. Returns a
+  /// CefBinaryValue containing the JPEG image data on success or NULL on
+  /// failure.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetAsJPEG(float scale_factor,
diff --git a/src/include/cef_jsdialog_handler.h b/src/include/cef_jsdialog_handler.h
index b7e094505..9ad652761 100644
--- a/src/include/cef_jsdialog_handler.h
+++ b/src/include/cef_jsdialog_handler.h
@@ -42,23 +42,23 @@
 #include "include/cef_browser.h"
 
 ///
-// Callback interface used for asynchronous continuation of JavaScript dialog
-// requests.
+/// Callback interface used for asynchronous continuation of JavaScript dialog
+/// requests.
 ///
 /*--cef(source=library)--*/
 class CefJSDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Continue the JS dialog request. Set |success| to true if the OK button was
-  // pressed. The |user_input| value should be specified for prompt dialogs.
+  /// Continue the JS dialog request. Set |success| to true if the OK button was
+  /// pressed. The |user_input| value should be specified for prompt dialogs.
   ///
   /*--cef(capi_name=cont,optional_param=user_input)--*/
   virtual void Continue(bool success, const CefString& user_input) = 0;
 };
 
 ///
-// Implement this interface to handle events related to JavaScript dialogs. The
-// methods of this class will be called on the UI thread.
+/// Implement this interface to handle events related to JavaScript dialogs. The
+/// methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefJSDialogHandler : public virtual CefBaseRefCounted {
@@ -66,20 +66,20 @@ class CefJSDialogHandler : public virtual CefBaseRefCounted {
   typedef cef_jsdialog_type_t JSDialogType;
 
   ///
-  // Called to run a JavaScript dialog. If |origin_url| is non-empty it can be
-  // passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
-  // and user-friendly display string. The |default_prompt_text| value will be
-  // specified for prompt dialogs only. Set |suppress_message| to true and
-  // return false to suppress the message (suppressing messages is preferable to
-  // immediately executing the callback as this is used to detect presumably
-  // malicious behavior like spamming alert messages in onbeforeunload). Set
-  // |suppress_message| to false and return false to use the default
-  // implementation (the default implementation will show one modal dialog at a
-  // time and suppress any additional dialog requests until the displayed dialog
-  // is dismissed). Return true if the application will use a custom dialog or
-  // if the callback has been executed immediately. Custom dialogs may be either
-  // modal or modeless. If a custom dialog is used the application must execute
-  // |callback| once the custom dialog is dismissed.
+  /// Called to run a JavaScript dialog. If |origin_url| is non-empty it can be
+  /// passed to the CefFormatUrlForSecurityDisplay function to retrieve a secure
+  /// and user-friendly display string. The |default_prompt_text| value will be
+  /// specified for prompt dialogs only. Set |suppress_message| to true and
+  /// return false to suppress the message (suppressing messages is preferable
+  /// to immediately executing the callback as this is used to detect presumably
+  /// malicious behavior like spamming alert messages in onbeforeunload). Set
+  /// |suppress_message| to false and return false to use the default
+  /// implementation (the default implementation will show one modal dialog at a
+  /// time and suppress any additional dialog requests until the displayed
+  /// dialog is dismissed). Return true if the application will use a custom
+  /// dialog or if the callback has been executed immediately. Custom dialogs
+  /// may be either modal or modeless. If a custom dialog is used the
+  /// application must execute |callback| once the custom dialog is dismissed.
   ///
   /*--cef(optional_param=origin_url,optional_param=accept_lang,
           optional_param=message_text,optional_param=default_prompt_text)--*/
@@ -94,12 +94,12 @@ class CefJSDialogHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called to run a dialog asking the user if they want to leave a page. Return
-  // false to use the default dialog implementation. Return true if the
-  // application will use a custom dialog or if the callback has been executed
-  // immediately. Custom dialogs may be either modal or modeless. If a custom
-  // dialog is used the application must execute |callback| once the custom
-  // dialog is dismissed.
+  /// Called to run a dialog asking the user if they want to leave a page.
+  /// Return false to use the default dialog implementation. Return true if the
+  /// application will use a custom dialog or if the callback has been executed
+  /// immediately. Custom dialogs may be either modal or modeless. If a custom
+  /// dialog is used the application must execute |callback| once the custom
+  /// dialog is dismissed.
   ///
   /*--cef(optional_param=message_text)--*/
   virtual bool OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser,
@@ -110,15 +110,15 @@ class CefJSDialogHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called to cancel any pending dialogs and reset any saved dialog state. Will
-  // be called due to events like page navigation irregardless of whether any
-  // dialogs are currently pending.
+  /// Called to cancel any pending dialogs and reset any saved dialog state.
+  /// Will be called due to events like page navigation irregardless of whether
+  /// any dialogs are currently pending.
   ///
   /*--cef()--*/
   virtual void OnResetDialogState(CefRefPtr<CefBrowser> browser) {}
 
   ///
-  // Called when the default implementation dialog is closed.
+  /// Called when the dialog is closed.
   ///
   /*--cef()--*/
   virtual void OnDialogClosed(CefRefPtr<CefBrowser> browser) {}
diff --git a/src/include/cef_keyboard_handler.h b/src/include/cef_keyboard_handler.h
index 386491ed9..69838f98b 100644
--- a/src/include/cef_keyboard_handler.h
+++ b/src/include/cef_keyboard_handler.h
@@ -42,18 +42,18 @@
 #include "include/cef_browser.h"
 
 ///
-// Implement this interface to handle events related to keyboard input. The
-// methods of this class will be called on the UI thread.
+/// Implement this interface to handle events related to keyboard input. The
+/// methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefKeyboardHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called before a keyboard event is sent to the renderer. |event| contains
-  // information about the keyboard event. |os_event| is the operating system
-  // event message, if any. Return true if the event was handled or false
-  // otherwise. If the event will be handled in OnKeyEvent() as a keyboard
-  // shortcut set |is_keyboard_shortcut| to true and return false.
+  /// Called before a keyboard event is sent to the renderer. |event| contains
+  /// information about the keyboard event. |os_event| is the operating system
+  /// event message, if any. Return true if the event was handled or false
+  /// otherwise. If the event will be handled in OnKeyEvent() as a keyboard
+  /// shortcut set |is_keyboard_shortcut| to true and return false.
   ///
   /*--cef()--*/
   virtual bool OnPreKeyEvent(CefRefPtr<CefBrowser> browser,
@@ -64,10 +64,10 @@ class CefKeyboardHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called after the renderer and JavaScript in the page has had a chance to
-  // handle the event. |event| contains information about the keyboard event.
-  // |os_event| is the operating system event message, if any. Return true if
-  // the keyboard event was handled or false otherwise.
+  /// Called after the renderer and JavaScript in the page has had a chance to
+  /// handle the event. |event| contains information about the keyboard event.
+  /// |os_event| is the operating system event message, if any. Return true if
+  /// the keyboard event was handled or false otherwise.
   ///
   /*--cef()--*/
   virtual bool OnKeyEvent(CefRefPtr<CefBrowser> browser,
diff --git a/src/include/cef_life_span_handler.h b/src/include/cef_life_span_handler.h
index 64553018a..1170cd3b7 100644
--- a/src/include/cef_life_span_handler.h
+++ b/src/include/cef_life_span_handler.h
@@ -44,9 +44,9 @@
 class CefClient;
 
 ///
-// Implement this interface to handle events related to browser life span. The
-// methods of this class will be called on the UI thread unless otherwise
-// indicated.
+/// Implement this interface to handle events related to browser life span. The
+/// methods of this class will be called on the UI thread unless otherwise
+/// indicated.
 ///
 /*--cef(source=client)--*/
 class CefLifeSpanHandler : public virtual CefBaseRefCounted {
@@ -54,26 +54,29 @@ class CefLifeSpanHandler : public virtual CefBaseRefCounted {
   typedef cef_window_open_disposition_t WindowOpenDisposition;
 
   ///
-  // Called on the UI thread before a new popup browser is created. The
-  // |browser| and |frame| values represent the source of the popup request. The
-  // |target_url| and |target_frame_name| values indicate where the popup
-  // browser should navigate and may be empty if not specified with the request.
-  // The |target_disposition| value indicates where the user intended to open
-  // the popup (e.g. current tab, new tab, etc). The |user_gesture| value will
-  // be true if the popup was opened via explicit user gesture (e.g. clicking a
-  // link) or false if the popup opened automatically (e.g. via the
-  // DomContentLoaded event). The |popupFeatures| structure contains additional
-  // information about the requested popup window. To allow creation of the
-  // popup browser optionally modify |windowInfo|, |client|, |settings| and
-  // |no_javascript_access| and return false. To cancel creation of the popup
-  // browser return true. The |client| and |settings| values will default to the
-  // source browser's values. If the |no_javascript_access| value is set to
-  // false the new browser will not be scriptable and may not be hosted in the
-  // same renderer process as the source browser. Any modifications to
-  // |windowInfo| will be ignored if the parent browser is wrapped in a
-  // CefBrowserView. Popup browser creation will be canceled if the parent
-  // browser is destroyed before the popup browser creation completes (indicated
-  // by a call to OnAfterCreated for the popup browser).
+  /// Called on the UI thread before a new popup browser is created. The
+  /// |browser| and |frame| values represent the source of the popup request.
+  /// The |target_url| and |target_frame_name| values indicate where the popup
+  /// browser should navigate and may be empty if not specified with the
+  /// request. The |target_disposition| value indicates where the user intended
+  /// to open the popup (e.g. current tab, new tab, etc). The |user_gesture|
+  /// value will be true if the popup was opened via explicit user gesture (e.g.
+  /// clicking a link) or false if the popup opened automatically (e.g. via the
+  /// DomContentLoaded event). The |popupFeatures| structure contains additional
+  /// information about the requested popup window. To allow creation of the
+  /// popup browser optionally modify |windowInfo|, |client|, |settings| and
+  /// |no_javascript_access| and return false. To cancel creation of the popup
+  /// browser return true. The |client| and |settings| values will default to
+  /// the source browser's values. If the |no_javascript_access| value is set to
+  /// false the new browser will not be scriptable and may not be hosted in the
+  /// same renderer process as the source browser. Any modifications to
+  /// |windowInfo| will be ignored if the parent browser is wrapped in a
+  /// CefBrowserView. Popup browser creation will be canceled if the parent
+  /// browser is destroyed before the popup browser creation completes
+  /// (indicated by a call to OnAfterCreated for the popup browser). The
+  /// |extra_info| parameter provides an opportunity to specify extra
+  /// information specific to the created popup browser that will be passed to
+  /// CefRenderProcessHandler::OnBrowserCreated() in the render process.
   ///
   /*--cef(optional_param=target_url,optional_param=target_frame_name)--*/
   virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
@@ -86,114 +89,150 @@ class CefLifeSpanHandler : public virtual CefBaseRefCounted {
                              CefWindowInfo& windowInfo,
                              CefRefPtr<CefClient>& client,
                              CefBrowserSettings& settings,
+                             CefRefPtr<CefDictionaryValue>& extra_info,
                              bool* no_javascript_access) {
     return false;
   }
 
   ///
-  // Called after a new browser is created. This callback will be the first
-  // notification that references |browser|.
+  /// Called on the UI thread before a new DevTools popup browser is created.
+  /// The |browser| value represents the source of the popup request. Optionally
+  /// modify |windowInfo|, |client|, |settings| and |extra_info| values. The
+  /// |client|, |settings| and |extra_info| values will default to the source
+  /// browser's values. Any modifications to |windowInfo| will be ignored if the
+  /// parent browser is Views-hosted (wrapped in a CefBrowserView).
+  ///
+  /// The |extra_info| parameter provides an opportunity to specify extra
+  /// information specific to the created popup browser that will be passed to
+  /// CefRenderProcessHandler::OnBrowserCreated() in the render process. The
+  /// existing |extra_info| object, if any, will be read-only but may be
+  /// replaced with a new object.
+  ///
+  /// Views-hosted source browsers will create Views-hosted DevTools popups
+  /// unless |use_default_window| is set to to true. DevTools popups can be
+  /// blocked by returning true from CefCommandHandler::OnChromeCommand for
+  /// IDC_DEV_TOOLS. Only used with the Chrome runtime.
+  ///
+  /*--cef()--*/
+  virtual void OnBeforeDevToolsPopup(CefRefPtr<CefBrowser> browser,
+                                     CefWindowInfo& windowInfo,
+                                     CefRefPtr<CefClient>& client,
+                                     CefBrowserSettings& settings,
+                                     CefRefPtr<CefDictionaryValue>& extra_info,
+                                     bool* use_default_window) {}
+
+  ///
+  /// Called after a new browser is created. It is now safe to begin performing
+  /// actions with |browser|. CefFrameHandler callbacks related to initial main
+  /// frame creation will arrive before this callback. See CefFrameHandler
+  /// documentation for additional usage information.
   ///
   /*--cef()--*/
   virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) {}
 
   ///
-  // Called when a browser has recieved a request to close. This may result
-  // directly from a call to CefBrowserHost::*CloseBrowser() or indirectly if
-  // the browser is parented to a top-level window created by CEF and the user
-  // attempts to close that window (by clicking the 'X', for example). The
-  // DoClose() method will be called after the JavaScript 'onunload' event has
-  // been fired.
-  //
-  // An application should handle top-level owner window close notifications by
-  // calling CefBrowserHost::TryCloseBrowser() or
-  // CefBrowserHost::CloseBrowser(false) instead of allowing the window to close
-  // immediately (see the examples below). This gives CEF an opportunity to
-  // process the 'onbeforeunload' event and optionally cancel the close before
-  // DoClose() is called.
-  //
-  // When windowed rendering is enabled CEF will internally create a window or
-  // view to host the browser. In that case returning false from DoClose() will
-  // send the standard close notification to the browser's top-level owner
-  // window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
-  // Linux or CefWindowDelegate::CanClose() callback from Views). If the
-  // browser's host window/view has already been destroyed (via view hierarchy
-  // tear-down, for example) then DoClose() will not be called for that browser
-  // since is no longer possible to cancel the close.
-  //
-  // When windowed rendering is disabled returning false from DoClose() will
-  // cause the browser object to be destroyed immediately.
-  //
-  // If the browser's top-level owner window requires a non-standard close
-  // notification then send that notification from DoClose() and return true.
-  //
-  // The CefLifeSpanHandler::OnBeforeClose() method will be called after
-  // DoClose() (if DoClose() is called) and immediately before the browser
-  // object is destroyed. The application should only exit after OnBeforeClose()
-  // has been called for all existing browsers.
-  //
-  // The below examples describe what should happen during window close when the
-  // browser is parented to an application-provided top-level window.
-  //
-  // Example 1: Using CefBrowserHost::TryCloseBrowser(). This is recommended for
-  // clients using standard close handling and windows created on the browser
-  // process UI thread.
-  // 1.  User clicks the window close button which sends a close notification to
-  //     the application's top-level window.
-  // 2.  Application's top-level window receives the close notification and
-  //     calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
-  //     TryCloseBrowser() returns false so the client cancels the window close.
-  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
-  //     confirmation dialog (which can be overridden via
-  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
-  // 4.  User approves the close.
-  // 5.  JavaScript 'onunload' handler executes.
-  // 6.  CEF sends a close notification to the application's top-level window
-  //     (because DoClose() returned false by default).
-  // 7.  Application's top-level window receives the close notification and
-  //     calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
-  //     allows the window close.
-  // 8.  Application's top-level window is destroyed.
-  // 9.  Application's OnBeforeClose() handler is called and the browser object
-  //     is destroyed.
-  // 10. Application exits by calling CefQuitMessageLoop() if no other browsers
-  //     exist.
-  //
-  // Example 2: Using CefBrowserHost::CloseBrowser(false) and implementing the
-  // DoClose() callback. This is recommended for clients using non-standard
-  // close handling or windows that were not created on the browser process UI
-  // thread.
-  // 1.  User clicks the window close button which sends a close notification to
-  //     the application's top-level window.
-  // 2.  Application's top-level window receives the close notification and:
-  //     A. Calls CefBrowserHost::CloseBrowser(false).
-  //     B. Cancels the window close.
-  // 3.  JavaScript 'onbeforeunload' handler executes and shows the close
-  //     confirmation dialog (which can be overridden via
-  //     CefJSDialogHandler::OnBeforeUnloadDialog()).
-  // 4.  User approves the close.
-  // 5.  JavaScript 'onunload' handler executes.
-  // 6.  Application's DoClose() handler is called. Application will:
-  //     A. Set a flag to indicate that the next close attempt will be allowed.
-  //     B. Return false.
-  // 7.  CEF sends an close notification to the application's top-level window.
-  // 8.  Application's top-level window receives the close notification and
-  //     allows the window to close based on the flag from #6B.
-  // 9.  Application's top-level window is destroyed.
-  // 10. Application's OnBeforeClose() handler is called and the browser object
-  //     is destroyed.
-  // 11. Application exits by calling CefQuitMessageLoop() if no other browsers
-  //     exist.
+  /// Called when a browser has received a request to close. This may result
+  /// directly from a call to CefBrowserHost::*CloseBrowser() or indirectly if
+  /// the browser is parented to a top-level window created by CEF and the user
+  /// attempts to close that window (by clicking the 'X', for example). The
+  /// DoClose() method will be called after the JavaScript 'onunload' event has
+  /// been fired.
+  ///
+  /// An application should handle top-level owner window close notifications by
+  /// calling CefBrowserHost::TryCloseBrowser() or
+  /// CefBrowserHost::CloseBrowser(false) instead of allowing the window to
+  /// close immediately (see the examples below). This gives CEF an opportunity
+  /// to process the 'onbeforeunload' event and optionally cancel the close
+  /// before DoClose() is called.
+  ///
+  /// When windowed rendering is enabled CEF will internally create a window or
+  /// view to host the browser. In that case returning false from DoClose() will
+  /// send the standard close notification to the browser's top-level owner
+  /// window (e.g. WM_CLOSE on Windows, performClose: on OS X, "delete_event" on
+  /// Linux or CefWindowDelegate::CanClose() callback from Views). If the
+  /// browser's host window/view has already been destroyed (via view hierarchy
+  /// tear-down, for example) then DoClose() will not be called for that browser
+  /// since is no longer possible to cancel the close.
+  ///
+  /// When windowed rendering is disabled returning false from DoClose() will
+  /// cause the browser object to be destroyed immediately.
+  ///
+  /// If the browser's top-level owner window requires a non-standard close
+  /// notification then send that notification from DoClose() and return true.
+  ///
+  /// The CefLifeSpanHandler::OnBeforeClose() method will be called after
+  /// DoClose() (if DoClose() is called) and immediately before the browser
+  /// object is destroyed. The application should only exit after
+  /// OnBeforeClose() has been called for all existing browsers.
+  ///
+  /// The below examples describe what should happen during window close when
+  /// the browser is parented to an application-provided top-level window.
+  ///
+  /// Example 1: Using CefBrowserHost::TryCloseBrowser(). This is recommended
+  /// for clients using standard close handling and windows created on the
+  /// browser process UI thread.
+  /// 1.  User clicks the window close button which sends a close notification
+  ///     to the application's top-level window.
+  /// 2.  Application's top-level window receives the close notification and
+  ///     calls TryCloseBrowser() (which internally calls CloseBrowser(false)).
+  ///     TryCloseBrowser() returns false so the client cancels the window
+  ///     close.
+  /// 3.  JavaScript 'onbeforeunload' handler executes and shows the close
+  ///     confirmation dialog (which can be overridden via
+  ///     CefJSDialogHandler::OnBeforeUnloadDialog()).
+  /// 4.  User approves the close.
+  /// 5.  JavaScript 'onunload' handler executes.
+  /// 6.  CEF sends a close notification to the application's top-level window
+  ///     (because DoClose() returned false by default).
+  /// 7.  Application's top-level window receives the close notification and
+  ///     calls TryCloseBrowser(). TryCloseBrowser() returns true so the client
+  ///     allows the window close.
+  /// 8.  Application's top-level window is destroyed.
+  /// 9.  Application's OnBeforeClose() handler is called and the browser object
+  ///     is destroyed.
+  /// 10. Application exits by calling CefQuitMessageLoop() if no other browsers
+  ///     exist.
+  ///
+  /// Example 2: Using CefBrowserHost::CloseBrowser(false) and implementing the
+  /// DoClose() callback. This is recommended for clients using non-standard
+  /// close handling or windows that were not created on the browser process UI
+  /// thread.
+  /// 1.  User clicks the window close button which sends a close notification
+  ///     to the application's top-level window.
+  /// 2.  Application's top-level window receives the close notification and:
+  ///     A. Calls CefBrowserHost::CloseBrowser(false).
+  ///     B. Cancels the window close.
+  /// 3.  JavaScript 'onbeforeunload' handler executes and shows the close
+  ///     confirmation dialog (which can be overridden via
+  ///     CefJSDialogHandler::OnBeforeUnloadDialog()).
+  /// 4.  User approves the close.
+  /// 5.  JavaScript 'onunload' handler executes.
+  /// 6.  Application's DoClose() handler is called. Application will:
+  ///     A. Set a flag to indicate that the next close attempt will be allowed.
+  ///     B. Return false.
+  /// 7.  CEF sends an close notification to the application's top-level window.
+  /// 8.  Application's top-level window receives the close notification and
+  ///     allows the window to close based on the flag from #6B.
+  /// 9.  Application's top-level window is destroyed.
+  /// 10. Application's OnBeforeClose() handler is called and the browser object
+  ///     is destroyed.
+  /// 11. Application exits by calling CefQuitMessageLoop() if no other browsers
+  ///     exist.
   ///
   /*--cef()--*/
   virtual bool DoClose(CefRefPtr<CefBrowser> browser) { return false; }
 
   ///
-  // Called just before a browser is destroyed. Release all references to the
-  // browser object and do not attempt to execute any methods on the browser
-  // object after this callback returns. This callback will be the last
-  // notification that references |browser|. See DoClose() documentation for
-  // additional usage information.
+  /// Called just before a browser is destroyed. Release all references to the
+  /// browser object and do not attempt to execute any methods on the browser
+  /// object (other than IsValid, GetIdentifier or IsSame) after this callback
+  /// returns. CefFrameHandler callbacks related to final main frame destruction
+  /// will arrive after this callback and CefBrowser::IsValid will return false
+  /// at that time. Any in-progress network requests associated with |browser|
+  /// will be aborted when the browser is destroyed, and
+  /// CefResourceRequestHandler callbacks related to those requests may still
+  /// arrive on the IO thread after this callback. See CefFrameHandler and
+  /// DoClose() documentation for additional usage information.
   ///
   /*--cef()--*/
   virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) {}
diff --git a/src/include/cef_load_handler.h b/src/include/cef_load_handler.h
index 66b556732..a7381d829 100644
--- a/src/include/cef_load_handler.h
+++ b/src/include/cef_load_handler.h
@@ -43,9 +43,9 @@
 #include "include/cef_frame.h"
 
 ///
-// Implement this interface to handle events related to browser load status. The
-// methods of this class will be called on the browser process UI thread or
-// render process main thread (TID_RENDERER).
+/// Implement this interface to handle events related to browser load status.
+/// The methods of this class will be called on the browser process UI thread or
+/// render process main thread (TID_RENDERER).
 ///
 /*--cef(source=client)--*/
 class CefLoadHandler : public virtual CefBaseRefCounted {
@@ -54,11 +54,11 @@ class CefLoadHandler : public virtual CefBaseRefCounted {
   typedef cef_transition_type_t TransitionType;
 
   ///
-  // Called when the loading state has changed. This callback will be executed
-  // twice -- once when loading is initiated either programmatically or by user
-  // action, and once when loading is terminated due to completion, cancellation
-  // of failure. It will be called before any calls to OnLoadStart and after all
-  // calls to OnLoadError and/or OnLoadEnd.
+  /// Called when the loading state has changed. This callback will be executed
+  /// twice -- once when loading is initiated either programmatically or by user
+  /// action, and once when loading is terminated due to completion,
+  /// cancellation of failure. It will be called before any calls to OnLoadStart
+  /// and after all calls to OnLoadError and/or OnLoadEnd.
   ///
   /*--cef()--*/
   virtual void OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
@@ -67,16 +67,16 @@ class CefLoadHandler : public virtual CefBaseRefCounted {
                                     bool canGoForward) {}
 
   ///
-  // Called after a navigation has been committed and before the browser begins
-  // loading contents in the frame. The |frame| value will never be empty --
-  // call the IsMain() method to check if this frame is the main frame.
-  // |transition_type| provides information about the source of the navigation
-  // and an accurate value is only available in the browser process. Multiple
-  // frames may be loading at the same time. Sub-frames may start or continue
-  // loading after the main frame load has ended. This method will not be called
-  // for same page navigations (fragments, history state, etc.) or for
-  // navigations that fail or are canceled before commit. For notification of
-  // overall browser load status use OnLoadingStateChange instead.
+  /// Called after a navigation has been committed and before the browser begins
+  /// loading contents in the frame. The |frame| value will never be empty --
+  /// call the IsMain() method to check if this frame is the main frame.
+  /// |transition_type| provides information about the source of the navigation
+  /// and an accurate value is only available in the browser process. Multiple
+  /// frames may be loading at the same time. Sub-frames may start or continue
+  /// loading after the main frame load has ended. This method will not be
+  /// called for same page navigations (fragments, history state, etc.) or for
+  /// navigations that fail or are canceled before commit. For notification of
+  /// overall browser load status use OnLoadingStateChange instead.
   ///
   /*--cef()--*/
   virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,
@@ -84,14 +84,14 @@ class CefLoadHandler : public virtual CefBaseRefCounted {
                            TransitionType transition_type) {}
 
   ///
-  // Called when the browser is done loading a frame. The |frame| value will
-  // never be empty -- call the IsMain() method to check if this frame is the
-  // main frame. Multiple frames may be loading at the same time. Sub-frames may
-  // start or continue loading after the main frame load has ended. This method
-  // will not be called for same page navigations (fragments, history state,
-  // etc.) or for navigations that fail or are canceled before commit. For
-  // notification of overall browser load status use OnLoadingStateChange
-  // instead.
+  /// Called when the browser is done loading a frame. The |frame| value will
+  /// never be empty -- call the IsMain() method to check if this frame is the
+  /// main frame. Multiple frames may be loading at the same time. Sub-frames
+  /// may start or continue loading after the main frame load has ended. This
+  /// method will not be called for same page navigations (fragments, history
+  /// state, etc.) or for navigations that fail or are canceled before commit.
+  /// For notification of overall browser load status use OnLoadingStateChange
+  /// instead.
   ///
   /*--cef()--*/
   virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
@@ -99,11 +99,12 @@ class CefLoadHandler : public virtual CefBaseRefCounted {
                          int httpStatusCode) {}
 
   ///
-  // Called when a navigation fails or is canceled. This method may be called
-  // by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
-  // after commit. |errorCode| is the error code number, |errorText| is the
-  // error text and |failedUrl| is the URL that failed to load.
-  // See net\base\net_error_list.h for complete descriptions of the error codes.
+  /// Called when a navigation fails or is canceled. This method may be called
+  /// by itself if before commit or in combination with OnLoadStart/OnLoadEnd if
+  /// after commit. |errorCode| is the error code number, |errorText| is the
+  /// error text and |failedUrl| is the URL that failed to load.
+  /// See net\base\net_error_list.h for complete descriptions of the error
+  /// codes.
   ///
   /*--cef(optional_param=errorText)--*/
   virtual void OnLoadError(CefRefPtr<CefBrowser> browser,
diff --git a/src/include/cef_media_router.h b/src/include/cef_media_router.h
new file mode 100644
index 000000000..a6bbf27ae
--- /dev/null
+++ b/src/include/cef_media_router.h
@@ -0,0 +1,317 @@
+// Copyright (c) 2020 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_MEDIA_ROUTER_H_
+#define CEF_INCLUDE_CEF_MEDIA_ROUTER_H_
+#pragma once
+
+#include <vector>
+#include "include/cef_base.h"
+#include "include/cef_callback.h"
+#include "include/cef_registration.h"
+
+class CefMediaObserver;
+class CefMediaRoute;
+class CefMediaRouteCreateCallback;
+class CefMediaSink;
+class CefMediaSinkDeviceInfoCallback;
+class CefMediaSource;
+
+///
+/// Supports discovery of and communication with media devices on the local
+/// network via the Cast and DIAL protocols. The methods of this class may be
+/// called on any browser process thread unless otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefMediaRouter : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Returns the MediaRouter object associated with the global request context.
+  /// If |callback| is non-NULL it will be executed asnychronously on the UI
+  /// thread after the manager's storage has been initialized. Equivalent to
+  /// calling CefRequestContext::GetGlobalContext()->GetMediaRouter().
+  ///
+  /*--cef(optional_param=callback)--*/
+  static CefRefPtr<CefMediaRouter> GetGlobalMediaRouter(
+      CefRefPtr<CefCompletionCallback> callback);
+
+  ///
+  /// Add an observer for MediaRouter events. The observer will remain
+  /// registered until the returned Registration object is destroyed.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefRegistration> AddObserver(
+      CefRefPtr<CefMediaObserver> observer) = 0;
+
+  ///
+  /// Returns a MediaSource object for the specified media source URN. Supported
+  /// URN schemes include "cast:" and "dial:", and will be already known by the
+  /// client application (e.g. "cast:<appId>?clientId=<clientId>").
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefMediaSource> GetSource(const CefString& urn) = 0;
+
+  ///
+  /// Trigger an asynchronous call to CefMediaObserver::OnSinks on all
+  /// registered observers.
+  ///
+  /*--cef()--*/
+  virtual void NotifyCurrentSinks() = 0;
+
+  ///
+  /// Create a new route between |source| and |sink|. Source and sink must be
+  /// valid, compatible (as reported by CefMediaSink::IsCompatibleWith), and a
+  /// route between them must not already exist. |callback| will be executed
+  /// on success or failure. If route creation succeeds it will also trigger an
+  /// asynchronous call to CefMediaObserver::OnRoutes on all registered
+  /// observers.
+  ///
+  /*--cef()--*/
+  virtual void CreateRoute(CefRefPtr<CefMediaSource> source,
+                           CefRefPtr<CefMediaSink> sink,
+                           CefRefPtr<CefMediaRouteCreateCallback> callback) = 0;
+
+  ///
+  /// Trigger an asynchronous call to CefMediaObserver::OnRoutes on all
+  /// registered observers.
+  ///
+  /*--cef()--*/
+  virtual void NotifyCurrentRoutes() = 0;
+};
+
+///
+/// Implemented by the client to observe MediaRouter events and registered via
+/// CefMediaRouter::AddObserver. The methods of this class will be called on the
+/// browser process UI thread.
+///
+/*--cef(source=client)--*/
+class CefMediaObserver : public virtual CefBaseRefCounted {
+ public:
+  typedef cef_media_route_connection_state_t ConnectionState;
+
+  ///
+  /// The list of available media sinks has changed or
+  /// CefMediaRouter::NotifyCurrentSinks was called.
+  ///
+  /*--cef()--*/
+  virtual void OnSinks(const std::vector<CefRefPtr<CefMediaSink>>& sinks) = 0;
+
+  ///
+  /// The list of available media routes has changed or
+  /// CefMediaRouter::NotifyCurrentRoutes was called.
+  ///
+  /*--cef()--*/
+  virtual void OnRoutes(
+      const std::vector<CefRefPtr<CefMediaRoute>>& routes) = 0;
+
+  ///
+  /// The connection state of |route| has changed.
+  ///
+  /*--cef()--*/
+  virtual void OnRouteStateChanged(CefRefPtr<CefMediaRoute> route,
+                                   ConnectionState state) = 0;
+
+  ///
+  /// A message was received over |route|. |message| is only valid for
+  /// the scope of this callback and should be copied if necessary.
+  ///
+  /*--cef()--*/
+  virtual void OnRouteMessageReceived(CefRefPtr<CefMediaRoute> route,
+                                      const void* message,
+                                      size_t message_size) = 0;
+};
+
+///
+/// Represents the route between a media source and sink. Instances of this
+/// object are created via CefMediaRouter::CreateRoute and retrieved via
+/// CefMediaObserver::OnRoutes. Contains the status and metadata of a
+/// routing operation. The methods of this class may be called on any browser
+/// process thread unless otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefMediaRoute : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Returns the ID for this route.
+  ///
+  /*--cef()--*/
+  virtual CefString GetId() = 0;
+
+  ///
+  /// Returns the source associated with this route.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefMediaSource> GetSource() = 0;
+
+  ///
+  /// Returns the sink associated with this route.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefMediaSink> GetSink() = 0;
+
+  ///
+  /// Send a message over this route. |message| will be copied if necessary.
+  ///
+  /*--cef()--*/
+  virtual void SendRouteMessage(const void* message, size_t message_size) = 0;
+
+  ///
+  /// Terminate this route. Will result in an asynchronous call to
+  /// CefMediaObserver::OnRoutes on all registered observers.
+  ///
+  /*--cef()--*/
+  virtual void Terminate() = 0;
+};
+
+///
+/// Callback interface for CefMediaRouter::CreateRoute. The methods of this
+/// class will be called on the browser process UI thread.
+///
+/*--cef(source=client)--*/
+class CefMediaRouteCreateCallback : public virtual CefBaseRefCounted {
+ public:
+  typedef cef_media_route_create_result_t RouteCreateResult;
+
+  ///
+  /// Method that will be executed when the route creation has finished.
+  /// |result| will be CEF_MRCR_OK if the route creation succeeded. |error| will
+  /// be a description of the error if the route creation failed. |route| is the
+  /// resulting route, or empty if the route creation failed.
+  ///
+  /*--cef(optional_param=error,optional_param=route)--*/
+  virtual void OnMediaRouteCreateFinished(RouteCreateResult result,
+                                          const CefString& error,
+                                          CefRefPtr<CefMediaRoute> route) = 0;
+};
+
+///
+/// Represents a sink to which media can be routed. Instances of this object are
+/// retrieved via CefMediaObserver::OnSinks. The methods of this class may
+/// be called on any browser process thread unless otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefMediaSink : public virtual CefBaseRefCounted {
+ public:
+  typedef cef_media_sink_icon_type_t IconType;
+
+  ///
+  /// Returns the ID for this sink.
+  ///
+  /*--cef()--*/
+  virtual CefString GetId() = 0;
+
+  ///
+  /// Returns the name of this sink.
+  ///
+  /*--cef()--*/
+  virtual CefString GetName() = 0;
+
+  ///
+  /// Returns the icon type for this sink.
+  ///
+  /*--cef(default_retval=CEF_MSIT_GENERIC)--*/
+  virtual IconType GetIconType() = 0;
+
+  ///
+  /// Asynchronously retrieves device info.
+  ///
+  /*--cef()--*/
+  virtual void GetDeviceInfo(
+      CefRefPtr<CefMediaSinkDeviceInfoCallback> callback) = 0;
+
+  ///
+  /// Returns true if this sink accepts content via Cast.
+  ///
+  /*--cef()--*/
+  virtual bool IsCastSink() = 0;
+
+  ///
+  /// Returns true if this sink accepts content via DIAL.
+  ///
+  /*--cef()--*/
+  virtual bool IsDialSink() = 0;
+
+  ///
+  /// Returns true if this sink is compatible with |source|.
+  ///
+  /*--cef()--*/
+  virtual bool IsCompatibleWith(CefRefPtr<CefMediaSource> source) = 0;
+};
+
+///
+/// Callback interface for CefMediaSink::GetDeviceInfo. The methods of this
+/// class will be called on the browser process UI thread.
+///
+/*--cef(source=client)--*/
+class CefMediaSinkDeviceInfoCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Method that will be executed asyncronously once device information has
+  /// been retrieved.
+  ///
+  /*--cef()--*/
+  virtual void OnMediaSinkDeviceInfo(
+      const CefMediaSinkDeviceInfo& device_info) = 0;
+};
+
+///
+/// Represents a source from which media can be routed. Instances of this object
+/// are retrieved via CefMediaRouter::GetSource. The methods of this class may
+/// be called on any browser process thread unless otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefMediaSource : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Returns the ID (media source URN or URL) for this source.
+  ///
+  /*--cef()--*/
+  virtual CefString GetId() = 0;
+
+  ///
+  /// Returns true if this source outputs its content via Cast.
+  ///
+  /*--cef()--*/
+  virtual bool IsCastSource() = 0;
+
+  ///
+  /// Returns true if this source outputs its content via DIAL.
+  ///
+  /*--cef()--*/
+  virtual bool IsDialSource() = 0;
+};
+
+#endif  // CEF_INCLUDE_CEF_MEDIA_ROUTER_H_
diff --git a/src/include/cef_menu_model.h b/src/include/cef_menu_model.h
index 1c9a7c090..4ddc54a7d 100644
--- a/src/include/cef_menu_model.h
+++ b/src/include/cef_menu_model.h
@@ -42,10 +42,10 @@
 #include "include/cef_menu_model_delegate.h"
 
 ///
-// Supports creation and modification of menus. See cef_menu_id_t for the
-// command ids that have default implementations. All user-defined command ids
-// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The methods of
-// this class can only be accessed on the browser process the UI thread.
+/// Supports creation and modification of menus. See cef_menu_id_t for the
+/// command ids that have default implementations. All user-defined command ids
+/// should be between MENU_ID_USER_FIRST and MENU_ID_USER_LAST. The methods of
+/// this class can only be accessed on the browser process the UI thread.
 ///
 /*--cef(source=library)--*/
 class CefMenuModel : public virtual CefBaseRefCounted {
@@ -53,50 +53,50 @@ class CefMenuModel : public virtual CefBaseRefCounted {
   typedef cef_menu_item_type_t MenuItemType;
 
   ///
-  // Create a new MenuModel with the specified |delegate|.
+  /// Create a new MenuModel with the specified |delegate|.
   ///
   /*--cef()--*/
   static CefRefPtr<CefMenuModel> CreateMenuModel(
       CefRefPtr<CefMenuModelDelegate> delegate);
 
   ///
-  // Returns true if this menu is a submenu.
+  /// Returns true if this menu is a submenu.
   ///
   /*--cef()--*/
   virtual bool IsSubMenu() = 0;
 
   ///
-  // Clears the menu. Returns true on success.
+  /// Clears the menu. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool Clear() = 0;
 
   ///
-  // Returns the number of items in this menu.
+  /// Returns the number of items in this menu.
   ///
   /*--cef()--*/
-  virtual int GetCount() = 0;
+  virtual size_t GetCount() = 0;
 
   ///
-  // Add a separator to the menu. Returns true on success.
+  /// Add a separator to the menu. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool AddSeparator() = 0;
 
   ///
-  // Add an item to the menu. Returns true on success.
+  /// Add an item to the menu. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool AddItem(int command_id, const CefString& label) = 0;
 
   ///
-  // Add a check item to the menu. Returns true on success.
+  /// Add a check item to the menu. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool AddCheckItem(int command_id, const CefString& label) = 0;
   ///
-  // Add a radio item to the menu. Only a single item with the specified
-  // |group_id| can be checked at a time. Returns true on success.
+  /// Add a radio item to the menu. Only a single item with the specified
+  /// |group_id| can be checked at a time. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool AddRadioItem(int command_id,
@@ -104,257 +104,257 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                             int group_id) = 0;
 
   ///
-  // Add a sub-menu to the menu. The new sub-menu is returned.
+  /// Add a sub-menu to the menu. The new sub-menu is returned.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefMenuModel> AddSubMenu(int command_id,
                                              const CefString& label) = 0;
 
   ///
-  // Insert a separator in the menu at the specified |index|. Returns true on
-  // success.
+  /// Insert a separator in the menu at the specified |index|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
-  virtual bool InsertSeparatorAt(int index) = 0;
+  virtual bool InsertSeparatorAt(size_t index) = 0;
 
   ///
-  // Insert an item in the menu at the specified |index|. Returns true on
-  // success.
+  /// Insert an item in the menu at the specified |index|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
-  virtual bool InsertItemAt(int index,
+  virtual bool InsertItemAt(size_t index,
                             int command_id,
                             const CefString& label) = 0;
 
   ///
-  // Insert a check item in the menu at the specified |index|. Returns true on
-  // success.
+  /// Insert a check item in the menu at the specified |index|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
-  virtual bool InsertCheckItemAt(int index,
+  virtual bool InsertCheckItemAt(size_t index,
                                  int command_id,
                                  const CefString& label) = 0;
 
   ///
-  // Insert a radio item in the menu at the specified |index|. Only a single
-  // item with the specified |group_id| can be checked at a time. Returns true
-  // on success.
+  /// Insert a radio item in the menu at the specified |index|. Only a single
+  /// item with the specified |group_id| can be checked at a time. Returns true
+  /// on success.
   ///
   /*--cef()--*/
-  virtual bool InsertRadioItemAt(int index,
+  virtual bool InsertRadioItemAt(size_t index,
                                  int command_id,
                                  const CefString& label,
                                  int group_id) = 0;
 
   ///
-  // Insert a sub-menu in the menu at the specified |index|. The new sub-menu
-  // is returned.
+  /// Insert a sub-menu in the menu at the specified |index|. The new sub-menu
+  /// is returned.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefMenuModel> InsertSubMenuAt(int index,
+  virtual CefRefPtr<CefMenuModel> InsertSubMenuAt(size_t index,
                                                   int command_id,
                                                   const CefString& label) = 0;
 
   ///
-  // Removes the item with the specified |command_id|. Returns true on success.
+  /// Removes the item with the specified |command_id|. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool Remove(int command_id) = 0;
 
   ///
-  // Removes the item at the specified |index|. Returns true on success.
+  /// Removes the item at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool RemoveAt(int index) = 0;
+  virtual bool RemoveAt(size_t index) = 0;
 
   ///
-  // Returns the index associated with the specified |command_id| or -1 if not
-  // found due to the command id not existing in the menu.
+  /// Returns the index associated with the specified |command_id| or -1 if not
+  /// found due to the command id not existing in the menu.
   ///
   /*--cef()--*/
   virtual int GetIndexOf(int command_id) = 0;
 
   ///
-  // Returns the command id at the specified |index| or -1 if not found due to
-  // invalid range or the index being a separator.
+  /// Returns the command id at the specified |index| or -1 if not found due to
+  /// invalid range or the index being a separator.
   ///
   /*--cef()--*/
-  virtual int GetCommandIdAt(int index) = 0;
+  virtual int GetCommandIdAt(size_t index) = 0;
 
   ///
-  // Sets the command id at the specified |index|. Returns true on success.
+  /// Sets the command id at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetCommandIdAt(int index, int command_id) = 0;
+  virtual bool SetCommandIdAt(size_t index, int command_id) = 0;
 
   ///
-  // Returns the label for the specified |command_id| or empty if not found.
+  /// Returns the label for the specified |command_id| or empty if not found.
   ///
   /*--cef()--*/
   virtual CefString GetLabel(int command_id) = 0;
 
   ///
-  // Returns the label at the specified |index| or empty if not found due to
-  // invalid range or the index being a separator.
+  /// Returns the label at the specified |index| or empty if not found due to
+  /// invalid range or the index being a separator.
   ///
   /*--cef()--*/
-  virtual CefString GetLabelAt(int index) = 0;
+  virtual CefString GetLabelAt(size_t index) = 0;
 
   ///
-  // Sets the label for the specified |command_id|. Returns true on success.
+  /// Sets the label for the specified |command_id|. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetLabel(int command_id, const CefString& label) = 0;
 
   ///
-  // Set the label at the specified |index|. Returns true on success.
+  /// Set the label at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetLabelAt(int index, const CefString& label) = 0;
+  virtual bool SetLabelAt(size_t index, const CefString& label) = 0;
 
   ///
-  // Returns the item type for the specified |command_id|.
+  /// Returns the item type for the specified |command_id|.
   ///
   /*--cef(default_retval=MENUITEMTYPE_NONE)--*/
   virtual MenuItemType GetType(int command_id) = 0;
 
   ///
-  // Returns the item type at the specified |index|.
+  /// Returns the item type at the specified |index|.
   ///
   /*--cef(default_retval=MENUITEMTYPE_NONE)--*/
-  virtual MenuItemType GetTypeAt(int index) = 0;
+  virtual MenuItemType GetTypeAt(size_t index) = 0;
 
   ///
-  // Returns the group id for the specified |command_id| or -1 if invalid.
+  /// Returns the group id for the specified |command_id| or -1 if invalid.
   ///
   /*--cef()--*/
   virtual int GetGroupId(int command_id) = 0;
 
   ///
-  // Returns the group id at the specified |index| or -1 if invalid.
+  /// Returns the group id at the specified |index| or -1 if invalid.
   ///
   /*--cef()--*/
-  virtual int GetGroupIdAt(int index) = 0;
+  virtual int GetGroupIdAt(size_t index) = 0;
 
   ///
-  // Sets the group id for the specified |command_id|. Returns true on success.
+  /// Sets the group id for the specified |command_id|. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetGroupId(int command_id, int group_id) = 0;
 
   ///
-  // Sets the group id at the specified |index|. Returns true on success.
+  /// Sets the group id at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetGroupIdAt(int index, int group_id) = 0;
+  virtual bool SetGroupIdAt(size_t index, int group_id) = 0;
 
   ///
-  // Returns the submenu for the specified |command_id| or empty if invalid.
+  /// Returns the submenu for the specified |command_id| or empty if invalid.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefMenuModel> GetSubMenu(int command_id) = 0;
 
   ///
-  // Returns the submenu at the specified |index| or empty if invalid.
+  /// Returns the submenu at the specified |index| or empty if invalid.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefMenuModel> GetSubMenuAt(int index) = 0;
+  virtual CefRefPtr<CefMenuModel> GetSubMenuAt(size_t index) = 0;
 
   ///
-  // Returns true if the specified |command_id| is visible.
+  /// Returns true if the specified |command_id| is visible.
   ///
   /*--cef()--*/
   virtual bool IsVisible(int command_id) = 0;
 
   ///
-  // Returns true if the specified |index| is visible.
+  /// Returns true if the specified |index| is visible.
   ///
   /*--cef()--*/
-  virtual bool IsVisibleAt(int index) = 0;
+  virtual bool IsVisibleAt(size_t index) = 0;
 
   ///
-  // Change the visibility of the specified |command_id|. Returns true on
-  // success.
+  /// Change the visibility of the specified |command_id|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
   virtual bool SetVisible(int command_id, bool visible) = 0;
 
   ///
-  // Change the visibility at the specified |index|. Returns true on success.
+  /// Change the visibility at the specified |index|. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetVisibleAt(int index, bool visible) = 0;
+  virtual bool SetVisibleAt(size_t index, bool visible) = 0;
 
   ///
-  // Returns true if the specified |command_id| is enabled.
+  /// Returns true if the specified |command_id| is enabled.
   ///
   /*--cef()--*/
   virtual bool IsEnabled(int command_id) = 0;
 
   ///
-  // Returns true if the specified |index| is enabled.
+  /// Returns true if the specified |index| is enabled.
   ///
   /*--cef()--*/
-  virtual bool IsEnabledAt(int index) = 0;
+  virtual bool IsEnabledAt(size_t index) = 0;
 
   ///
-  // Change the enabled status of the specified |command_id|. Returns true on
-  // success.
+  /// Change the enabled status of the specified |command_id|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
   virtual bool SetEnabled(int command_id, bool enabled) = 0;
 
   ///
-  // Change the enabled status at the specified |index|. Returns true on
-  // success.
+  /// Change the enabled status at the specified |index|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
-  virtual bool SetEnabledAt(int index, bool enabled) = 0;
+  virtual bool SetEnabledAt(size_t index, bool enabled) = 0;
 
   ///
-  // Returns true if the specified |command_id| is checked. Only applies to
-  // check and radio items.
+  /// Returns true if the specified |command_id| is checked. Only applies to
+  /// check and radio items.
   ///
   /*--cef()--*/
   virtual bool IsChecked(int command_id) = 0;
 
   ///
-  // Returns true if the specified |index| is checked. Only applies to check
-  // and radio items.
+  /// Returns true if the specified |index| is checked. Only applies to check
+  /// and radio items.
   ///
   /*--cef()--*/
-  virtual bool IsCheckedAt(int index) = 0;
+  virtual bool IsCheckedAt(size_t index) = 0;
 
   ///
-  // Check the specified |command_id|. Only applies to check and radio items.
-  // Returns true on success.
+  /// Check the specified |command_id|. Only applies to check and radio items.
+  /// Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetChecked(int command_id, bool checked) = 0;
 
   ///
-  // Check the specified |index|. Only applies to check and radio items. Returns
-  // true on success.
+  /// Check the specified |index|. Only applies to check and radio items.
+  /// Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetCheckedAt(int index, bool checked) = 0;
+  virtual bool SetCheckedAt(size_t index, bool checked) = 0;
 
   ///
-  // Returns true if the specified |command_id| has a keyboard accelerator
-  // assigned.
+  /// Returns true if the specified |command_id| has a keyboard accelerator
+  /// assigned.
   ///
   /*--cef()--*/
   virtual bool HasAccelerator(int command_id) = 0;
 
   ///
-  // Returns true if the specified |index| has a keyboard accelerator assigned.
+  /// Returns true if the specified |index| has a keyboard accelerator assigned.
   ///
   /*--cef()--*/
-  virtual bool HasAcceleratorAt(int index) = 0;
+  virtual bool HasAcceleratorAt(size_t index) = 0;
 
   ///
-  // Set the keyboard accelerator for the specified |command_id|. |key_code| can
-  // be any virtual key or character value. Returns true on success.
+  /// Set the keyboard accelerator for the specified |command_id|. |key_code|
+  /// can be any virtual key or character value. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetAccelerator(int command_id,
@@ -364,33 +364,33 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                               bool alt_pressed) = 0;
 
   ///
-  // Set the keyboard accelerator at the specified |index|. |key_code| can be
-  // any virtual key or character value. Returns true on success.
+  /// Set the keyboard accelerator at the specified |index|. |key_code| can be
+  /// any virtual key or character value. Returns true on success.
   ///
   /*--cef()--*/
-  virtual bool SetAcceleratorAt(int index,
+  virtual bool SetAcceleratorAt(size_t index,
                                 int key_code,
                                 bool shift_pressed,
                                 bool ctrl_pressed,
                                 bool alt_pressed) = 0;
 
   ///
-  // Remove the keyboard accelerator for the specified |command_id|. Returns
-  // true on success.
+  /// Remove the keyboard accelerator for the specified |command_id|. Returns
+  /// true on success.
   ///
   /*--cef()--*/
   virtual bool RemoveAccelerator(int command_id) = 0;
 
   ///
-  // Remove the keyboard accelerator at the specified |index|. Returns true on
-  // success.
+  /// Remove the keyboard accelerator at the specified |index|. Returns true on
+  /// success.
   ///
   /*--cef()--*/
-  virtual bool RemoveAcceleratorAt(int index) = 0;
+  virtual bool RemoveAcceleratorAt(size_t index) = 0;
 
   ///
-  // Retrieves the keyboard accelerator for the specified |command_id|. Returns
-  // true on success.
+  /// Retrieves the keyboard accelerator for the specified |command_id|. Returns
+  /// true on success.
   ///
   /*--cef()--*/
   virtual bool GetAccelerator(int command_id,
@@ -400,21 +400,21 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                               bool& alt_pressed) = 0;
 
   ///
-  // Retrieves the keyboard accelerator for the specified |index|. Returns true
-  // on success.
+  /// Retrieves the keyboard accelerator for the specified |index|. Returns true
+  /// on success.
   ///
   /*--cef()--*/
-  virtual bool GetAcceleratorAt(int index,
+  virtual bool GetAcceleratorAt(size_t index,
                                 int& key_code,
                                 bool& shift_pressed,
                                 bool& ctrl_pressed,
                                 bool& alt_pressed) = 0;
 
   ///
-  // Set the explicit color for |command_id| and |color_type| to |color|.
-  // Specify a |color| value of 0 to remove the explicit color. If no explicit
-  // color or default color is set for |color_type| then the system color will
-  // be used. Returns true on success.
+  /// Set the explicit color for |command_id| and |color_type| to |color|.
+  /// Specify a |color| value of 0 to remove the explicit color. If no explicit
+  /// color or default color is set for |color_type| then the system color will
+  /// be used. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetColor(int command_id,
@@ -422,11 +422,11 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                         cef_color_t color) = 0;
 
   ///
-  // Set the explicit color for |command_id| and |index| to |color|. Specify a
-  // |color| value of 0 to remove the explicit color. Specify an |index| value
-  // of -1 to set the default color for items that do not have an explicit
-  // color set. If no explicit color or default color is set for |color_type|
-  // then the system color will be used. Returns true on success.
+  /// Set the explicit color for |command_id| and |index| to |color|. Specify a
+  /// |color| value of 0 to remove the explicit color. Specify an |index| value
+  /// of -1 to set the default color for items that do not have an explicit
+  /// color set. If no explicit color or default color is set for |color_type|
+  /// then the system color will be used. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetColorAt(int index,
@@ -434,9 +434,9 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                           cef_color_t color) = 0;
 
   ///
-  // Returns in |color| the color that was explicitly set for |command_id| and
-  // |color_type|. If a color was not set then 0 will be returned in |color|.
-  // Returns true on success.
+  /// Returns in |color| the color that was explicitly set for |command_id| and
+  /// |color_type|. If a color was not set then 0 will be returned in |color|.
+  /// Returns true on success.
   ///
   /*--cef()--*/
   virtual bool GetColor(int command_id,
@@ -444,10 +444,10 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                         cef_color_t& color) = 0;
 
   ///
-  // Returns in |color| the color that was explicitly set for |command_id| and
-  // |color_type|. Specify an |index| value of -1 to return the default color
-  // in |color|. If a color was not set then 0 will be returned in |color|.
-  // Returns true on success.
+  /// Returns in |color| the color that was explicitly set for |command_id| and
+  /// |color_type|. Specify an |index| value of -1 to return the default color
+  /// in |color|. If a color was not set then 0 will be returned in |color|.
+  /// Returns true on success.
   ///
   /*--cef()--*/
   virtual bool GetColorAt(int index,
@@ -455,34 +455,34 @@ class CefMenuModel : public virtual CefBaseRefCounted {
                           cef_color_t& color) = 0;
 
   ///
-  // Sets the font list for the specified |command_id|. If |font_list| is empty
-  // the system font will be used. Returns true on success. The format is
-  // "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where:
-  // - FONT_FAMILY_LIST is a comma-separated list of font family names,
-  // - STYLES is an optional space-separated list of style names (case-sensitive
-  //   "Bold" and "Italic" are supported), and
-  // - SIZE is an integer font size in pixels with the suffix "px".
-  //
-  // Here are examples of valid font description strings:
-  // - "Arial, Helvetica, Bold Italic 14px"
-  // - "Arial, 14px"
+  /// Sets the font list for the specified |command_id|. If |font_list| is empty
+  /// the system font will be used. Returns true on success. The format is
+  /// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where:
+  /// - FONT_FAMILY_LIST is a comma-separated list of font family names,
+  /// - STYLES is an optional space-separated list of style names
+  ///   (case-sensitive "Bold" and "Italic" are supported), and
+  /// - SIZE is an integer font size in pixels with the suffix "px".
+  ///
+  /// Here are examples of valid font description strings:
+  /// - "Arial, Helvetica, Bold Italic 14px"
+  /// - "Arial, 14px"
   ///
   /*--cef(optional_param=font_list)--*/
   virtual bool SetFontList(int command_id, const CefString& font_list) = 0;
 
   ///
-  // Sets the font list for the specified |index|. Specify an |index| value of
-  // -1 to set the default font. If |font_list| is empty the system font will
-  // be used. Returns true on success. The format is
-  // "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where:
-  // - FONT_FAMILY_LIST is a comma-separated list of font family names,
-  // - STYLES is an optional space-separated list of style names (case-sensitive
-  //   "Bold" and "Italic" are supported), and
-  // - SIZE is an integer font size in pixels with the suffix "px".
-  //
-  // Here are examples of valid font description strings:
-  // - "Arial, Helvetica, Bold Italic 14px"
-  // - "Arial, 14px"
+  /// Sets the font list for the specified |index|. Specify an |index| value of
+  /// -1 to set the default font. If |font_list| is empty the system font will
+  /// be used. Returns true on success. The format is
+  /// "<FONT_FAMILY_LIST>,[STYLES] <SIZE>", where:
+  /// - FONT_FAMILY_LIST is a comma-separated list of font family names,
+  /// - STYLES is an optional space-separated list of style names
+  ///   (case-sensitive "Bold" and "Italic" are supported), and
+  /// - SIZE is an integer font size in pixels with the suffix "px".
+  ///
+  /// Here are examples of valid font description strings:
+  /// - "Arial, Helvetica, Bold Italic 14px"
+  /// - "Arial, 14px"
   ///
   /*--cef(optional_param=font_list)--*/
   virtual bool SetFontListAt(int index, const CefString& font_list) = 0;
diff --git a/src/include/cef_menu_model_delegate.h b/src/include/cef_menu_model_delegate.h
index e3ddfbdac..c64823049 100644
--- a/src/include/cef_menu_model_delegate.h
+++ b/src/include/cef_menu_model_delegate.h
@@ -43,16 +43,16 @@
 class CefMenuModel;
 
 ///
-// Implement this interface to handle menu model events. The methods of this
-// class will be called on the browser process UI thread unless otherwise
-// indicated.
+/// Implement this interface to handle menu model events. The methods of this
+/// class will be called on the browser process UI thread unless otherwise
+/// indicated.
 ///
 /*--cef(source=client)--*/
 class CefMenuModelDelegate : public virtual CefBaseRefCounted {
  public:
   ///
-  // Perform the action associated with the specified |command_id| and
-  // optional |event_flags|.
+  /// Perform the action associated with the specified |command_id| and
+  /// optional |event_flags|.
   ///
   /*--cef()--*/
   virtual void ExecuteCommand(CefRefPtr<CefMenuModel> menu_model,
@@ -60,43 +60,43 @@ class CefMenuModelDelegate : public virtual CefBaseRefCounted {
                               cef_event_flags_t event_flags) = 0;
 
   ///
-  // Called when the user moves the mouse outside the menu and over the owning
-  // window.
+  /// Called when the user moves the mouse outside the menu and over the owning
+  /// window.
   ///
   /*--cef()--*/
   virtual void MouseOutsideMenu(CefRefPtr<CefMenuModel> menu_model,
                                 const CefPoint& screen_point) {}
 
   ///
-  // Called on unhandled open submenu keyboard commands. |is_rtl| will be true
-  // if the menu is displaying a right-to-left language.
+  /// Called on unhandled open submenu keyboard commands. |is_rtl| will be true
+  /// if the menu is displaying a right-to-left language.
   ///
   /*--cef()--*/
   virtual void UnhandledOpenSubmenu(CefRefPtr<CefMenuModel> menu_model,
                                     bool is_rtl) {}
 
   ///
-  // Called on unhandled close submenu keyboard commands. |is_rtl| will be true
-  // if the menu is displaying a right-to-left language.
+  /// Called on unhandled close submenu keyboard commands. |is_rtl| will be true
+  /// if the menu is displaying a right-to-left language.
   ///
   /*--cef()--*/
   virtual void UnhandledCloseSubmenu(CefRefPtr<CefMenuModel> menu_model,
                                      bool is_rtl) {}
 
   ///
-  // The menu is about to show.
+  /// The menu is about to show.
   ///
   /*--cef()--*/
   virtual void MenuWillShow(CefRefPtr<CefMenuModel> menu_model) {}
 
   ///
-  // The menu has closed.
+  /// The menu has closed.
   ///
   /*--cef()--*/
   virtual void MenuClosed(CefRefPtr<CefMenuModel> menu_model) {}
 
   ///
-  // Optionally modify a menu item label. Return true if |label| was modified.
+  /// Optionally modify a menu item label. Return true if |label| was modified.
   ///
   /*--cef()--*/
   virtual bool FormatLabel(CefRefPtr<CefMenuModel> menu_model,
diff --git a/src/include/cef_navigation_entry.h b/src/include/cef_navigation_entry.h
index 292f5b6c3..a8e2f3377 100644
--- a/src/include/cef_navigation_entry.h
+++ b/src/include/cef_navigation_entry.h
@@ -42,7 +42,7 @@
 #include "include/cef_ssl_status.h"
 
 ///
-// Class used to represent an entry in navigation history.
+/// Class used to represent an entry in navigation history.
 ///
 /*--cef(source=library)--*/
 class CefNavigationEntry : public virtual CefBaseRefCounted {
@@ -50,68 +50,69 @@ class CefNavigationEntry : public virtual CefBaseRefCounted {
   typedef cef_transition_type_t TransitionType;
 
   ///
-  // Returns true if this object is valid. Do not call any other methods if this
-  // function returns false.
+  /// Returns true if this object is valid. Do not call any other methods if
+  /// this function returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns the actual URL of the page. For some pages this may be data: URL or
-  // similar. Use GetDisplayURL() to return a display-friendly version.
+  /// Returns the actual URL of the page. For some pages this may be data: URL
+  /// or similar. Use GetDisplayURL() to return a display-friendly version.
   ///
   /*--cef()--*/
   virtual CefString GetURL() = 0;
 
   ///
-  // Returns a display-friendly version of the URL.
+  /// Returns a display-friendly version of the URL.
   ///
   /*--cef()--*/
   virtual CefString GetDisplayURL() = 0;
 
   ///
-  // Returns the original URL that was entered by the user before any redirects.
+  /// Returns the original URL that was entered by the user before any
+  /// redirects.
   ///
   /*--cef()--*/
   virtual CefString GetOriginalURL() = 0;
 
   ///
-  // Returns the title set by the page. This value may be empty.
+  /// Returns the title set by the page. This value may be empty.
   ///
   /*--cef()--*/
   virtual CefString GetTitle() = 0;
 
   ///
-  // Returns the transition type which indicates what the user did to move to
-  // this page from the previous page.
+  /// Returns the transition type which indicates what the user did to move to
+  /// this page from the previous page.
   ///
   /*--cef(default_retval=TT_EXPLICIT)--*/
   virtual TransitionType GetTransitionType() = 0;
 
   ///
-  // Returns true if this navigation includes post data.
+  /// Returns true if this navigation includes post data.
   ///
   /*--cef()--*/
   virtual bool HasPostData() = 0;
 
   ///
-  // Returns the time for the last known successful navigation completion. A
-  // navigation may be completed more than once if the page is reloaded. May be
-  // 0 if the navigation has not yet completed.
+  /// Returns the time for the last known successful navigation completion. A
+  /// navigation may be completed more than once if the page is reloaded. May be
+  /// 0 if the navigation has not yet completed.
   ///
   /*--cef()--*/
-  virtual CefTime GetCompletionTime() = 0;
+  virtual CefBaseTime GetCompletionTime() = 0;
 
   ///
-  // Returns the HTTP status code for the last known successful navigation
-  // response. May be 0 if the response has not yet been received or if the
-  // navigation has not yet completed.
+  /// Returns the HTTP status code for the last known successful navigation
+  /// response. May be 0 if the response has not yet been received or if the
+  /// navigation has not yet completed.
   ///
   /*--cef()--*/
   virtual int GetHttpStatusCode() = 0;
 
   ///
-  // Returns the SSL information for this navigation entry.
+  /// Returns the SSL information for this navigation entry.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefSSLStatus> GetSSLStatus() = 0;
diff --git a/src/include/cef_origin_whitelist.h b/src/include/cef_origin_whitelist.h
index ad173181f..e684ef619 100644
--- a/src/include/cef_origin_whitelist.h
+++ b/src/include/cef_origin_whitelist.h
@@ -41,40 +41,41 @@
 #include "include/cef_base.h"
 
 ///
-// Add an entry to the cross-origin access whitelist.
-//
-// The same-origin policy restricts how scripts hosted from different origins
-// (scheme + domain + port) can communicate. By default, scripts can only access
-// resources with the same origin. Scripts hosted on the HTTP and HTTPS schemes
-// (but no other schemes) can use the "Access-Control-Allow-Origin" header to
-// allow cross-origin requests. For example, https://source.example.com can make
-// XMLHttpRequest requests on http://target.example.com if the
-// http://target.example.com request returns an "Access-Control-Allow-Origin:
-// https://source.example.com" response header.
-//
-// Scripts in separate frames or iframes and hosted from the same protocol and
-// domain suffix can execute cross-origin JavaScript if both pages set the
-// document.domain value to the same domain suffix. For example,
-// scheme://foo.example.com and scheme://bar.example.com can communicate using
-// JavaScript if both domains set document.domain="example.com".
-//
-// This method is used to allow access to origins that would otherwise violate
-// the same-origin policy. Scripts hosted underneath the fully qualified
-// |source_origin| URL (like http://www.example.com) will be allowed access to
-// all resources hosted on the specified |target_protocol| and |target_domain|.
-// If |target_domain| is non-empty and |allow_target_subdomains| if false only
-// exact domain matches will be allowed. If |target_domain| contains a top-
-// level domain component (like "example.com") and |allow_target_subdomains| is
-// true sub-domain matches will be allowed. If |target_domain| is empty and
-// |allow_target_subdomains| if true all domains and IP addresses will be
-// allowed.
-//
-// This method cannot be used to bypass the restrictions on local or display
-// isolated schemes. See the comments on CefRegisterCustomScheme for more
-// information.
-//
-// This function may be called on any thread. Returns false if |source_origin|
-// is invalid or the whitelist cannot be accessed.
+/// Add an entry to the cross-origin access whitelist.
+///
+/// The same-origin policy restricts how scripts hosted from different origins
+/// (scheme + domain + port) can communicate. By default, scripts can only
+/// access resources with the same origin. Scripts hosted on the HTTP and HTTPS
+/// schemes (but no other schemes) can use the "Access-Control-Allow-Origin"
+/// header to allow cross-origin requests. For example,
+/// https://source.example.com can make XMLHttpRequest requests on
+/// http://target.example.com if the http://target.example.com request returns
+/// an "Access-Control-Allow-Origin: https://source.example.com" response
+/// header.
+///
+/// Scripts in separate frames or iframes and hosted from the same protocol and
+/// domain suffix can execute cross-origin JavaScript if both pages set the
+/// document.domain value to the same domain suffix. For example,
+/// scheme://foo.example.com and scheme://bar.example.com can communicate using
+/// JavaScript if both domains set document.domain="example.com".
+///
+/// This method is used to allow access to origins that would otherwise violate
+/// the same-origin policy. Scripts hosted underneath the fully qualified
+/// |source_origin| URL (like http://www.example.com) will be allowed access to
+/// all resources hosted on the specified |target_protocol| and |target_domain|.
+/// If |target_domain| is non-empty and |allow_target_subdomains| is false only
+/// exact domain matches will be allowed. If |target_domain| contains a top-
+/// level domain component (like "example.com") and |allow_target_subdomains| is
+/// true sub-domain matches will be allowed. If |target_domain| is empty and
+/// |allow_target_subdomains| if true all domains and IP addresses will be
+/// allowed.
+///
+/// This method cannot be used to bypass the restrictions on local or display
+/// isolated schemes. See the comments on CefRegisterCustomScheme for more
+/// information.
+///
+/// This function may be called on any thread. Returns false if |source_origin|
+/// is invalid or the whitelist cannot be accessed.
 ///
 /*--cef(optional_param=target_domain)--*/
 bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin,
@@ -83,8 +84,8 @@ bool CefAddCrossOriginWhitelistEntry(const CefString& source_origin,
                                      bool allow_target_subdomains);
 
 ///
-// Remove an entry from the cross-origin access whitelist. Returns false if
-// |source_origin| is invalid or the whitelist cannot be accessed.
+/// Remove an entry from the cross-origin access whitelist. Returns false if
+/// |source_origin| is invalid or the whitelist cannot be accessed.
 ///
 /*--cef(optional_param=target_domain)--*/
 bool CefRemoveCrossOriginWhitelistEntry(const CefString& source_origin,
@@ -93,8 +94,8 @@ bool CefRemoveCrossOriginWhitelistEntry(const CefString& source_origin,
                                         bool allow_target_subdomains);
 
 ///
-// Remove all entries from the cross-origin access whitelist. Returns false if
-// the whitelist cannot be accessed.
+/// Remove all entries from the cross-origin access whitelist. Returns false if
+/// the whitelist cannot be accessed.
 ///
 /*--cef()--*/
 bool CefClearCrossOriginWhitelist();
diff --git a/src/include/cef_pack_resources.h b/src/include/cef_pack_resources.h
new file mode 100644
index 000000000..9d4a1fc31
--- /dev/null
+++ b/src/include/cef_pack_resources.h
@@ -0,0 +1,1684 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file is generated by the make_pack_header.py tool.
+//
+
+#ifndef CEF_INCLUDE_CEF_PACK_RESOURCES_H_
+#define CEF_INCLUDE_CEF_PACK_RESOURCES_H_
+#pragma once
+
+// ---------------------------------------------------------------------------
+// From blink_resources.h:
+
+#define IDR_UASTYLE_HTML_CSS 45250
+#define IDR_UASTYLE_QUIRKS_CSS 45251
+#define IDR_UASTYLE_VIEW_SOURCE_CSS 45252
+#define IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS 45253
+#define IDR_UASTYLE_FULLSCREEN_ANDROID_CSS 45254
+#define IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS 45255
+#define IDR_UASTYLE_PERMISSION_ELEMENT_CSS 45257
+#define IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS 45258
+#define IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_INLINE_FLEX_CSS 45259
+#define IDR_UASTYLE_THEME_FORCED_COLORS_CSS 45260
+#define IDR_UASTYLE_SELECTLIST_CSS 45261
+#define IDR_UASTYLE_SVG_CSS 45262
+#define IDR_UASTYLE_MARKER_CSS 45263
+#define IDR_UASTYLE_MATHML_CSS 45264
+#define IDR_UASTYLE_FULLSCREEN_CSS 45265
+#define IDR_UASTYLE_TRANSITION_CSS 45266
+#define IDR_UASTYLE_TRANSITION_ANIMATIONS_CSS 45267
+#define IDR_UASTYLE_FORM_CONTROLS_NOT_VERTICAL_CSS 45268
+#define IDR_UASTYLE_FORM_CONTROLS_NOT_VERTICAL_CSS_TEXT 45269
+#define IDR_DOCUMENTXMLTREEVIEWER_CSS 45270
+#define IDR_DOCUMENTXMLTREEVIEWER_JS 45271
+#define IDR_VALIDATION_BUBBLE_ICON 45272
+#define IDR_VALIDATION_BUBBLE_CSS 45273
+#define IDR_PICKER_COMMON_JS 45274
+#define IDR_PICKER_COMMON_CSS 45275
+#define IDR_CALENDAR_PICKER_CSS 45276
+#define IDR_CALENDAR_PICKER_JS 45277
+#define IDR_MONTH_PICKER_JS 45278
+#define IDR_TIME_PICKER_CSS 45279
+#define IDR_TIME_PICKER_JS 45280
+#define IDR_DATETIMELOCAL_PICKER_JS 45281
+#define IDR_SUGGESTION_PICKER_CSS 45282
+#define IDR_SUGGESTION_PICKER_JS 45283
+#define IDR_COLOR_PICKER_COMMON_JS 45284
+#define IDR_COLOR_SUGGESTION_PICKER_CSS 45285
+#define IDR_COLOR_SUGGESTION_PICKER_JS 45286
+#define IDR_COLOR_PICKER_CSS 45287
+#define IDR_COLOR_PICKER_JS 45288
+#define IDR_LIST_PICKER_CSS 45289
+#define IDR_LIST_PICKER_JS 45290
+#define IDR_AUDIO_SPATIALIZATION_COMPOSITE 45291
+#define IDR_UASTYLE_JSON_DOCUMENT_CSS 45292
+
+// ---------------------------------------------------------------------------
+// From browser_resources.h:
+
+#define IDR_INCOGNITO_TAB_HTML 16700
+#define IDR_REVAMPED_INCOGNITO_TAB_HTML 16701
+#define IDR_INCOGNITO_TAB_THEME_CSS 16702
+#define IDR_GUEST_TAB_HTML 16703
+#define IDR_NEW_TAB_4_THEME_CSS 16704
+#define IDR_WEBAUTHN_HYBRID_CONNECTING_LIGHT 16705
+#define IDR_WEBAUTHN_HYBRID_CONNECTING_DARK 16706
+#define IDR_WEBAUTHN_GPM_FINGERPRINT_LIGHT 16707
+#define IDR_WEBAUTHN_GPM_LAPTOP_LIGHT 16708
+#define IDR_ABOUT_CONFLICTS_HTML 16510
+#define IDR_ABOUT_CONFLICTS_JS 16511
+#define IDR_ABOUT_CONFLICTS_WARNING_SVG 16512
+#define IDR_AD_NETWORK_HASHES 16516
+#define IDR_RESET_PASSWORD_HTML 16641
+#define IDR_RESET_PASSWORD_JS 16642
+#define IDR_RESET_PASSWORD_MOJOM_WEBUI_JS 16643
+#define IDR_INSPECT_CSS 16650
+#define IDR_INSPECT_HTML 16651
+#define IDR_INSPECT_JS 16652
+#define IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST 382
+#define IDR_PDF_MANIFEST 380
+#define IDR_WEBSTORE_MANIFEST 379
+#define IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML 16659
+#define IDR_IME_WINDOW_CLOSE 16660
+#define IDR_IME_WINDOW_CLOSE_C 16661
+#define IDR_IME_WINDOW_CLOSE_H 16662
+#define IDR_CART_DOMAIN_NAME_MAPPING_JSON 16663
+#define IDR_CART_DOMAIN_CART_URL_MAPPING_JSON 16664
+
+// ---------------------------------------------------------------------------
+// From cef_resources.h:
+
+#define IDR_CEF_DEVTOOLS_DISCOVERY_PAGE 63000
+#define IDR_CEF_LICENSE_TXT 63001
+#define IDR_CEF_VERSION_HTML 63002
+#define IDR_CEF_EXTENSION_API_FEATURES 63003
+
+// ---------------------------------------------------------------------------
+// From common_resources.h:
+
+#define IDR_CHROME_EXTENSION_API_FEATURES 25300
+#define IDR_CHROME_APP_API_FEATURES 25301
+#define IDR_CHROME_CONTROLLED_FRAME_API_FEATURES 25302
+
+// ---------------------------------------------------------------------------
+// From component_extension_resources.h:
+
+#define IDR_NETWORK_SPEECH_SYNTHESIS_JS 18810
+#define IDS_READING_MODE_DEFAULT_PNG 18847
+#define IDS_READING_MODE_LIGHT_PNG 18848
+#define IDS_READING_MODE_DARK_PNG 18849
+#define IDS_READING_MODE_YELLOW_PNG 18850
+#define IDS_READING_MODE_BLUE_PNG 18851
+
+// ---------------------------------------------------------------------------
+// From components_resources.h:
+
+#define IDR_ABOUT_UI_CREDITS_CSS 40370
+#define IDR_ABOUT_UI_CREDITS_HTML 40371
+#define IDR_ABOUT_UI_CREDITS_JS 40372
+#define IDR_CART_DOMAIN_CART_URL_REGEX_JSON 40373
+#define IDR_CHECKOUT_URL_REGEX_DOMAIN_MAPPING_JSON 40374
+#define IDR_QUERY_SHOPPING_META_JS 40375
+#define IDR_DOM_DISTILLER_VIEWER_HTML 40376
+#define IDR_DOM_DISTILLER_VIEWER_JS 40377
+#define IDR_DISTILLER_JS 40378
+#define IDR_DISTILLER_CSS 40379
+#define IDR_DISTILLER_DESKTOP_CSS 40380
+#define IDR_DISTILLER_LOADING_IMAGE 40381
+#define IDR_EXTRACT_PAGE_FEATURES_JS 40382
+#define IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL_NEW 40383
+#define IDR_LONG_PAGE_SERIALIZED_MODEL 40384
+#define IDR_MOBILE_MANAGEMENT_CSS 40385
+#define IDR_MOBILE_MANAGEMENT_HTML 40386
+#define IDR_MOBILE_MANAGEMENT_JS 40387
+#define IDR_NET_ERROR_HTML 40388
+#define IDR_PDF_EMBEDDER_HTML 40416
+#define IDR_PRINT_HEADER_FOOTER_TEMPLATE_PAGE 40417
+#define IDR_SAFE_BROWSING_HTML 40419
+#define IDR_SAFE_BROWSING_CSS 40420
+#define IDR_SAFE_BROWSING_JS 40421
+#define IDR_DOWNLOAD_FILE_TYPES_PB 102
+#define IDR_SEARCH_COMPANION_FETCH_IMAGES_JS 40423
+#define IDR_SECURITY_INTERSTITIAL_COMMON_CSS 40424
+#define IDR_SECURITY_INTERSTITIAL_CORE_CSS 40425
+#define IDR_SECURITY_INTERSTITIAL_HTML 40426
+#define IDR_SECURITY_INTERSTITIAL_QUIET_HTML 40427
+#define IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_HTML 40428
+#define IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_CSS 40429
+#define IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_JS 40430
+#define IDR_KNOWN_INTERCEPTION_HTML 40431
+#define IDR_KNOWN_INTERCEPTION_CSS 40432
+#define IDR_KNOWN_INTERCEPTION_ICON_1X_PNG 40433
+#define IDR_KNOWN_INTERCEPTION_ICON_2X_PNG 40434
+#define IDR_SSL_ERROR_ASSISTANT_PB 40435
+#define IDR_TRANSLATE_JS 40436
+#define IDR_WEBAPP_ERROR_PAGE_HTML 40437
+#define IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_V2_HTML 40440
+#define IDR_SUPERVISED_USER_ICON 40441
+
+// ---------------------------------------------------------------------------
+// From content_resources.h:
+
+#define IDR_DEVTOOLS_PINCH_CURSOR_ICON 40800
+#define IDR_DEVTOOLS_PINCH_CURSOR_ICON_2X 40801
+#define IDR_DEVTOOLS_TOUCH_CURSOR_ICON 40802
+#define IDR_DEVTOOLS_TOUCH_CURSOR_ICON_2X 40803
+
+// ---------------------------------------------------------------------------
+// From dev_ui_browser_resources.h:
+
+#define IDR_FAMILY_LINK_USER_INTERNALS_HTML 16500
+#define IDR_FAMILY_LINK_USER_INTERNALS_CSS 16501
+#define IDR_FAMILY_LINK_USER_INTERNALS_JS 16502
+#define IDR_TRANSLATE_INTERNALS_CSS 16503
+#define IDR_TRANSLATE_INTERNALS_HTML 16504
+#define IDR_TRANSLATE_INTERNALS_JS 16505
+
+// ---------------------------------------------------------------------------
+// From dev_ui_components_resources.h:
+
+#define IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_HTML 24660
+#define IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_JS 24661
+#define IDR_CRASH_CRASHES_HTML 24662
+#define IDR_CRASH_CRASHES_JS 24663
+#define IDR_CRASH_CRASHES_CSS 24664
+#define IDR_CRASH_SADTAB_SVG 24665
+#define IDR_GCM_DRIVER_GCM_INTERNALS_HTML 24666
+#define IDR_GCM_DRIVER_GCM_INTERNALS_CSS 24667
+#define IDR_GCM_DRIVER_GCM_INTERNALS_JS 24668
+#define IDR_LOCAL_STATE_HTML 24669
+#define IDR_LOCAL_STATE_JS 24670
+#define IDR_NET_LOG_NET_EXPORT_CSS 24671
+#define IDR_NET_LOG_NET_EXPORT_HTML 24672
+#define IDR_NET_LOG_NET_EXPORT_JS 24673
+#define IDR_NTP_TILES_INTERNALS_HTML 24674
+#define IDR_NTP_TILES_INTERNALS_JS 24675
+#define IDR_NTP_TILES_INTERNALS_CSS 24676
+#define IDR_SECURITY_INTERSTITIAL_UI_HTML 24677
+#define IDR_SIGNIN_INTERNALS_INDEX_HTML 24678
+#define IDR_SIGNIN_INTERNALS_INDEX_CSS 24679
+#define IDR_SIGNIN_INTERNALS_INDEX_JS 24680
+#define IDR_USER_ACTIONS_CSS 24681
+#define IDR_USER_ACTIONS_HTML 24682
+#define IDR_USER_ACTIONS_JS 24683
+
+// ---------------------------------------------------------------------------
+// From devtools_resources.h:
+
+#define COMPRESSED_PROTOCOL_JSON 51660
+#define IMAGES_3D_CENTER_SVG 51661
+#define IMAGES_3D_PAN_SVG 51662
+#define IMAGES_3D_ROTATE_SVG 51663
+#define IMAGES_IMAGES_JS 51664
+#define IMAGES_ACCELEROMETER_BACK_SVG 51665
+#define IMAGES_ACCELEROMETER_BOTTOM_PNG 51666
+#define IMAGES_ACCELEROMETER_FRONT_SVG 51667
+#define IMAGES_ACCELEROMETER_LEFT_PNG 51668
+#define IMAGES_ACCELEROMETER_RIGHT_PNG 51669
+#define IMAGES_ACCELEROMETER_TOP_PNG 51670
+#define IMAGES_ALIGN_CONTENT_CENTER_SVG 51671
+#define IMAGES_ALIGN_CONTENT_END_SVG 51672
+#define IMAGES_ALIGN_CONTENT_SPACE_AROUND_SVG 51673
+#define IMAGES_ALIGN_CONTENT_SPACE_BETWEEN_SVG 51674
+#define IMAGES_ALIGN_CONTENT_SPACE_EVENLY_SVG 51675
+#define IMAGES_ALIGN_CONTENT_START_SVG 51676
+#define IMAGES_ALIGN_CONTENT_STRETCH_SVG 51677
+#define IMAGES_ALIGN_ITEMS_BASELINE_SVG 51678
+#define IMAGES_ALIGN_ITEMS_CENTER_SVG 51679
+#define IMAGES_ALIGN_ITEMS_END_SVG 51680
+#define IMAGES_ALIGN_ITEMS_START_SVG 51681
+#define IMAGES_ALIGN_ITEMS_STRETCH_SVG 51682
+#define IMAGES_ALIGN_SELF_CENTER_SVG 51683
+#define IMAGES_ALIGN_SELF_END_SVG 51684
+#define IMAGES_ALIGN_SELF_START_SVG 51685
+#define IMAGES_ALIGN_SELF_STRETCH_SVG 51686
+#define IMAGES_ARROW_BACK_SVG 51687
+#define IMAGES_ARROW_DOWN_SVG 51688
+#define IMAGES_ARROW_DROP_DOWN_DARK_SVG 51689
+#define IMAGES_ARROW_DROP_DOWN_LIGHT_SVG 51690
+#define IMAGES_ARROW_FORWARD_SVG 51691
+#define IMAGES_ARROW_UP_DOWN_CIRCLE_SVG 51692
+#define IMAGES_ARROW_UP_DOWN_SVG 51693
+#define IMAGES_ARROW_UP_SVG 51694
+#define IMAGES_BELL_SVG 51695
+#define IMAGES_BEZIER_CURVE_FILLED_SVG 51696
+#define IMAGES_BIN_SVG 51697
+#define IMAGES_BOTTOM_PANEL_CLOSE_SVG 51698
+#define IMAGES_BOTTOM_PANEL_OPEN_SVG 51699
+#define IMAGES_BRACKETS_SVG 51700
+#define IMAGES_BREAKPOINT_CIRCLE_SVG 51701
+#define IMAGES_BREAKPOINT_CROSSED_FILLED_SVG 51702
+#define IMAGES_BREAKPOINT_CROSSED_SVG 51703
+#define IMAGES_BRUSH_FILLED_SVG 51704
+#define IMAGES_BRUSH_SVG 51705
+#define IMAGES_BUG_SVG 51706
+#define IMAGES_BUNDLE_SVG 51707
+#define IMAGES_CHECK_CIRCLE_SVG 51708
+#define IMAGES_CHECK_DOUBLE_SVG 51709
+#define IMAGES_CHECKER_SVG 51710
+#define IMAGES_CHECKMARK_SVG 51711
+#define IMAGES_CHEVRON_DOUBLE_RIGHT_SVG 51712
+#define IMAGES_CHEVRON_DOWN_SVG 51713
+#define IMAGES_CHEVRON_LEFT_DOT_SVG 51714
+#define IMAGES_CHEVRON_LEFT_SVG 51715
+#define IMAGES_CHEVRON_RIGHT_SVG 51716
+#define IMAGES_CHEVRON_UP_SVG 51717
+#define IMAGES_CHROMELEFT_AVIF 51718
+#define IMAGES_CHROMEMIDDLE_AVIF 51719
+#define IMAGES_CHROMERIGHT_AVIF 51720
+#define IMAGES_CLEAR_LIST_SVG 51721
+#define IMAGES_CLEAR_SVG 51722
+#define IMAGES_CLOUD_SVG 51723
+#define IMAGES_CODE_CIRCLE_SVG 51724
+#define IMAGES_CODE_SVG 51725
+#define IMAGES_COLON_SVG 51726
+#define IMAGES_COLOR_PICKER_FILLED_SVG 51727
+#define IMAGES_COLOR_PICKER_SVG 51728
+#define IMAGES_CONSOLE_CONDITIONAL_BREAKPOINT_SVG 51729
+#define IMAGES_CONSOLE_LOGPOINT_SVG 51730
+#define IMAGES_COOKIE_SVG 51731
+#define IMAGES_COPY_SVG 51732
+#define IMAGES_CREDIT_CARD_SVG 51733
+#define IMAGES_CROSS_CIRCLE_FILLED_SVG 51734
+#define IMAGES_CROSS_CIRCLE_SVG 51735
+#define IMAGES_CROSS_SVG 51736
+#define IMAGES_CSSOVERVIEW_ICONS_2X_AVIF 51737
+#define IMAGES_CUSTOM_TYPOGRAPHY_SVG 51738
+#define IMAGES_DATABASE_SVG 51739
+#define IMAGES_DEPLOYED_SVG 51740
+#define IMAGES_DEVICE_FOLD_SVG 51741
+#define IMAGES_DEVICES_SVG 51742
+#define IMAGES_DOCK_BOTTOM_SVG 51743
+#define IMAGES_DOCK_LEFT_SVG 51744
+#define IMAGES_DOCK_RIGHT_SVG 51745
+#define IMAGES_DOCK_WINDOW_SVG 51746
+#define IMAGES_DOCUMENT_SVG 51747
+#define IMAGES_DOG_PAW_SVG 51748
+#define IMAGES_DOTS_HORIZONTAL_SVG 51749
+#define IMAGES_DOTS_VERTICAL_SVG 51750
+#define IMAGES_DOWNLOAD_SVG 51751
+#define IMAGES_EDIT_SVG 51752
+#define IMAGES_EMPTY_SVG 51753
+#define IMAGES_ERRORWAVE_SVG 51754
+#define IMAGES_EXCLAMATION_SVG 51755
+#define IMAGES_EXPERIMENT_CHECK_SVG 51756
+#define IMAGES_EXPERIMENT_SVG 51757
+#define IMAGES_EXTENSION_SVG 51758
+#define IMAGES_EYE_SVG 51759
+#define IMAGES_FILE_DOCUMENT_SVG 51760
+#define IMAGES_FILE_FETCH_XHR_SVG 51761
+#define IMAGES_FILE_FONT_SVG 51762
+#define IMAGES_FILE_GENERIC_SVG 51763
+#define IMAGES_FILE_IMAGE_SVG 51764
+#define IMAGES_FILE_JSON_SVG 51765
+#define IMAGES_FILE_MANIFEST_SVG 51766
+#define IMAGES_FILE_MEDIA_SVG 51767
+#define IMAGES_FILE_SCRIPT_SVG 51768
+#define IMAGES_FILE_SNIPPET_SVG 51769
+#define IMAGES_FILE_STYLESHEET_SVG 51770
+#define IMAGES_FILE_WASM_SVG 51771
+#define IMAGES_FILE_WEBSOCKET_SVG 51772
+#define IMAGES_FILTER_CLEAR_SVG 51773
+#define IMAGES_FILTER_FILLED_SVG 51774
+#define IMAGES_FILTER_SVG 51775
+#define IMAGES_FLEX_DIRECTION_SVG 51776
+#define IMAGES_FLEX_NO_WRAP_SVG 51777
+#define IMAGES_FLEX_WRAP_SVG 51778
+#define IMAGES_FLOW_SVG 51779
+#define IMAGES_FOLD_MORE_SVG 51780
+#define IMAGES_FOLDER_SVG 51781
+#define IMAGES_FRAME_CROSSED_SVG 51782
+#define IMAGES_FRAME_ICON_SVG 51783
+#define IMAGES_FRAME_SVG 51784
+#define IMAGES_GEAR_FILLED_SVG 51785
+#define IMAGES_GEAR_SVG 51786
+#define IMAGES_GEARS_SVG 51787
+#define IMAGES_GOTO_FILLED_SVG 51788
+#define IMAGES_HEAP_SNAPSHOT_SVG 51789
+#define IMAGES_HEAP_SNAPSHOTS_SVG 51790
+#define IMAGES_HELP_SVG 51791
+#define IMAGES_IFRAME_CROSSED_SVG 51792
+#define IMAGES_IFRAME_SVG 51793
+#define IMAGES_IMPORT_SVG 51794
+#define IMAGES_INFO_FILLED_SVG 51795
+#define IMAGES_INFO_SVG 51796
+#define IMAGES_ISSUE_CROSS_FILLED_SVG 51797
+#define IMAGES_ISSUE_EXCLAMATION_FILLED_SVG 51798
+#define IMAGES_ISSUE_QUESTIONMARK_FILLED_SVG 51799
+#define IMAGES_ISSUE_TEXT_FILLED_SVG 51800
+#define IMAGES_JUSTIFY_CONTENT_CENTER_SVG 51801
+#define IMAGES_JUSTIFY_CONTENT_END_SVG 51802
+#define IMAGES_JUSTIFY_CONTENT_SPACE_AROUND_SVG 51803
+#define IMAGES_JUSTIFY_CONTENT_SPACE_BETWEEN_SVG 51804
+#define IMAGES_JUSTIFY_CONTENT_SPACE_EVENLY_SVG 51805
+#define IMAGES_JUSTIFY_CONTENT_START_SVG 51806
+#define IMAGES_JUSTIFY_ITEMS_CENTER_SVG 51807
+#define IMAGES_JUSTIFY_ITEMS_END_SVG 51808
+#define IMAGES_JUSTIFY_ITEMS_START_SVG 51809
+#define IMAGES_JUSTIFY_ITEMS_STRETCH_SVG 51810
+#define IMAGES_KEYBOARD_PEN_SVG 51811
+#define IMAGES_LARGE_ARROW_RIGHT_FILLED_SVG 51812
+#define IMAGES_LAYERS_FILLED_SVG 51813
+#define IMAGES_LAYERS_SVG 51814
+#define IMAGES_LEFT_PANEL_CLOSE_SVG 51815
+#define IMAGES_LEFT_PANEL_OPEN_SVG 51816
+#define IMAGES_LIGHTBULB_SPARK_SVG 51817
+#define IMAGES_LIGHTHOUSE_LOGO_SVG 51818
+#define IMAGES_LIST_SVG 51819
+#define IMAGES_MATCH_WHOLE_WORD_SVG 51820
+#define IMAGES_MEMORY_SVG 51821
+#define IMAGES_MINUS_SVG 51822
+#define IMAGES_MOP_SVG 51823
+#define IMAGES_MOUSE_SVG 51824
+#define IMAGES_NAVIGATIONCONTROLS_PNG 51825
+#define IMAGES_NAVIGATIONCONTROLS_2X_PNG 51826
+#define IMAGES_NETWORK_SETTINGS_SVG 51827
+#define IMAGES_NODEICON_AVIF 51828
+#define IMAGES_OPEN_EXTERNALLY_SVG 51829
+#define IMAGES_PAUSE_SVG 51830
+#define IMAGES_PERFORMANCE_SVG 51831
+#define IMAGES_PERSON_SVG 51832
+#define IMAGES_PLAY_SVG 51833
+#define IMAGES_PLUS_SVG 51834
+#define IMAGES_POPOVERARROWS_PNG 51835
+#define IMAGES_POPUP_SVG 51836
+#define IMAGES_PREVIEW_FEATURE_VIDEO_THUMBNAIL_SVG 51837
+#define IMAGES_PROFILE_SVG 51838
+#define IMAGES_RECORD_START_SVG 51839
+#define IMAGES_RECORD_STOP_SVG 51840
+#define IMAGES_REDO_SVG 51841
+#define IMAGES_REFRESH_SVG 51842
+#define IMAGES_REPLACE_SVG 51843
+#define IMAGES_REPLAY_SVG 51844
+#define IMAGES_RESIZEDIAGONAL_SVG 51845
+#define IMAGES_RESIZEHORIZONTAL_SVG 51846
+#define IMAGES_RESIZEVERTICAL_SVG 51847
+#define IMAGES_RESUME_SVG 51848
+#define IMAGES_REVIEW_SVG 51849
+#define IMAGES_RIGHT_PANEL_CLOSE_SVG 51850
+#define IMAGES_RIGHT_PANEL_OPEN_SVG 51851
+#define IMAGES_SCISSORS_SVG 51852
+#define IMAGES_SCREEN_ROTATION_SVG 51853
+#define IMAGES_SEARCH_SVG 51854
+#define IMAGES_SECURITYICONS_SVG 51855
+#define IMAGES_SELECT_ELEMENT_SVG 51856
+#define IMAGES_SEND_SVG 51857
+#define IMAGES_SHADOW_SVG 51858
+#define IMAGES_SMALL_STATUS_DOT_SVG 51859
+#define IMAGES_SNIPPET_SVG 51860
+#define IMAGES_SPARK_INFO_SVG 51861
+#define IMAGES_SPARK_SVG 51862
+#define IMAGES_STAR_SVG 51863
+#define IMAGES_STEP_INTO_SVG 51864
+#define IMAGES_STEP_OUT_SVG 51865
+#define IMAGES_STEP_OVER_SVG 51866
+#define IMAGES_STEP_SVG 51867
+#define IMAGES_STOP_SVG 51868
+#define IMAGES_SYMBOL_SVG 51869
+#define IMAGES_SYNC_SVG 51870
+#define IMAGES_TABLE_SVG 51871
+#define IMAGES_THUMB_DOWN_SVG 51872
+#define IMAGES_THUMB_UP_SVG 51873
+#define IMAGES_TOOLBARRESIZERVERTICAL_PNG 51874
+#define IMAGES_TOP_PANEL_CLOSE_SVG 51875
+#define IMAGES_TOP_PANEL_OPEN_SVG 51876
+#define IMAGES_TOUCH_APP_SVG 51877
+#define IMAGES_TOUCHCURSOR_PNG 51878
+#define IMAGES_TOUCHCURSOR_2X_PNG 51879
+#define IMAGES_TRIANGLE_BOTTOM_RIGHT_SVG 51880
+#define IMAGES_TRIANGLE_DOWN_SVG 51881
+#define IMAGES_TRIANGLE_LEFT_SVG 51882
+#define IMAGES_TRIANGLE_RIGHT_SVG 51883
+#define IMAGES_TRIANGLE_UP_SVG 51884
+#define IMAGES_UNDO_SVG 51885
+#define IMAGES_WARNING_FILLED_SVG 51886
+#define IMAGES_WARNING_SVG 51887
+#define IMAGES_WATCH_SVG 51888
+#define IMAGES_WHATSNEW_AVIF 51889
+#define IMAGES_WIDTH_SVG 51890
+#define IMAGES_ZOOM_IN_SVG 51891
+#define TESTS_JS 51892
+#define CORE_COMMON_COMMON_JS 51893
+#define CORE_DOM_EXTENSION_DOM_EXTENSION_JS 51894
+#define CORE_HOST_HOST_JS 51895
+#define CORE_I18N_I18N_JS 51896
+#define CORE_I18N_LOCALES_EN_US_JSON 51897
+#define CORE_I18N_LOCALES_ZH_JSON 51898
+#define CORE_PLATFORM_PLATFORM_JS 51899
+#define CORE_PROTOCOL_CLIENT_PROTOCOL_CLIENT_JS 51900
+#define CORE_ROOT_ROOT_JS 51901
+#define CORE_SDK_SDK_META_JS 51902
+#define CORE_SDK_SDK_JS 51903
+#define DEVICE_MODE_EMULATION_FRAME_HTML 51904
+#define DEVTOOLS_APP_HTML 51905
+#define DEVTOOLS_COMPATIBILITY_JS 51906
+#define EMULATED_DEVICES_OPTIMIZED_MOTOG4_LANDSCAPE_AVIF 51907
+#define EMULATED_DEVICES_OPTIMIZED_MOTOG4_PORTRAIT_AVIF 51908
+#define EMULATED_DEVICES_OPTIMIZED_NEXUS5X_LANDSCAPE_AVIF 51909
+#define EMULATED_DEVICES_OPTIMIZED_NEXUS5X_PORTRAIT_AVIF 51910
+#define EMULATED_DEVICES_OPTIMIZED_NEXUS6P_LANDSCAPE_AVIF 51911
+#define EMULATED_DEVICES_OPTIMIZED_NEXUS6P_PORTRAIT_AVIF 51912
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEST_HUB_HORIZONTAL_AVIF 51913
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEST_HUB_MAX_HORIZONTAL_AVIF 51914
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_HORIZONTAL_DEFAULT_1X_AVIF 51915
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_HORIZONTAL_DEFAULT_2X_AVIF 51916
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_HORIZONTAL_KEYBOARD_1X_AVIF 51917
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_HORIZONTAL_KEYBOARD_2X_AVIF 51918
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_HORIZONTAL_NAVIGATION_1X_AVIF 51919
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_HORIZONTAL_NAVIGATION_2X_AVIF 51920
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_VERTICAL_DEFAULT_1X_AVIF 51921
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_VERTICAL_DEFAULT_2X_AVIF 51922
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_VERTICAL_KEYBOARD_1X_AVIF 51923
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_VERTICAL_KEYBOARD_2X_AVIF 51924
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_VERTICAL_NAVIGATION_1X_AVIF 51925
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5_VERTICAL_NAVIGATION_2X_AVIF 51926
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_HORIZONTAL_DEFAULT_1X_AVIF 51927
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_HORIZONTAL_DEFAULT_2X_AVIF 51928
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_HORIZONTAL_KEYBOARD_1X_AVIF 51929
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_HORIZONTAL_KEYBOARD_2X_AVIF 51930
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_HORIZONTAL_NAVIGATION_1X_AVIF 51931
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_HORIZONTAL_NAVIGATION_2X_AVIF 51932
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_VERTICAL_DEFAULT_1X_AVIF 51933
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_VERTICAL_DEFAULT_2X_AVIF 51934
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_VERTICAL_KEYBOARD_1X_AVIF 51935
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_VERTICAL_KEYBOARD_2X_AVIF 51936
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_VERTICAL_NAVIGATION_1X_AVIF 51937
+#define EMULATED_DEVICES_OPTIMIZED_GOOGLE_NEXUS_5X_VERTICAL_NAVIGATION_2X_AVIF 51938
+#define EMULATED_DEVICES_OPTIMIZED_IPAD_LANDSCAPE_AVIF 51939
+#define EMULATED_DEVICES_OPTIMIZED_IPAD_PORTRAIT_AVIF 51940
+#define EMULATED_DEVICES_OPTIMIZED_IPHONE5_LANDSCAPE_AVIF 51941
+#define EMULATED_DEVICES_OPTIMIZED_IPHONE5_PORTRAIT_AVIF 51942
+#define EMULATED_DEVICES_OPTIMIZED_IPHONE6_LANDSCAPE_AVIF 51943
+#define EMULATED_DEVICES_OPTIMIZED_IPHONE6_PORTRAIT_AVIF 51944
+#define EMULATED_DEVICES_OPTIMIZED_IPHONE6PLUS_LANDSCAPE_AVIF 51945
+#define EMULATED_DEVICES_OPTIMIZED_IPHONE6PLUS_PORTRAIT_AVIF 51946
+#define ENTRYPOINTS_DEVICE_MODE_EMULATION_FRAME_DEVICE_MODE_EMULATION_FRAME_JS 51947
+#define ENTRYPOINTS_DEVTOOLS_APP_DEVTOOLS_APP_JS 51948
+#define ENTRYPOINTS_FORMATTER_WORKER_FORMATTERACTIONS_JS 51949
+#define ENTRYPOINTS_FORMATTER_WORKER_FORMATTER_WORKER_ENTRYPOINT_JS 51950
+#define ENTRYPOINTS_FORMATTER_WORKER_FORMATTER_WORKER_JS 51951
+#define ENTRYPOINTS_HEAP_SNAPSHOT_WORKER_HEAP_SNAPSHOT_WORKER_ENTRYPOINT_JS 51952
+#define ENTRYPOINTS_HEAP_SNAPSHOT_WORKER_HEAP_SNAPSHOT_WORKER_JS 51953
+#define ENTRYPOINTS_INSPECTOR_INSPECTOR_JS 51954
+#define ENTRYPOINTS_INSPECTOR_MAIN_INSPECTOR_MAIN_META_JS 51955
+#define ENTRYPOINTS_INSPECTOR_MAIN_INSPECTOR_MAIN_JS 51956
+#define ENTRYPOINTS_JS_APP_JS_APP_JS 51957
+#define ENTRYPOINTS_LIGHTHOUSE_WORKER_LIGHTHOUSE_WORKER_JS 51958
+#define ENTRYPOINTS_MAIN_MAIN_META_JS 51959
+#define ENTRYPOINTS_MAIN_MAIN_JS 51960
+#define ENTRYPOINTS_NDB_APP_NDB_APP_JS 51961
+#define ENTRYPOINTS_NODE_APP_NODE_APP_JS 51962
+#define ENTRYPOINTS_SHELL_SHELL_JS 51963
+#define ENTRYPOINTS_WASMPARSER_WORKER_WASMPARSER_WORKER_ENTRYPOINT_JS 51964
+#define ENTRYPOINTS_WASMPARSER_WORKER_WASMPARSER_WORKER_JS 51965
+#define ENTRYPOINTS_WORKER_APP_WORKER_APP_JS 51966
+#define INSPECTOR_HTML 51967
+#define INTEGRATION_TEST_RUNNER_HTML 51968
+#define JS_APP_HTML 51969
+#define LEGACY_TEST_RUNNER_LEGACY_TEST_RUNNER_JS 51970
+#define LEGACY_TEST_RUNNER_TEST_RUNNER_TEST_RUNNER_JS 51971
+#define MODELS_AUTOFILL_MANAGER_AUTOFILL_MANAGER_JS 51972
+#define MODELS_BINDINGS_BINDINGS_JS 51973
+#define MODELS_BREAKPOINTS_BREAKPOINTS_JS 51974
+#define MODELS_CPU_PROFILE_CPU_PROFILE_JS 51975
+#define MODELS_EMULATION_EMULATION_JS 51976
+#define MODELS_EXTENSIONS_EXTENSIONS_JS 51977
+#define MODELS_FORMATTER_FORMATTER_JS 51978
+#define MODELS_HAR_HAR_JS 51979
+#define MODELS_HEAP_SNAPSHOT_MODEL_HEAP_SNAPSHOT_MODEL_JS 51980
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COEPCOOPSANDBOXEDIFRAMECANNOTNAVIGATETOCOOPPAGE_MD 51981
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COEPCORPNOTSAMEORIGIN_MD 51982
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COEPCORPNOTSAMEORIGINAFTERDEFAULTEDTOSAMEORIGINBYCOEP_MD 51983
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COEPCORPNOTSAMESITE_MD 51984
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COEPFRAMERESOURCENEEDSCOEPHEADER_MD 51985
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COMPATIBILITYMODEQUIRKS_MD 51986
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEATTRIBUTEVALUEEXCEEDSMAXSIZE_MD 51987
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_LOWTEXTCONTRAST_MD 51988
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEEXCLUDECONTEXTDOWNGRADEREAD_MD 51989
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEEXCLUDECONTEXTDOWNGRADESET_MD 51990
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEEXCLUDENAVIGATIONCONTEXTDOWNGRADE_MD 51991
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEINVALIDSAMEPARTY_MD 51992
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITENONEINSECUREERRORREAD_MD 51993
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITENONEINSECUREERRORSET_MD 51994
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITENONEINSECUREWARNREAD_MD 51995
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITENONEINSECUREWARNSET_MD 51996
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEUNSPECIFIEDLAXALLOWUNSAFEREAD_MD 51997
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEUNSPECIFIEDLAXALLOWUNSAFESET_MD 51998
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEWARNCROSSDOWNGRADEREAD_MD 51999
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEWARNCROSSDOWNGRADESET_MD 52000
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SAMESITEWARNSTRICTLAXDOWNGRADESTRICT_MD 52001
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARINSECURECONTEXT_MD 52002
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARINVALIDREGISTEROSSOURCEHEADER_MD 52003
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARINVALIDREGISTEROSTRIGGERHEADER_MD 52004
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARINVALIDREGISTERSOURCEHEADER_MD 52005
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARINVALIDREGISTERTRIGGERHEADER_MD 52006
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_AROSSOURCEIGNORED_MD 52007
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_AROSTRIGGERIGNORED_MD 52008
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARPERMISSIONPOLICYDISABLED_MD 52009
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARSOURCEANDTRIGGERHEADERS_MD 52010
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARSOURCEIGNORED_MD 52011
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARTRIGGERIGNORED_MD 52012
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARUNTRUSTWORTHYREPORTINGORIGIN_MD 52013
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_ARWEBANDOSHEADERS_MD 52014
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_BOUNCETRACKINGMITIGATIONS_MD 52015
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CLIENTHINTMETATAGALLOWLISTINVALIDORIGIN_MD 52016
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CLIENTHINTMETATAGMODIFIEDHTML_MD 52017
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIECROSSSITEREDIRECTDOWNGRADE_MD 52018
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEEXCLUDEBLOCKEDWITHINRELATEDWEBSITESET_MD 52019
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEEXCLUDEDOMAINNONASCII_MD 52020
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEEXCLUDETHIRDPARTYPHASEOUTREAD_MD 52021
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEEXCLUDETHIRDPARTYPHASEOUTSET_MD 52022
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEWARNDOMAINNONASCII_MD 52023
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEWARNMETADATAGRANTREAD_MD 52024
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEWARNMETADATAGRANTSET_MD 52025
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEWARNTHIRDPARTYPHASEOUTREAD_MD 52026
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_COOKIEWARNTHIRDPARTYPHASEOUTSET_MD 52027
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSALLOWCREDENTIALSREQUIRED_MD 52028
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSDISABLEDSCHEME_MD 52029
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSDISALLOWEDBYMODE_MD 52030
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSHEADERDISALLOWEDBYPREFLIGHTRESPONSE_MD 52031
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSINSECUREPRIVATENETWORK_MD 52032
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSINVALIDHEADERVALUES_MD 52033
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSMETHODDISALLOWEDBYPREFLIGHTRESPONSE_MD 52034
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSNOCORSREDIRECTMODENOTFOLLOW_MD 52035
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSORIGINMISMATCH_MD 52036
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSPREFLIGHTALLOWPRIVATENETWORKERROR_MD 52037
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSPREFLIGHTRESPONSEINVALID_MD 52038
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSPRIVATENETWORKPERMISSIONDENIED_MD 52039
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSREDIRECTCONTAINSCREDENTIALS_MD 52040
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CORSWILDCARDORIGINNOTALLOWED_MD 52041
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CSPEVALVIOLATION_MD 52042
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CSPINLINEVIOLATION_MD 52043
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CSPTRUSTEDTYPESPOLICYVIOLATION_MD 52044
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CSPTRUSTEDTYPESSINKVIOLATION_MD 52045
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_CSPURLVIOLATION_MD 52046
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_DEPRECATION_MD 52047
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTACCOUNTSHTTPNOTFOUND_MD 52048
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTACCOUNTSINVALIDRESPONSE_MD 52049
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTACCOUNTSNORESPONSE_MD 52050
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTAPPROVALDECLINED_MD 52051
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTCANCELED_MD 52052
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTCLIENTMETADATAHTTPNOTFOUND_MD 52053
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTCLIENTMETADATAINVALIDRESPONSE_MD 52054
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTCLIENTMETADATANORESPONSE_MD 52055
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTERRORFETCHINGSIGNIN_MD 52056
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTERRORIDTOKEN_MD 52057
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTIDTOKENHTTPNOTFOUND_MD 52058
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTIDTOKENINVALIDREQUEST_MD 52059
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTIDTOKENINVALIDRESPONSE_MD 52060
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTIDTOKENNORESPONSE_MD 52061
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTINVALIDSIGNINRESPONSE_MD 52062
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTMANIFESTHTTPNOTFOUND_MD 52063
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTMANIFESTINVALIDRESPONSE_MD 52064
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTMANIFESTNORESPONSE_MD 52065
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHREQUESTTOOMANYREQUESTS_MD 52066
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTINVALIDACCOUNTSRESPONSE_MD 52067
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTINVALIDCONFIGORWELLKNOWN_MD 52068
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNOACCOUNTSHARINGPERMISSION_MD 52069
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNOAPIPERMISSION_MD 52070
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNORETURNINGUSERFROMFETCHEDACCOUNTS_MD 52071
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNOTIFRAME_MD 52072
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNOTPOTENTIALLYTRUSTWORTHY_MD 52073
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNOTSAMEORIGIN_MD 52074
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_FEDERATEDAUTHUSERINFOREQUESTNOTSIGNEDINWITHIDP_MD 52075
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICCROSSORIGINPORTALPOSTMESSAGEERROR_MD 52076
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMARIALABELLEDBYTONONEXISTINGID_MD 52077
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMAUTOCOMPLETEATTRIBUTEEMPTYERROR_MD 52078
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMDUPLICATEIDFORINPUTERROR_MD 52079
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMEMPTYIDANDNAMEATTRIBUTESFORINPUTERROR_MD 52080
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMINPUTASSIGNEDAUTOCOMPLETEVALUETOIDORNAMEATTRIBUTEERROR_MD 52081
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMINPUTHASWRONGBUTWELLINTENDEDAUTOCOMPLETEVALUEERROR_MD 52082
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMINPUTWITHNOLABELERROR_MD 52083
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMLABELFORMATCHESNONEXISTINGIDERROR_MD 52084
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMLABELFORNAMEERROR_MD 52085
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICFORMLABELHASNEITHERFORNORNESTEDINPUT_MD 52086
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_GENERICRESPONSEWASBLOCKEDBYORB_MD 52087
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_HEAVYAD_MD 52088
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_MIXEDCONTENT_MD 52089
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_PROPERTYRULEINVALIDNAMEISSUE_MD 52090
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_PROPERTYRULEISSUE_MD 52091
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_SHAREDARRAYBUFFER_MD 52092
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_STYLESHEETLATEIMPORT_MD 52093
+#define MODELS_ISSUES_MANAGER_DESCRIPTIONS_STYLESHEETREQUESTFAILED_MD 52094
+#define MODELS_ISSUES_MANAGER_ISSUES_MANAGER_JS 52095
+#define MODELS_JAVASCRIPT_METADATA_JAVASCRIPT_METADATA_JS 52096
+#define MODELS_LOGS_LOGS_META_JS 52097
+#define MODELS_LOGS_LOGS_JS 52098
+#define MODELS_PERSISTENCE_PERSISTENCE_META_JS 52099
+#define MODELS_PERSISTENCE_PERSISTENCE_JS 52100
+#define MODELS_SOURCE_MAP_SCOPES_SOURCE_MAP_SCOPES_JS 52101
+#define MODELS_TEXT_UTILS_TEXT_UTILS_JS 52102
+#define MODELS_TIMELINE_MODEL_TIMELINE_MODEL_JS 52103
+#define MODELS_TRACE_EXTRAS_EXTRAS_JS 52104
+#define MODELS_TRACE_HANDLERS_HANDLERS_JS 52105
+#define MODELS_TRACE_HELPERS_HELPERS_JS 52106
+#define MODELS_TRACE_ROOT_CAUSES_ROOT_CAUSES_JS 52107
+#define MODELS_TRACE_TRACE_JS 52108
+#define MODELS_TRACE_TYPES_TYPES_JS 52109
+#define MODELS_WORKSPACE_WORKSPACE_JS 52110
+#define MODELS_WORKSPACE_DIFF_WORKSPACE_DIFF_JS 52111
+#define NDB_APP_HTML 52112
+#define NODE_APP_HTML 52113
+#define PANELS_ACCESSIBILITY_ACCESSIBILITY_META_JS 52114
+#define PANELS_ACCESSIBILITY_ACCESSIBILITY_JS 52115
+#define PANELS_ANIMATION_ANIMATION_META_JS 52116
+#define PANELS_ANIMATION_ANIMATION_JS 52117
+#define PANELS_APPLICATION_APPLICATION_META_JS 52118
+#define PANELS_APPLICATION_APPLICATION_JS 52119
+#define PANELS_APPLICATION_COMPONENTS_COMPONENTS_JS 52120
+#define PANELS_APPLICATION_PRELOADING_COMPONENTS_COMPONENTS_JS 52121
+#define PANELS_APPLICATION_PRELOADING_HELPER_HELPER_JS 52122
+#define PANELS_AUTOFILL_AUTOFILL_META_JS 52123
+#define PANELS_AUTOFILL_AUTOFILL_JS 52124
+#define PANELS_BROWSER_DEBUGGER_BROWSER_DEBUGGER_META_JS 52125
+#define PANELS_BROWSER_DEBUGGER_BROWSER_DEBUGGER_JS 52126
+#define PANELS_CHANGES_CHANGES_META_JS 52127
+#define PANELS_CHANGES_CHANGES_JS 52128
+#define PANELS_CONSOLE_CONSOLE_META_JS 52129
+#define PANELS_CONSOLE_CONSOLE_JS 52130
+#define PANELS_CONSOLE_COUNTERS_CONSOLE_COUNTERS_META_JS 52131
+#define PANELS_CONSOLE_COUNTERS_CONSOLE_COUNTERS_JS 52132
+#define PANELS_COVERAGE_COVERAGE_META_JS 52133
+#define PANELS_COVERAGE_COVERAGE_JS 52134
+#define PANELS_CSS_OVERVIEW_COMPONENTS_COMPONENTS_JS 52135
+#define PANELS_CSS_OVERVIEW_CSS_OVERVIEW_META_JS 52136
+#define PANELS_CSS_OVERVIEW_CSS_OVERVIEW_JS 52137
+#define PANELS_DEVELOPER_RESOURCES_DEVELOPER_RESOURCES_META_JS 52138
+#define PANELS_DEVELOPER_RESOURCES_DEVELOPER_RESOURCES_JS 52139
+#define PANELS_ELEMENTS_COMPONENTS_COMPONENTS_JS 52140
+#define PANELS_ELEMENTS_ELEMENTS_META_JS 52141
+#define PANELS_ELEMENTS_ELEMENTS_JS 52142
+#define PANELS_EMULATION_COMPONENTS_COMPONENTS_JS 52143
+#define PANELS_EMULATION_EMULATION_META_JS 52144
+#define PANELS_EMULATION_EMULATION_JS 52145
+#define PANELS_EVENT_LISTENERS_EVENT_LISTENERS_JS 52146
+#define PANELS_EXPLAIN_EXPLAIN_META_JS 52147
+#define PANELS_EXPLAIN_EXPLAIN_JS 52148
+#define PANELS_ISSUES_COMPONENTS_COMPONENTS_JS 52149
+#define PANELS_ISSUES_ISSUES_META_JS 52150
+#define PANELS_ISSUES_ISSUES_JS 52151
+#define PANELS_JS_PROFILER_JS_PROFILER_META_JS 52152
+#define PANELS_JS_PROFILER_JS_PROFILER_JS 52153
+#define PANELS_LAYER_VIEWER_LAYER_VIEWER_META_JS 52154
+#define PANELS_LAYER_VIEWER_LAYER_VIEWER_JS 52155
+#define PANELS_LAYERS_LAYERS_META_JS 52156
+#define PANELS_LAYERS_LAYERS_JS 52157
+#define PANELS_LIGHTHOUSE_LIGHTHOUSE_META_JS 52158
+#define PANELS_LIGHTHOUSE_LIGHTHOUSE_JS 52159
+#define PANELS_LINEAR_MEMORY_INSPECTOR_COMPONENTS_COMPONENTS_JS 52160
+#define PANELS_LINEAR_MEMORY_INSPECTOR_LINEAR_MEMORY_INSPECTOR_META_JS 52161
+#define PANELS_LINEAR_MEMORY_INSPECTOR_LINEAR_MEMORY_INSPECTOR_JS 52162
+#define PANELS_MEDIA_MEDIA_META_JS 52163
+#define PANELS_MEDIA_MEDIA_JS 52164
+#define PANELS_MOBILE_THROTTLING_MOBILE_THROTTLING_META_JS 52165
+#define PANELS_MOBILE_THROTTLING_MOBILE_THROTTLING_JS 52166
+#define PANELS_NETWORK_COMPONENTS_COMPONENTS_JS 52167
+#define PANELS_NETWORK_FORWARD_FORWARD_JS 52168
+#define PANELS_NETWORK_NETWORK_META_JS 52169
+#define PANELS_NETWORK_NETWORK_JS 52170
+#define PANELS_PERFORMANCE_MONITOR_PERFORMANCE_MONITOR_META_JS 52171
+#define PANELS_PERFORMANCE_MONITOR_PERFORMANCE_MONITOR_JS 52172
+#define PANELS_PROFILER_PROFILER_META_JS 52173
+#define PANELS_PROFILER_PROFILER_JS 52174
+#define PANELS_PROTOCOL_MONITOR_COMPONENTS_COMPONENTS_JS 52175
+#define PANELS_PROTOCOL_MONITOR_PROTOCOL_MONITOR_META_JS 52176
+#define PANELS_PROTOCOL_MONITOR_PROTOCOL_MONITOR_JS 52177
+#define PANELS_RECORDER_COMPONENTS_COMPONENTS_JS 52178
+#define PANELS_RECORDER_CONTROLLERS_CONTROLLERS_JS 52179
+#define PANELS_RECORDER_CONVERTERS_CONVERTERS_JS 52180
+#define PANELS_RECORDER_EXTENSIONS_EXTENSIONS_JS 52181
+#define PANELS_RECORDER_INJECTED_INJECTED_GENERATED_JS 52182
+#define PANELS_RECORDER_INJECTED_INJECTED_JS 52183
+#define PANELS_RECORDER_MODELS_MODELS_JS 52184
+#define PANELS_RECORDER_RECORDER_ACTIONS_RECORDER_ACTIONS_JS 52185
+#define PANELS_RECORDER_RECORDER_META_JS 52186
+#define PANELS_RECORDER_RECORDER_JS 52187
+#define PANELS_RECORDER_UTIL_UTIL_JS 52188
+#define PANELS_SCREENCAST_SCREENCAST_META_JS 52189
+#define PANELS_SCREENCAST_SCREENCAST_JS 52190
+#define PANELS_SEARCH_SEARCH_JS 52191
+#define PANELS_SECURITY_SECURITY_META_JS 52192
+#define PANELS_SECURITY_SECURITY_JS 52193
+#define PANELS_SENSORS_SENSORS_META_JS 52194
+#define PANELS_SENSORS_SENSORS_JS 52195
+#define PANELS_SETTINGS_COMPONENTS_COMPONENTS_JS 52196
+#define PANELS_SETTINGS_EMULATION_COMPONENTS_COMPONENTS_JS 52197
+#define PANELS_SETTINGS_EMULATION_EMULATION_META_JS 52198
+#define PANELS_SETTINGS_EMULATION_EMULATION_JS 52199
+#define PANELS_SETTINGS_EMULATION_UTILS_UTILS_JS 52200
+#define PANELS_SETTINGS_SETTINGS_META_JS 52201
+#define PANELS_SETTINGS_SETTINGS_JS 52202
+#define PANELS_SNIPPETS_SNIPPETS_JS 52203
+#define PANELS_SOURCES_COMPONENTS_COMPONENTS_JS 52204
+#define PANELS_SOURCES_SOURCES_META_JS 52205
+#define PANELS_SOURCES_SOURCES_JS 52206
+#define PANELS_TIMELINE_COMPONENTS_COMPONENTS_JS 52207
+#define PANELS_TIMELINE_TIMELINE_META_JS 52208
+#define PANELS_TIMELINE_TIMELINE_JS 52209
+#define PANELS_UTILS_UTILS_JS 52210
+#define PANELS_WEB_AUDIO_GRAPH_VISUALIZER_GRAPH_VISUALIZER_JS 52211
+#define PANELS_WEB_AUDIO_WEB_AUDIO_META_JS 52212
+#define PANELS_WEB_AUDIO_WEB_AUDIO_JS 52213
+#define PANELS_WEBAUTHN_WEBAUTHN_META_JS 52214
+#define PANELS_WEBAUTHN_WEBAUTHN_JS 52215
+#define SERVICES_PUPPETEER_PUPPETEER_JS 52216
+#define SERVICES_TRACE_BOUNDS_TRACE_BOUNDS_JS 52217
+#define SERVICES_TRACING_TRACING_JS 52218
+#define SERVICES_WINDOW_BOUNDS_WINDOW_BOUNDS_JS 52219
+#define THIRD_PARTY_ACORN_ACORN_JS 52220
+#define THIRD_PARTY_CHROMIUM_CLIENT_VARIATIONS_CLIENT_VARIATIONS_JS 52221
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_ANGULAR_JS 52222
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_CODEMIRROR_JS 52223
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_CPP_JS 52224
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_JAVA_JS 52225
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_LEGACY_JS 52226
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_LESS_JS 52227
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_MARKDOWN_JS 52228
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_PHP_JS 52229
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_PYTHON_JS 52230
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_SASS_JS 52231
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_SVELTE_JS 52232
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_VUE_JS 52233
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_WAST_JS 52234
+#define THIRD_PARTY_CODEMIRROR_NEXT_CHUNK_XML_JS 52235
+#define THIRD_PARTY_CODEMIRROR_NEXT_CODEMIRROR_NEXT_JS 52236
+#define THIRD_PARTY_CSP_EVALUATOR_CSP_EVALUATOR_JS 52237
+#define THIRD_PARTY_DIFF_DIFF_JS 52238
+#define THIRD_PARTY_I18N_I18N_JS 52239
+#define THIRD_PARTY_INTL_MESSAGEFORMAT_INTL_MESSAGEFORMAT_JS 52240
+#define THIRD_PARTY_LIGHTHOUSE_LIGHTHOUSE_DT_BUNDLE_JS 52241
+#define THIRD_PARTY_LIGHTHOUSE_REPORT_REPORT_JS 52242
+#define THIRD_PARTY_LIT_LIT_JS 52243
+#define THIRD_PARTY_MARKED_MARKED_JS 52244
+#define THIRD_PARTY_PUPPETEER_REPLAY_PUPPETEER_REPLAY_JS 52245
+#define THIRD_PARTY_PUPPETEER_PUPPETEER_JS 52246
+#define THIRD_PARTY_WASMPARSER_WASMPARSER_JS 52247
+#define UI_COMPONENTS_ADORNERS_ADORNERS_JS 52248
+#define UI_COMPONENTS_BUTTONS_BUTTONS_JS 52249
+#define UI_COMPONENTS_CHROME_LINK_CHROME_LINK_JS 52250
+#define UI_COMPONENTS_CODE_HIGHLIGHTER_CODE_HIGHLIGHTER_JS 52251
+#define UI_COMPONENTS_DATA_GRID_DATA_GRID_JS 52252
+#define UI_COMPONENTS_DIALOGS_DIALOGS_JS 52253
+#define UI_COMPONENTS_DIFF_VIEW_DIFF_VIEW_JS 52254
+#define UI_COMPONENTS_EXPANDABLE_LIST_EXPANDABLE_LIST_JS 52255
+#define UI_COMPONENTS_HELPERS_HELPERS_JS 52256
+#define UI_COMPONENTS_HIGHLIGHTING_HIGHLIGHTING_JS 52257
+#define UI_COMPONENTS_ICON_BUTTON_ICON_BUTTON_JS 52258
+#define UI_COMPONENTS_INPUT_INPUT_JS 52259
+#define UI_COMPONENTS_ISSUE_COUNTER_ISSUE_COUNTER_JS 52260
+#define UI_COMPONENTS_LEGACY_WRAPPER_LEGACY_WRAPPER_JS 52261
+#define UI_COMPONENTS_LINKIFIER_LINKIFIER_JS 52262
+#define UI_COMPONENTS_MARKDOWN_VIEW_MARKDOWN_VIEW_JS 52263
+#define UI_COMPONENTS_MENUS_MENUS_JS 52264
+#define UI_COMPONENTS_NODE_TEXT_NODE_TEXT_JS 52265
+#define UI_COMPONENTS_PANEL_FEEDBACK_PANEL_FEEDBACK_JS 52266
+#define UI_COMPONENTS_PANEL_INTRODUCTION_STEPS_PANEL_INTRODUCTION_STEPS_JS 52267
+#define UI_COMPONENTS_RENDER_COORDINATOR_RENDER_COORDINATOR_JS 52268
+#define UI_COMPONENTS_REPORT_VIEW_REPORT_VIEW_JS 52269
+#define UI_COMPONENTS_REQUEST_LINK_ICON_REQUEST_LINK_ICON_JS 52270
+#define UI_COMPONENTS_SETTINGS_SETTINGS_JS 52271
+#define UI_COMPONENTS_SPLIT_VIEW_SPLIT_VIEW_JS 52272
+#define UI_COMPONENTS_SRGB_OVERLAY_SRGB_OVERLAY_JS 52273
+#define UI_COMPONENTS_SUGGESTION_INPUT_SUGGESTION_INPUT_JS 52274
+#define UI_COMPONENTS_SURVEY_LINK_SURVEY_LINK_JS 52275
+#define UI_COMPONENTS_TEXT_EDITOR_TEXT_EDITOR_JS 52276
+#define UI_COMPONENTS_TEXT_PROMPT_TEXT_PROMPT_JS 52277
+#define UI_COMPONENTS_TREE_OUTLINE_TREE_OUTLINE_JS 52278
+#define UI_COMPONENTS_TWO_STATES_COUNTER_TWO_STATES_COUNTER_JS 52279
+#define UI_LEGACY_COMPONENTS_COLOR_PICKER_COLOR_PICKER_JS 52280
+#define UI_LEGACY_COMPONENTS_COOKIE_TABLE_COOKIE_TABLE_JS 52281
+#define UI_LEGACY_COMPONENTS_DATA_GRID_DATA_GRID_JS 52282
+#define UI_LEGACY_COMPONENTS_INLINE_EDITOR_INLINE_EDITOR_JS 52283
+#define UI_LEGACY_COMPONENTS_OBJECT_UI_OBJECT_UI_META_JS 52284
+#define UI_LEGACY_COMPONENTS_OBJECT_UI_OBJECT_UI_JS 52285
+#define UI_LEGACY_COMPONENTS_PERF_UI_PERF_UI_META_JS 52286
+#define UI_LEGACY_COMPONENTS_PERF_UI_PERF_UI_JS 52287
+#define UI_LEGACY_COMPONENTS_QUICK_OPEN_QUICK_OPEN_META_JS 52288
+#define UI_LEGACY_COMPONENTS_QUICK_OPEN_QUICK_OPEN_JS 52289
+#define UI_LEGACY_COMPONENTS_SOURCE_FRAME_SOURCE_FRAME_META_JS 52290
+#define UI_LEGACY_COMPONENTS_SOURCE_FRAME_SOURCE_FRAME_JS 52291
+#define UI_LEGACY_COMPONENTS_UTILS_UTILS_JS 52292
+#define UI_LEGACY_LEGACY_JS 52293
+#define UI_LEGACY_THEME_SUPPORT_THEME_SUPPORT_JS 52294
+#define UI_LEGACY_UTILS_UTILS_JS 52295
+#define UI_LIT_HTML_LIT_HTML_JS 52296
+#define UI_VISUAL_LOGGING_VISUAL_LOGGING_JS 52297
+#define WORKER_APP_HTML 52298
+
+// ---------------------------------------------------------------------------
+// From extensions_browser_resources.h:
+
+#define IDR_APP_DEFAULT_ICON 44780
+#define IDR_EXTENSION_DEFAULT_ICON 44781
+#define IDR_EXTENSION_ACTION_PLAIN_BACKGROUND 44782
+#define IDR_EXTENSION_ICON_PLAIN_BACKGROUND 44783
+#define IDR_EXTENSIONS_FAVICON 44784
+
+// ---------------------------------------------------------------------------
+// From extensions_renderer_resources.h:
+
+#define IDR_APP_VIEW_JS 44800
+#define IDR_APP_VIEW_DENY_JS 44801
+#define IDR_APP_VIEW_ELEMENT_JS 44802
+#define IDR_BROWSER_TEST_ENVIRONMENT_SPECIFIC_BINDINGS_JS 44803
+#define IDR_ENTRY_ID_MANAGER 44804
+#define IDR_EXTENSIONS_WEB_VIEW_ELEMENT_JS 44805
+#define IDR_EXTENSION_OPTIONS_JS 44806
+#define IDR_EXTENSION_OPTIONS_ELEMENT_JS 44807
+#define IDR_EXTENSION_OPTIONS_ATTRIBUTES_JS 44808
+#define IDR_EXTENSION_OPTIONS_CONSTANTS_JS 44809
+#define IDR_EXTENSION_OPTIONS_EVENTS_JS 44810
+#define IDR_FEEDBACK_PRIVATE_CUSTOM_BINDINGS_JS 44811
+#define IDR_GUEST_VIEW_ATTRIBUTES_JS 44812
+#define IDR_GUEST_VIEW_CONTAINER_JS 44813
+#define IDR_GUEST_VIEW_CONTAINER_ELEMENT_JS 44814
+#define IDR_GUEST_VIEW_DENY_JS 44815
+#define IDR_GUEST_VIEW_EVENTS_JS 44816
+#define IDR_GUEST_VIEW_JS 44817
+#define IDR_IMAGE_UTIL_JS 44818
+#define IDR_KEEP_ALIVE_JS 44819
+#define IDR_KEEP_ALIVE_MOJOM_JS 44820
+#define IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS 44821
+#define IDR_MIME_HANDLER_MOJOM_JS 44822
+#define IDR_SAFE_METHODS_JS 44823
+#define IDR_SET_ICON_JS 44824
+#define IDR_TEST_CUSTOM_BINDINGS_JS 44825
+#define IDR_UNCAUGHT_EXCEPTION_HANDLER_JS 44826
+#define IDR_UTILS_JS 44827
+#define IDR_WEB_VIEW_ACTION_REQUESTS_JS 44828
+#define IDR_WEB_VIEW_API_METHODS_JS 44829
+#define IDR_WEB_VIEW_ATTRIBUTES_JS 44830
+#define IDR_WEB_VIEW_CONSTANTS_JS 44831
+#define IDR_WEB_VIEW_EVENTS_JS 44832
+#define IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS 44833
+#define IDR_WEB_VIEW_JS 44834
+#define IDR_WEB_VIEW_DENY_JS 44835
+#define IDR_WEB_VIEW_ELEMENT_JS 44836
+#define IDR_AUTOMATION_CUSTOM_BINDINGS_JS 44837
+#define IDR_AUTOMATION_EVENT_JS 44838
+#define IDR_AUTOMATION_NODE_JS 44839
+#define IDR_AUTOMATION_TREE_CACHE_JS 44840
+#define IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS 44841
+#define IDR_APP_WINDOW_CUSTOM_BINDINGS_JS 44842
+#define IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS 44843
+#define IDR_CONTEXT_MENUS_HANDLERS_JS 44844
+#define IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS 44845
+#define IDR_FILE_ENTRY_BINDING_UTIL_JS 44846
+#define IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS 44847
+#define IDR_GREASEMONKEY_API_JS 44848
+#define IDR_MOJO_PRIVATE_CUSTOM_BINDINGS_JS 44849
+#define IDR_PERMISSIONS_CUSTOM_BINDINGS_JS 44850
+#define IDR_PRINTER_PROVIDER_CUSTOM_BINDINGS_JS 44851
+#define IDR_SERVICE_WORKER_BINDINGS_JS 44852
+#define IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS 44853
+#define IDR_WEB_REQUEST_EVENT_JS 44854
+#define IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS 44855
+#define IDR_PLATFORM_APP_JS 44856
+#define IDR_EXTENSION_FONTS_CSS 44857
+#define IDR_PLATFORM_APP_CSS 44870
+#define IDR_EXTENSION_CSS 44871
+
+// ---------------------------------------------------------------------------
+// From extensions_resources.h:
+
+#define IDR_EXTENSION_API_FEATURES 44790
+
+// ---------------------------------------------------------------------------
+// From gpu_resources.h:
+
+#define IDR_GPU_GPU_INTERNALS_HTML 24750
+#define IDR_GPU_INFO_VIEW_JS 24751
+#define IDR_GPU_BROWSER_BRIDGE_JS 24752
+#define IDR_GPU_GPU_INTERNALS_JS 24753
+#define IDR_GPU_VULKAN_INFO_JS 24754
+#define IDR_GPU_INFO_VIEW_HTML_JS 24755
+#define IDR_GPU_VULKAN_INFO_MOJOM_WEBUI_JS 24756
+#define IDR_GPU_VULKAN_TYPES_MOJOM_WEBUI_JS 24757
+
+// ---------------------------------------------------------------------------
+// From histograms_resources.h:
+
+#define IDR_HISTOGRAMS_HISTOGRAMS_INTERNALS_CSS 24780
+#define IDR_HISTOGRAMS_HISTOGRAMS_INTERNALS_HTML 24781
+#define IDR_HISTOGRAMS_HISTOGRAMS_INTERNALS_JS 24782
+
+// ---------------------------------------------------------------------------
+// From mojo_bindings_resources.h:
+
+#define IDR_MOJO_MOJO_BINDINGS_JS 44970
+#define IDR_MOJO_BINDINGS_JS 44971
+
+// ---------------------------------------------------------------------------
+// From net_resources.h:
+
+#define IDR_DIR_HEADER_HTML 44990
+
+// ---------------------------------------------------------------------------
+// From pdf_resources.h:
+
+#define IDR_PDF_PDF_INTERNAL_PLUGIN_WRAPPER_ROLLUP_JS 20190
+#define IDR_PDF_BROWSER_API_JS 20191
+#define IDR_PDF_MAIN_JS 20192
+#define IDR_PDF_MAIN_PRINT_JS 20193
+#define IDR_PDF_PDF_SCRIPTING_API_JS 20194
+#define IDR_PDF_INDEX_CSS 20195
+#define IDR_PDF_INDEX_HTML 20196
+#define IDR_PDF_INDEX_PRINT_HTML 20197
+#define IDR_PDF_PDF_VIEWER_WRAPPER_ROLLUP_JS 20198
+#define IDR_PDF_PDF_PRINT_WRAPPER_ROLLUP_JS 20199
+#define IDR_PDF_SHARED_ROLLUP_JS 20200
+
+// ---------------------------------------------------------------------------
+// From process_resources.h:
+
+#define IDR_PROCESS_PROCESS_INTERNALS_CSS 24850
+#define IDR_PROCESS_PROCESS_INTERNALS_HTML 24851
+#define IDR_PROCESS_PROCESS_INTERNALS_JS 24852
+#define IDR_PROCESS_PROCESS_INTERNALS_MOJOM_WEBUI_JS 24853
+
+// ---------------------------------------------------------------------------
+// From renderer_resources.h:
+
+#define IDR_BLOCKED_PLUGIN_HTML 25390
+#define IDR_DISABLED_PLUGIN_HTML 25391
+#define IDR_PDF_PLUGIN_HTML 25392
+#define IDR_CART_PRODUCT_EXTRACTION_JS 25393
+#define IDR_CART_DOMAIN_PRODUCT_ID_REGEX_JSON 25394
+#define IDR_SKIP_ADD_TO_CART_REQUEST_DOMAIN_MAPPING_JSON 25395
+#define IDR_PURCHASE_URL_REGEX_DOMAIN_MAPPING_JSON 25396
+#define IDR_ACTION_CUSTOM_BINDINGS_JS 25397
+#define IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS 25398
+#define IDR_CONTROLLED_FRAME_JS 25399
+#define IDR_CONTROLLED_FRAME_INTERNAL_CUSTOM_BINDINGS_JS 25400
+#define IDR_CONTROLLED_FRAME_IMPL_JS 25401
+#define IDR_CONTROLLED_FRAME_API_METHODS_JS 25402
+#define IDR_CHROME_WEB_VIEW_ELEMENT_JS 25403
+#define IDR_CHROME_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS 25404
+#define IDR_CHROME_WEB_VIEW_JS 25405
+#define IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS 25406
+#define IDR_DESKTOP_CAPTURE_CUSTOM_BINDINGS_JS 25407
+#define IDR_DEVELOPER_PRIVATE_CUSTOM_BINDINGS_JS 25408
+#define IDR_DOWNLOADS_CUSTOM_BINDINGS_JS 25409
+#define IDR_GCM_CUSTOM_BINDINGS_JS 25410
+#define IDR_IDENTITY_CUSTOM_BINDINGS_JS 25411
+#define IDR_IMAGE_WRITER_PRIVATE_CUSTOM_BINDINGS_JS 25412
+#define IDR_INPUT_IME_CUSTOM_BINDINGS_JS 25413
+#define IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS 25414
+#define IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS 25415
+#define IDR_OMNIBOX_CUSTOM_BINDINGS_JS 25416
+#define IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS 25417
+#define IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS 25418
+#define IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS 25419
+#define IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS 25420
+#define IDR_TAB_CAPTURE_CUSTOM_BINDINGS_JS 25421
+#define IDR_TTS_CUSTOM_BINDINGS_JS 25422
+#define IDR_TTS_ENGINE_CUSTOM_BINDINGS_JS 25423
+#define IDR_WEBRTC_DESKTOP_CAPTURE_PRIVATE_CUSTOM_BINDINGS_JS 25424
+#define IDR_WEBRTC_LOGGING_PRIVATE_CUSTOM_BINDINGS_JS 25425
+
+// ---------------------------------------------------------------------------
+// From service_worker_resources.h:
+
+#define IDR_SERVICE_WORKER_SERVICEWORKER_INTERNALS_CSS 24870
+#define IDR_SERVICE_WORKER_SERVICEWORKER_INTERNALS_HTML 24871
+#define IDR_SERVICE_WORKER_SERVICEWORKER_INTERNALS_JS 24872
+
+// ---------------------------------------------------------------------------
+// From tracing_proto_resources.h:
+
+#define chrome_track_event_descriptor 44710
+
+// ---------------------------------------------------------------------------
+// From tracing_resources.h:
+
+#define IDR_TRACING_ABOUT_TRACING_HTML 40840
+#define IDR_TRACING_ABOUT_TRACING_JS 40841
+
+// ---------------------------------------------------------------------------
+// From ui_resources.h:
+
+#define IDR_AURA_CURSOR_ALIAS 49430
+#define IDR_AURA_CURSOR_BIG_ALIAS 49431
+#define IDR_AURA_CURSOR_BIG_CELL 49432
+#define IDR_AURA_CURSOR_BIG_COL_RESIZE 49433
+#define IDR_AURA_CURSOR_BIG_CONTEXT_MENU 49434
+#define IDR_AURA_CURSOR_BIG_COPY 49435
+#define IDR_AURA_CURSOR_BIG_CROSSHAIR 49436
+#define IDR_AURA_CURSOR_BIG_EAST_RESIZE 49437
+#define IDR_AURA_CURSOR_BIG_EAST_WEST_NO_RESIZE 49438
+#define IDR_AURA_CURSOR_BIG_EAST_WEST_RESIZE 49439
+#define IDR_AURA_CURSOR_BIG_GRAB 49440
+#define IDR_AURA_CURSOR_BIG_GRABBING 49441
+#define IDR_AURA_CURSOR_BIG_HAND 49442
+#define IDR_AURA_CURSOR_BIG_HELP 49443
+#define IDR_AURA_CURSOR_BIG_IBEAM 49444
+#define IDR_AURA_CURSOR_BIG_MOVE 49445
+#define IDR_AURA_CURSOR_BIG_NORTH_EAST_RESIZE 49446
+#define IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_NO_RESIZE 49447
+#define IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_RESIZE 49448
+#define IDR_AURA_CURSOR_BIG_NORTH_RESIZE 49449
+#define IDR_AURA_CURSOR_BIG_NORTH_SOUTH_NO_RESIZE 49450
+#define IDR_AURA_CURSOR_BIG_NORTH_SOUTH_RESIZE 49451
+#define IDR_AURA_CURSOR_BIG_NORTH_WEST_RESIZE 49452
+#define IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_NO_RESIZE 49453
+#define IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_RESIZE 49454
+#define IDR_AURA_CURSOR_BIG_NO_DROP 49455
+#define IDR_AURA_CURSOR_BIG_PTR 49456
+#define IDR_AURA_CURSOR_BIG_ROW_RESIZE 49457
+#define IDR_AURA_CURSOR_BIG_SOUTH_EAST_RESIZE 49458
+#define IDR_AURA_CURSOR_BIG_SOUTH_RESIZE 49459
+#define IDR_AURA_CURSOR_BIG_SOUTH_WEST_RESIZE 49460
+#define IDR_AURA_CURSOR_BIG_WEST_RESIZE 49461
+#define IDR_AURA_CURSOR_BIG_XTERM_HORIZ 49462
+#define IDR_AURA_CURSOR_BIG_ZOOM_IN 49463
+#define IDR_AURA_CURSOR_BIG_ZOOM_OUT 49464
+#define IDR_AURA_CURSOR_CELL 49465
+#define IDR_AURA_CURSOR_COL_RESIZE 49466
+#define IDR_AURA_CURSOR_CONTEXT_MENU 49467
+#define IDR_AURA_CURSOR_COPY 49468
+#define IDR_AURA_CURSOR_CROSSHAIR 49469
+#define IDR_AURA_CURSOR_EAST_RESIZE 49470
+#define IDR_AURA_CURSOR_EAST_WEST_NO_RESIZE 49471
+#define IDR_AURA_CURSOR_EAST_WEST_RESIZE 49472
+#define IDR_AURA_CURSOR_GRAB 49473
+#define IDR_AURA_CURSOR_GRABBING 49474
+#define IDR_AURA_CURSOR_HAND 49475
+#define IDR_AURA_CURSOR_HELP 49476
+#define IDR_AURA_CURSOR_IBEAM 49477
+#define IDR_AURA_CURSOR_MOVE 49478
+#define IDR_AURA_CURSOR_NORTH_EAST_RESIZE 49479
+#define IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_NO_RESIZE 49480
+#define IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE 49481
+#define IDR_AURA_CURSOR_NORTH_RESIZE 49482
+#define IDR_AURA_CURSOR_NORTH_SOUTH_NO_RESIZE 49483
+#define IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE 49484
+#define IDR_AURA_CURSOR_NORTH_WEST_RESIZE 49485
+#define IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_NO_RESIZE 49486
+#define IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE 49487
+#define IDR_AURA_CURSOR_NO_DROP 49488
+#define IDR_AURA_CURSOR_PTR 49489
+#define IDR_AURA_CURSOR_ROW_RESIZE 49490
+#define IDR_AURA_CURSOR_SOUTH_EAST_RESIZE 49491
+#define IDR_AURA_CURSOR_SOUTH_RESIZE 49492
+#define IDR_AURA_CURSOR_SOUTH_WEST_RESIZE 49493
+#define IDR_AURA_CURSOR_THROBBER 49494
+#define IDR_AURA_CURSOR_WEST_RESIZE 49495
+#define IDR_AURA_CURSOR_XTERM_HORIZ 49496
+#define IDR_AURA_CURSOR_ZOOM_IN 49497
+#define IDR_AURA_CURSOR_ZOOM_OUT 49498
+#define IDR_CLOSE_2 49522
+#define IDR_CLOSE_2_H 49523
+#define IDR_CLOSE_2_P 49524
+#define IDR_CLOSE_DIALOG 49525
+#define IDR_CLOSE_DIALOG_H 49526
+#define IDR_CLOSE_DIALOG_P 49527
+#define IDR_DISABLE 49528
+#define IDR_DISABLE_H 49529
+#define IDR_DISABLE_P 49530
+#define IDR_DEFAULT_FAVICON 49531
+#define IDR_DEFAULT_FAVICON_DARK 477
+#define IDR_DEFAULT_FAVICON_32 49532
+#define IDR_DEFAULT_FAVICON_DARK_32 49533
+#define IDR_DEFAULT_FAVICON_64 49534
+#define IDR_DEFAULT_FAVICON_DARK_64 49535
+#define IDR_FINGERPRINT_COMPLETE_CHECK_DARK 49536
+#define IDR_FINGERPRINT_COMPLETE_CHECK_LIGHT 49537
+#define IDR_FINGERPRINT_ICON_ANIMATION_DARK 49538
+#define IDR_FINGERPRINT_ICON_ANIMATION_LIGHT 49539
+#define IDR_FOLDER_CLOSED 684
+#define IDR_FOLDER_OPEN 49541
+#define IDR_SIGNAL_0_BAR 49542
+#define IDR_SIGNAL_1_BAR 49543
+#define IDR_SIGNAL_2_BAR 49544
+#define IDR_SIGNAL_3_BAR 49545
+#define IDR_SIGNAL_4_BAR 49546
+#define IDR_TEXT_SELECTION_HANDLE_CENTER 49547
+#define IDR_TEXT_SELECTION_HANDLE_LEFT 49548
+#define IDR_TEXT_SELECTION_HANDLE_RIGHT 49549
+#define IDR_TOUCH_DRAG_TIP_COPY 49550
+#define IDR_TOUCH_DRAG_TIP_MOVE 49551
+#define IDR_TOUCH_DRAG_TIP_LINK 49552
+#define IDR_TOUCH_DRAG_TIP_NODROP 49553
+
+// ---------------------------------------------------------------------------
+// From views_resources.h:
+
+#define IDR_APP_TOP_CENTER 50290
+#define IDR_APP_TOP_LEFT 50291
+#define IDR_APP_TOP_RIGHT 50292
+#define IDR_CLOSE 50293
+#define IDR_CLOSE_H 50294
+#define IDR_CLOSE_P 50295
+#define IDR_CONTENT_BOTTOM_CENTER 50296
+#define IDR_CONTENT_BOTTOM_LEFT_CORNER 50297
+#define IDR_CONTENT_BOTTOM_RIGHT_CORNER 50298
+#define IDR_CONTENT_LEFT_SIDE 50299
+#define IDR_CONTENT_RIGHT_SIDE 50300
+#define IDR_FRAME 50301
+#define IDR_FRAME_INACTIVE 50302
+#define IDR_MAXIMIZE 50303
+#define IDR_MAXIMIZE_H 50304
+#define IDR_MAXIMIZE_P 50305
+#define IDR_MINIMIZE 50306
+#define IDR_MINIMIZE_H 50307
+#define IDR_MINIMIZE_P 50308
+#define IDR_RESTORE 50309
+#define IDR_RESTORE_H 50310
+#define IDR_RESTORE_P 50311
+#define IDR_TEXTBUTTON_HOVER_BOTTOM 50312
+#define IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT 50313
+#define IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT 50314
+#define IDR_TEXTBUTTON_HOVER_CENTER 50315
+#define IDR_TEXTBUTTON_HOVER_LEFT 50316
+#define IDR_TEXTBUTTON_HOVER_RIGHT 50317
+#define IDR_TEXTBUTTON_HOVER_TOP 50318
+#define IDR_TEXTBUTTON_HOVER_TOP_LEFT 50319
+#define IDR_TEXTBUTTON_HOVER_TOP_RIGHT 50320
+#define IDR_TEXTBUTTON_PRESSED_BOTTOM 50321
+#define IDR_TEXTBUTTON_PRESSED_BOTTOM_LEFT 50322
+#define IDR_TEXTBUTTON_PRESSED_BOTTOM_RIGHT 50323
+#define IDR_TEXTBUTTON_PRESSED_CENTER 50324
+#define IDR_TEXTBUTTON_PRESSED_LEFT 50325
+#define IDR_TEXTBUTTON_PRESSED_RIGHT 50326
+#define IDR_TEXTBUTTON_PRESSED_TOP 50327
+#define IDR_TEXTBUTTON_PRESSED_TOP_LEFT 50328
+#define IDR_TEXTBUTTON_PRESSED_TOP_RIGHT 50329
+#define IDR_WINDOW_BOTTOM_CENTER 50330
+#define IDR_WINDOW_BOTTOM_LEFT_CORNER 50331
+#define IDR_WINDOW_BOTTOM_RIGHT_CORNER 50332
+#define IDR_WINDOW_LEFT_SIDE 50333
+#define IDR_WINDOW_RIGHT_SIDE 50334
+#define IDR_WINDOW_TOP_CENTER 50335
+#define IDR_WINDOW_TOP_LEFT_CORNER 50336
+#define IDR_WINDOW_TOP_RIGHT_CORNER 50337
+
+// ---------------------------------------------------------------------------
+// From webrtc_internals_resources.h:
+
+#define IDR_WEBRTC_INTERNALS_CANDIDATE_GRID_JS 24970
+#define IDR_WEBRTC_INTERNALS_DATA_SERIES_JS 24971
+#define IDR_WEBRTC_INTERNALS_DUMP_CREATOR_JS 24972
+#define IDR_WEBRTC_INTERNALS_PEER_CONNECTION_UPDATE_TABLE_JS 24973
+#define IDR_WEBRTC_INTERNALS_STATS_GRAPH_HELPER_JS 24974
+#define IDR_WEBRTC_INTERNALS_STATS_HELPER_JS 24975
+#define IDR_WEBRTC_INTERNALS_STATS_RATES_CALCULATOR_JS 24976
+#define IDR_WEBRTC_INTERNALS_STATS_TABLE_JS 24977
+#define IDR_WEBRTC_INTERNALS_TAB_VIEW_JS 24978
+#define IDR_WEBRTC_INTERNALS_TIMELINE_GRAPH_VIEW_JS 24979
+#define IDR_WEBRTC_INTERNALS_USER_MEDIA_TABLE_JS 24980
+#define IDR_WEBRTC_INTERNALS_WEBRTC_INTERNALS_HTML 24981
+#define IDR_WEBRTC_INTERNALS_WEBRTC_INTERNALS_CSS 24982
+#define IDR_WEBRTC_INTERNALS_WEBRTC_INTERNALS_JS 24983
+
+// ---------------------------------------------------------------------------
+// From webui_resources.h:
+
+#define IDR_JSTEMPLATE_JSTEMPLATE_COMPILED_JS 50380
+#define IDR_CR_COMPONENTS_COMMERCE_BROWSER_PROXY_JS 50381
+#define IDR_CR_COMPONENTS_COMMERCE_SHOPPING_SERVICE_MOJOM_WEBUI_JS 50382
+#define IDR_WEBUI_CR_ELEMENTS_CR_TAB_BOX_CR_TAB_BOX_JS 50383
+#define IDR_WEBUI_CR_ELEMENTS_CR_TREE_CR_TREE_JS 50384
+#define IDR_WEBUI_CR_ELEMENTS_CR_TREE_CR_TREE_ITEM_JS 50385
+#define IDR_WEBUI_CR_ELEMENTS_CR_A11Y_ANNOUNCER_CR_A11Y_ANNOUNCER_JS 50386
+#define IDR_WEBUI_CR_ELEMENTS_CR_ACTION_MENU_CR_ACTION_MENU_JS 50387
+#define IDR_WEBUI_CR_ELEMENTS_CR_BUTTON_CR_BUTTON_JS 50388
+#define IDR_WEBUI_CR_ELEMENTS_CR_CHECKBOX_CR_CHECKBOX_JS 50389
+#define IDR_WEBUI_CR_ELEMENTS_CR_CHIP_CR_CHIP_JS 50390
+#define IDR_WEBUI_CR_ELEMENTS_CR_DIALOG_CR_DIALOG_JS 50391
+#define IDR_WEBUI_CR_ELEMENTS_CR_DRAWER_CR_DRAWER_JS 50392
+#define IDR_WEBUI_CR_ELEMENTS_CR_EXPAND_BUTTON_CR_EXPAND_BUTTON_JS 50393
+#define IDR_WEBUI_CR_ELEMENTS_CR_FEEDBACK_BUTTONS_CR_FEEDBACK_BUTTONS_JS 50394
+#define IDR_WEBUI_CR_ELEMENTS_CR_FINGERPRINT_CR_FINGERPRINT_PROGRESS_ARC_JS 50395
+#define IDR_WEBUI_CR_ELEMENTS_CR_GRID_CR_GRID_JS 50396
+#define IDR_WEBUI_CR_ELEMENTS_CR_ICON_BUTTON_CR_ICON_BUTTON_JS 50397
+#define IDR_WEBUI_CR_ELEMENTS_CR_INPUT_CR_INPUT_JS 50398
+#define IDR_WEBUI_CR_ELEMENTS_CR_LINK_ROW_CR_LINK_ROW_JS 50399
+#define IDR_WEBUI_CR_ELEMENTS_CR_LOADING_GRADIENT_CR_LOADING_GRADIENT_JS 50400
+#define IDR_WEBUI_CR_ELEMENTS_CR_LOTTIE_CR_LOTTIE_JS 50401
+#define IDR_WEBUI_CR_ELEMENTS_CR_TEXTAREA_CR_TEXTAREA_JS 50402
+#define IDR_WEBUI_CR_ELEMENTS_CR_PROFILE_AVATAR_SELECTOR_CR_PROFILE_AVATAR_SELECTOR_GRID_JS 50403
+#define IDR_WEBUI_CR_ELEMENTS_CR_PROFILE_AVATAR_SELECTOR_CR_PROFILE_AVATAR_SELECTOR_JS 50404
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_BUTTON_CR_CARD_RADIO_BUTTON_JS 50405
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_BUTTON_CR_RADIO_BUTTON_JS 50406
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_GROUP_CR_RADIO_GROUP_JS 50407
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEARCH_FIELD_CR_SEARCH_FIELD_JS 50408
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEGMENTED_BUTTON_CR_SEGMENTED_BUTTON_JS 50409
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEGMENTED_BUTTON_CR_SEGMENTED_BUTTON_OPTION_JS 50410
+#define IDR_WEBUI_CR_ELEMENTS_CR_SLIDER_CR_SLIDER_JS 50411
+#define IDR_WEBUI_CR_ELEMENTS_CR_TABS_CR_TABS_JS 50412
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOAST_CR_TOAST_MANAGER_JS 50413
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOAST_CR_TOAST_JS 50414
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOGGLE_CR_TOGGLE_JS 50415
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_JS 50416
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_SEARCH_FIELD_JS 50417
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_SELECTION_OVERLAY_JS 50418
+#define IDR_WEBUI_CR_ELEMENTS_CR_URL_LIST_ITEM_CR_URL_LIST_ITEM_JS 50419
+#define IDR_WEBUI_CR_ELEMENTS_CR_VIEW_MANAGER_CR_VIEW_MANAGER_JS 50420
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_POLICY_INDICATOR_JS 50421
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_POLICY_PREF_INDICATOR_JS 50422
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_TOOLTIP_ICON_JS 50423
+#define IDR_WEBUI_CR_ELEMENTS_CR_SPLITTER_CR_SPLITTER_JS 50424
+#define IDR_WEBUI_CR_ELEMENTS_CR_TREE_CR_TREE_BASE_JS 50425
+#define IDR_WEBUI_CR_ELEMENTS_CR_AUTO_IMG_CR_AUTO_IMG_JS 50426
+#define IDR_WEBUI_CR_ELEMENTS_CR_CONTAINER_SHADOW_MIXIN_JS 50427
+#define IDR_WEBUI_CR_ELEMENTS_CR_CONTAINER_SHADOW_MIXIN_LIT_JS 50428
+#define IDR_WEBUI_CR_ELEMENTS_CR_LAZY_RENDER_CR_LAZY_RENDER_JS 50429
+#define IDR_WEBUI_CR_ELEMENTS_CR_MENU_SELECTOR_CR_MENU_SELECTOR_JS 50430
+#define IDR_WEBUI_CR_ELEMENTS_CR_PAPER_RIPPLE_MIXIN_JS 50431
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_BUTTON_CR_RADIO_BUTTON_MIXIN_JS 50432
+#define IDR_WEBUI_CR_ELEMENTS_CR_SCROLLABLE_MIXIN_JS 50433
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEARCH_FIELD_CR_SEARCH_FIELD_MIXIN_JS 50434
+#define IDR_WEBUI_CR_ELEMENTS_FIND_SHORTCUT_MIXIN_JS 50435
+#define IDR_WEBUI_CR_ELEMENTS_FOCUS_ROW_MIXIN_JS 50436
+#define IDR_WEBUI_CR_ELEMENTS_I18N_MIXIN_JS 50437
+#define IDR_WEBUI_CR_ELEMENTS_LIST_PROPERTY_UPDATE_MIXIN_JS 50438
+#define IDR_WEBUI_CR_ELEMENTS_MOUSE_HOVERABLE_MIXIN_JS 50439
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_POLICY_INDICATOR_MIXIN_JS 50440
+#define IDR_WEBUI_CR_ELEMENTS_STORE_CLIENT_STORE_CLIENT_JS 50441
+#define IDR_WEBUI_CR_ELEMENTS_WEB_UI_LISTENER_MIXIN_JS 50442
+#define IDR_WEBUI_CR_ELEMENTS_CR_TAB_BOX_CR_TAB_BOX_HTML_JS 50443
+#define IDR_WEBUI_CR_ELEMENTS_CR_TREE_CR_TREE_HTML_JS 50444
+#define IDR_WEBUI_CR_ELEMENTS_CR_TREE_CR_TREE_ITEM_HTML_JS 50445
+#define IDR_WEBUI_CR_ELEMENTS_CR_A11Y_ANNOUNCER_CR_A11Y_ANNOUNCER_HTML_JS 50446
+#define IDR_WEBUI_CR_ELEMENTS_CR_ACTION_MENU_CR_ACTION_MENU_HTML_JS 50447
+#define IDR_WEBUI_CR_ELEMENTS_CR_BUTTON_CR_BUTTON_HTML_JS 50448
+#define IDR_WEBUI_CR_ELEMENTS_CR_CHECKBOX_CR_CHECKBOX_HTML_JS 50449
+#define IDR_WEBUI_CR_ELEMENTS_CR_CHIP_CR_CHIP_HTML_JS 50450
+#define IDR_WEBUI_CR_ELEMENTS_CR_DIALOG_CR_DIALOG_HTML_JS 50451
+#define IDR_WEBUI_CR_ELEMENTS_CR_DRAWER_CR_DRAWER_HTML_JS 50452
+#define IDR_WEBUI_CR_ELEMENTS_CR_EXPAND_BUTTON_CR_EXPAND_BUTTON_HTML_JS 50453
+#define IDR_WEBUI_CR_ELEMENTS_CR_FEEDBACK_BUTTONS_CR_FEEDBACK_BUTTONS_HTML_JS 50454
+#define IDR_WEBUI_CR_ELEMENTS_CR_FINGERPRINT_CR_FINGERPRINT_PROGRESS_ARC_HTML_JS 50455
+#define IDR_WEBUI_CR_ELEMENTS_CR_GRID_CR_GRID_HTML_JS 50456
+#define IDR_WEBUI_CR_ELEMENTS_CR_ICON_BUTTON_CR_ICON_BUTTON_HTML_JS 50457
+#define IDR_WEBUI_CR_ELEMENTS_CR_INPUT_CR_INPUT_HTML_JS 50458
+#define IDR_WEBUI_CR_ELEMENTS_CR_LINK_ROW_CR_LINK_ROW_HTML_JS 50459
+#define IDR_WEBUI_CR_ELEMENTS_CR_LOADING_GRADIENT_CR_LOADING_GRADIENT_HTML_JS 50460
+#define IDR_WEBUI_CR_ELEMENTS_CR_LOTTIE_CR_LOTTIE_HTML_JS 50461
+#define IDR_WEBUI_CR_ELEMENTS_CR_TEXTAREA_CR_TEXTAREA_HTML_JS 50462
+#define IDR_WEBUI_CR_ELEMENTS_CR_PROFILE_AVATAR_SELECTOR_CR_PROFILE_AVATAR_SELECTOR_GRID_HTML_JS 50463
+#define IDR_WEBUI_CR_ELEMENTS_CR_PROFILE_AVATAR_SELECTOR_CR_PROFILE_AVATAR_SELECTOR_HTML_JS 50464
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_BUTTON_CR_CARD_RADIO_BUTTON_HTML_JS 50465
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_BUTTON_CR_RADIO_BUTTON_HTML_JS 50466
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_GROUP_CR_RADIO_GROUP_HTML_JS 50467
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEARCH_FIELD_CR_SEARCH_FIELD_HTML_JS 50468
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEGMENTED_BUTTON_CR_SEGMENTED_BUTTON_HTML_JS 50469
+#define IDR_WEBUI_CR_ELEMENTS_CR_SEGMENTED_BUTTON_CR_SEGMENTED_BUTTON_OPTION_HTML_JS 50470
+#define IDR_WEBUI_CR_ELEMENTS_CR_SLIDER_CR_SLIDER_HTML_JS 50471
+#define IDR_WEBUI_CR_ELEMENTS_CR_TABS_CR_TABS_HTML_JS 50472
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOAST_CR_TOAST_MANAGER_HTML_JS 50473
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOAST_CR_TOAST_HTML_JS 50474
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOGGLE_CR_TOGGLE_HTML_JS 50475
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_HTML_JS 50476
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_SEARCH_FIELD_HTML_JS 50477
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_SELECTION_OVERLAY_HTML_JS 50478
+#define IDR_WEBUI_CR_ELEMENTS_CR_URL_LIST_ITEM_CR_URL_LIST_ITEM_HTML_JS 50479
+#define IDR_WEBUI_CR_ELEMENTS_CR_VIEW_MANAGER_CR_VIEW_MANAGER_HTML_JS 50480
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_POLICY_INDICATOR_HTML_JS 50481
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_POLICY_PREF_INDICATOR_HTML_JS 50482
+#define IDR_WEBUI_CR_ELEMENTS_POLICY_CR_TOOLTIP_ICON_HTML_JS 50483
+#define IDR_WEBUI_CR_ELEMENTS_CR_FINGERPRINT_CR_FINGERPRINT_ICONS_HTML_JS 50484
+#define IDR_WEBUI_CR_ELEMENTS_ICONS_HTML_JS 50485
+#define IDR_WEBUI_CR_ELEMENTS_MWB_SHARED_ICONS_HTML_JS 50486
+#define IDR_WEBUI_CR_ELEMENTS_ACTION_LINK_CSS_JS 50487
+#define IDR_WEBUI_CR_ELEMENTS_CR_ACTIONABLE_ROW_STYLE_CSS_JS 50488
+#define IDR_WEBUI_CR_ELEMENTS_CR_ACTIONABLE_ROW_STYLE_LIT_CSS_JS 50489
+#define IDR_WEBUI_CR_ELEMENTS_CR_HIDDEN_STYLE_CSS_JS 50490
+#define IDR_WEBUI_CR_ELEMENTS_CR_HIDDEN_STYLE_LIT_CSS_JS 50491
+#define IDR_WEBUI_CR_ELEMENTS_CR_ICONS_CSS_JS 50492
+#define IDR_WEBUI_CR_ELEMENTS_CR_ICONS_LIT_CSS_JS 50493
+#define IDR_WEBUI_CR_ELEMENTS_CR_NAV_MENU_ITEM_STYLE_CSS_JS 50494
+#define IDR_WEBUI_CR_ELEMENTS_CR_PAGE_HOST_STYLE_CSS_JS 50495
+#define IDR_WEBUI_CR_ELEMENTS_CR_RADIO_BUTTON_CR_RADIO_BUTTON_STYLE_CSS_JS 50496
+#define IDR_WEBUI_CR_ELEMENTS_CR_SCREEN_READER_ONLY_CSS_JS 50497
+#define IDR_WEBUI_CR_ELEMENTS_CR_SHARED_STYLE_CSS_JS 50498
+#define IDR_WEBUI_CR_ELEMENTS_CR_SHARED_VARS_CSS_JS 50499
+#define IDR_WEBUI_CR_ELEMENTS_MD_SELECT_CSS_JS 50500
+#define IDR_WEBUI_CR_ELEMENTS_MWB_ELEMENT_SHARED_STYLE_CSS_JS 50501
+#define IDR_WEBUI_CR_ELEMENTS_MWB_SHARED_STYLE_CSS_JS 50502
+#define IDR_WEBUI_CR_ELEMENTS_MWB_SHARED_VARS_CSS_JS 50503
+#define IDR_WEBUI_CR_ELEMENTS_SEARCH_HIGHLIGHT_STYLE_CSS_JS 50504
+#define IDR_WEBUI_CR_ELEMENTS_CR_ACTION_MENU_CR_ACTION_MENU_CSS_JS 50505
+#define IDR_WEBUI_CR_ELEMENTS_CR_DIALOG_CR_DIALOG_CSS_JS 50506
+#define IDR_WEBUI_CR_ELEMENTS_CR_DRAWER_CR_DRAWER_CSS_JS 50507
+#define IDR_WEBUI_CR_ELEMENTS_CR_EXPAND_BUTTON_CR_EXPAND_BUTTON_CSS_JS 50508
+#define IDR_WEBUI_CR_ELEMENTS_CR_INPUT_CR_INPUT_STYLE_CSS_JS 50509
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_CSS_JS 50510
+#define IDR_WEBUI_CR_ELEMENTS_CR_TOOLBAR_CR_TOOLBAR_SELECTION_OVERLAY_CSS_JS 50511
+#define IDR_WEBUI_CR_ELEMENTS_CR_VIEW_MANAGER_CR_VIEW_MANAGER_CSS_JS 50512
+#define IDR_WEBUI_CSS_ACTION_LINK_CSS 50513
+#define IDR_WEBUI_CSS_CHROME_SHARED_CSS 50514
+#define IDR_WEBUI_CSS_SPINNER_CSS 50515
+#define IDR_WEBUI_CSS_TEXT_DEFAULTS_CSS 50516
+#define IDR_WEBUI_CSS_TEXT_DEFAULTS_MD_CSS 699
+#define IDR_WEBUI_CSS_THROBBER_CSS 50517
+#define IDR_WEBUI_CSS_WIDGETS_CSS 50518
+#define IDR_WEBUI_CSS_MD_COLORS_CSS 50519
+#define IDR_WEBUI_IMAGES_ADD_SVG 50520
+#define IDR_WEBUI_IMAGES_APPS_HOME_EMPTY_238X170_SVG 50521
+#define IDR_WEBUI_IMAGES_CANCEL_RED_SVG 50522
+#define IDR_WEBUI_IMAGES_CHECKBOX_BLACK_PNG 50523
+#define IDR_WEBUI_IMAGES_CHECKBOX_WHITE_PNG 50524
+#define IDR_WEBUI_IMAGES_CHECK_CIRCLE_GREEN_SVG 50525
+#define IDR_WEBUI_IMAGES_CHECK_PNG 50526
+#define IDR_WEBUI_IMAGES_DARK_ICON_SEARCH_SVG 50527
+#define IDR_WEBUI_IMAGES_DISABLED_SELECT_PNG 50528
+#define IDR_WEBUI_IMAGES_DROP_DOWN_ARROW_BLACK_SVG 50529
+#define IDR_WEBUI_IMAGES_DROP_DOWN_ARROW_GRAY_SVG 50530
+#define IDR_WEBUI_IMAGES_DROP_DOWN_ARROW_WHITE_SVG 50531
+#define IDR_WEBUI_IMAGES_ERROR_SVG 50532
+#define IDR_WEBUI_IMAGES_ERROR_YELLOW900_SVG 50533
+#define IDR_WEBUI_IMAGES_EXTENSION_SVG 50534
+#define IDR_WEBUI_IMAGES_ICON_ARROW_DROPDOWN_SVG 50535
+#define IDR_WEBUI_IMAGES_ICON_CANCEL_SVG 50536
+#define IDR_WEBUI_IMAGES_ICON_COPY_CONTENT_SVG 50537
+#define IDR_WEBUI_IMAGES_ICON_FILE_PNG 50538
+#define IDR_WEBUI_IMAGES_ICON_TAB_SVG 50539
+#define IDR_WEBUI_IMAGES_ICON_REFRESH_SVG 50540
+#define IDR_WEBUI_IMAGES_ICON_SEARCH_SVG 717
+#define IDR_WEBUI_IMAGES_OPEN_IN_NEW_SVG 50541
+#define IDR_WEBUI_IMAGES_SELECT_PNG 50542
+#define IDR_WEBUI_IMAGES_THROBBER_MEDIUM_SVG 50543
+#define IDR_WEBUI_IMAGES_THROBBER_SMALL_DARK_SVG 50544
+#define IDR_WEBUI_IMAGES_THROBBER_SMALL_SVG 50545
+#define IDR_WEBUI_IMAGES_TREE_TRIANGLE_SVG 50546
+#define IDR_WEBUI_IMAGES_2X_CHECKBOX_BLACK_PNG 50547
+#define IDR_WEBUI_IMAGES_2X_CHECKBOX_WHITE_PNG 50548
+#define IDR_WEBUI_IMAGES_2X_CHECK_PNG 50549
+#define IDR_WEBUI_IMAGES_2X_DISABLED_SELECT_PNG 50550
+#define IDR_WEBUI_IMAGES_2X_SELECT_PNG 50551
+#define IDR_WEBUI_IMAGES_ARROW_DOWN_SVG 50552
+#define IDR_WEBUI_IMAGES_ARROW_RIGHT_SVG 50553
+#define IDR_WEBUI_IMAGES_BUSINESS_SVG 50554
+#define IDR_WEBUI_IMAGES_CHROME_LOGO_DARK_SVG 50555
+#define IDR_WEBUI_IMAGES_DARK_ARROW_DOWN_SVG 50556
+#define IDR_WEBUI_IMAGES_ICON_ARROW_BACK_SVG 50557
+#define IDR_WEBUI_IMAGES_ICON_ARROW_DROP_DOWN_CR23_SVG 50558
+#define IDR_WEBUI_IMAGES_ICON_ARROW_DROP_UP_CR23_SVG 50559
+#define IDR_WEBUI_IMAGES_ICON_BOOKMARK_SVG 50560
+#define IDR_WEBUI_IMAGES_ICON_CLEAR_SVG 50561
+#define IDR_WEBUI_IMAGES_ICON_CLOCK_SVG 50562
+#define IDR_WEBUI_IMAGES_ICON_DELETE_GRAY_SVG 50563
+#define IDR_WEBUI_IMAGES_ICON_EDIT_SVG 50564
+#define IDR_WEBUI_IMAGES_ICON_EXPAND_LESS_SVG 50565
+#define IDR_WEBUI_IMAGES_ICON_EXPAND_MORE_SVG 50566
+#define IDR_WEBUI_IMAGES_ICON_FILETYPE_GENERIC_SVG 50567
+#define IDR_WEBUI_IMAGES_ICON_FOLDER_OPEN_SVG 50568
+#define IDR_WEBUI_IMAGES_ICON_HISTORY_SVG 50569
+#define IDR_WEBUI_IMAGES_ICON_JOURNEYS_SVG 50570
+#define IDR_WEBUI_IMAGES_ICON_MORE_VERT_SVG 50571
+#define IDR_WEBUI_IMAGES_ICON_PICTURE_DELETE_SVG 50572
+#define IDR_WEBUI_IMAGES_ICON_SETTINGS_SVG 50573
+#define IDR_WEBUI_IMAGES_ICON_VISIBILITY_OFF_SVG 50574
+#define IDR_WEBUI_IMAGES_ICON_VISIBILITY_SVG 50575
+#define IDR_WEBUI_JS_ACTION_LINK_JS 50576
+#define IDR_WEBUI_JS_ASSERT_JS 50577
+#define IDR_WEBUI_JS_COLOR_UTILS_JS 50578
+#define IDR_WEBUI_JS_CR_JS 50579
+#define IDR_WEBUI_JS_CUSTOM_ELEMENT_JS 50580
+#define IDR_WEBUI_JS_DRAG_WRAPPER_JS 50581
+#define IDR_WEBUI_JS_EVENT_TRACKER_JS 50582
+#define IDR_WEBUI_JS_FOCUS_GRID_JS 50583
+#define IDR_WEBUI_JS_FOCUS_OUTLINE_MANAGER_JS 50584
+#define IDR_WEBUI_JS_FOCUS_ROW_JS 50585
+#define IDR_WEBUI_JS_ICON_JS 50586
+#define IDR_WEBUI_JS_KEYBOARD_SHORTCUT_LIST_JS 50587
+#define IDR_WEBUI_JS_LOAD_TIME_DATA_DEPRECATED_JS 50588
+#define IDR_WEBUI_JS_LOAD_TIME_DATA_JS 705
+#define IDR_WEBUI_JS_METRICS_REPORTER_BROWSER_PROXY_JS 50589
+#define IDR_WEBUI_JS_METRICS_REPORTER_METRICS_REPORTER_JS 50590
+#define IDR_WEBUI_JS_MOJO_TYPE_UTIL_JS 50591
+#define IDR_WEBUI_JS_OPEN_WINDOW_PROXY_JS 50592
+#define IDR_WEBUI_JS_PARSE_HTML_SUBSET_JS 50593
+#define IDR_WEBUI_JS_PLATFORM_JS 50594
+#define IDR_WEBUI_JS_PLURAL_STRING_PROXY_JS 50595
+#define IDR_WEBUI_JS_PROMISE_RESOLVER_JS 50596
+#define IDR_WEBUI_JS_SEARCH_HIGHLIGHT_UTILS_JS 50597
+#define IDR_WEBUI_JS_STATIC_TYPES_JS 50598
+#define IDR_WEBUI_JS_STORE_JS 50599
+#define IDR_WEBUI_JS_TEST_LOADER_JS 50600
+#define IDR_WEBUI_JS_TEST_LOADER_UTIL_JS 50601
+#define IDR_WEBUI_JS_UTIL_JS 50602
+#define IDR_WEBUI_JS_FOCUS_WITHOUT_INK_JS 50603
+#define IDR_WEBUI_JS_BROWSER_COMMAND_BROWSER_COMMAND_PROXY_JS 50604
+#define IDR_WEBUI_JS_METRICS_REPORTER_MOJOM_WEBUI_JS 50605
+#define IDR_WEBUI_JS_BROWSER_COMMAND_MOJOM_WEBUI_JS 50606
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_JS_BINDINGS_JS 706
+#define IDR_WEBUI_MOJO_SKIA_PUBLIC_MOJOM_SKCOLOR_MOJOM_WEBUI_JS 714
+#define IDR_WEBUI_MOJO_SKIA_PUBLIC_MOJOM_BITMAP_MOJOM_WEBUI_JS 50607
+#define IDR_WEBUI_MOJO_SKIA_PUBLIC_MOJOM_IMAGE_INFO_MOJOM_WEBUI_JS 50608
+#define IDR_WEBUI_MOJO_UI_BASE_MOJOM_THEMES_MOJOM_WEBUI_JS 50609
+#define IDR_WEBUI_MOJO_UI_BASE_MOJOM_WINDOW_OPEN_DISPOSITION_MOJOM_WEBUI_JS 50610
+#define IDR_WEBUI_MOJO_UI_GFX_IMAGE_MOJOM_IMAGE_MOJOM_WEBUI_JS 50611
+#define IDR_WEBUI_MOJO_UI_GFX_RANGE_MOJOM_RANGE_MOJOM_WEBUI_JS 50612
+#define IDR_WEBUI_MOJO_UI_GFX_GEOMETRY_MOJOM_GEOMETRY_MOJOM_WEBUI_JS 50613
+#define IDR_WEBUI_MOJO_URL_MOJOM_ORIGIN_MOJOM_WEBUI_JS 50614
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_BIG_BUFFER_MOJOM_WEBUI_JS 715
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_FILE_MOJOM_WEBUI_JS 50615
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_FILE_PATH_MOJOM_WEBUI_JS 50616
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_INT128_MOJOM_WEBUI_JS 50617
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_PROCESS_ID_MOJOM_WEBUI_JS 50618
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_READ_ONLY_BUFFER_MOJOM_WEBUI_JS 50619
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_READ_ONLY_FILE_MOJOM_WEBUI_JS 50620
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_SAFE_BASE_NAME_MOJOM_WEBUI_JS 50621
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_STRING16_MOJOM_WEBUI_JS 710
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_TEXT_DIRECTION_MOJOM_WEBUI_JS 716
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_TIME_MOJOM_WEBUI_JS 707
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_TOKEN_MOJOM_WEBUI_JS 50622
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_UNGUESSABLE_TOKEN_MOJOM_WEBUI_JS 50623
+#define IDR_WEBUI_MOJO_MOJO_PUBLIC_MOJOM_BASE_VALUES_MOJOM_WEBUI_JS 50624
+#define IDR_WEBUI_MOJO_URL_MOJOM_URL_MOJOM_WEBUI_JS 711
+#define IDR_D3_D3_MIN_JS 50625
+#define IDR_LIT_V3_0_LIT_ROLLUP_JS 50626
+#define IDR_POLYMER_3_0_POLYMER_POLYMER_BUNDLED_MIN_JS 704
+#define IDR_POLYMER_3_0_IRON_A11Y_ANNOUNCER_IRON_A11Y_ANNOUNCER_JS 50627
+#define IDR_POLYMER_3_0_IRON_A11Y_KEYS_BEHAVIOR_IRON_A11Y_KEYS_BEHAVIOR_JS 50628
+#define IDR_POLYMER_3_0_IRON_A11Y_KEYS_IRON_A11Y_KEYS_JS 50629
+#define IDR_POLYMER_3_0_IRON_BEHAVIORS_IRON_CONTROL_STATE_JS 50630
+#define IDR_POLYMER_3_0_IRON_COLLAPSE_IRON_COLLAPSE_JS 50631
+#define IDR_POLYMER_3_0_IRON_FIT_BEHAVIOR_IRON_FIT_BEHAVIOR_JS 50632
+#define IDR_POLYMER_3_0_IRON_FLEX_LAYOUT_IRON_FLEX_LAYOUT_CLASSES_JS 50633
+#define IDR_POLYMER_3_0_IRON_ICON_IRON_ICON_JS 50634
+#define IDR_POLYMER_3_0_IRON_ICONSET_SVG_IRON_ICONSET_SVG_JS 50635
+#define IDR_POLYMER_3_0_IRON_LIST_IRON_LIST_JS 50636
+#define IDR_POLYMER_3_0_IRON_LOCATION_IRON_LOCATION_JS 50637
+#define IDR_POLYMER_3_0_IRON_LOCATION_IRON_QUERY_PARAMS_JS 50638
+#define IDR_POLYMER_3_0_IRON_MEDIA_QUERY_IRON_MEDIA_QUERY_JS 50639
+#define IDR_POLYMER_3_0_IRON_META_IRON_META_JS 50640
+#define IDR_POLYMER_3_0_IRON_PAGES_IRON_PAGES_JS 50641
+#define IDR_POLYMER_3_0_IRON_RANGE_BEHAVIOR_IRON_RANGE_BEHAVIOR_JS 50642
+#define IDR_POLYMER_3_0_IRON_RESIZABLE_BEHAVIOR_IRON_RESIZABLE_BEHAVIOR_JS 50643
+#define IDR_POLYMER_3_0_IRON_SCROLL_TARGET_BEHAVIOR_IRON_SCROLL_TARGET_BEHAVIOR_JS 50644
+#define IDR_POLYMER_3_0_IRON_SCROLL_THRESHOLD_IRON_SCROLL_THRESHOLD_JS 50645
+#define IDR_POLYMER_3_0_IRON_SELECTOR_IRON_MULTI_SELECTABLE_JS 50646
+#define IDR_POLYMER_3_0_IRON_SELECTOR_IRON_SELECTABLE_JS 50647
+#define IDR_POLYMER_3_0_IRON_SELECTOR_IRON_SELECTION_JS 50648
+#define IDR_POLYMER_3_0_IRON_SELECTOR_IRON_SELECTOR_JS 50649
+#define IDR_POLYMER_3_0_IRON_TEST_HELPERS_MOCK_INTERACTIONS_JS 50650
+#define IDR_POLYMER_3_0_PAPER_BEHAVIORS_PAPER_RIPPLE_MIXIN_JS 50651
+#define IDR_POLYMER_3_0_PAPER_PROGRESS_PAPER_PROGRESS_JS 50652
+#define IDR_POLYMER_3_0_PAPER_RIPPLE_PAPER_RIPPLE_JS 50653
+#define IDR_POLYMER_3_0_PAPER_SPINNER_PAPER_SPINNER_BEHAVIOR_JS 50654
+#define IDR_POLYMER_3_0_PAPER_SPINNER_PAPER_SPINNER_LITE_JS 50655
+#define IDR_POLYMER_3_0_PAPER_SPINNER_PAPER_SPINNER_STYLES_JS 50656
+#define IDR_POLYMER_3_0_PAPER_STYLES_COLOR_JS 50657
+#define IDR_POLYMER_3_0_PAPER_STYLES_SHADOW_JS 50658
+#define IDR_POLYMER_3_0_PAPER_TOOLTIP_PAPER_TOOLTIP_JS 50659
+#define IDR_CR_COMPONENTS_APP_MANAGEMENT_CONSTANTS_JS 50660
+#define IDR_CR_COMPONENTS_APP_MANAGEMENT_PERMISSION_CONSTANTS_JS 50661
+#define IDR_CR_COMPONENTS_APP_MANAGEMENT_PERMISSION_UTIL_JS 50662
+#define IDR_CR_COMPONENTS_APP_MANAGEMENT_BROWSER_PROXY_JS 50663
+#define IDR_CR_COMPONENTS_APP_MANAGEMENT_UTIL_JS 50664
+#define IDR_CR_COMPONENTS_APP_MANAGEMENT_APP_MANAGEMENT_MOJOM_WEBUI_JS 50665
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_CHECK_MARK_WRAPPER_JS 50666
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_COLOR_JS 50667
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_COLOR_PICKER_JS 50668
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_HUE_SLIDER_DIALOG_JS 50669
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_BROWSER_PROXY_JS 50670
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_COLOR_UTILS_JS 50671
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_CHECK_MARK_WRAPPER_HTML_JS 50672
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_COLOR_HTML_JS 50673
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_COLOR_PICKER_HTML_JS 50674
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_HUE_SLIDER_DIALOG_HTML_JS 50675
+#define IDR_CR_COMPONENTS_THEME_COLOR_PICKER_THEME_COLOR_PICKER_MOJOM_WEBUI_JS 50676
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_DARK_MODE_SVG 50677
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_LIGHT_MODE_SVG 50678
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_SYSTEM_MODE_SVG 50679
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_CUSTOMIZE_COLOR_SCHEME_MODE_JS 50680
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_BROWSER_PROXY_JS 50681
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_CUSTOMIZE_COLOR_SCHEME_MODE_HTML_JS 50682
+#define IDR_CR_COMPONENTS_CUSTOMIZE_COLOR_SCHEME_MODE_CUSTOMIZE_COLOR_SCHEME_MODE_MOJOM_WEBUI_JS 50683
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_COLORIZE_SVG 50684
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_BRUSH_SVG 50685
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_CUSTOMIZE_THEMES_JS 50686
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_THEME_ICON_JS 50687
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_BROWSER_PROXY_JS 50688
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_CUSTOMIZE_THEMES_HTML_JS 50689
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_THEME_ICON_HTML_JS 50690
+#define IDR_CR_COMPONENTS_CUSTOMIZE_THEMES_CUSTOMIZE_THEMES_MOJOM_WEBUI_JS 722
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_JS 50691
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_MIXIN_JS 50692
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_PROXY_JS 50693
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_CONTROLLER_JS 50694
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_HTML_JS 50695
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_ICONS_HTML_JS 50696
+#define IDR_CR_COMPONENTS_HELP_BUBBLE_HELP_BUBBLE_MOJOM_WEBUI_JS 50697
+#define IDR_CR_COMPONENTS_LOCALIZED_LINK_LOCALIZED_LINK_JS 50698
+#define IDR_CR_COMPONENTS_LOCALIZED_LINK_LOCALIZED_LINK_HTML_JS 50699
+#define IDR_CR_COMPONENTS_MANAGED_DIALOG_MANAGED_DIALOG_JS 50700
+#define IDR_CR_COMPONENTS_MANAGED_DIALOG_MANAGED_DIALOG_HTML_JS 50701
+#define IDR_CR_COMPONENTS_MANAGED_FOOTNOTE_MANAGED_FOOTNOTE_JS 50702
+#define IDR_CR_COMPONENTS_MANAGED_FOOTNOTE_MANAGED_FOOTNOTE_HTML_JS 50703
+#define IDR_CR_COMPONENTS_MOST_VISITED_MOST_VISITED_JS 50704
+#define IDR_CR_COMPONENTS_MOST_VISITED_BROWSER_PROXY_JS 50705
+#define IDR_CR_COMPONENTS_MOST_VISITED_WINDOW_PROXY_JS 50706
+#define IDR_CR_COMPONENTS_MOST_VISITED_MOST_VISITED_HTML_JS 50707
+#define IDR_CR_COMPONENTS_MOST_VISITED_MOST_VISITED_MOJOM_WEBUI_JS 713
+#define IDR_SETTINGS_PREFS_PREFS_MIXIN_JS 50708
+#define IDR_SETTINGS_PREFS_PREFS_JS 50709
+#define IDR_SETTINGS_PREFS_PREFS_TYPES_JS 50710
+#define IDR_SETTINGS_PREFS_PREF_UTIL_JS 50711
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_HIDE_SOURCE_GM_GREY_24DP_SVG 50712
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_CLUSTER_JS 50713
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_CLUSTERS_JS 50714
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_CLUSTER_MENU_JS 50715
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_HORIZONTAL_CAROUSEL_JS 50716
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_PAGE_FAVICON_JS 50717
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_SEARCH_QUERY_JS 50718
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_URL_VISIT_JS 50719
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_BROWSER_PROXY_JS 50720
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_METRICS_PROXY_JS 50721
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_UTILS_JS 50722
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_CLUSTER_HTML_JS 50723
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_CLUSTERS_HTML_JS 50724
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_CLUSTER_MENU_HTML_JS 50725
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_HORIZONTAL_CAROUSEL_HTML_JS 50726
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_PAGE_FAVICON_HTML_JS 50727
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_SEARCH_QUERY_HTML_JS 50728
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_URL_VISIT_HTML_JS 50729
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_HISTORY_CLUSTERS_SHARED_STYLE_CSS_JS 50730
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_SHARED_VARS_CSS_JS 50731
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_HISTORY_CLUSTER_TYPES_MOJOM_WEBUI_JS 50732
+#define IDR_CR_COMPONENTS_HISTORY_CLUSTERS_HISTORY_CLUSTERS_MOJOM_WEBUI_JS 50733
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_ACTION_JS 50734
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_DROPDOWN_JS 50735
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_ICON_JS 50736
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_MATCH_JS 50737
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_BROWSER_PROXY_JS 50738
+#define IDR_CR_COMPONENTS_OMNIBOX_UTILS_JS 50739
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_ACTION_HTML_JS 50740
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_DROPDOWN_HTML_JS 50741
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_ICON_HTML_JS 50742
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_MATCH_HTML_JS 50743
+#define IDR_CR_COMPONENTS_OMNIBOX_REALBOX_DROPDOWN_SHARED_STYLE_CSS_JS 50744
+#define IDR_CR_COMPONENTS_OMNIBOX_OMNIBOX_MOJOM_WEBUI_JS 702
+#define IDR_OMNIBOX_ICONS_BOOKMARK_CR23_SVG 50745
+#define IDR_OMNIBOX_ICONS_CALCULATOR_CR23_SVG 50746
+#define IDR_OMNIBOX_ICONS_CALCULATOR_SVG 50747
+#define IDR_OMNIBOX_ICONS_CALENDAR_SVG 50748
+#define IDR_OMNIBOX_ICONS_CHROME_PRODUCT_CR23_SVG 50749
+#define IDR_OMNIBOX_ICONS_CHROME_PRODUCT_SVG 50750
+#define IDR_OMNIBOX_ICONS_CLOCK_CR23_SVG 50751
+#define IDR_OMNIBOX_ICONS_CURRENCY_CR23_SVG 50752
+#define IDR_OMNIBOX_ICONS_CURRENCY_SVG 50753
+#define IDR_OMNIBOX_ICONS_DEFAULT_SVG 50754
+#define IDR_OMNIBOX_ICONS_DEFINITION_CR23_SVG 50755
+#define IDR_OMNIBOX_ICONS_DEFINITION_SVG 50756
+#define IDR_OMNIBOX_ICONS_DINO_CR23_SVG 50757
+#define IDR_OMNIBOX_ICONS_DINO_SVG 50758
+#define IDR_OMNIBOX_ICONS_DRIVE_DOCS_SVG 50759
+#define IDR_OMNIBOX_ICONS_DRIVE_FOLDER_SVG 50760
+#define IDR_OMNIBOX_ICONS_DRIVE_FORM_SVG 50761
+#define IDR_OMNIBOX_ICONS_DRIVE_IMAGE_SVG 50762
+#define IDR_OMNIBOX_ICONS_DRIVE_LOGO_SVG 50763
+#define IDR_OMNIBOX_ICONS_DRIVE_PDF_SVG 50764
+#define IDR_OMNIBOX_ICONS_DRIVE_SHEETS_SVG 50765
+#define IDR_OMNIBOX_ICONS_DRIVE_SLIDES_SVG 50766
+#define IDR_OMNIBOX_ICONS_DRIVE_VIDEO_SVG 50767
+#define IDR_OMNIBOX_ICONS_EXTENSION_APP_SVG 50768
+#define IDR_OMNIBOX_ICONS_FINANCE_CR23_SVG 50769
+#define IDR_OMNIBOX_ICONS_FINANCE_SVG 50770
+#define IDR_OMNIBOX_ICONS_HISTORY_CR23_SVG 50771
+#define IDR_OMNIBOX_ICONS_INCOGNITO_CR23_SVG 50772
+#define IDR_OMNIBOX_ICONS_INCOGNITO_SVG 50773
+#define IDR_OMNIBOX_ICONS_JOURNEYS_CR23_SVG 50774
+#define IDR_OMNIBOX_ICONS_JOURNEYS_SVG 50775
+#define IDR_OMNIBOX_ICONS_MAC_SHARE_CR23_SVG 50776
+#define IDR_OMNIBOX_ICONS_MAC_SHARE_SVG 50777
+#define IDR_OMNIBOX_ICONS_NOTE_SVG 50778
+#define IDR_OMNIBOX_ICONS_PAGE_CR23_SVG 50779
+#define IDR_OMNIBOX_ICONS_PAGE_SVG 50780
+#define IDR_OMNIBOX_ICONS_SEARCH_CR23_SVG 50781
+#define IDR_OMNIBOX_ICONS_SHARE_CR23_SVG 50782
+#define IDR_OMNIBOX_ICONS_SHARE_SVG 50783
+#define IDR_OMNIBOX_ICONS_SITES_SVG 50784
+#define IDR_OMNIBOX_ICONS_SUNRISE_CR23_SVG 50785
+#define IDR_OMNIBOX_ICONS_SUNRISE_SVG 50786
+#define IDR_OMNIBOX_ICONS_TAB_CR23_SVG 50787
+#define IDR_OMNIBOX_ICONS_TAB_SVG 50788
+#define IDR_OMNIBOX_ICONS_TRANSLATION_CR23_SVG 50789
+#define IDR_OMNIBOX_ICONS_TRANSLATION_SVG 50790
+#define IDR_OMNIBOX_ICONS_TRENDING_UP_CR23_SVG 50791
+#define IDR_OMNIBOX_ICONS_TRENDING_UP_SVG 50792
+#define IDR_OMNIBOX_ICONS_WHEN_IS_CR23_SVG 50793
+#define IDR_OMNIBOX_ICONS_WHEN_IS_SVG 50794
+#define IDR_OMNIBOX_ICONS_WIN_SHARE_CR23_SVG 50795
+#define IDR_OMNIBOX_ICONS_WIN_SHARE_SVG 50796
+#define IDR_LOTTIE_LOTTIE_WORKER_MIN_JS 50797
+#define IDR_CR_COMPONENTS_COLOR_CHANGE_LISTENER_BROWSER_PROXY_JS 50798
+#define IDR_CR_COMPONENTS_COLOR_CHANGE_LISTENER_COLORS_CSS_UPDATER_JS 50799
+#define IDR_CR_COMPONENTS_COLOR_CHANGE_LISTENER_COLOR_CHANGE_LISTENER_MOJOM_WEBUI_JS 709
+#define IDR_CR_COMPONENTS_PAGE_IMAGE_SERVICE_BROWSER_PROXY_JS 50800
+#define IDR_CR_COMPONENTS_PAGE_IMAGE_SERVICE_PAGE_IMAGE_SERVICE_MOJOM_WEBUI_JS 727
+#define IDR_WEBUI_TEST_LOADER_HTML 50801
+
+#endif  // CEF_INCLUDE_CEF_PACK_RESOURCES_H_
diff --git a/src/include/cef_pack_strings.h b/src/include/cef_pack_strings.h
new file mode 100644
index 000000000..5ea719bbc
--- /dev/null
+++ b/src/include/cef_pack_strings.h
@@ -0,0 +1,11495 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file is generated by the make_pack_header.py tool.
+//
+
+#ifndef CEF_INCLUDE_CEF_PACK_STRINGS_H_
+#define CEF_INCLUDE_CEF_PACK_STRINGS_H_
+#pragma once
+
+// ---------------------------------------------------------------------------
+// From blink_accessibility_strings.h:
+
+#define IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION 45320
+#define IDS_AX_IMAGE_ELIGIBLE_FOR_ANNOTATION 45323
+#define IDS_AX_IMAGE_ANNOTATION_PENDING 45324
+#define IDS_AX_IMAGE_ANNOTATION_ADULT 45325
+#define IDS_AX_IMAGE_ANNOTATION_NO_DESCRIPTION 45326
+#define IDS_AX_IMAGE_ANNOTATION_OCR_CONTEXT 45327
+#define IDS_AX_IMAGE_ANNOTATION_DESCRIPTION_CONTEXT 45328
+#define IDS_AX_IMAGE_ANNOTATION_ICON_PLUS 45329
+#define IDS_AX_IMAGE_ANNOTATION_ICON_ARROW_BACKWARD 45330
+#define IDS_AX_IMAGE_ANNOTATION_ICON_ARROW_FORWARD 45331
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CALL 45332
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CHAT 45333
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CHECK 45334
+#define IDS_AX_IMAGE_ANNOTATION_ICON_X 45335
+#define IDS_AX_IMAGE_ANNOTATION_ICON_DELETE 45336
+#define IDS_AX_IMAGE_ANNOTATION_ICON_EDIT 45337
+#define IDS_AX_IMAGE_ANNOTATION_ICON_EMOJI 45338
+#define IDS_AX_IMAGE_ANNOTATION_ICON_END_CALL 45339
+#define IDS_AX_IMAGE_ANNOTATION_ICON_V_DOWNWARD 45340
+#define IDS_AX_IMAGE_ANNOTATION_ICON_HEART 45341
+#define IDS_AX_IMAGE_ANNOTATION_ICON_HOME 45342
+#define IDS_AX_IMAGE_ANNOTATION_ICON_INFO 45343
+#define IDS_AX_IMAGE_ANNOTATION_ICON_LAUNCH_APPS 45344
+#define IDS_AX_IMAGE_ANNOTATION_ICON_THUMBS_UP 45345
+#define IDS_AX_IMAGE_ANNOTATION_ICON_THREE_BARS 45346
+#define IDS_AX_IMAGE_ANNOTATION_ICON_THREE_DOTS 45347
+#define IDS_AX_IMAGE_ANNOTATION_ICON_NOTIFICATIONS 45348
+#define IDS_AX_IMAGE_ANNOTATION_ICON_PAUSE 45349
+#define IDS_AX_IMAGE_ANNOTATION_ICON_PLAY 45350
+#define IDS_AX_IMAGE_ANNOTATION_ICON_REFRESH 45351
+#define IDS_AX_IMAGE_ANNOTATION_ICON_MAGNIFYING_GLASS 45352
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SEND 45353
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SETTINGS 45354
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SHARE 45355
+#define IDS_AX_IMAGE_ANNOTATION_ICON_STAR 45356
+#define IDS_AX_IMAGE_ANNOTATION_ICON_TAKE_PHOTO 45357
+#define IDS_AX_IMAGE_ANNOTATION_ICON_TIME 45358
+#define IDS_AX_IMAGE_ANNOTATION_ICON_VIDEOCAM 45359
+#define IDS_AX_IMAGE_ANNOTATION_ICON_EXPAND 45360
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CONTRACT 45361
+#define IDS_AX_IMAGE_ANNOTATION_ICON_GOOGLE 45362
+#define IDS_AX_IMAGE_ANNOTATION_ICON_TWITTER 45363
+#define IDS_AX_IMAGE_ANNOTATION_ICON_FACEBOOK 45364
+#define IDS_AX_IMAGE_ANNOTATION_ICON_ASSISTANT 45365
+#define IDS_AX_IMAGE_ANNOTATION_ICON_WEATHER 45366
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SHOPPING_CART 45367
+#define IDS_AX_IMAGE_ANNOTATION_ICON_UPLOAD 45368
+#define IDS_AX_IMAGE_ANNOTATION_ICON_QUESTION 45369
+#define IDS_AX_IMAGE_ANNOTATION_ICON_MIC 45370
+#define IDS_AX_IMAGE_ANNOTATION_ICON_MIC_MUTE 45371
+#define IDS_AX_IMAGE_ANNOTATION_ICON_GALLERY 45372
+#define IDS_AX_IMAGE_ANNOTATION_ICON_COMPASS 45373
+#define IDS_AX_IMAGE_ANNOTATION_ICON_PEOPLE 45374
+#define IDS_AX_IMAGE_ANNOTATION_ICON_ARROW_UPWARD 45375
+#define IDS_AX_IMAGE_ANNOTATION_ICON_ENVELOPE 45376
+#define IDS_AX_IMAGE_ANNOTATION_ICON_EMOJI_FACE 45377
+#define IDS_AX_IMAGE_ANNOTATION_ICON_PAPERCLIP 45378
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CAST 45379
+#define IDS_AX_IMAGE_ANNOTATION_ICON_VOLUME_UP 45380
+#define IDS_AX_IMAGE_ANNOTATION_ICON_VOLUME_DOWN 45381
+#define IDS_AX_IMAGE_ANNOTATION_ICON_VOLUME_STATE 45382
+#define IDS_AX_IMAGE_ANNOTATION_ICON_VOLUME_MUTE 45383
+#define IDS_AX_IMAGE_ANNOTATION_ICON_STOP 45384
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SHOPPING_BAG 45385
+#define IDS_AX_IMAGE_ANNOTATION_ICON_LIST 45386
+#define IDS_AX_IMAGE_ANNOTATION_ICON_LOCATION 45387
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CALENDAR 45388
+#define IDS_AX_IMAGE_ANNOTATION_ICON_THUMBS_DOWN 45389
+#define IDS_AX_IMAGE_ANNOTATION_ICON_HEADSET 45390
+#define IDS_AX_IMAGE_ANNOTATION_ICON_REDO 45391
+#define IDS_AX_IMAGE_ANNOTATION_ICON_UNDO 45392
+#define IDS_AX_IMAGE_ANNOTATION_ICON_DOWNLOAD 45393
+#define IDS_AX_IMAGE_ANNOTATION_ICON_ARROW_DOWNWARD 45394
+#define IDS_AX_IMAGE_ANNOTATION_ICON_V_UPWARD 45395
+#define IDS_AX_IMAGE_ANNOTATION_ICON_V_FORWARD 45396
+#define IDS_AX_IMAGE_ANNOTATION_ICON_V_BACKWARD 45397
+#define IDS_AX_IMAGE_ANNOTATION_ICON_HISTORY 45398
+#define IDS_AX_IMAGE_ANNOTATION_ICON_PERSON 45399
+#define IDS_AX_IMAGE_ANNOTATION_ICON_HAPPY_FACE 45400
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SAD_FACE 45401
+#define IDS_AX_IMAGE_ANNOTATION_ICON_MOON 45402
+#define IDS_AX_IMAGE_ANNOTATION_ICON_CLOUD 45403
+#define IDS_AX_IMAGE_ANNOTATION_ICON_SUN 45404
+
+// ---------------------------------------------------------------------------
+// From blink_strings.h:
+
+#define IDS_DETAILS_WITHOUT_SUMMARY_LABEL 45420
+#define IDS_FORM_CALENDAR_CLEAR 45421
+#define IDS_FORM_CALENDAR_TODAY 45422
+#define IDS_FORM_SUBMIT_LABEL 45423
+#define IDS_FORM_INPUT_ALT 45424
+#define IDS_FORM_RESET_LABEL 45425
+#define IDS_FORM_FILE_BUTTON_LABEL 45426
+#define IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL 45427
+#define IDS_FORM_FILE_NO_FILE_LABEL 45428
+#define IDS_FORM_FILE_MULTIPLE_UPLOAD 45429
+#define IDS_FORM_OTHER_COLOR_LABEL 45430
+#define IDS_FORM_OTHER_DATE_LABEL 45431
+#define IDS_FORM_OTHER_MONTH_LABEL 45432
+#define IDS_FORM_OTHER_WEEK_LABEL 45433
+#define IDS_FORM_PLACEHOLDER_FOR_DAY_OF_MONTH_FIELD 45434
+#define IDS_FORM_PLACEHOLDER_FOR_MONTH_FIELD 45435
+#define IDS_FORM_PLACEHOLDER_FOR_YEAR_FIELD 45436
+#define IDS_FORM_SELECT_MENU_LIST_TEXT 45437
+#define IDS_FORM_THIS_MONTH_LABEL 45438
+#define IDS_FORM_THIS_WEEK_LABEL 45439
+#define IDS_FORM_WEEK_NUMBER_LABEL 45440
+#define IDS_AX_CALENDAR_SHOW_DATE_PICKER 45441
+#define IDS_AX_CALENDAR_SHOW_DATE_TIME_LOCAL_PICKER 45442
+#define IDS_AX_CALENDAR_SHOW_MONTH_PICKER 45443
+#define IDS_AX_CALENDAR_SHOW_TIME_PICKER 45444
+#define IDS_AX_CALENDAR_SHOW_WEEK_PICKER 45445
+#define IDS_AX_CALENDAR_SHOW_MONTH_SELECTOR 45446
+#define IDS_AX_CALENDAR_SHOW_NEXT_MONTH 45447
+#define IDS_AX_CALENDAR_SHOW_PREVIOUS_MONTH 45448
+#define IDS_AX_CALENDAR_WEEK_DESCRIPTION 45449
+#define IDS_AX_COLOR_EDIT_BLUE 45450
+#define IDS_AX_COLOR_EDIT_GREEN 45451
+#define IDS_AX_COLOR_EDIT_HEXADECIMAL 45452
+#define IDS_AX_COLOR_EDIT_HUE 45453
+#define IDS_AX_COLOR_EDIT_LIGHTNESS 45454
+#define IDS_AX_COLOR_EDIT_RED 45455
+#define IDS_AX_COLOR_EDIT_SATURATION 45456
+#define IDS_AX_COLOR_EYEDROPPER 45457
+#define IDS_AX_COLOR_FORMAT_TOGGLER 45458
+#define IDS_AX_COLOR_HUE_SLIDER 45459
+#define IDS_AX_COLOR_WELL 45460
+#define IDS_AX_COLOR_WELL_ROLEDESCRIPTION 45461
+#define IDS_SYSTEM_COLOR_CHOOSER 45462
+#define IDS_AX_AM_PM_FIELD_TEXT 45482
+#define IDS_AX_DAY_OF_MONTH_FIELD_TEXT 45483
+#define IDS_AX_HOUR_FIELD_TEXT 45484
+#define IDS_AX_MEDIA_DEFAULT 45485
+#define IDS_AX_MEDIA_AUDIO_ELEMENT 45486
+#define IDS_AX_MEDIA_VIDEO_ELEMENT 45487
+#define IDS_AX_MEDIA_MUTE_BUTTON 45488
+#define IDS_AX_MEDIA_UNMUTE_BUTTON 45489
+#define IDS_AX_MEDIA_PLAY_BUTTON 45490
+#define IDS_AX_MEDIA_PAUSE_BUTTON 45491
+#define IDS_AX_MEDIA_CURRENT_TIME_DISPLAY 45492
+#define IDS_AX_MEDIA_TIME_REMAINING_DISPLAY 45493
+#define IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON 45494
+#define IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON 45495
+#define IDS_AX_MEDIA_DISPLAY_CUT_OUT_FULL_SCREEN_BUTTON 45496
+#define IDS_AX_MEDIA_ENTER_PICTURE_IN_PICTURE_BUTTON 45497
+#define IDS_AX_MEDIA_EXIT_PICTURE_IN_PICTURE_BUTTON 45498
+#define IDS_AX_MEDIA_LOADING_PANEL 45499
+#define IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_MENU_BUTTON 45500
+#define IDS_AX_MEDIA_SHOW_AUDIO_DESCRIPTIONS_MENU_BUTTON 45501
+#define IDS_AX_MEDIA_SHOW_PLAYBACK_SPEED_MENU_BUTTON 45502
+#define IDS_AX_MEDIA_BACK_TO_OPTIONS_BUTTON 45503
+#define IDS_AX_MEDIA_CAST_OFF_BUTTON 45504
+#define IDS_AX_MEDIA_CAST_ON_BUTTON 45505
+#define IDS_AX_MEDIA_DOWNLOAD_BUTTON 45506
+#define IDS_AX_MEDIA_OVERFLOW_BUTTON 45507
+#define IDS_AX_MEDIA_AUDIO_ELEMENT_HELP 45508
+#define IDS_AX_MEDIA_VIDEO_ELEMENT_HELP 45509
+#define IDS_AX_MEDIA_AUDIO_SLIDER_HELP 45510
+#define IDS_AX_MEDIA_VIDEO_SLIDER_HELP 45511
+#define IDS_AX_MEDIA_VOLUME_SLIDER_HELP 45512
+#define IDS_AX_MEDIA_CURRENT_TIME_DISPLAY_HELP 45513
+#define IDS_AX_MEDIA_TIME_REMAINING_DISPLAY_HELP 45514
+#define IDS_AX_MEDIA_OVERFLOW_BUTTON_HELP 45515
+#define IDS_AX_MILLISECOND_FIELD_TEXT 45516
+#define IDS_AX_MINUTE_FIELD_TEXT 45517
+#define IDS_AX_MONTH_FIELD_TEXT 45518
+#define IDS_AX_SECOND_FIELD_TEXT 45519
+#define IDS_AX_WEEK_OF_YEAR_FIELD_TEXT 45520
+#define IDS_AX_YEAR_FIELD_TEXT 45521
+#define IDS_AX_OBJECT_SELECTED 45522
+#define IDS_AX_OBJECT_NOT_SELECTED 45523
+#define IDS_DEBUGGER_PAUSED_IN_ANOTHER_TAB 45524
+#define IDS_VIEW_SOURCE_LINE_WRAP 45525
+#define IDS_FORM_INPUT_WEEK_TEMPLATE 45526
+#define IDS_FORM_VALIDATION_VALUE_MISSING_MULTIPLE_FILE 45527
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH 45528
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_EMPTY 45529
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_EMPTY_DOMAIN 45530
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_EMPTY_LOCAL 45531
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_INVALID_DOMAIN 45532
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_INVALID_DOTS 45533
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_INVALID_LOCAL 45534
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL_NO_AT_SIGN 45535
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_MULTIPLE_EMAIL 45536
+#define IDS_FORM_VALIDATION_VALUE_NOT_EQUAL 45537
+#define IDS_FORM_VALIDATION_VALUE_NOT_EQUAL_DATETIME 45538
+#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW 45539
+#define IDS_FORM_VALIDATION_RANGE_UNDERFLOW_DATETIME 45540
+#define IDS_FORM_VALIDATION_RANGE_OVERFLOW 45541
+#define IDS_FORM_VALIDATION_RANGE_OVERFLOW_DATETIME 45542
+#define IDS_FORM_VALIDATION_REVERSED_RANGE_OUT_OF_RANGE_TIME 45543
+#define IDS_FORM_VALIDATION_RANGE_REVERSED 45544
+#define IDS_FORM_VALIDATION_RANGE_INVALID_DATETIME 45545
+#define IDS_FORM_VALIDATION_BAD_INPUT_DATETIME 45546
+#define IDS_FORM_VALIDATION_BAD_INPUT_NUMBER 45547
+#define IDS_PRETTY_PRINT_JSON 45548
+#define IDS_PERMISSION_REQUEST_CAMERA 45549
+#define IDS_PERMISSION_REQUEST_MICROPHONE 45550
+#define IDS_PERMISSION_REQUEST_CAMERA_MICROPHONE 45551
+#define IDS_PERMISSION_REQUEST_GEOLOCATION 45552
+#define IDS_PERMISSION_REQUEST_CAMERA_ALLOWED 45553
+#define IDS_PERMISSION_REQUEST_MICROPHONE_ALLOWED 45554
+#define IDS_PERMISSION_REQUEST_CAMERA_MICROPHONE_ALLOWED 45555
+#define IDS_PERMISSION_REQUEST_GEOLOCATION_ALLOWED 45556
+#define IDS_STRONG_PASSWORD_LABEL 45557
+#define IDS_FORM_VALIDATION_VALUE_MISSING 45558
+#define IDS_FORM_VALIDATION_VALUE_MISSING_CHECKBOX 45559
+#define IDS_FORM_VALIDATION_VALUE_MISSING_FILE 45560
+#define IDS_FORM_VALIDATION_VALUE_MISSING_RADIO 45561
+#define IDS_FORM_VALIDATION_VALUE_MISSING_SELECT 45562
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_EMAIL 45563
+#define IDS_FORM_VALIDATION_TYPE_MISMATCH_URL 45564
+#define IDS_FORM_VALIDATION_PATTERN_MISMATCH 45565
+#define IDS_FORM_VALIDATION_STEP_MISMATCH 45566
+#define IDS_FORM_VALIDATION_STEP_MISMATCH_CLOSE_TO_LIMIT 45567
+#define IDS_FORM_VALIDATION_TOO_LONG 45568
+#define IDS_FORM_VALIDATION_TOO_SHORT 45569
+#define IDS_FORM_VALIDATION_TOO_SHORT_PLURAL 45570
+#define IDS_MEDIA_SESSION_FILE_SOURCE 45571
+#define IDS_MEDIA_OVERFLOW_MENU_CLOSED_CAPTIONS 45572
+#define IDS_MEDIA_OVERFLOW_MENU_CLOSED_CAPTIONS_SUBMENU_TITLE 45573
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED 45574
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_SUBMENU_TITLE 45575
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_0_25X_TITLE 45576
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_0_5X_TITLE 45577
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_0_75X_TITLE 45578
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_NORMAL_TITLE 45579
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_1_25X_TITLE 45580
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_1_5X_TITLE 45581
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_1_75X_TITLE 45582
+#define IDS_MEDIA_OVERFLOW_MENU_PLAYBACK_SPEED_2X_TITLE 45583
+#define IDS_MEDIA_OVERFLOW_MENU_CAST 45584
+#define IDS_MEDIA_OVERFLOW_MENU_ENTER_FULLSCREEN 45585
+#define IDS_MEDIA_OVERFLOW_MENU_EXIT_FULLSCREEN 45586
+#define IDS_MEDIA_OVERFLOW_MENU_MUTE 45587
+#define IDS_MEDIA_OVERFLOW_MENU_UNMUTE 45588
+#define IDS_MEDIA_OVERFLOW_MENU_PLAY 45589
+#define IDS_MEDIA_OVERFLOW_MENU_PAUSE 45590
+#define IDS_MEDIA_OVERFLOW_MENU_DOWNLOAD 45591
+#define IDS_MEDIA_OVERFLOW_MENU_ENTER_PICTURE_IN_PICTURE 45592
+#define IDS_MEDIA_OVERFLOW_MENU_EXIT_PICTURE_IN_PICTURE 45593
+#define IDS_MEDIA_PICTURE_IN_PICTURE_INTERSTITIAL_TEXT 45594
+#define IDS_MEDIA_REMOTING_CAST_TEXT 45595
+#define IDS_MEDIA_REMOTING_CAST_TO_UNKNOWN_DEVICE_TEXT 45596
+#define IDS_MEDIA_REMOTING_STOP_TEXT 45597
+#define IDS_MEDIA_REMOTING_STOP_BY_PLAYBACK_QUALITY_TEXT 45598
+#define IDS_MEDIA_REMOTING_STOP_BY_ERROR_TEXT 45599
+#define IDS_MEDIA_SCRUBBING_MESSAGE_TEXT 45600
+#define IDS_MEDIA_TRACKS_NO_LABEL 45601
+#define IDS_MEDIA_TRACKS_OFF 45602
+#define IDS_PLUGIN_INITIALIZATION_ERROR 45603
+#define IDS_MEDIA_PLAYBACK_ERROR 45604
+#define IDS_UNITS_KIBIBYTES 45605
+#define IDS_UNITS_MEBIBYTES 45606
+#define IDS_UNITS_GIBIBYTES 45607
+#define IDS_UNITS_TEBIBYTES 45608
+#define IDS_UNITS_PEBIBYTES 45609
+#define CONTENT_INVALID_TRUE 45610
+#define CONTENT_INVALID_SPELLING 45611
+#define CONTENT_INVALID_GRAMMAR 45612
+
+// ---------------------------------------------------------------------------
+// From branded_strings.h:
+
+#define IDS_RELAUNCH_CONFIRMATION_DIALOG_TITLE 800
+#define IDS_SETTINGS_ABOUT_PROGRAM 801
+#define IDS_SETTINGS_GET_HELP_USING_CHROME 802
+#define IDS_SETTINGS_UPGRADE_UPDATING 803
+#define IDS_SETTINGS_UPGRADE_UPDATING_PERCENT 804
+#define IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH 805
+#define IDS_SETTINGS_UPGRADE_UP_TO_DATE 806
+#define IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED 810
+#define IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE 811
+#define IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT 812
+#define IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS 813
+#define IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT 814
+#define IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT 815
+#define IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC 816
+#define IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL 817
+#define IDS_SETTINGS_SIGNED_OUT_USER_LABEL 818
+#define IDS_SETTINGS_SIGNED_OUT_USER_HAS_COMPROMISED_CREDENTIALS_LABEL 819
+#define IDS_SETTINGS_WEAK_PASSWORDS_DESCRIPTION_GENERATION 820
+#define IDS_SETTINGS_COMPROMISED_EDIT_DISCLAIMER_DESCRIPTION 821
+#define IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT 822
+#define IDS_SETTINGS_DEFAULT_BROWSER_MAKE_DEFAULT 823
+#define IDS_SETTINGS_DEFAULT_BROWSER_ERROR 824
+#define IDS_SETTINGS_DEFAULT_BROWSER_SECONDARY 825
+#define IDS_SETTINGS_PRELOAD_PAGES_STANDARD_PRELOADING_WHEN_ON_BULLET_TWO 826
+#define IDS_SETTINGS_PRELOAD_PAGES_EXTENDED_PRELOADING_WHEN_ON_BULLET_TWO 827
+#define IDS_SETTINGS_PRELOAD_PAGES_EXTENDED_PRELOADING_THINGS_TO_CONSIDER_BULLET_TWO 828
+#define IDS_SETTINGS_PRELOAD_PAGES_THINGS_TO_CONSIDER_BULLET_ONE 829
+#define IDS_SETTINGS_SPELLING_PREF_DESC 830
+#define IDS_SETTINGS_RESTART_TO_APPLY_CHANGES 831
+#define IDS_SETTINGS_SIGNIN_ALLOWED 832
+#define IDS_SETTINGS_SIGNIN_ALLOWED_DESC 833
+#define IDS_SETTINGS_SITE_SETTINGS_PDFS_BLOCKED 834
+#define IDS_SETTINGS_SITE_DATA_PAGE_CLEAR_ON_EXIT_RADIO_SUBLABEL 835
+#define IDS_SETTINGS_SITE_DATA_PAGE_CLEAR_ON_EXIT_WITH_EXCEPTION_RADIO_SUBLABEL 836
+#define IDS_SETTINGS_SITE_DATA_PAGE_DELETE_ON_EXIT_EXCEPTIONS_SUB_HEADING 837
+#define IDS_SETTINGS_PRIVACY_GUIDE_PROMO_BODY 838
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_STANDARD_PROTECTION_FEATURE_DESCRIPTION2 839
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_STANDARD_PROTECTION_PRIVACY_DESCRIPTION1 840
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_PRIVACY_SANDBOX_SUB_LABEL 841
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_WAA_SUB_LABEL 842
+#define IDS_SETTINGS_PRIVACY_GUIDE_MSBB_FEATURE_DESCRIPTION3 843
+#define IDS_SETTINGS_PRIVACY_GUIDE_MSBB_PRIVACY_DESCRIPTION2 844
+#define IDS_SETTINGS_PRIVACY_GUIDE_SEARCH_SUGGESTIONS_PRIVACY_DESCRIPTION1 845
+#define IDS_SETTINGS_PRIVACY_GUIDE_SEARCH_SUGGESTIONS_PRIVACY_DESCRIPTION2 846
+#define IDS_SETTINGS_PRIVACY_GUIDE_SEARCH_SUGGESTIONS_PRIVACY_DESCRIPTION3 847
+#define IDS_SETTINGS_PRIVACY_SANDBOX_LEARN_MORE_DIALOG_TOPICS_TITLE 848
+#define IDS_SETTINGS_PRIVACY_SANDBOX_LEARN_MORE_DIALOG_TOPICS_DATA_TYPES 849
+#define IDS_SETTINGS_PRIVACY_SANDBOX_LEARN_MORE_DIALOG_TOPICS_DATA_USAGE 850
+#define IDS_SETTINGS_PRIVACY_SANDBOX_LEARN_MORE_DIALOG_TOPICS_DATA_MANAGEMENT 851
+#define IDS_SETTINGS_PRIVACY_SANDBOX_LEARN_MORE_DIALOG_FLEDGE_DATA_TYPES 852
+#define IDS_SETTINGS_PRIVACY_SANDBOX_LEARN_MORE_DIALOG_FLEDGE_DATA_USAGE 853
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_DESCRIPTION 854
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_DESCRIPTION_TRIALS_OFF 855
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_DESCRIPTION_LISTS_EMPTY 856
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_TOPICS_TITLE 857
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_TOPICS_LEARN_MORE_1 858
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_TOPICS_LEARN_MORE_2 859
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_TOPICS_LEARN_MORE_3 860
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_PERSONALIZATION_DIALOG_FLEDGE_LEARN_MORE_1 861
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_MEASUREMENT_DIALOG_DESCRIPTION 862
+#define IDS_SETTINGS_PRIVACY_SANDBOX_AD_MEASUREMENT_DIALOG_DESCRIPTION_TRIALS_OFF 863
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE 864
+#define IDS_SETTINGS_SAFETY_CHECK_UPDATES_FAILED_OFFLINE 865
+#define IDS_SETTINGS_SAFETY_CHECK_UPDATES_FAILED 866
+#define IDS_SETTINGS_SAFETY_CHECK_UPDATES_UNKNOWN 867
+#define IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_SIGNED_OUT 868
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED 869
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_SETTING_SUBLABEL 870
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_TWO 871
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO 872
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_WHEN_ON_BULLET_ONE 873
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_LEARN_MORE_LABEL 874
+#define IDS_SETTINGS_SECURE_DNS_DESCRIPTION 875
+#define IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR 876
+#define IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_PLURAL 877
+#define IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITHOUT_COUNTS 878
+#define IDS_SETTINGS_CUSTOMIZE_YOUR_CHROME_PROFILE 879
+#define IDS_SETTING_NAME_YOUR_PROFILE 880
+#define IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY_WITH_ACCOUNT 881
+#define IDS_SETTINGS_SYNC_DATA_ENCRYPTED_TEXT 883
+#define IDS_SETTINGS_SYNC_DISCONNECT_TITLE 884
+#define IDS_SETTINGS_SUGGEST_PREF_DESC 885
+#define IDS_SETTINGS_DRIVE_SUGGEST_PREF_DESC 886
+#define IDS_SETTINGS_SYNC_SIGN_IN_PROMPT_WITH_NO_ACCOUNT 887
+#define IDS_SETTINGS_PAGE_CONTENT_THINGS_TO_CONSIDER_BULLET_TWO 888
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING_DESCRIPTION 889
+#define IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_SETTING_DESCRIPTION 890
+#define IDS_SETTINGS_PERFORMANCE_PRELOAD_TOGGLE_SUMMARY 891
+#define IDS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE 892
+#define IDS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE 893
+#define IDS_SETTINGS_SYSTEM_BACKGROUND_APPS_LABEL 894
+#define IDS_SETTINGS_RESET_PROFILE_FEEDBACK 895
+#define IDS_SETTINGS_CHROME_CERTIFICATES 896
+#define IDS_SETTINGS_CHROME_CERTIFICATES_DESCRIPTION 897
+#define IDS_SETTINGS_SAFETY_HUB_ENTRY_POINT_NOTHING_TO_DO 898
+#define IDS_SETTINGS_SAFETY_HUB_ENTRY_POINT_HEADER 899
+#define IDS_SETTINGS_SAFETY_HUB_EMPTY_STATE_MODULE_SUBHEADER 900
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_MODULE_UPPERCASE_NAME 901
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_MODULE_LOWERCASE_NAME 902
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_SUBHEADER_NO_PASSWORDS 903
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_MODULE_HEADER 904
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_DATA_HEADER 905
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_DATA_SUBHEADER 906
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_INCOGNITO_HEADER 907
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_SAFE_BROWSING_SUBHEADER 908
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_CARD_HEADER_RESTART 909
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_CARD_HEADER_UPDATED 910
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_NAVIGATION_ARIA_LABEL 911
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_RELAUNCH_ARIA_LABEL 912
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_SUBTITLE 913
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_ENABLED_FULL_SUBLABEL 914
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_ENABLED_INCOGNITO_SUBLABEL 915
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_DISABLED_SUBLABEL 916
+#define IDS_PRODUCT_NAME 101
+#define IDS_SHORT_PRODUCT_NAME 103
+#define IDS_SXS_SHORTCUT_NAME 917
+#define IDS_SHORTCUT_NAME_BETA 918
+#define IDS_SHORTCUT_NAME_DEV 919
+#define IDS_PRODUCT_DESCRIPTION 920
+#define IDS_WELCOME_TO_CHROME 921
+#define IDS_PRODUCT_LOGO_ENTERPRISE_ALT_TEXT 926
+#define IDS_SHORTCUT_NEW_WINDOW 927
+#define IDS_TASK_MANAGER_TITLE 928
+#define IDS_SESSION_CRASHED_VIEW_UMA_OPTIN 929
+#define IDS_BROWSER_WINDOW_TITLE_FORMAT 475
+#define IDS_CAPTIVE_PORTAL_BROWSER_WINDOW_TITLE_FORMAT 930
+#define IDS_ACCESSIBLE_BROWSER_WINDOW_TITLE_FORMAT 694
+#define IDS_ACCESSIBLE_BETA_BROWSER_WINDOW_TITLE_FORMAT 931
+#define IDS_ACCESSIBLE_DEV_BROWSER_WINDOW_TITLE_FORMAT 932
+#define IDS_ACCESSIBLE_CANARY_BROWSER_WINDOW_TITLE_FORMAT 933
+#define IDS_ABOUT_VERSION_COMPANY_NAME 934
+#define IDS_ABOUT_VERSION_COPYRIGHT 935
+#define IDS_ABOUT_TERMS_OF_SERVICE 939
+#define IDS_WIN_XP_VISTA_OBSOLETE 941
+#define IDS_WIN_7_OBSOLETE 942
+#define IDS_WIN_8_OBSOLETE 943
+#define IDS_WIN_8_1_OBSOLETE 944
+#define IDS_ACCNAME_APP 437
+#define IDS_BROWSER_HUNGBROWSER_MESSAGE 946
+#define IDS_BROWSER_SHARING_CLICK_TO_CALL_DIALOG_HELP_TEXT_NO_DEVICES 947
+#define IDS_BROWSER_SHARING_CLICK_TO_CALL_DIALOG_HELP_TEXT_NO_DEVICES_ORIGIN 948
+#define IDS_BROWSER_SHARING_ERROR_DIALOG_TEXT_DEVICE_NOT_FOUND 949
+#define IDS_UNINSTALL_CLOSE_APP 950
+#define IDS_UNINSTALL_VERIFY 951
+#define IDS_UNINSTALL_CHROME 952
+#define IDS_FR_CUSTOMIZE_DEFAULT_BROWSER 953
+#define IDS_STATUS_TRAY_KEEP_CHROME_RUNNING_IN_BACKGROUND 954
+#define IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY 955
+#define IDS_PROFILE_TOO_NEW_ERROR 957
+#define IDS_PREFERENCES_UNREADABLE_ERROR 958
+#define IDS_PREFERENCES_CORRUPT_ERROR 959
+#define IDS_CRASH_RECOVERY_TITLE 383
+#define IDS_CRASH_RECOVERY_CONTENT 384
+#define IDS_PASSWORD_GENERATION_PROMPT 961
+#define IDS_PASSWORD_MANAGER_ONBOARDING_DETAILS_C 962
+#define IDS_PASSWORD_MANAGER_TITLE_BRAND 963
+#define IDS_PASSWORD_BUBBLES_PASSWORD_MANAGER_LINK_TEXT_SAVING_ON_DEVICE 964
+#define IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SIGNED_OUT_MESSAGE_DESCRIPTION 965
+#define IDS_PASSWORD_MANAGER_UPDATE_PASSWORD_SIGNED_OUT_MESSAGE_DESCRIPTION 966
+#define IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT 968
+#define IDS_PASSWORDS_PAGE_COPY_AUTHENTICATION_PROMPT 969
+#define IDS_PASSWORDS_PAGE_EDIT_AUTHENTICATION_PROMPT 970
+#define IDS_PASSWORDS_PAGE_EXPORT_AUTHENTICATION_PROMPT 971
+#define IDS_PASSWORDS_PAGE_IMPORT_AUTHENTICATION_PROMPT 972
+#define IDS_INSTALL_HIGHER_VERSION 973
+#define IDS_INSTALL_FAILED 974
+#define IDS_SAME_VERSION_REPAIR_FAILED 975
+#define IDS_SETUP_PATCH_FAILED 976
+#define IDS_INSTALL_OS_NOT_SUPPORTED 977
+#define IDS_INSTALL_OS_ERROR 978
+#define IDS_INSTALL_SINGLETON_ACQUISITION_FAILED 979
+#define IDS_INSTALL_TEMP_DIR_FAILED 980
+#define IDS_INSTALL_UNCOMPRESSION_FAILED 981
+#define IDS_INSTALL_INVALID_ARCHIVE 982
+#define IDS_INSTALL_INSUFFICIENT_RIGHTS 983
+#define IDS_INSTALL_EXISTING_VERSION_LAUNCHED 984
+#define IDS_SHORTCUT_TOOLTIP 985
+#define IDS_UNINSTALL_DELETE_PROFILE 986
+#define IDS_UNINSTALL_SET_DEFAULT_BROWSER 987
+#define IDS_UNINSTALL_BUTTON_TEXT 988
+#define IDS_DEFAULT_BROWSER_INFOBAR_TEXT 989
+#define IDS_TRY_TOAST_HEADING 990
+#define IDS_TRY_TOAST_HEADING2 991
+#define IDS_TRY_TOAST_HEADING3 992
+#define IDS_TRY_TOAST_HEADING4 993
+#define IDS_TRY_TOAST_HEADING_SKYPE 994
+#define IDS_DOWNLOAD_BUBBLE_DANGEROUS_FILE 995
+#define IDS_DOWNLOAD_BUBBLE_MALICIOUS_URL_BLOCKED 996
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_UNKNOWN_SOURCE 997
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_MALWARE 998
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_BLOCKED_LEARN_MORE_LINK 999
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_DEEP_SCANNING_PROMPT_LOCAL_DECRYPTION 1000
+#define IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING 1001
+#define IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS 1002
+#define IDS_PROMPT_MALICIOUS_DOWNLOAD_URL 1003
+#define IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT 1004
+#define IDS_BLOCK_REASON_DANGEROUS_DOWNLOAD 1005
+#define IDS_BLOCK_REASON_UNWANTED_DOWNLOAD 1006
+#define IDS_BLOCK_REASON_PROMPT_FOR_SCANNING 1007
+#define IDS_BLOCK_DOWNLOAD_REASON_DANGEROUS_FILETYPE 1008
+#define IDS_BLOCK_DOWNLOAD_REASON_DANGEROUS 1009
+#define IDS_BLOCK_DOWNLOAD_REASON_UNCOMMON 1010
+#define IDS_BLOCK_DOWNLOAD_REASON_POTENTIALLY_UNWANTED 1011
+#define IDS_BLOCK_DOWNLOAD_REASON_INSECURE 1012
+#define IDS_BLOCK_DOWNLOAD_REASON_UNVERIFIED_NO_SAFE_BROWSING 1013
+#define IDS_DOWNLOAD_WARNING_BYPASS_DIALOG_LEARN_MORE_LINK 1014
+#define IDS_ABANDON_DOWNLOAD_DIALOG_BROWSER_MESSAGE 1015
+#define IDS_MISSING_GOOGLE_API_KEYS 1017
+#define IDS_EXTENSION_INSTALLED_HEADING 1018
+#define IDS_EXTENSION_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX 1019
+#define IDS_EXTENSION_ALERT_ITEM_BLOCKLISTED_MALWARE 1020
+#define IDS_EXTENSIONS_ALERT_ITEM_BLOCKLISTED_MALWARE_TITLE 1021
+#define IDS_SAFETY_CHECK_EXTENSIONS_MALWARE 1022
+#define IDS_SAFETY_CHECK_EXTENSIONS_POLICY_VIOLATION 1023
+#define IDS_SAFETY_CHECK_EXTENSIONS_UNPUBLISHED 1024
+#define IDS_EXTENSIONS_SAFETY_CHECK_PRIMARY_LABEL 1025
+#define IDS_EXTENSIONS_ITEM_SHOW_ACCESS_REQUESTS_IN_TOOLBAR 1026
+#define IDS_EXTENSIONS_INCOGNITO_WARNING 1027
+#define IDS_EXTENSIONS_UNINSTALL 1028
+#define IDS_EXTENSIONS_SHORTCUT_SCOPE_IN_CHROME 1029
+#define IDS_EXTENSIONS_MULTIPLE_UNSUPPORTED_DISABLED_BODY 1030
+#define IDS_EXTENSIONS_SINGLE_UNSUPPORTED_DISABLED_BODY 1031
+#define IDS_APPMENU_TOOLTIP 438
+#define IDS_APPMENU_TOOLTIP_UPDATE_AVAILABLE 1032
+#define IDS_APPMENU_TOOLTIP_ALERT 1033
+#define IDS_OPEN_IN_CHROME 1034
+#define IDS_ABOUT 1035
+#define IDS_RELAUNCH_TO_UPDATE 1036
+#define IDS_RELAUNCH_TO_UPDATE_ALT 1037
+#define IDS_VIEW_PASSWORDS 1041
+#define IDS_CHROME_SIGNIN_TITLE 1042
+#define IDS_PROFILES_DICE_SYNC_PROMO 1043
+#define IDS_SYNC_WRONG_EMAIL 1044
+#define IDS_SYNC_USED_PROFILE_ERROR 1045
+#define IDS_ENTERPRISE_SIGNIN_TITLE 1046
+#define IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION 1047
+#define IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION 1048
+#define IDS_ENTERPRISE_SIGNIN_WORK_PROFILE_TITLE 1049
+#define IDS_ENTERPRISE_SIGNIN_WORK_PROFILE_CREATION 1050
+#define IDS_ENTERPRISE_SIGNIN_WORK_PROFILE_ISOLATION_NOTICE 1051
+#define IDS_ENTERPRISE_SIGNIN_WORK_PROFILE_EXPLANATION 1052
+#define IDS_ONE_CLICK_SIGNIN_DIALOG_TITLE_NEW 1053
+#define IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW 1054
+#define IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER 1055
+#define IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_KNOWN_BROWSER 1056
+#define IDS_NTP_CUSTOMIZE_BUTTON_LABEL 508
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_TITLE 1057
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_CREATE_BUBBLE_TITLE 1058
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_SWITCH_BUBBLE_TITLE 1059
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_SWITCH_BUBBLE_DESC 1060
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC 1061
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC_MANAGED_DEVICE 1062
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_ENTERPRISE_BUBBLE_DESC_MANAGED_DEVICE 1063
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_CONSUMER_BUBBLE_DESC_V2 1064
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CHROME_SIGNIN_TITLE 1065
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CHROME_SIGNIN_SUBTITLE 1066
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CHROME_SIGNIN_DECLINE_TEXT 1067
+#define IDS_AVATAR_BUTTON_INTERCEPT_BUBBLE_CHROME_SIGNIN_TEXT 1068
+#define IDS_PROFILE_CUSTOMIZATION_TEXT 1069
+#define IDS_PROFILE_CUSTOMIZATION_TITLE_V2 1070
+#define IDS_PROFILE_MENU_PROFILES_LIST_TITLE 1075
+#define IDS_APP_SHORTCUTS_SUBDIR_NAME 1077
+#define IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY 1078
+#define IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA 1079
+#define IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV 1080
+#define IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_AND_VIDEO 1082
+#define IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY 1083
+#define IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY 1084
+#define IDS_WEBHID_SYSTEM_TRAY_ICON_TITLE 1085
+#define IDS_WEBUSB_SYSTEM_TRAY_ICON_TITLE 1086
+#define IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC 1089
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_INTRO_TITLE 1090
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_INTRO_TEXT 1091
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_YOUR_CHROME_TITLE 1092
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_YOUR_CHROME_TEXT 1093
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_GUEST_TEXT 1094
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_FRIENDS_TEXT 1095
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_OUTRO_TEXT 1096
+#define IDS_USER_MANAGER_TUTORIAL_SLIDE_OUTRO_ADD_USER 1097
+#define IDS_TUTORIAL_PASSWORD_MANAGER_OPEN_APP_MENU 1098
+#define IDS_TUTORIAL_PASSWORD_MANAGER_CLICK_PASSWORD_MANAGER 1099
+#define IDS_TUTORIAL_PASSWORD_MANAGER_SUCCESS_BODY 1100
+#define IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_BODY 1101
+#define IDS_EXTENSIONS_SETTINGS_API_SECOND_LINE_START_PAGES 1102
+#define IDS_EXTENSIONS_SETTINGS_API_SECOND_LINE_START_AND_SEARCH 1103
+#define IDS_WEBSTORE_APP_DESCRIPTION 377
+#define IDS_INBOUND_MDNS_RULE_NAME 1104
+#define IDS_INBOUND_MDNS_RULE_NAME_BETA 1105
+#define IDS_INBOUND_MDNS_RULE_NAME_CANARY 1106
+#define IDS_INBOUND_MDNS_RULE_NAME_DEV 1107
+#define IDS_INBOUND_MDNS_RULE_DESCRIPTION 1108
+#define IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA 1109
+#define IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY 1110
+#define IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV 1111
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_TEXT 1112
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_TEXT_ONCE 1113
+#define IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT 1114
+#define IDS_CONTENT_CONTEXT_OPENLINKNEWTAB_INAPP 1115
+#define IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD_INAPP 1116
+#define IDS_UPDATE_RECOMMENDED_DIALOG_TITLE 1117
+#define IDS_UPDATE_RECOMMENDED 1118
+#define IDS_RELAUNCH_AND_UPDATE 1119
+#define IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT 1120
+#define IDS_UPDATE_RECOMMENDED_ALT 1121
+#define IDS_REINSTALL_APP 1122
+#define IDS_UPGRADE_BUBBLE_MENU_ITEM 1123
+#define IDS_UPGRADE_BUBBLE_TITLE 1124
+#define IDS_UPGRADE_BUBBLE_TEXT 1125
+#define IDS_SYNC_ERROR_USER_MENU_UPGRADE_BUTTON 1126
+#define IDS_SYNC_UPGRADE_CLIENT 1127
+#define IDS_SYNC_UPGRADE_CLIENT_BUTTON 1128
+#define IDS_RECOVERY_BUBBLE_TITLE 1129
+#define IDS_RUN_RECOVERY 1130
+#define IDS_RECOVERY_BUBBLE_TEXT 1131
+#define IDS_CRITICAL_NOTIFICATION_TITLE 1132
+#define IDS_CRITICAL_NOTIFICATION_TITLE_ALTERNATE 1133
+#define IDS_CRITICAL_NOTIFICATION_TEXT 1134
+#define IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_TAB 1135
+#define IDS_WELCOME_HEADER 1151
+#define IDS_WIN_NOTIFICATION_SETTINGS_CONTEXT_MENU_ITEM_NAME 1152
+#define IDS_RELAUNCH_RECOMMENDED_TITLE 1153
+#define IDS_RELAUNCH_RECOMMENDED_BODY 1154
+#define IDS_RELAUNCH_REQUIRED_TITLE_DAYS 1155
+#define IDS_RELAUNCH_REQUIRED_TITLE_HOURS 1156
+#define IDS_RELAUNCH_REQUIRED_TITLE_MINUTES 1157
+#define IDS_RELAUNCH_REQUIRED_TITLE_SECONDS 1158
+#define IDS_RELAUNCH_REQUIRED_BODY 1159
+#define IDS_ENTERPRISE_STARTUP_CLOUD_POLICY_ENROLLMENT_TOOLTIP 1160
+#define IDS_ENTERPRISE_STARTUP_CLOUD_POLICY_ENROLLMENT_ERROR 1161
+#define IDS_ENTERPRISE_STARTUP_RELAUNCH_BUTTON 1162
+#define IDS_DESKTOP_MEDIA_PICKER_TITLE_WEB_CONTENTS_ONLY 1163
+#define IDS_IDLE_BUBBLE_TITLE_CLOSE 1164
+#define IDS_IDLE_BUBBLE_BODY_CLOSE_AND_CLEAR 1165
+#define IDS_IDLE_BUBBLE_BODY_CLEAR 1166
+#define IDS_IDLE_BUBBLE_BODY_CLOSE 1167
+#define IDS_IDLE_TIMEOUT_CLOSE_TITLE 1168
+#define IDS_IDLE_TIMEOUT_CLEAR_TITLE 1169
+#define IDS_IDLE_TIMEOUT_CLOSE_AND_CLEAR_TITLE 1170
+#define IDS_IDLE_TIMEOUT_CLOSE_BODY 1171
+#define IDS_IDLE_TIMEOUT_CLEAR_BODY 1172
+#define IDS_IDLE_TIMEOUT_CLOSE_AND_CLEAR_BODY 1173
+#define IDS_IDLE_DISMISS_BUTTON 1174
+#define IDS_HATS_BUBBLE_TITLE 1175
+#define IDS_EXTENSION_PERMISSIONS_BLOCKED_BY_PARENT_PROMPT_MESSAGE 1176
+#define IDS_PROFILE_PICKER_MAIN_VIEW_TITLE 1181
+#define IDS_PROFILE_PICKER_MAIN_VIEW_TITLE_V2 1182
+#define IDS_PROFILE_PICKER_MAIN_VIEW_SUBTITLE 1183
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_PROFILE_TYPE_CHOICE_SUBTITLE 1184
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_PROFILE_TYPE_CHOICE_TITLE 1185
+#define IDS_PROFILE_PICKER_IPH_FOR_PROFILES_TEXT 1186
+#define IDS_PROFILE_PICKER_IPH_FOR_ADD_PROFILE_TEXT 1187
+#define IDS_PROFILE_PICKER_PROFILE_SWITCH_TITLE 1188
+#define IDS_PROFILE_PICKER_PROFILE_SWITCH_SUBTITLE 1189
+#define IDS_FRE_SIGN_IN_TITLE_0 1194
+#define IDS_FRE_SIGN_IN_TITLE_1 1195
+#define IDS_FRE_SIGN_IN_TITLE_2 1196
+#define IDS_FRE_DEFAULT_BROWSER_TITLE 1197
+#define IDS_FRE_DEFAULT_BROWSER_SUBTITLE_NEW 1198
+#define IDS_FRE_DEFAULT_BROWSER_ILLUSTRATION_ALT_TEXT 1199
+#define IDS_PROFILE_SWITCH_PROMO 1200
+#define IDS_PROFILE_SWITCH_PROMO_SCREENREADER 1201
+#define IDS_PASSWORD_MANAGER_IPH_BODY_WEB_APP_PROFILE_SWITCH 1202
+#define IDS_CHROMELABS_RELAUNCH_FOOTER_MESSAGE 1204
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_AUTHORIZE_BLUETOOTH 1205
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_NOTIFICATION_TITLE 1206
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_MESSAGE_TITLE 1207
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_MESSAGE_DESCRIPTION 1208
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_MESSAGE_DESCRIPTION_UPDATED 1209
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_MESSAGE_ACCEPT 1210
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_SUBTITLE 1211
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_DESCRIPTION_2 1212
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_LABEL 1213
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_1_HEADER 1214
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_1_BULLET_POINT_1 1215
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_1_BULLET_POINT_2 1216
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_1_BULLET_POINT_3 1217
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_2_BULLET_POINT_1 1218
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_2_BULLET_POINT_2 1219
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BOTTOM_SUMMARY 1220
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_SUBTITLE 1221
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_BODY_DESCRIPTION_2 1222
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_BOTTOM_SUMMARY 1223
+#define IDS_SETTINGS_SECURITY_V8_LINK_DESCRIPTION 1224
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_DESCRIPTION 1225
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_ALLOWED_SUB_LABEL 1226
+#define IDS_FRIENDLY_COMPANY_NAME 1227
+#define IDS_NO_UPDATE_RESPONSE 1228
+#define IDS_INSTALL_UPDATER_FAILED 1229
+#define IDS_INSTALLER_DISPLAY_NAME 1230
+#define IDS_CLOSE_BUTTON 1231
+#define IDS_MINIMIZE_BUTTON 1232
+#define IDS_INITIALIZING 1233
+#define IDS_WAITING_TO_CONNECT 1234
+#define IDS_DOWNLOADING_SHORT 1235
+#define IDS_DOWNLOADING_LONG 1236
+#define IDS_DOWNLOADING_VERY_LONG 1237
+#define IDS_DOWNLOADING_COMPLETED 1238
+#define IDS_DOWNLOADING 1239
+#define IDS_WAITING_TO_INSTALL 1240
+#define IDS_INSTALLING 1241
+#define IDS_CANCELING 1242
+#define IDS_TEXT_RESTART_BROWSER 1243
+#define IDS_TEXT_RESTART_ALL_BROWSERS 1244
+#define IDS_TEXT_RESTART_COMPUTER 1245
+#define IDS_UPDATER_CLOSE 1246
+#define IDS_RESTART_NOW 1247
+#define IDS_RESTART_LATER 1248
+#define IDS_GET_HELP_TEXT 1249
+#define IDS_INSTALLATION_STOPPED_WINDOW_TITLE 1250
+#define IDS_INSTALL_STOPPED 1251
+#define IDS_RESUME_INSTALLATION 1252
+#define IDS_CANCEL_INSTALLATION 1253
+#define IDS_SPLASH_SCREEN_MESSAGE 1254
+#define IDS_BUNDLE_INSTALLED_SUCCESSFULLY 1255
+#define IDS_EXTRA_CODE 1256
+#define IDS_NO_NETWORK_PRESENT_ERROR 1257
+#define IDS_ERROR_HTTPSTATUS_UNAUTHORIZED 1258
+#define IDS_ERROR_HTTPSTATUS_FORBIDDEN 1259
+#define IDS_ERROR_HTTPSTATUS_PROXY_AUTH_REQUIRED 1260
+#define IDS_UNKNOWN_APPLICATION 1261
+#define IDS_RESTRICTED_RESPONSE_FROM_SERVER 1262
+#define IDS_OS_NOT_SUPPORTED 1263
+#define IDS_HW_NOT_SUPPORTED 1264
+#define IDS_NO_HASH 1265
+#define IDS_UNSUPPORTED_PROTOCOL 1266
+#define IDS_INTERNAL 1267
+#define IDS_GENERIC_UPDATE_CHECK_ERROR 1268
+#define IDS_DOWNLOAD_HASH_MISMATCH 1269
+#define IDS_GENERIC_DOWNLOAD_ERROR 1270
+#define IDS_UNPACK_CACHING_ERROR 1271
+#define IDS_GENERIC_UNPACK_ERROR 1272
+#define IDS_GENERIC_SERVICE_ERROR 1273
+#define IDS_GENERIC_INSTALL_ERROR 1274
+#define IDS_INSTALL_REBOOT 1275
+#define IDS_APP_INSTALL_DISABLED_BY_GROUP_POLICY 1276
+#define IDS_INVALID_INSTALLER_FILENAME 1277
+#define IDS_INSTALLER_FAILED_TO_START 1278
+#define IDS_INSTALLER_TIMED_OUT 1279
+#define IDS_MEMORY_SAVER_DIALOG_BODY 1280
+#define IDS_MEMORY_SAVER_MODE_PROMO_TITLE 390
+#define IDS_SETTINGS_CLEAR_BROWSING_DATA_SIGNED_IN 1281
+
+// ---------------------------------------------------------------------------
+// From cef_strings.h:
+
+#define IDS_TEXT_FILES 64000
+#define IDS_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS 64001
+
+// ---------------------------------------------------------------------------
+// From components_branded_strings.h:
+
+#define IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY 35050
+#define IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER 35051
+#define IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_CLIENT 35052
+#define IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM 35053
+#define IDS_PAYMENTS_AUTOFILL_MANDATORY_REAUTH_PROMPT 35054
+#define IDS_PAYMENTS_AUTOFILL_EDIT_CARD_MANDATORY_REAUTH_PROMPT 35055
+#define IDS_FLAGS_UI_RELAUNCH_NOTICE 35056
+#define IDS_DEPRECATED_FEATURES_RELAUNCH_NOTICE 35057
+#define IDS_CRASH_DISABLED_MESSAGE 35058
+#define IDS_SHORT_PRODUCT_LOGO_ALT_TEXT 35059
+#define IDS_VERSION_UI_LICENSE 35060
+#define IDS_PAGE_INFO_INTERNAL_PAGE 35063
+#define IDS_SESSION_CRASHED_VIEW_MESSAGE 35064
+
+// ---------------------------------------------------------------------------
+// From components_strings.h:
+
+#define IDS_ASH_ARC_APP_COMPAT_DISABLED_COMPAT_MODE_BUTTON_TOOLTIP_PHONE 35090
+#define IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_TITLE 35091
+#define IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_BODY 35092
+#define IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_ACCEPT 35093
+#define IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_DONT_ASK_ME 35094
+#define IDS_ASH_ARC_NEARBY_SHARE_FILE_PREPARATION_PROGRESS 35095
+#define IDS_ASH_ARC_NEARBY_SHARE_FILES_PREPARATION_PROGRESS 35096
+#define IDS_ASH_ARC_NEARBY_SHARE_ERROR_DIALOG_MESSAGE 35097
+#define IDS_ASH_ARC_NEARBY_SHARE_ERROR_DIALOG_MESSAGE_PH 35098
+#define IDS_ASH_ARC_NEARBY_SHARE_LOW_DISK_SPACE_DIALOG_TITLE 35099
+#define IDS_ASH_ARC_NEARBY_SHARE_LOW_DISK_SPACE_DIALOG_MESSAGE 35100
+#define IDS_ASH_ARC_NEARBY_SHARE_LOW_DISK_SPACE_DIALOG_MESSAGE_PH 35101
+#define IDS_ASH_ARC_NEARBY_SHARE_LOW_DISK_SPACE_DIALOG_STORAGE_BUTTON 35102
+#define IDS_ARC_COMPAT_MODE_RESIZE_TOGGLE_MENU_RESIZE_SETTINGS 35103
+#define IDS_ARC_COMPAT_MODE_RESIZE_TOGGLE_MENU_TITLE 35104
+#define IDS_ARC_COMPAT_MODE_SPLASH_SCREEN_TITLE 35105
+#define IDS_ARC_COMPAT_MODE_SPLASH_SCREEN_BODY 35106
+#define IDS_ARC_COMPAT_MODE_SPLASH_SCREEN_BODY_UNRESIZABLE 35107
+#define IDS_ARC_COMPAT_MODE_SPLASH_SCREEN_CLOSE 35108
+#define IDS_ARC_COMPAT_MODE_SPLASH_SCREEN_LINK 35109
+#define IDS_ARC_COMPAT_MODE_DISABLE_RESIZE_LOCK_TOAST 35110
+#define IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_ICON 35111
+#define IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_THROBBER 35112
+#define IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_MESSAGE 35113
+#define IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_AOD_MESSAGE 35114
+#define IDS_ARC_GHOST_WINDOW_APP_FIXUP_MESSAGE 35115
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_TITLE 35116
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_BODY 35117
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_BODY_WITH_LEARN_MORE 35118
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_SUBSCRIPTION_BODY_WITH_LEARN_MORE 35119
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_LEARN_MORE_LABEL 35120
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_ALLOW_BUTTON 35121
+#define IDS_ASH_ARC_PASSPOINT_APP_APPROVAL_DONT_ALLOW_BUTTON 35122
+#define IDS_ARC_VM_DATA_MIGRATION_NOTIFICATION_TITLE 35123
+#define IDS_ARC_VM_DATA_MIGRATION_NOTIFICATION_DAYS_UNTIL_DEADLINE 35124
+#define IDS_ARC_VM_DATA_MIGRATION_NOTIFICATION_ACCEPT_BUTTON_LABEL 35125
+#define IDS_ARC_VM_DATA_MIGRATION_DIALOG_TITLE 35126
+#define IDS_ARC_VM_DATA_MIGRATION_DIALOG_SAVE_WORK_MESSAGE 35127
+#define IDS_ARC_VM_DATA_MIGRATION_DIALOG_DAYS_UNTIL_DEADLINE 35128
+#define IDS_ARC_VM_DATA_MIGRATION_DIALOG_UPDATE_NOW_BUTTON_LABEL 35129
+#define IDS_ARC_VM_DATA_MIGRATION_DIALOG_SKIP_BUTTON_LABEL 35130
+#define IDS_ARC_VM_DATA_MIGRATION_DIALOG_UPDATE_BUTTON_LABEL 35131
+#define IDS_ARC_VM_DATA_MIGRATION_LOADING_SCREEN_MESSAGE 35132
+#define IDS_ARC_VM_DATA_MIGRATION_WELCOME_SCREEN_TITLE 35133
+#define IDS_ARC_VM_DATA_MIGRATION_WHAT_TO_EXPECT_TITLE 35134
+#define IDS_ARC_VM_DATA_MIGRATION_UPDATE_DESCRIPTION 35135
+#define IDS_ARC_VM_DATA_MIGRATION_BLOCKING_BEHAVIOR_DESCRIPTION 35136
+#define IDS_ARC_VM_DATA_MIGRATION_CONNECT_TO_CHARGER_MESSAGE 35137
+#define IDS_ARC_VM_DATA_MIGRATION_NOT_ENOUGH_FREE_DISK_SPACE_MESSAGE 35138
+#define IDS_ARC_VM_DATA_MIGRATION_NOT_ENOUGH_BATTERY_MESSAGE 35139
+#define IDS_ARC_VM_DATA_MIGRATION_SCREEN_UPDATE_BUTTON_LABEL 35140
+#define IDS_ARC_VM_DATA_MIGRATION_SCREEN_SKIP_BUTTON_LABEL 35141
+#define IDS_ARC_VM_DATA_MIGRATION_RESUME_SCREEN_TITLE 35142
+#define IDS_ARC_VM_DATA_MIGRATION_RESUME_DESCRIPTION 35143
+#define IDS_ARC_VM_DATA_MIGRATION_SCREEN_RESUME_BUTTON_LABEL 35144
+#define IDS_ARC_VM_DATA_MIGRATION_PROGRESS_SCREEN_TITLE 35145
+#define IDS_ARC_VM_DATA_MIGRATION_PROGRESS_DESCRIPTION 35146
+#define IDS_ARC_VM_DATA_MIGRATION_SUCCESS_SCREEN_TITLE 35147
+#define IDS_ARC_VM_DATA_MIGRATION_SCREEN_FINISH_BUTTON_LABEL 35148
+#define IDS_ARC_VM_DATA_MIGRATION_FAILURE_SCREEN_TITLE 35149
+#define IDS_ARC_VM_DATA_MIGRATION_FAILURE_DESCRIPTION 35150
+#define IDS_ARC_VM_DATA_MIGRATION_SEND_FEEDBACK_MESSAGE 35151
+#define IDS_ARC_VM_DATA_MIGRATION_SCREEN_REPORT_BUTTON_LABEL 35152
+#define IDS_AUTOFILL_NO_THANKS_DESKTOP_LOCAL_SAVE 35153
+#define IDS_AUTOFILL_NO_THANKS_DESKTOP_UPLOAD_SAVE 35154
+#define IDS_AUTOFILL_SAVE_IBAN_BUBBLE_SAVE_NO_THANKS 35155
+#define IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_NO_THANKS 35156
+#define IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_ACCEPT 35157
+#define IDS_AUTOFILL_GOOGLE_PAY_LOGO_ACCESSIBLE_NAME 35160
+#define IDS_AUTOFILL_FIELD_LABEL_PHONE 35165
+#define IDS_AUTOFILL_FIELD_LABEL_BILLING_ADDRESS 35166
+#define IDS_AUTOFILL_SAVE_CARD_BUBBLE_LOCAL_SAVE_ACCEPT 35168
+#define IDS_AUTOFILL_SAVE_CARD_BUBBLE_UPLOAD_SAVE_ACCEPT 35169
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_CONTINUE 35171
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL 35172
+#define IDS_AUTOFILL_SAVE_CARD_ONLY_PROMPT_EXPLANATION_LOCAL 35173
+#define IDS_AUTOFILL_SAVE_CARD_WITH_CVC_PROMPT_EXPLANATION_LOCAL 35174
+#define IDS_AUTOFILL_SAVE_CVC_PROMPT_TITLE_LOCAL 35175
+#define IDS_AUTOFILL_SAVE_CVC_PROMPT_EXPLANATION_LOCAL 35176
+#define IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL 35177
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD 35178
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_EXPERIMENT_ENCRYPTED_AND_SECURE 35179
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_EXPERIMENT_FASTER_AND_PROTECTED 35180
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD_V3 35181
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD_V4 35182
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD_V5 35183
+#define IDS_AUTOFILL_SAVE_CVC_PROMPT_TITLE_TO_CLOUD 35184
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_CARD_DESCRIPTION 35185
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_CARD_DESCRIPTION_WITH_NICKNAME 35186
+#define IDS_AUTOFILL_CARD_SAVED 35190
+#define IDS_AUTOFILL_CVC_SAVED 35191
+#define IDS_AUTOFILL_DONE 35192
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION 35193
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_V3 35194
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_EXPERIMENT_ENCRYPTED_AND_SECURE 35195
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_EXPERIMENT_FASTER_AND_PROTECTED 35196
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_V3_WITH_NAME 35197
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_V4 35198
+#define IDS_AUTOFILL_SAVE_CVC_PROMPT_EXPLANATION_UPLOAD 35199
+#define IDS_AUTOFILL_SAVE_CARD_WITH_CVC_PROMPT_EXPLANATION_UPLOAD 35200
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_CARDHOLDER_NAME 35202
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_CARDHOLDER_NAME_TOOLTIP 35203
+#define IDS_AUTOFILL_SAVE_CARD_CARDHOLDER_NAME_FIX_FLOW_HEADER 35204
+#define IDS_AUTOFILL_SAVE_CARD_UPDATE_EXPIRATION_DATE_TITLE 35205
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_TOOLTIP 35208
+#define IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_AND_CARDHOLDER_NAME_TOOLTIP 35209
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_ANIMATION_LABEL 35210
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_TITLE 35211
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BUTTON_LABEL 35212
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BODY_TEXT 35213
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_TITLE_OFFER 35214
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_TITLE_DONE 35215
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_TITLE_FIX 35216
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_CHECKBOX_UNCHECK_WARNING 35217
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_MESSAGE_OFFER 35218
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_MESSAGE_DONE 35219
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_MESSAGE_ERROR 35220
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_MESSAGE_FIX 35221
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_MESSAGE_INVALID_CARD_REMOVED 35222
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_BUTTON_LABEL_SAVE 35223
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_BUTTON_LABEL_CANCEL 35224
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_BUTTON_LABEL_DONE 35225
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_BUTTON_LABEL_VIEW_CARDS 35226
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_LABEL_INVALID_CARDS 35227
+#define IDS_AUTOFILL_LOCAL_CARD_MIGRATION_DIALOG_TRASH_CAN_BUTTON_TOOLTIP 35228
+#define IDS_AUTOFILL_MASKED_SERVER_CARD_RISK_BASED_UNMASKING_ERROR_TITLE 35229
+#define IDS_AUTOFILL_VIRTUAL_CARD_TEMPORARY_ERROR_TITLE 35230
+#define IDS_AUTOFILL_VIRTUAL_CARD_PERMANENT_ERROR_TITLE 35231
+#define IDS_AUTOFILL_VIRTUAL_CARD_TEMPORARY_ERROR_DESCRIPTION 35232
+#define IDS_AUTOFILL_VIRTUAL_CARD_PERMANENT_ERROR_DESCRIPTION 35233
+#define IDS_AUTOFILL_VIRTUAL_CARD_NOT_ELIGIBLE_ERROR_TITLE 35234
+#define IDS_AUTOFILL_VIRTUAL_CARD_NOT_ELIGIBLE_ERROR_DESCRIPTION 35235
+#define IDS_AUTOFILL_ERROR_DIALOG_NEGATIVE_BUTTON_LABEL 35236
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_TRY_AGAIN_CVC 35237
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_TRY_AGAIN_SECURITY_CODE 35238
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_PERMANENT 35239
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_ERROR_NETWORK 35240
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_SECURITY_CODE_POSITION_BACK_OF_CARD 35241
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_SECURITY_CODE_POSITION_FRONT_OF_CARD 35242
+#define IDS_AUTOFILL_CARD_UNMASK_CVC_IMAGE_DESCRIPTION 35243
+#define IDS_AUTOFILL_CARD_UNMASK_CVC_IMAGE_DESCRIPTION_FOR_AMEX 35244
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_DEFAULT 35245
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED_CARD 35246
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_VIRTUAL_CARD 35247
+#define IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_TITLE 35248
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_TITLE 35252
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_TITLE_SECURITY_CODE 35253
+#define IDS_AUTOFILL_CARD_UNMASK_PROMPT_EXPIRED_TITLE 35254
+#define IDS_AUTOFILL_CARD_UNMASK_CONFIRM_BUTTON 35271
+#define IDS_AUTOFILL_CARD_UNMASK_VERIFY_BUTTON 35272
+#define IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_MONTH 35273
+#define IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_YEAR 35274
+#define IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_IN_PROGRESS 35275
+#define IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_SUCCESS 35276
+#define IDS_AUTOFILL_CARD_UNMASK_INVALID_EXPIRATION_DATE 35277
+#define IDS_AUTOFILL_EXPIRATION_DATE_SEPARATOR 35278
+#define IDS_AUTOFILL_CARD_UNMASK_NEW_CARD_LINK 35279
+#define IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC 35280
+#define IDS_AUTOFILL_DIALOG_ACCESSIBLE_NAME_SECURITY_CODE 35281
+#define IDS_AUTOFILL_CARD_UNMASK_PROGRESS_BAR_MESSAGE 35282
+#define IDS_AUTOFILL_MASKED_SERVER_CARD_RISK_BASED_UNMASK_PROGRESS_BAR_MESSAGE 35283
+#define IDS_AUTOFILL_CARD_UNMASK_PROGRESS_DIALOG_TITLE 35284
+#define IDS_AUTOFILL_IBAN_UNMASK_PROGRESS_DIALOG_TITLE 35285
+#define IDS_AUTOFILL_IBAN_UNMASK_PROGRESS_BAR_MESSAGE 35286
+#define IDS_AUTOFILL_CARD_UNMASK_CONFIRMATION_DIALOG_TITLE 35287
+#define IDS_AUTOFILL_CARD_UNMASK_CANCEL_BUTTON_LABEL 35288
+#define IDS_AUTOFILL_CARD_UNMASK_CONFIRMATION_MESSAGE 35289
+#define IDS_AUTOFILL_FIDO_AUTHENTICATION_PROMPT_TITLE 35290
+#define IDS_AUTOFILL_IBAN_UNMASK_ERROR_DIALOG_TITLE 35291
+#define IDS_AUTOFILL_IBAN_UNMASK_ERROR_DIALOG_MESSAGE 35292
+#define IDS_PAYMENTS_AUTOFILL_FILLING_MANDATORY_REAUTH 35293
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_TITLE 35300
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_TITLE_ERROR 35301
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_INSTRUCTION 35302
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_OK_BUTTON_LABEL 35303
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_INSTRUCTION_ERROR 35304
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_CANCEL_BUTTON_LABEL 35305
+#define IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_CANCEL_BUTTON_LABEL_ERROR 35306
+#define IDS_AUTOFILL_WEBAUTHN_VERIFY_PENDING_DIALOG_TITLE 35307
+#define IDS_AUTOFILL_WEBAUTHN_VERIFY_PENDING_DIALOG_CANCEL_BUTTON_LABEL 35308
+#define IDS_AUTOFILL_WALLET_MANAGEMENT_LINK_TEXT 35309
+#define IDS_AUTOFILL_FROM_GOOGLE_ACCOUNT_LONG 35310
+#define IDS_AUTOFILL_SAVE_IBAN_PROMPT_TITLE_LOCAL 35311
+#define IDS_AUTOFILL_SAVE_IBAN_LABEL 35312
+#define IDS_AUTOFILL_SAVE_IBAN_BUBBLE_SAVE_ACCEPT 35313
+#define IDS_AUTOFILL_SAVE_IBAN_PROMPT_NICKNAME 35314
+#define IDS_AUTOFILL_SAVE_IBAN_PLACEHOLDER 35315
+#define IDS_IBAN_NICKNAME_COUNT_BY 35316
+#define IDS_AUTOFILL_IBAN_SAVED 35317
+#define IDS_AUTOFILL_MANAGE_SAVED_PAYMENT_METHODS 35318
+#define IDS_AUTOFILL_SAVE_IBAN_PROMPT_TITLE_SERVER 35319
+#define IDS_AUTOFILL_UPLOAD_IBAN_PROMPT_EXPLANATION 35320
+#define IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_TITLE 35321
+#define IDS_AUTOFILL_MANDATORY_REAUTH_OPT_IN_EXPLANATION 35322
+#define IDS_AUTOFILL_MANDATORY_REAUTH_ICON_TOOLTIP 465
+#define IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_TITLE 35323
+#define IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_EXPLANATION 35324
+#define IDS_AUTOFILL_MANDATORY_REAUTH_CONFIRMATION_SETTINGS_LINK 35325
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENTRY_PREFIX 35329
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_FALLBACK_ICON_TOOLTIP 464
+#define IDS_AUTOFILL_VIRTUAL_CARD_SELECTION_DIALOG_CONTENT_TITLE 35330
+#define IDS_AUTOFILL_VIRTUAL_CARD_SELECTION_DIALOG_CONTENT_EXPLANATION 35331
+#define IDS_AUTOFILL_VIRTUAL_CARD_SELECTION_DIALOG_OK_BUTTON_LABEL 35332
+#define IDS_AUTOFILL_VIRTUAL_CARD_SELECTION_DIALOG_CANCEL_BUTTON_LABEL 35333
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_TITLE 35334
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_EDUCATIONAL_BODY_LABEL 35335
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_LEARN_MORE_LINK_LABEL 35336
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_CARD_NUMBER_LABEL 35337
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_EXP_DATE_LABEL 35338
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_CARDHOLDER_NAME_LABEL 35339
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_CVC_LABEL 35340
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_VIRTUAL_CARD_LABEL 35341
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_ICON_TOOLTIP 463
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_BUTTON_TOOLTIP_NORMAL 35342
+#define IDS_AUTOFILL_VIRTUAL_CARD_MANUAL_FALLBACK_BUBBLE_BUTTON_TOOLTIP_CLICKED 35343
+#define IDS_AUTOFILL_PAYMENTS_MANUAL_FALLBACK_AUTOFILL_POPUP_CC_NUMBER_SUGGESTION_LABEL 35344
+#define IDS_AUTOFILL_PAYMENTS_MANUAL_FALLBACK_AUTOFILL_POPUP_CC_EXPIRY_DATE_SUGGESTION_LABEL 35345
+#define IDS_AUTOFILL_PAYMENTS_MANUAL_FALLBACK_AUTOFILL_POPUP_CC_EXPIRY_YEAR_SUGGESTION_LABEL 35346
+#define IDS_AUTOFILL_PAYMENTS_MANUAL_FALLBACK_AUTOFILL_POPUP_CC_EXPIRY_MONTH_SUGGESTION_LABEL 35347
+#define IDS_AUTOFILL_VIRTUAL_CARD_SUGGESTION_IPH_BUBBLE_LABEL 35348
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_ACCEPT_BUTTON_LABEL 35349
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DIALOG_TITLE_LABEL 35350
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DIALOG_CONTENT_LABEL 35351
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DECLINE_BUTTON_LABEL_SKIP 35352
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_DECLINE_BUTTON_LABEL_NO_THANKS 35353
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_LEARN_MORE_LINK_LABEL 35354
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLLMENT_CARD_IMAGE_TOOLTIP 35355
+#define IDS_AUTOFILL_VIRTUAL_CARD_SUGGESTION_OPTION_VALUE 35356
+#define IDS_AUTOFILL_VIRTUAL_CARD_NUMBER_SWITCH_LABEL 35357
+#define IDS_AUTOFILL_VIRTUAL_CARD_STANDALONE_CVC_SUGGESTION_IPH_BUBBLE_LABEL 35366
+#define IDS_AUTOFILL_VIRTUAL_CARD_STANDALONE_CVC_SUGGESTION_IPH_BUBBLE_LABEL_SCREENREADER 35367
+#define IDS_AUTOFILL_VIRTUAL_CARD_STANDALONE_CVC_SUGGESTION_TITLE 35368
+#define IDS_AUTOFILL_CARD_AUTH_SELECTION_DIALOG_TITLE_MULTIPLE_OPTIONS 35369
+#define IDS_AUTOFILL_CARD_UNMASK_AUTHENTICATION_SELECTION_DIALOG_ISSUER_CONFIRMATION_TEXT 35370
+#define IDS_AUTOFILL_AUTHENTICATION_MODE_SECURITY_CODE 35371
+#define IDS_AUTOFILL_AUTHENTICATION_MODE_GET_TEXT_MESSAGE 35372
+#define IDS_AUTOFILL_AUTHENTICATION_MODE_TEXT_MESSAGE 35373
+#define IDS_AUTOFILL_AUTHENTICATION_MODE_GET_EMAIL 35374
+#define IDS_AUTOFILL_CARD_UNMASK_AUTHENTICATION_SELECTION_DIALOG_CURRENT_INFO_NOT_SEEN_TEXT 35375
+#define IDS_AUTOFILL_CARD_UNMASK_AUTHENTICATION_SELECTION_DIALOG_OK_BUTTON_LABEL_CONTINUE 35376
+#define IDS_AUTOFILL_CARD_UNMASK_AUTHENTICATION_SELECTION_DIALOG_OK_BUTTON_LABEL_SEND 35377
+#define IDS_AUTOFILL_CARD_UNMASK_AUTHENTICATION_SELECTION_DIALOG_CVC_CHALLENGE_INFO 35378
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_TITLE 35379
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_FOOTER_MESSAGE 35380
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_NEW_CODE_MESSAGE 35381
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_TEXTFIELD_PLACEHOLDER_MESSAGE 35382
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_PENDING_MESSAGE 35383
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_VERIFICATION_CODE_EXPIRED_LABEL 35384
+#define IDS_AUTOFILL_CARD_UNMASK_OTP_INPUT_DIALOG_ENTER_CORRECT_CODE_LABEL 35385
+#define IDS_AUTOFILL_CREDIT_CARD_BENEFIT_TEXT_FOR_SUGGESTIONS 35386
+#define IDS_AUTOFILL_OFFERS_CASHBACK 35387
+#define IDS_AUTOFILL_CARD_LINKED_OFFER_REMINDER_TITLE 35388
+#define IDS_AUTOFILL_OFFERS_REMINDER_POSITIVE_BUTTON_LABEL 35389
+#define IDS_AUTOFILL_PROMO_CODE_SUGGESTIONS_FOOTER_TEXT 35390
+#define IDS_AUTOFILL_OFFERS_REMINDER_ICON_TOOLTIP_TEXT 459
+#define IDS_AUTOFILL_OFFERS_REMINDER_DESCRIPTION_TEXT 35391
+#define IDS_AUTOFILL_PROMO_CODE_OFFERS_REMINDER_TITLE 35396
+#define IDS_AUTOFILL_GPAY_PROMO_CODE_OFFERS_REMINDER_TITLE 35397
+#define IDS_AUTOFILL_PROMO_CODE_OFFER_BUTTON_TOOLTIP_NORMAL 35398
+#define IDS_AUTOFILL_PROMO_CODE_OFFER_BUTTON_TOOLTIP_CLICKED 35399
+#define IDS_AUTOFILL_GPAY_PROMO_CODE_OFFERS_REMINDER_VALUE_PROP_TEXT 35400
+#define IDS_AUTOFILL_PROMO_CODE_OFFERS_USE_THIS_CODE_TEXT 35401
+#define IDS_AUTOFILL_PAYMENTS_OTP_VERIFICATION_DIALOG_CANT_FIND_CODE_MESSAGE 35402
+#define IDS_AUTOFILL_PAYMENTS_OTP_VERIFICATION_DIALOG_OTP_INPUT_HINT 35403
+#define IDS_AUTOFILL_PAYMENTS_OTP_VERIFICATION_DIALOG_POSITIVE_BUTTON_LABEL 35404
+#define IDS_AUTOFILL_PAYMENTS_OTP_VERIFICATION_DIALOG_NEGATIVE_BUTTON_LABEL 35405
+#define IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_PAYMENT_METHOD_MANDATORY_REAUTH_LABEL 35418
+#define IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_PAYMENT_METHOD_MANDATORY_REAUTH_SUBLABEL 35419
+#define IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_CVC_STORAGE_LABEL 35422
+#define IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_CVC_STORAGE_SUBLABEL 35423
+#define IDS_AUTOFILL_SETTINGS_PAGE_ENABLE_CVC_STORAGE_WITH_DELETE_LINK_SUBLABEL 35424
+#define IDS_AUTOFILL_SETTINGS_PAGE_CARD_BENEFITS_TOGGLE_LABEL 35425
+#define IDS_AUTOFILL_SETTINGS_PAGE_CARD_BENEFITS_TOGGLE_SUBLABEL_WITH_LEARN_LINK 35426
+#define IDS_AUTOFILL_SETTINGS_PAGE_BULK_REMOVE_CVC_TITLE 35427
+#define IDS_AUTOFILL_SETTINGS_PAGE_BULK_REMOVE_CVC_DESCRIPTION 35428
+#define IDS_AUTOFILL_SETTINGS_PAGE_CVC_TAG_FOR_CREDIT_CARD_LIST_ENTRY 35429
+#define IDS_AUTOFILL_SETTINGS_PAGE_BENEFITS_AVAILABLE_TAG_FOR_CREDIT_CARD_LIST_ENTRY 35430
+#define IDS_AUTOFILL_SETTINGS_PAGE_BENEFITS_TERMS_TAG_FOR_CREDIT_CARD_LIST_ENTRY 35431
+#define IDS_AUTOFILL_CVC_SUGGESTION_MAIN_TEXT 35433
+#define IDS_AUTOFILL_SETTINGS_PAGE_CVC_SAVED_LABEL 35434
+#define IDS_AUTOFILL_SETTINGS_PAGE_SUMMARY_SEPARATED_BY_PIPE 35435
+#define IDS_AUTOFILL_SAVE_CARD_CONFIRMATION_SUCCESS_TITLE_TEXT 35436
+#define IDS_AUTOFILL_SAVE_CARD_CONFIRMATION_FAILURE_TITLE_TEXT 35437
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLL_CONFIRMATION_SUCCESS_TITLE_TEXT 35438
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLL_CONFIRMATION_FAILURE_TITLE_TEXT 35439
+#define IDS_AUTOFILL_SAVE_CARD_CONFIRMATION_SUCCESS_DESCRIPTION_TEXT 35440
+#define IDS_AUTOFILL_SAVE_CARD_CONFIRMATION_FAILURE_DESCRIPTION_TEXT 35441
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLL_CONFIRMATION_SUCCESS_DESCRIPTION_TEXT 35442
+#define IDS_AUTOFILL_VIRTUAL_CARD_ENROLL_CONFIRMATION_FAILURE_DESCRIPTION_TEXT 35443
+#define IDS_AUTOFILL_SAVE_CARD_AND_VIRTUAL_CARD_ENROLL_CONFIRMATION_FAILURE_BUTTON_TEXT 35444
+#define IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM 35445
+#define IDS_AUTOFILL_UNDO_MENU_ITEM 35446
+#define IDS_AUTOFILL_WARNING_INSECURE_CONNECTION 35448
+#define IDS_AUTOFILL_WARNING_MIXED_FORM 35449
+#define IDS_AUTOFILL_DELETE_AUTOCOMPLETE_SUGGESTION_CONFIRMATION_BODY 35450
+#define IDS_AUTOFILL_DELETE_CREDIT_CARD_SUGGESTION_CONFIRMATION_BODY 35451
+#define IDS_AUTOFILL_DELETE_PROFILE_SUGGESTION_CONFIRMATION_BODY 35452
+#define IDS_AUTOFILL_DELETE_AUTOCOMPLETE_SUGGESTION_TOOLTIP 35453
+#define IDS_AUTOFILL_AUTOCOMPLETE_ENTRY_DELETED_A11Y_HINT 35454
+#define IDS_AUTOFILL_DELETE_AUTOCOMPLETE_SUGGESTION_A11Y_HINT 35455
+#define IDS_AUTOFILL_CC_AMEX 35456
+#define IDS_AUTOFILL_CC_AMEX_SHORT 35457
+#define IDS_AUTOFILL_CC_DINERS 35458
+#define IDS_AUTOFILL_CC_DISCOVER 35459
+#define IDS_AUTOFILL_CC_ELO 35460
+#define IDS_AUTOFILL_CC_GOOGLE_PAY 35461
+#define IDS_AUTOFILL_CC_JCB 35462
+#define IDS_AUTOFILL_CC_MASTERCARD 35463
+#define IDS_AUTOFILL_CC_MIR 35464
+#define IDS_AUTOFILL_CC_TROY 35465
+#define IDS_AUTOFILL_CC_UNION_PAY 35466
+#define IDS_AUTOFILL_CC_VISA 35467
+#define IDS_AUTOFILL_CC_GENERIC 35468
+#define IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR 35469
+#define IDS_AUTOFILL_ADDRESS_TEST_DATA 35470
+#define IDS_AUTOFILL_TEST_ADDRESS_SELECTED_A11Y_HINT 35471
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_FILLED_FORM 35472
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_EXPANDABLE_ONLY_ENTRY 35473
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_VIRTUAL_CARD_MANUAL_FALLBACK_ENTRY 35474
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_EDIT_ADDRESS_PROFILE_POPUP_OPTION_SELECTED 35475
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_DELETE_ADDRESS_PROFILE_POPUP_OPTION_SELECTED 35476
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_CLEARED_FORM 35477
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_FILL_ADDRESS_GROUP_POPUP_OPTION_SELECTED 35478
+#define IDS_AUTOFILL_FILL_ADDRESS_GROUP_POPUP_OPTION_SELECTED 35479
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_FILL_NAME_GROUP_POPUP_OPTION_SELECTED 35480
+#define IDS_AUTOFILL_FILL_NAME_GROUP_POPUP_OPTION_SELECTED 35481
+#define IDS_AUTOFILL_A11Y_ANNOUNCE_FILL_EVERYTHING_FROM_ADDRESS_PROFILE_POPUP_OPTION_SELECTED 35482
+#define IDS_AUTOFILL_HIDE_SUGGESTIONS 35483
+#define IDS_AUTOFILL_EDIT_ADDRESS_PROFILE_POPUP_OPTION_SELECTED 35484
+#define IDS_AUTOFILL_DELETE_ADDRESS_PROFILE_POPUP_OPTION_SELECTED 35485
+#define IDS_AUTOFILL_HOUSE_NUMBER_SUGGESTION_SECONDARY_TEXT_OPTION_SELECTED 35486
+#define IDS_AUTOFILL_STREET_NAME_SUGGESTION_SECONDARY_TEXT_OPTION_SELECTED 35487
+#define IDS_AUTOFILL_HOUSE_NUMBER_SUGGESTION_SECONDARY_TEXT 35488
+#define IDS_AUTOFILL_STREET_NAME_SUGGESTION_SECONDARY_TEXT 35489
+#define IDS_AUTOFILL_FILL_EVERYTHING_FROM_ADDRESS_PROFILE_POPUP_OPTION_SELECTED 35490
+#define IDS_AUTOFILL_MANAGE_ADDRESSES 35491
+#define IDS_AUTOFILL_MANAGE_PAYMENT_METHODS 35492
+#define IDS_AUTOFILL_MANAGE_PASSWORDS 35493
+#define IDS_AUTOFILL_SCAN_CREDIT_CARD 35494
+#define IDS_AUTOFILL_SHOW_ALL_SAVED_FALLBACK 35495
+#define IDS_AUTOFILL_SHOW_ACCOUNT_CARDS 35496
+#define IDS_AUTOFILL_POPUP_ACCESSIBLE_NODE_DATA 35497
+#define IDS_AUTOFILL_IPH_EXTERNAL_ACCOUNT_PROFILE_SUGGESTION 35498
+#define IDS_AUTOFILL_SUGGESTION_LABEL_SEPARATOR 35499
+#define IDS_AUTOFILL_CREDIT_CARD_EXPIRATION_DATE_ABBR 35500
+#define IDS_AUTOFILL_CREDIT_CARD_EXPIRATION_DATE_ABBR_V2 35501
+#define IDS_AUTOFILL_CREDIT_CARD_TWO_LINE_LABEL_FROM_NAME 35502
+#define IDS_AUTOFILL_CREDIT_CARD_TWO_LINE_LABEL_FROM_CARD_NUMBER 35503
+#define IDS_AUTOFILL_LOADING_REGIONS 35504
+#define IDS_AUTOFILL_SELECT 35505
+#define IDS_AUTOFILL_NO_SAVED_ADDRESS 35506
+#define IDS_AUTOFILL_ADDRESSES 35507
+#define IDS_AUTOFILL_ADDRESSES_TABLE_ARIA_LABEL 35508
+#define IDS_AUTOFILL_ENABLE_PROFILES_TOGGLE_SUBLABEL 35509
+#define IDS_AUTOFILL_LOCAL_PROFILE_ACCESSIBILITY_LABEL 35510
+#define IDS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_SUBLABEL 35511
+#define IDS_AUTOFILL_DELETE_ACCOUNT_ADDRESS_SOURCE_NOTICE 35512
+#define IDS_AUTOFILL_DELETE_SYNC_ADDRESS_SOURCE_NOTICE 35513
+#define IDS_AUTOFILL_DELETE_LOCAL_ADDRESS_SOURCE_NOTICE 35514
+#define IDS_AUTOFILL_SAVE_IN_ACCOUNT_MESSAGE_ADDRESS_SOURCE_NOTICE 35515
+#define IDS_AUTOFILL_SAVE_IN_ACCOUNT_MESSAGE_ADDRESS_MIGRATION_SOURCE_NOTICE 35516
+#define IDS_AUTOFILL_ADDRESS_ALREADY_SAVED_IN_ACCOUNT_SOURCE_NOTICE 35517
+#define IDS_AUTOFILL_ADDRESS_WILL_BE_SAVED_IN_ACCOUNT_SOURCE_NOTICE 35518
+#define IDS_AUTOFILL_EDIT_ADDRESS_REQUIRED_FIELD_FORM_ERROR 35519
+#define IDS_AUTOFILL_EDIT_ADDRESS_REQUIRED_FIELDS_FORM_ERROR 35520
+#define IDS_AUTOFILL_LOCAL_ADDRESS_ICON_A11Y_LABEL 35521
+#define IDS_AUTOFILL_SYNC_TOGGLE_LABEL 35522
+#define IDS_AUTOFILL_ADDRESSES_SETTINGS_TITLE 35523
+#define IDS_AUTOFILL_PAYMENT_METHODS 35524
+#define IDS_AUTOFILL_PAYMENT_METHODS_TABLE_ARIA_LABEL 35525
+#define IDS_AUTOFILL_ENABLE_PROFILES_TOGGLE_LABEL 35526
+#define IDS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_LABEL 35527
+#define IDS_AUTOFILL_DELETE_ADDRESS_CONFIRMATION_DIALOG_TITLE 35528
+#define IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_LABEL 35529
+#define IDS_ENABLE_CREDIT_CARD_FIDO_AUTH_SUBLABEL 35530
+#define IDS_SYNC_DATATYPE_PAYMENTS 35536
+#define IDS_AUTOFILL_SAVE_ADDRESS_PROMPT_OK_BUTTON_LABEL 35542
+#define IDS_AUTOFILL_SAVE_ADDRESS_PROMPT_MIGRATION_OK_BUTTON_LABEL 35543
+#define IDS_AUTOFILL_ACCOUNT_MIGRATE_ADDRESS_PROMPT_TITLE 35544
+#define IDS_AUTOFILL_UPDATE_ADDRESS_PROMPT_OK_BUTTON_LABEL 35545
+#define IDS_AUTOFILL_ADDRESS_MIGRATION_TO_ACCOUNT_PROMPT_OK_BUTTON_LABEL 35546
+#define IDS_AUTOFILL_ADDRESS_MIGRATION_TO_ACCOUNT_PROMPT_CANCEL_BUTTON_LABEL 35547
+#define IDS_AUTOFILL_UPDATE_ADDRESS_PROMPT_NEW_VALUES_SECTION_LABEL 35548
+#define IDS_AUTOFILL_UPDATE_ADDRESS_PROMPT_OLD_VALUES_SECTION_LABEL 35549
+#define IDS_AUTOFILL_MIGRATE_ADDRESS_PROMPT_CANCEL_BUTTON_LABEL 35550
+#define IDS_AUTOFILL_SAVE_IN_ACCOUNT_PROMPT_ADDRESS_SOURCE_NOTICE 35551
+#define IDS_AUTOFILL_UPDATE_PROMPT_ACCOUNT_ADDRESS_SOURCE_NOTICE 35552
+#define IDS_AUTOFILL_SYNCABLE_PROFILE_MIGRATION_PROMPT_NOTICE 35553
+#define IDS_AUTOFILL_LOCAL_PROFILE_MIGRATION_PROMPT_NOTICE 35554
+#define IDS_AUTOFILL_SAVE_PROMPT_ADDRESS_SECTION_A11Y_LABEL 35555
+#define IDS_AUTOFILL_SAVE_PROMPT_PHONE_SECTION_A11Y_LABEL 35556
+#define IDS_AUTOFILL_SAVE_PROMPT_EMAIL_SECTION_A11Y_LABEL 35557
+#define IDS_AUTOFILL_SAVE_ADDRESS_PROMPT_TITLE 466
+#define IDS_AUTOFILL_SAVE_ADDRESS_PROMPT_CANCEL_BUTTON_LABEL 35575
+#define IDS_AUTOFILL_SAVE_ADDRESS_PROMPT_EDIT_BUTTON_TOOLTIP 35561
+#define IDS_AUTOFILL_UPDATE_ADDRESS_PROMPT_TITLE 35559
+#define IDS_AUTOFILL_UPDATE_ADDRESS_PROMPT_CANCEL_BUTTON_LABEL 35576
+#define IDS_AUTOFILL_EDIT_ADDRESS_DIALOG_TITLE 35562
+#define IDS_AUTOFILL_EDIT_ADDRESS_DIALOG_OK_BUTTON_LABEL_SAVE 35577
+#define IDS_AUTOFILL_MIGRATE_ADDRESS_DIALOG_OK_BUTTON_LABEL_SAVE 35578
+#define IDS_AUTOFILL_EDIT_ADDRESS_DIALOG_OK_BUTTON_LABEL_UPDATE 35579
+#define IDS_AUTOFILL_EDIT_ADDRESS_DIALOG_CANCEL_BUTTON_LABEL 35580
+#define IDS_AUTOFILL_EXPANDABLE_SUGGESTION_FILL_ADDRESS_A11Y_ADDON 35581
+#define IDS_AUTOFILL_EXPANDABLE_SUGGESTION_EXPAND_SHORTCUT 35582
+#define IDS_AUTOFILL_EXPANDABLE_SUGGESTION_EXPAND_SHORTCUT_RTL 35583
+#define IDS_AUTOFILL_EXPANDABLE_SUGGESTION_SUBMENU_HINT 35584
+#define IDS_AUTOFILL_ADDRESS_EDIT_DIALOG_HISPANIC_MUNICIPIO 35585
+#define IDS_BOOKMARK_BAR_FOLDER_NAME 147
+#define IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME 149
+#define IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME 148
+#define IDS_BOOKMARK_BAR_MANAGED_FOLDER_DOMAIN_NAME 35586
+#define IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME 150
+#define IDS_BOOKMARK_EDITOR_TITLE 35587
+#define IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME 35588
+#define IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK 35589
+#define IDS_BOOKMARK_MANAGER_NAME_INPUT_PLACE_HOLDER 35590
+#define IDS_BOOKMARK_MANAGER_URL_INPUT_PLACE_HOLDER 35591
+#define IDS_TOOLTIP_STAR 469
+#define IDS_CLEAR_BROWSING_DATA_CALCULATING 35595
+#define IDS_DEL_BROWSING_HISTORY_COUNTER 35596
+#define IDS_DEL_BROWSING_HISTORY_COUNTER_SYNCED 35597
+#define IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE 35598
+#define IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY 35599
+#define IDS_DEL_CACHE_COUNTER_BASIC 35600
+#define IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE_BASIC 35601
+#define IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY_BASIC 35602
+#define IDS_ANDROID_DEL_CACHE_COUNTER_ADVANCED 35603
+#define IDS_ANDROID_DEL_CACHE_COUNTER_ADVANCED_UPPER_ESTIMATE 35604
+#define IDS_ANDROID_DEL_CACHE_COUNTER_ADVANCED_ALMOST_EMPTY 35605
+#define IDS_DEL_PASSWORDS_COUNTER 35606
+#define IDS_DEL_PASSWORDS_COUNTER_SYNCED 35607
+#define IDS_DEL_ACCOUNT_PASSWORDS_COUNTER 35608
+#define IDS_DEL_PASSWORDS_DOMAINS_DISPLAY 35609
+#define IDS_DEL_PASSWORDS_COUNTER_AND_X_MORE 35610
+#define IDS_DEL_SIGNIN_DATA_COUNTER 35611
+#define IDS_DEL_PASSWORDS_AND_SIGNIN_DATA_COUNTER_NONE 35612
+#define IDS_DEL_PASSWORDS_AND_SIGNIN_DATA_COUNTER_COMBINATION 35613
+#define IDS_DEL_SITE_SETTINGS_COUNTER 35614
+#define IDS_DEL_AUTOFILL_COUNTER_EMPTY 35615
+#define IDS_DEL_AUTOFILL_COUNTER_CREDIT_CARDS 35616
+#define IDS_DEL_AUTOFILL_COUNTER_ADDRESSES 35617
+#define IDS_DEL_AUTOFILL_COUNTER_SUGGESTIONS 35618
+#define IDS_DEL_AUTOFILL_COUNTER_SUGGESTIONS_LONG 35619
+#define IDS_DEL_AUTOFILL_COUNTER_SUGGESTIONS_SHORT 35620
+#define IDS_DEL_AUTOFILL_COUNTER_ONE_TYPE_SYNCED 35621
+#define IDS_DEL_AUTOFILL_COUNTER_TWO_TYPES 35622
+#define IDS_DEL_AUTOFILL_COUNTER_TWO_TYPES_SYNCED 35623
+#define IDS_DEL_AUTOFILL_COUNTER_THREE_TYPES 35624
+#define IDS_DEL_AUTOFILL_COUNTER_THREE_TYPES_SYNCED 35625
+#define IDS_DEL_COOKIES_COUNTER 35626
+#define IDS_DEL_COOKIES_COUNTER_ADVANCED 35627
+#define IDS_DEL_COOKIES_COUNTER_ADVANCED_WITH_SIGNED_IN_EXCEPTION 35628
+#define IDS_ANDROID_DEL_COOKIES_COUNTER_ADVANCED 35629
+#define IDS_DEL_DOWNLOADS_COUNTER 35630
+#define IDS_DEL_HOSTED_APPS_COUNTER 35631
+#define IDS_DEL_HOSTED_APPS_COUNTER_AND_X_MORE 35632
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_TITLE 35633
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_CONTENT 35634
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_NO_THANKS 35635
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_GET_DISCOUNTS 35636
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_ACCEPTED_CONFIRMATION_TITLE 35637
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_ACCEPTED_CONFIRMATION_CONTENT 35638
+#define IDS_DISCOUNT_CONTEXTUAL_CONSENT_ACCEPTED_CONFIRMATION_DONE 35639
+#define IDS_NATIVE_NTP_CART_DISCOUNT_CONSENT_ACCEPT_BUTTON 35640
+#define IDS_NATIVE_NTP_CART_DISCOUNT_CONSENT_TITLE 35641
+#define IDS_NATIVE_NTP_CART_DISCOUNT_CONSENT_BODY 35642
+#define IDS_NTP_CART_DISCOUNT_STEP_ONE_CONTENT 662
+#define IDS_OMNIBOX_TRACK_PRICE 444
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_TITLE 35643
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_DESCRIPTION 35644
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_EMAIL_DESCRIPTION 35645
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_ACTION_BUTTON 35646
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_ERROR_DESCRIPTION 35647
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_ERROR_BUTTON 35648
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_TITLE_FIRST_RUN 35649
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_DESCRIPTION_FIRST_RUN 35650
+#define IDS_OMNIBOX_TRACK_PRICE_DIALOG_CANCEL_BUTTON 35651
+#define IDS_PRICE_TRACKING_SAVE_DESCRIPTION 35652
+#define IDS_PRICE_TRACKING_SAVE_LOCATION 35653
+#define IDS_PRICE_TRACKING_EMAIL_CONSENT_BODY 35654
+#define IDS_PRICE_TRACKING_EMAIL_CONSENT_TITLE 35655
+#define IDS_PRICE_TRACKING_EMAIL_CONSENT_LEARN_MORE_LINK_TEXT 35656
+#define IDS_PRICE_TRACKING_NOT_NOW 35657
+#define IDS_PRICE_TRACKING_YES_IM_IN 35658
+#define IDS_OMNIBOX_TRACKING_PRICE 35659
+#define IDS_OMNIBOX_TRACKING_PRICE_DIALOG_TITLE 35660
+#define IDS_OMNIBOX_TRACKING_PRICE_DIALOG_ACTION_BUTTON 35661
+#define IDS_OMNIBOX_TRACKING_PRICE_DIALOG_UNTRACK_BUTTON 35662
+#define IDS_OMNIBOX_PRICE_TRACKING_OFF_DIALOG_TITLE 35663
+#define IDS_OMNIBOX_PRICE_TRACKING_OFF_DIALOG_DESCRIPTION 35664
+#define IDS_OMNIBOX_PRICE_TRACKING_OFF_DIALOG_DESCRIPTION_BOOKMARK_REMOVED 35665
+#define IDS_OMNIBOX_PRICE_TRACKING_OFF_DIALOG_ACTION_BUTTON 35666
+#define IDS_BOOKMARK_STAR_DIALOG_TRACK_PRICE_DESCRIPTION 35667
+#define IDS_BOOKMARK_STAR_DIALOG_TRACK_PRICE_DESCRIPTION_EMAIL_OFF 35668
+#define IDS_BOOKMARKS_MANAGER_TRACKED_PRODUCTS 35669
+#define IDS_BOOKMARKS_MANAGER_UNTRACK_BUTTON 35670
+#define IDS_PRICE_TRACKING_SIDE_PANEL_IPH 35671
+#define IDS_SIDE_PANEL_TRACKED_PRODUCTS 35672
+#define IDS_PRICE_TRACKING_CHIP_IPH 35673
+#define IDS_SIDE_PANEL_UNTRACK_BUTTON 35674
+#define IDS_SIDE_PANEL_TRACK_BUTTON 35675
+#define IDS_BOOKMARKS_MENU_UNTRACK_PRICE 35676
+#define IDS_BOOKMARKS_MENU_TRACK_PRICE 35677
+#define IDS_PRICE_TRACKING_UNTRACK_PRODUCT_ACCESSIBILITY 35678
+#define IDS_PRICE_TRACKING_TRACK_PRODUCT_ACCESSIBILITY 35679
+#define IDS_PRICE_TRACKING_SIDE_PANEL_ERROR_BUTTON 35680
+#define IDS_PRICE_TRACKING_SETTINGS_TITLE 35681
+#define IDS_PRICE_TRACKING_SETTINGS_EMAIL_DESCRIPTION 35682
+#define IDS_PRICE_TRACKING_SETTINGS_POPUP_DESCRIPTION 35683
+#define IDS_PRICE_TRACKING_SIDE_PANEL_ERROR_MESSAGE 35684
+#define IDS_SHOPPING_COLLECTION_IPH_TITLE 35685
+#define IDS_SHOPPING_COLLECTION_IPH_BODY 35686
+#define IDS_SHOPPING_INSIGHTS_SIDE_PANEL_TITLE 35687
+#define IDS_PRICE_HISTORY_TITLE 35688
+#define IDS_PRICE_HISTORY_TITLE_MULTIPLE_OPTIONS 35689
+#define IDS_PRICE_HISTORY_TITLE_SINGLE_OPTION 35690
+#define IDS_PRICE_HISTORY_MULTIPLE_OPTIONS_LOW_PRICE 35691
+#define IDS_PRICE_HISTORY_MULTIPLE_OPTIONS_HIGH_PRICE 35692
+#define IDS_PRICE_HISTORY_MULTIPLE_OPTIONS_TYPICAL_PRICE 35693
+#define IDS_SHOPPING_INSIGHTS_SIDE_PANEL_TRACK_PRICE_TITLE 35694
+#define IDS_SHOPPING_INSIGHTS_ICON_EXPANDED_TEXT_LOW_PRICE 35695
+#define IDS_SHOPPING_INSIGHTS_ICON_EXPANDED_TEXT_HIGH_PRICE 35696
+#define IDS_SHOPPING_INSIGHTS_ICON_TOOLTIP_TEXT 35697
+#define IDS_SHOPPING_INSIGHTS_BUYING_OPTIONS 35698
+#define IDS_PRICE_HISTORY_TODAY_PRICE 35699
+#define IDS_PRICE_HISTORY_YESTERDAY_PRICE 35700
+#define IDS_PRICE_HISTORY_DESCRIPTION 35701
+#define IDS_PRICE_HISTORY_GRAPH_ACCESSIBILITY 35702
+#define IDS_SHOPPING_INSIGHTS_COLLECT_FEEDBACK 35703
+#define IDS_SHOPPING_INSIGHTS_FEEDBACK_FORM_TITLE 35704
+#define IDS_PRICE_RANGE_ALL_OPTIONS 35705
+#define IDS_PRICE_RANGE_ALL_OPTIONS_ONE_TYPICAL_PRICE 35706
+#define IDS_PRICE_RANGE_SINGLE_OPTION 35707
+#define IDS_PRICE_RANGE_SINGLE_OPTION_ONE_TYPICAL_PRICE 35708
+#define IDS_PRICE_HISTORY_SINGLE_OPTION_LOW_PRICE 35709
+#define IDS_PRICE_HISTORY_SINGLE_OPTION_HIGH_PRICE 35710
+#define IDS_PRICE_HISTORY_SINGLE_OPTION_TYPICAL_PRICE 35711
+#define IDS_SHOPPING_INSIGHTS_SIDE_PANEL_TRACK_PRICE_DESCRIPTION 35712
+#define IDS_SHOPPING_INSIGHTS_SIDE_PANEL_TRACK_PRICE_ERROR 35713
+#define IDS_DISCOUNT_USE_THIS_CODE_AT_CHECKOUT 35714
+#define IDS_DISCOUNT_EXPIRATION_DATE 35715
+#define IDS_DISCOUNT_CODE_COPY_BUTTON_TEXT 35716
+#define IDS_TWO_STRINGS_CONNECTOR 35717
+#define IDS_TWO_STRINGS_CONNECTOR_WITH_SPACE 35718
+#define IDS_SELLER_TERMS_AND_CONDITIONS_DIALOG_TITLE 35719
+#define IDS_SELLER_TERMS_AND_CONDITIONS_DIALOG_FOOTER 35720
+#define IDS_SEE_SELLER_TERMS_AND_CONDITIONS 35721
+#define IDS_DISCOUNT_ICON_EXPANDED_TEXT 35722
+#define IDS_PRICE_DROP_POPUP_CONTENT_TITLE 35735
+#define IDS_PRICE_DROP_POPUP_CONTENT_TEXT 35736
+#define IDS_PRICE_DROP_POPUP_ACTION_BUTTON 35737
+#define IDS_PRICE_DROP_POPUP_UNTRACK_BUTTON 35738
+#define IDS_SHOPPING_COLLECTION_FOLDER_NAME 35739
+#define IDS_COMPOSE_SUGGESTION_MAIN_TEXT 35740
+#define IDS_COMPOSE_CONTEXT_MENU_TEXT 35741
+#define IDS_COMPOSE_SUGGESTION_LABEL 35742
+#define IDS_COMPOSE_SUGGESTION_SAVED_TEXT 35743
+#define IDS_COMPOSE_SUGGESTION_SAVED_LABEL 35744
+#define IDS_COMPOSE_SUGGESTION_AX_MESSAGE_ON_SHOW 35745
+#define IDS_COMPOSE_FRE_TITLE 35746
+#define IDS_COMPOSE_FRE_MAIN_TOP 35747
+#define IDS_COMPOSE_FRE_MAIN_MID 35748
+#define IDS_COMPOSE_FRE_OK_BUTTON 35749
+#define IDS_COMPOSE_FRE_MSBB_TITLE 35750
+#define IDS_COMPOSE_FRE_MSBB_MAIN 35751
+#define IDS_COMPOSE_FRE_MSBB_SETTINGS_BUTTON 35752
+#define IDS_COMPOSE_MSBB_IPH_BUBBLE_TEXT 35753
+#define IDS_COMPOSE_MSBB_IPH_BUBBLE_TEXT_SCREENREADER 35754
+#define IDS_COMPOSE_MSBB_IPH_BUBBLE_CLOSE_BUTTON_LABEL_TEXT 35755
+#define IDS_COMPOSE_DIALOG_TITLE 35756
+#define IDS_COMPOSE_INPUT_PLACEHOLDER_TITLE 35757
+#define IDS_COMPOSE_INPUT_PLACEHOLDER_LINE_1 35758
+#define IDS_COMPOSE_INPUT_PLACEHOLDER_LINE_2 35759
+#define IDS_COMPOSE_INPUT_PLACEHOLDER_LINE_3 35760
+#define IDS_COMPOSE_INPUT_FOOTER 35761
+#define IDS_COMPOSE_SUBMIT_BUTTON 35762
+#define IDS_COMPOSE_EDIT_UPDATE_BUTTON 35763
+#define IDS_COMPOSE_EDIT 35764
+#define IDS_COMPOSE_MENU_LENGTH_TITLE 35765
+#define IDS_COMPOSE_MENU_SHORTER_OPTION 35766
+#define IDS_COMPOSE_MENU_LONGER_OPTION 35767
+#define IDS_COMPOSE_MENU_TONE_TITLE 35768
+#define IDS_COMPOSE_MENU_CASUAL_OPTION 35769
+#define IDS_COMPOSE_MENU_FORMAL_OPTION 35770
+#define IDS_COMPOSE_UNDO 35771
+#define IDS_COMPOSE_RESUBMIT 35772
+#define IDS_COMPOSE_INSERT_BUTTON 35773
+#define IDS_COMPOSE_REPLACE_BUTTON 35774
+#define IDS_COMPOSE_THUMBS_DOWN 35775
+#define IDS_COMPOSE_THUMBS_UP 35776
+#define IDS_COMPOSE_ERROR_TOO_SHORT 35777
+#define IDS_COMPOSE_ERROR_TOO_LONG 35778
+#define IDS_COMPOSE_ERROR_TRY_AGAIN 35779
+#define IDS_COMPOSE_ERROR_TRY_AGAIN_LATER 35780
+#define IDS_COMPOSE_ERROR_FILTERED 35781
+#define IDS_COMPOSE_ERROR_UNSUPPORTED_LANGUAGE 35782
+#define IDS_COMPOSE_ERROR_PERMISSION_DENIED 35783
+#define IDS_COMPOSE_ERROR_REQUEST_THROTTLED 35784
+#define IDS_COMPOSE_ERROR_OFFLINE 35785
+#define IDS_COMPOSE_FOOTER_FISHFOOD 35786
+#define IDS_COMPOSE_EXPERIMENTAL_DISCLAIMER_FOOTER 35787
+#define IDS_COMPOSE_FOOTER_FISHFOOD_ON_DEVICE_USED 35788
+#define IDS_COMPOSE_FEEDBACK_PLACEHOLDER 35789
+#define IDS_LIVE_CAPTION_BUBBLE_TITLE 35790
+#define IDS_LIVE_CAPTION_BUBBLE_CLOSE 35791
+#define IDS_LIVE_CAPTION_BUBBLE_EXPAND 35792
+#define IDS_LIVE_CAPTION_BUBBLE_COLLAPSE 35793
+#define IDS_LIVE_CAPTION_BUBBLE_BACK_TO_TAB 35794
+#define IDS_LIVE_CAPTION_BUBBLE_PIN 35795
+#define IDS_LIVE_CAPTION_BUBBLE_UNPIN 35796
+#define IDS_LIVE_CAPTION_BUBBLE_ERROR 35797
+#define IDS_LIVE_CAPTION_BUBBLE_CONTENT_SETTINGS 35798
+#define IDS_LIVE_CAPTION_BUBBLE_MEDIA_FOUNDATION_RENDERER_ERROR 35799
+#define IDS_LIVE_CAPTION_BUBBLE_MEDIA_FOUNDATION_RENDERER_ERROR_CHECKBOX 35800
+#define IDS_LIVE_CAPTION_BUBBLE_APPEAR_SCREENREADER_ANNOUNCEMENT 35801
+#define IDS_LIVE_CAPTION_CAPTION_LANGUAGE_AUTODETECTED 35802
+#define IDS_LIVE_CAPTION_TRANSLATED_CAPTION_LANGUAGE 35803
+#define IDS_LIVE_CAPTION_TRANSLATED_CAPTION_LANGUAGE_AUTODETECTED 35804
+#define IDS_LIVE_CAPTION_BUBBLE_CAPTION_SETTINGS 35805
+#define IDS_LIVE_CAPTION_DOWNLOAD_PROGRESS 35806
+#define IDS_LIVE_CAPTION_LANGUAGE_DOWNLOAD_FAILED 35807
+#define IDS_SETTINGS_TITLE 35808
+#define IDS_SETTINGS_HIDE_ADVANCED_SETTINGS 35809
+#define IDS_SETTINGS_SHOW_ADVANCED_SETTINGS 35810
+#define IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION 35811
+#define IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON 35812
+#define IDS_CRASH_TITLE 35813
+#define IDS_CRASH_CRASH_COUNT_BANNER_FORMAT 35814
+#define IDS_CRASH_SHOW_DEVELOPER_DETAILS 35815
+#define IDS_CRASH_CAPTURE_TIME_FORMAT 35816
+#define IDS_CRASH_REPORT_STATUS 35817
+#define IDS_CRASH_REPORT_STATUS_NOT_UPLOADED 35818
+#define IDS_CRASH_REPORT_STATUS_PENDING 35819
+#define IDS_CRASH_REPORT_STATUS_PENDING_USER_REQUESTED 35820
+#define IDS_CRASH_REPORT_STATUS_UPLOADED 35821
+#define IDS_CRASH_REPORT_UPLOADED_ID 35822
+#define IDS_CRASH_REPORT_UPLOADED_TIME 35823
+#define IDS_CRASH_REPORT_LOCAL_ID 35824
+#define IDS_CRASH_REPORT_FILE_SIZE 35825
+#define IDS_CRASH_BUG_LINK_LABEL 35826
+#define IDS_CRASH_NO_CRASHES_MESSAGE 35827
+#define IDS_CRASH_DISABLED_HEADER 35828
+#define IDS_CRASH_UPLOAD_MESSAGE 35829
+#define IDS_CRASH_UPLOAD_NOW_LINK_TEXT 35830
+#define IDS_HTTP_POST_WARNING_TITLE 35831
+#define IDS_HTTP_POST_WARNING 35832
+#define IDS_HTTP_POST_WARNING_RESEND 35833
+#define IDS_DOM_DISTILLER_JAVASCRIPT_DISABLED_CONTENT 35834
+#define IDS_DOM_DISTILLER_WEBUI_ENTRY_URL 35835
+#define IDS_DOM_DISTILLER_WEBUI_ENTRY_ADD 35836
+#define IDS_DOM_DISTILLER_WEBUI_ENTRY_ADD_FAILED 35837
+#define IDS_DOM_DISTILLER_WEBUI_VIEW_URL 35838
+#define IDS_DOM_DISTILLER_WEBUI_VIEW_URL_FAILED 35839
+#define IDS_DOM_DISTILLER_WEBUI_REFRESH 35840
+#define IDS_DOM_DISTILLER_WEBUI_FETCHING_ENTRIES 35841
+#define IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_TITLE 35842
+#define IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_CONTENT 35843
+#define IDS_DOM_DISTILLER_VIEWER_LOADING_TITLE 35844
+#define IDS_DOM_DISTILLER_VIEWER_CUSTOMIZE_APPEARANCE 35845
+#define IDS_DOM_DISTILLER_VIEWER_FONT_STYLE 35846
+#define IDS_DOM_DISTILLER_VIEWER_SANS_SERIF_FONT 35847
+#define IDS_DOM_DISTILLER_VIEWER_SERIF_FONT 35848
+#define IDS_DOM_DISTILLER_VIEWER_MONOSPACE_FONT 35849
+#define IDS_DOM_DISTILLER_VIEWER_PAGE_COLOR 35850
+#define IDS_DOM_DISTILLER_VIEWER_PAGE_COLOR_LIGHT 35851
+#define IDS_DOM_DISTILLER_VIEWER_PAGE_COLOR_SEPIA 35852
+#define IDS_DOM_DISTILLER_VIEWER_PAGE_COLOR_DARK 35853
+#define IDS_DOM_DISTILLER_VIEWER_FONT_SIZE 35854
+#define IDS_DOM_DISTILLER_VIEWER_FONT_SIZE_SMALL 35855
+#define IDS_DOM_DISTILLER_VIEWER_FONT_SIZE_LARGE 35856
+#define IDS_DOM_DISTILLER_VIEWER_CLOSE 35857
+#define IDS_DOM_DISTILLER_VIEWER_NO_DATA_CONTENT 35858
+#define IDS_DOM_DISTILLER_WEBUI_TITLE 35859
+#define IDS_DOM_DISTILLER_VIEWER_TITLE_SUFFIX 35860
+#define IDS_ENTERPRISE_COPY_PREVENTION_MISSING_LIST_ERROR 35861
+#define IDS_ENTERPRISE_COPY_PREVENTION_DISABLE_CONTAINS_WILDCARD_ERROR 35862
+#define IDS_ENTERPRISE_COPY_PREVENTION_WARNING_MESSAGE 35863
+#define IDS_ENTERPRISE_DATA_CONTROLS_COPY_PREVENTION_WARNING_MESSAGE 35864
+#define IDS_ERRORPAGE_NET_BUTTON_DETAILS 35865
+#define IDS_ERRORPAGE_NET_BUTTON_HIDE_DETAILS 35866
+#define IDS_ERRORPAGES_BUTTON_RELOAD 35867
+#define IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY 35868
+#define IDS_ERRORPAGE_FUN_DISABLED 35869
+#define IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_SUMMARY 35879
+#define IDS_ERRORPAGES_SUGGESTION_RELOAD_PRIVATE_NETWORK_ACCESS 35880
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER 35881
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY 35882
+#define IDS_ERRORPAGES_SUGGESTION_SECURE_DNS_CONFIG_HEADER 35883
+#define IDS_ERRORPAGES_SUGGESTION_SECURE_DNS_CONFIG_BODY 35884
+#define IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER 35885
+#define IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_BODY 35886
+#define IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_HEADER 35887
+#define IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_BODY 35888
+#define IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER 35889
+#define IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY 35890
+#define IDS_ERRORPAGES_SUGGESTION_CAPTIVE_PORTAL_SIGNIN 35891
+#define IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_HEADER 35893
+#define IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_BODY 35894
+#define IDS_ERRORPAGES_SUGGESTION_UNSUPPORTED_CIPHER_HEADER 35895
+#define IDS_ERRORPAGES_SUGGESTION_UNSUPPORTED_CIPHER_BODY 35896
+#define IDS_ERRORPAGES_SUGGESTION_NAVIGATE_TO_ORIGIN 35897
+#define IDS_ERRORPAGES_HEADING_NOT_AVAILABLE 35898
+#define IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED 35899
+#define IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED 35900
+#define IDS_ERRORPAGES_HEADING_YOU_ARE_OFFLINE 35901
+#define IDS_ERRORPAGES_MESSAGE_IWA_INVALID_WEB_BUNDLE 35902
+#define IDS_ERRORPAGES_MESSAGE_IWA_CONNECTION_REFUSED 35903
+#define IDS_ERRORPAGES_HEADING_CACHE_READ_FAILURE 35904
+#define IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED 35905
+#define IDS_ERRORPAGES_HEADING_NOT_FOUND 35906
+#define IDS_ERRORPAGES_HEADING_FILE_NOT_FOUND 35907
+#define IDS_ERRORPAGES_HEADING_BLOCKED 35908
+#define IDS_ERRORPAGES_HEADING_BLOCKED_SCHEME 35909
+#define IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE 35910
+#define IDS_ERRORPAGES_SUMMARY_TIMED_OUT 35911
+#define IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET 35912
+#define IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED 35913
+#define IDS_ERRORPAGES_SUMMARY_CONNECTION_FAILED 35914
+#define IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED 35915
+#define IDS_ERRORPAGES_SUMMARY_CONNECTION_REFUSED 35916
+#define IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED 35917
+#define IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION 35918
+#define IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE 35919
+#define IDS_ERRORPAGES_SUMMARY_FILE_ACCESS_DENIED 35920
+#define IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED 35921
+#define IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED 35922
+#define IDS_ERRORPAGES_SUMMARY_CACHE_READ_FAILURE 35923
+#define IDS_ERRORPAGES_SUMMARY_NETWORK_IO_SUSPENDED 35924
+#define IDS_ERRORPAGES_SUMMARY_NOT_FOUND 35925
+#define IDS_ERRORPAGES_SUMMARY_FILE_NOT_FOUND 35926
+#define IDS_ERRORPAGES_SUMMARY_TOO_MANY_REDIRECTS 35927
+#define IDS_ERRORPAGES_SUMMARY_EMPTY_RESPONSE 35928
+#define IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE 35929
+#define IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING 35930
+#define IDS_ERRORPAGES_HEADING_ACCESS_DENIED 35931
+#define IDS_ERRORPAGES_HEADING_FILE_ACCESS_DENIED 35932
+#define IDS_ERRORPAGES_SUMMARY_FORBIDDEN 35933
+#define IDS_ERRORPAGES_SUMMARY_GONE 35934
+#define IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING 35935
+#define IDS_ERRORPAGES_SUMMARY_CONTACT_SITE_OWNER 35936
+#define IDS_ERRORPAGES_SUMMARY_WEBSITE_CANNOT_HANDLE_REQUEST 35937
+#define IDS_ERRORPAGES_SUMMARY_GATEWAY_TIMEOUT 35938
+#define IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR 35939
+#define IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH 35940
+#define IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION 35941
+#define IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT 35942
+#define IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_EXTENSION 35943
+#define IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_ADMINISTRATOR 35944
+#define IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_SECURITY 35945
+#define IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_PRIVATE_NETWORK_ACCESS_CHECKS 35946
+#define IDS_ERRORPAGES_HTTP_POST_WARNING 35947
+#define IDS_ERRORPAGES_HEADING_LINKPREVIEW_NON_HTTPS_FORBIDDEN 35948
+#define IDS_ERRORPAGES_SUMMARY_LINKPREVIEW_NON_HTTPS_FORBIDDEN 35949
+#define IDS_ERRORPAGES_SUGGESTION_LIST_HEADER 35950
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_SUMMARY 35951
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_DNS_SUMMARY 35953
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_SECURE_DNS_SUMMARY 35954
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_FIREWALL_ANTIVIRUS_SUMMARY 35955
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_SUMMARY 35956
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_ADDRESS_SUMMARY 35957
+#define IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMIN_SUMMARY 35958
+#define IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMIN_SUMMARY_STANDALONE 35959
+#define IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY 35960
+#define IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY_STANDALONE 35961
+#define IDS_ERRORPAGES_SUGGESTION_DELETE_COOKIES_SUMMARY 35962
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_HARDWARE_SUMMARY 35966
+#define IDS_ERRORPAGES_SUGGESTION_CHECK_WIFI_SUMMARY 35967
+#define IDS_ERRORPAGES_SUGGESTION_DISABLE_EXTENSION_SUMMARY 35968
+#define IDS_ERRORPAGES_CHECK_TYPO_SUMMARY 35969
+#define IDS_ERRORPAGES_SUGGESTION_DIAGNOSE 35970
+#define IDS_ERRORPAGES_SUGGESTION_DIAGNOSE_STANDALONE 35971
+#define IDS_ERRORPAGES_SUGGESTION_DIAGNOSE_CHECK_TYPO_STANDALONE 35972
+#define IDS_ERRORPAGES_GAME_INSTRUCTIONS 35973
+#define IDS_ERRORPAGE_DINO_GAME_DESCRIPTION 35974
+#define IDS_ERRORPAGE_DINO_ARIA_LABEL 35975
+#define IDS_ERRORPAGE_DINO_GAME_START 35976
+#define IDS_ERRORPAGE_DINO_GAME_OVER 35977
+#define IDS_ERRORPAGE_DINO_HIGH_SCORE 35978
+#define IDS_ERRORPAGE_DINO_JUMP 35979
+#define IDS_ERRORPAGE_DINO_SLOW_SPEED_TOGGLE 35980
+#define IDS_FIND_IN_PAGE_ACCESSIBLE_TITLE 35981
+#define IDS_FIND_IN_PAGE_COUNT 35982
+#define IDS_ACCESSIBLE_FIND_IN_PAGE_COUNT 35983
+#define IDS_ACCESSIBLE_FIND_IN_PAGE_NO_RESULTS 35984
+#define IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP 35985
+#define IDS_FIND_IN_PAGE_NEXT_TOOLTIP 35986
+#define IDS_FIND_IN_PAGE_CLOSE_TOOLTIP 35987
+#define IDS_FLAGS_UI_SEARCH_PLACEHOLDER 35988
+#define IDS_FLAGS_UI_SEARCH_LABEL 35989
+#define IDS_FLAGS_UI_TITLE 35990
+#define IDS_FLAGS_UI_PAGE_RESET 35991
+#define IDS_FLAGS_UI_PAGE_WARNING 35992
+#define IDS_FLAGS_UI_PAGE_WARNING_EXPLANATION 35993
+#define IDS_FLAGS_UI_OWNER_WARNING 35994
+#define IDS_FLAGS_UI_AVAILABLE_FEATURE 35995
+#define IDS_FLAGS_UI_UNAVAILABLE_FEATURE 35996
+#define IDS_FLAGS_UI_ENABLED_FEATURE 35997
+#define IDS_FLAGS_UI_DISABLED_FEATURE 35998
+#define IDS_FLAGS_UI_NO_RESULTS 35999
+#define IDS_FLAGS_UI_NOT_AVAILABLE_ON_PLATFORM 36000
+#define IDS_FLAGS_UI_RELAUNCH 36001
+#define IDS_FLAGS_UI_CLEAR_SEARCH 36005
+#define IDS_FLAGS_UI_RESET_ACKNOWLEDGED 36006
+#define IDS_FLAGS_UI_EXPERIMENT_ENABLED 36007
+#define IDS_FLAGS_UI_SEARCH_RESULTS_SINGULAR 36008
+#define IDS_FLAGS_UI_SEARCH_RESULTS_PLURAL 36009
+#define IDS_DEPRECATED_FEATURES_PAGE_RESET 36010
+#define IDS_DEPRECATED_FEATURES_OWNER_WARNING 36011
+#define IDS_DEPRECATED_FEATURES_AVAILABLE_FEATURE 36012
+#define IDS_DEPRECATED_FEATURES_UNAVAILABLE_FEATURE 36013
+#define IDS_DEPRECATED_FEATURES_ENABLED_FEATURE 36014
+#define IDS_DEPRECATED_FEATURES_DISABLED_FEATURE 36015
+#define IDS_DEPRECATED_FEATURES_NOT_AVAILABLE_ON_PLATFORM 36016
+#define IDS_DEPRECATED_FEATURES_RELAUNCH 36017
+#define IDS_DEPRECATED_FEATURES_SEARCH_PLACEHOLDER 36021
+#define IDS_DEPRECATED_FEATURES_TITLE 36022
+#define IDS_DEPRECATED_FEATURES_HEADING 36023
+#define IDS_DEPRECATED_FEATURES_PAGE_WARNING_EXPLANATION 36024
+#define IDS_DEPRECATED_FEATURES_NO_RESULTS 36025
+#define IDS_DEPRECATED_UI_CLEAR_SEARCH 36026
+#define IDS_DEPRECATED_UI_RESET_ACKNOWLEDGED 36027
+#define IDS_DEPRECATED_UI_EXPERIMENT_ENABLED 36028
+#define IDS_ENTERPRISE_UI_SEARCH_RESULTS_SINGULAR 36029
+#define IDS_ENTERPRISE_UI_SEARCH_RESULTS_PLURAL 36030
+#define IDS_EXIT_FULLSCREEN_MODE 36031
+#define IDS_FULLSCREEN_HOLD_TO_EXIT_FULLSCREEN 36032
+#define IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN 36033
+#define IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN_TWO_KEYS 36034
+#define IDS_PRESS_TO_EXIT_MOUSELOCK 36035
+#define IDS_PRESS_TO_EXIT_MOUSELOCK_TWO_KEYS 36036
+#define IDS_FULLSCREEN_HOLD_TO_SEE_DOWNLOADS 36037
+#define IDS_FULLSCREEN_PRESS_TO_SEE_DOWNLOADS 36038
+#define IDS_FULLSCREEN_PRESS_TO_SEE_DOWNLOADS_AND_EXIT 36039
+#define IDS_FULLSCREEN_HOLD_TO_SEE_DOWNLOADS_AND_EXIT 36040
+#define IDS_GLOBAL_MEDIA_CONTROLS_BACK_TO_TAB 36041
+#define IDS_GLOBAL_MEDIA_CONTROLS_DISMISS_ICON_TOOLTIP_TEXT 36042
+#define IDS_HEAVY_AD_INTERVENTION_BUTTON_DETAILS 36043
+#define IDS_HEAVY_AD_INTERVENTION_HEADING 36044
+#define IDS_HEAVY_AD_INTERVENTION_SUMMARY 36045
+#define IDS_HEAVY_AD_INTERVENTION_BUTTON_RELOAD 36046
+#define IDS_HISTORY_ACTION_MENU_DESCRIPTION 36047
+#define IDS_HISTORY_ARIA_ROLE_DESCRIPTION 36048
+#define IDS_HISTORY_CANCEL_EDITING_BUTTON 36049
+#define IDS_HISTORY_DATE_WITH_RELATIVE_TIME 36050
+#define IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON 36051
+#define IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING 36052
+#define IDS_HISTORY_DELETE_SELECTED_ENTRIES_BUTTON 36053
+#define IDS_HISTORY_ENTRY_ACCESSIBILITY_DELETE 36054
+#define IDS_HISTORY_ENTRY_ACCESSIBILITY_LABEL 36055
+#define IDS_HISTORY_ENTRY_BOOKMARKED 36056
+#define IDS_HISTORY_ENTRY_SUMMARY 36057
+#define IDS_HISTORY_FOUND_SEARCH_RESULTS 36058
+#define IDS_HISTORY_OTHER_FORMS_OF_HISTORY 36059
+#define IDS_HISTORY_LOADING 36060
+#define IDS_HISTORY_MORE_FROM_SITE 36061
+#define IDS_HISTORY_NO_RESULTS 36062
+#define IDS_HISTORY_NO_SEARCH_RESULTS 36063
+#define IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG 36064
+#define IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION 36065
+#define IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION 36066
+#define IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW 36067
+#define IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL 36068
+#define IDS_HISTORY_REMOVE_BOOKMARK 36069
+#define IDS_HISTORY_REMOVE_PAGE 36070
+#define IDS_HISTORY_REMOVE_PAGE_SUCCESS 36071
+#define IDS_HISTORY_REMOVE_SELECTED_ITEMS 36072
+#define IDS_HISTORY_SEARCH_BUTTON 36073
+#define IDS_HISTORY_SEARCH_RESULT 36074
+#define IDS_HISTORY_SEARCH_RESULTS 36075
+#define IDS_HISTORY_SHOW_HISTORY 36076
+#define IDS_HISTORY_SHOWFULLHISTORY_LINK 36077
+#define IDS_HISTORY_START_EDITING_BUTTON 36078
+#define IDS_HISTORY_TITLE 36079
+#define IDS_HISTORY_UNKNOWN_DEVICE 36080
+#define IDS_JAVASCRIPT_MESSAGEBOX_TITLE 36081
+#define IDS_JAVASCRIPT_MESSAGEBOX_TITLE_IFRAME 36082
+#define IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL 36083
+#define IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL_IFRAME 36084
+#define IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION 36085
+#define IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE 36086
+#define IDS_BEFOREUNLOAD_APP_MESSAGEBOX_TITLE 36087
+#define IDS_BEFOREUNLOAD_MESSAGEBOX_OK_BUTTON_LABEL 36088
+#define IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE 36089
+#define IDS_BEFORERELOAD_MESSAGEBOX_TITLE 36090
+#define IDS_BEFORERELOAD_APP_MESSAGEBOX_TITLE 36091
+#define IDS_BEFORERELOAD_MESSAGEBOX_OK_BUTTON_LABEL 36092
+#define IDS_LOGIN_DIALOG_TITLE 36093
+#define IDS_LOGIN_DIALOG_OK_BUTTON_LABEL 36094
+#define IDS_LOGIN_DIALOG_AUTHORITY 36095
+#define IDS_LOGIN_DIALOG_PROXY_AUTHORITY 36096
+#define IDS_LOGIN_DIALOG_NOT_PRIVATE 36097
+#define IDS_LOGIN_DIALOG_USERNAME_FIELD 36098
+#define IDS_LOGIN_DIALOG_PASSWORD_FIELD 36099
+#define IDS_MANAGEMENT_TITLE 36100
+#define IDS_MANAGEMENT_TOOLBAR_TITLE 36101
+#define IDS_MANAGEMENT_SUBTITLE 36105
+#define IDS_MANAGEMENT_SUBTITLE_MANAGED_BY 36103
+#define IDS_MANAGEMENT_NOT_MANAGED_SUBTITLE 36104
+#define IDS_MANAGEMENT_SUBTITLE_BROWSER_AND_PROFILE_DIFFERENT_MANAGED_BY 36106
+#define IDS_MANAGEMENT_SUBTITLE_BROWSER_MANAGED_AND_PROFILE_MANAGED_BY 36107
+#define IDS_MANAGEMENT_SUBTITLE_BROWSER_AND_PROFILE_SAME_MANAGED_BY 36108
+#define IDS_MANAGEMENT_SUBTITLE_PROFILE_MANAGED_BY 36109
+#define IDS_MANAGEMENT_BROWSER_NOTICE 36110
+#define IDS_MANAGEMENT_NOT_MANAGED_NOTICE 36111
+#define IDS_MANAGEMENT_LEARN_MORE_ACCCESSIBILITY_TEXT 36112
+#define IDS_MANAGEMENT_EXTENSION_REPORTING 36147
+#define IDS_MANAGEMENT_EXTENSIONS_INSTALLED 36148
+#define IDS_MANAGEMENT_EXTENSIONS_INSTALLED_BY 36149
+#define IDS_MANAGEMENT_EXTENSIONS_NAME 36150
+#define IDS_MANAGEMENT_EXTENSIONS_PERMISSIONS 36151
+#define IDS_MANAGEMENT_APPLICATION_REPORTING 36152
+#define IDS_MANAGEMENT_APPLICATIONS_INSTALLED 36153
+#define IDS_MANAGEMENT_APPLICATIONS_INSTALLED_BY 36154
+#define IDS_MANAGEMENT_APPLICATIONS_NAME 36155
+#define IDS_MANAGEMENT_APPLICATIONS_PERMISSIONS 36156
+#define IDS_MANAGEMENT_APPLICATIONS_RUN_ON_OS_LOGIN 36157
+#define IDS_MANAGEMENT_MANAGED_WEBSITES 36158
+#define IDS_MANAGEMENT_MANAGED_WEBSITES_EXPLANATION 36159
+#define IDS_MANAGEMENT_MANAGED_WEBSITES_BY_EXPLANATION 36160
+#define IDS_MANAGEMENT_BROWSER_REPORTING 36161
+#define IDS_MANAGEMENT_BROWSER_REPORTING_EXPLANATION 36162
+#define IDS_MANAGEMENT_EXTENSION_REPORT_MACHINE_NAME 36163
+#define IDS_MANAGEMENT_EXTENSION_REPORT_MACHINE_NAME_ADDRESS 36164
+#define IDS_MANAGEMENT_EXTENSION_REPORT_USERNAME 36165
+#define IDS_MANAGEMENT_EXTENSION_REPORT_VERSION 36166
+#define IDS_MANAGEMENT_EXTENSION_REPORT_EXTENSIONS_PLUGINS 36167
+#define IDS_MANAGEMENT_EXTENSION_REPORT_USER_BROWSING_DATA 36168
+#define IDS_MANAGEMENT_EXTENSION_REPORT_PERF_CRASH 36169
+#define IDS_MANAGEMENT_LEGACY_TECH_REPORT 36170
+#define IDS_MANAGEMENT_THREAT_PROTECTION 36171
+#define IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION 36172
+#define IDS_MANAGEMENT_THREAT_PROTECTION_DESCRIPTION_BY 36173
+#define IDS_MANAGEMENT_CONNECTORS_EVENT 36174
+#define IDS_MANAGEMENT_CONNECTORS_VISIBLE_DATA 36175
+#define IDS_MANAGEMENT_FILE_ATTACHED_EVENT 36176
+#define IDS_MANAGEMENT_FILE_DOWNLOADED_EVENT 36177
+#define IDS_MANAGEMENT_TEXT_ENTERED_EVENT 36178
+#define IDS_MANAGEMENT_PAGE_PRINTED_EVENT 36179
+#define IDS_MANAGEMENT_FILE_TRANSFER_EVENT 36180
+#define IDS_MANAGEMENT_ENTERPRISE_REPORTING_EVENT 36181
+#define IDS_MANAGEMENT_PAGE_VISITED_EVENT 36182
+#define IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT 36183
+#define IDS_MANAGEMENT_FILE_ATTACHED_VISIBLE_DATA 36184
+#define IDS_MANAGEMENT_FILE_DOWNLOADED_VISIBLE_DATA 36185
+#define IDS_MANAGEMENT_TEXT_ENTERED_VISIBLE_DATA 36186
+#define IDS_MANAGEMENT_PAGE_PRINTED_VISIBLE_DATA 36187
+#define IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA 36188
+#define IDS_MANAGEMENT_SCREEN_CAPTURE_DATA 36189
+#define IDS_MANAGEMENT_ENTERPRISE_REPORTING_VISIBLE_DATA 36190
+#define IDS_MANAGEMENT_PAGE_VISITED_VISIBLE_DATA 36191
+#define IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE 36192
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_PREVIOUS_TRACK 36193
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_SEEK_BACKWARD 36194
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_PLAY 36195
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_PAUSE 36196
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_SEEK_FORWARD 36197
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_NEXT_TRACK 36198
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_ENTER_PIP 36199
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_EXIT_PIP 36200
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_MUTE 36201
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_UNMUTE 36202
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_SHOW_DEVICE_LIST 36203
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_HIDE_DEVICE_LIST 36204
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACTION_STOP_CASTING 36205
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_TIME_SCRUBBER 36206
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_ACCESSIBLE_NAME 36207
+#define IDS_MEDIA_MESSAGE_CENTER_MEDIA_NOTIFICATION_LABEL 36208
+#define IDS_DEFAULT_TAB_TITLE 474
+#define IDS_DOWNLOAD_TAB_TITLE 36209
+#define IDS_SAD_TAB_TITLE 36210
+#define IDS_SAD_TAB_MESSAGE 36211
+#define IDS_SAD_TAB_HELP_MESSAGE 36212
+#define IDS_SAD_TAB_HELP_LINK 36213
+#define IDS_SAD_TAB_RELOAD_LABEL 36214
+#define IDS_SAD_TAB_OOM_TITLE 36216
+#define IDS_SAD_TAB_RELOAD_TITLE 36217
+#define IDS_SAD_TAB_OOM_MESSAGE_TABS 36218
+#define IDS_SAD_TAB_OOM_MESSAGE_NOTABS 36219
+#define IDS_SAD_TAB_RELOAD_TRY 36220
+#define IDS_SAD_TAB_RELOAD_INCOGNITO 36221
+#define IDS_SAD_TAB_RELOAD_RESTART_BROWSER 36224
+#define IDS_SAD_TAB_RELOAD_RESTART_DEVICE 36225
+#define IDS_SAD_TAB_ERROR_CODE 36227
+#define IDS_NEW_TAB_TITLE 484
+#define IDS_NEW_INCOGNITO_TAB_TITLE 36228
+#define IDS_INCOGNITO_TAB_LEARN_MORE_ACCESSIBILITY_LABEL 36229
+#define IDS_NEW_TAB_OTR_HEADING 36230
+#define IDS_NEW_TAB_OTR_DESCRIPTION 36231
+#define IDS_NEW_TAB_OTR_LEARN_MORE_LINK 36232
+#define IDS_NEW_TAB_OTR_MESSAGE_WARNING 36233
+#define IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE 485
+#define IDS_NEW_TAB_OTR_TITLE 36234
+#define IDS_NEW_TAB_OTR_SUBTITLE 36235
+#define IDS_NEW_TAB_OTR_SUBTITLE_WITH_READING_LIST 36236
+#define IDS_NEW_TAB_OTR_NOT_SAVED 36237
+#define IDS_NEW_TAB_OTR_VISIBLE 36238
+#define IDS_NEW_TAB_OTR_COOKIE_CONTROLS_CONTROLLED_TOOLTIP_TEXT 36239
+#define IDS_NEW_TAB_OTR_THIRD_PARTY_COOKIE 36240
+#define IDS_NEW_TAB_OTR_THIRD_PARTY_COOKIE_SUBLABEL 36241
+#define IDS_NEW_TAB_OTR_THIRD_PARTY_BLOCKED_COOKIE 36242
+#define IDS_NEW_TAB_OTR_THIRD_PARTY_BLOCKED_COOKIE_SUBLABEL 36243
+#define IDS_REVAMPED_INCOGNITO_NTP_TITLE 36246
+#define IDS_REVAMPED_INCOGNITO_NTP_DOES_HEADER 36247
+#define IDS_REVAMPED_INCOGNITO_NTP_DOES_DESCRIPTION 36248
+#define IDS_REVAMPED_INCOGNITO_NTP_DOES_NOT_HEADER 36249
+#define IDS_REVAMPED_INCOGNITO_NTP_DOES_NOT_DESCRIPTION 36250
+#define IDS_REVAMPED_INCOGNITO_NTP_LEARN_MORE 36251
+#define IDS_REVAMPED_INCOGNITO_NTP_OTR_THIRD_PARTY_COOKIE 36252
+#define IDS_REVAMPED_INCOGNITO_NTP_OTR_THIRD_PARTY_COOKIE_SUBLABEL 36253
+#define IDS_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_HINT 154
+#define IDS_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_SUGGESTION_CONTENTS 153
+#define IDS_ACC_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_SUFFIX 152
+#define IDS_ACC_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA 151
+#define IDS_OMNIBOX_PEDAL_MANAGE_PASSWORDS_HINT 158
+#define IDS_OMNIBOX_PEDAL_MANAGE_PASSWORDS_SUGGESTION_CONTENTS 157
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_PASSWORDS_SUFFIX 156
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_PASSWORDS 155
+#define IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT 162
+#define IDS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_SUGGESTION_CONTENTS 161
+#define IDS_ACC_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_SUFFIX 160
+#define IDS_ACC_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD 159
+#define IDS_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_HINT 166
+#define IDS_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUGGESTION_CONTENTS 165
+#define IDS_ACC_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUFFIX 164
+#define IDS_ACC_OMNIBOX_PEDAL_LAUNCH_INCOGNITO 163
+#define IDS_OMNIBOX_PEDAL_TRANSLATE_HINT 170
+#define IDS_OMNIBOX_PEDAL_TRANSLATE_SUGGESTION_CONTENTS 169
+#define IDS_ACC_OMNIBOX_PEDAL_TRANSLATE_SUFFIX 168
+#define IDS_ACC_OMNIBOX_PEDAL_TRANSLATE 167
+#define IDS_OMNIBOX_PEDAL_UPDATE_CHROME_HINT 174
+#define IDS_OMNIBOX_PEDAL_UPDATE_CHROME_SUGGESTION_CONTENTS 173
+#define IDS_ACC_OMNIBOX_PEDAL_UPDATE_CHROME_SUFFIX 172
+#define IDS_ACC_OMNIBOX_PEDAL_UPDATE_CHROME 171
+#define IDS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_HINT 178
+#define IDS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_SUGGESTION_CONTENTS 177
+#define IDS_ACC_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_SUFFIX 176
+#define IDS_ACC_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK 175
+#define IDS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_V2_HINT 36254
+#define IDS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_V2_SUGGESTION_CONTENTS 36255
+#define IDS_ACC_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_V2_SUFFIX 36256
+#define IDS_ACC_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_V2 36257
+#define IDS_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS_HINT 182
+#define IDS_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS_SUGGESTION_CONTENTS 181
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS_SUFFIX 180
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_SECURITY_SETTINGS 179
+#define IDS_OMNIBOX_PEDAL_MANAGE_COOKIES_HINT 186
+#define IDS_OMNIBOX_PEDAL_MANAGE_COOKIES_SUGGESTION_CONTENTS 185
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_COOKIES_SUFFIX 184
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_COOKIES 183
+#define IDS_OMNIBOX_PEDAL_MANAGE_ADDRESSES_HINT 190
+#define IDS_OMNIBOX_PEDAL_MANAGE_ADDRESSES_SUGGESTION_CONTENTS 189
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_ADDRESSES_SUFFIX 188
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_ADDRESSES 187
+#define IDS_OMNIBOX_PEDAL_MANAGE_SYNC_HINT 194
+#define IDS_OMNIBOX_PEDAL_MANAGE_SYNC_SUGGESTION_CONTENTS 193
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_SYNC_SUFFIX 192
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_SYNC 191
+#define IDS_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS_HINT 198
+#define IDS_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS_SUGGESTION_CONTENTS 197
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS_SUFFIX 196
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_SITE_SETTINGS 195
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_HINT 206
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_SUGGESTION_CONTENTS 205
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC_SUFFIX 204
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_DOC 203
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_HINT 210
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUGGESTION_CONTENTS 209
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET_SUFFIX 208
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SHEET 207
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_HINT 214
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUGGESTION_CONTENTS 213
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE_SUFFIX 212
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SLIDE 211
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_HINT 218
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUGGESTION_CONTENTS 217
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT_SUFFIX 216
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_CALENDAR_EVENT 215
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_HINT 222
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUGGESTION_CONTENTS 221
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE_SUFFIX 220
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_SITE 219
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_HINT 226
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUGGESTION_CONTENTS 225
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE_SUFFIX 224
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_KEEP_NOTE 223
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_HINT 230
+#define IDS_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUGGESTION_CONTENTS 229
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM_SUFFIX 228
+#define IDS_ACC_OMNIBOX_PEDAL_CREATE_GOOGLE_FORM 227
+#define IDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_HINT 202
+#define IDS_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUGGESTION_CONTENTS 201
+#define IDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS_SUFFIX 200
+#define IDS_ACC_OMNIBOX_PEDAL_SEE_CHROME_TIPS 199
+#define IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_HINT 234
+#define IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUGGESTION_CONTENTS 233
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT_SUFFIX 232
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_ACCOUNT 231
+#define IDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_HINT 238
+#define IDS_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUGGESTION_CONTENTS 237
+#define IDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD_SUFFIX 236
+#define IDS_ACC_OMNIBOX_PEDAL_CHANGE_GOOGLE_PASSWORD 235
+#define IDS_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS_HINT 36258
+#define IDS_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS_SUGGESTION_CONTENTS 36259
+#define IDS_ACC_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS_SUFFIX 36260
+#define IDS_ACC_OMNIBOX_PEDAL_CLOSE_INCOGNITO_WINDOWS 36261
+#define IDS_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_HINT 242
+#define IDS_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_SUGGESTION_CONTENTS 241
+#define IDS_ACC_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_SUFFIX 240
+#define IDS_ACC_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME 239
+#define IDS_OMNIBOX_PEDAL_FIND_MY_PHONE_HINT 246
+#define IDS_OMNIBOX_PEDAL_FIND_MY_PHONE_SUGGESTION_CONTENTS 245
+#define IDS_ACC_OMNIBOX_PEDAL_FIND_MY_PHONE_SUFFIX 244
+#define IDS_ACC_OMNIBOX_PEDAL_FIND_MY_PHONE 243
+#define IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_HINT 250
+#define IDS_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_SUGGESTION_CONTENTS 249
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY_SUFFIX 248
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_GOOGLE_PRIVACY 247
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_HINT 254
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_SUGGESTION_CONTENTS 253
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_SUFFIX 252
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS 251
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS_HINT 258
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS_SUGGESTION_CONTENTS 257
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS_SUFFIX 256
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_DOWNLOADS 255
+#define IDS_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_HINT 262
+#define IDS_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_SUGGESTION_CONTENTS 261
+#define IDS_ACC_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_SUFFIX 260
+#define IDS_ACC_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY 259
+#define IDS_OMNIBOX_PEDAL_SHARE_THIS_PAGE_HINT 266
+#define IDS_OMNIBOX_PEDAL_SHARE_THIS_PAGE_SUGGESTION_CONTENTS 265
+#define IDS_ACC_OMNIBOX_PEDAL_SHARE_THIS_PAGE_SUFFIX 264
+#define IDS_ACC_OMNIBOX_PEDAL_SHARE_THIS_PAGE 263
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY_HINT 270
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY_SUGGESTION_CONTENTS 269
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY_SUFFIX 268
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_ACCESSIBILITY 267
+#define IDS_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS_HINT 274
+#define IDS_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS_SUGGESTION_CONTENTS 273
+#define IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS_SUFFIX 272
+#define IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_CHROME_FONTS 271
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES_HINT 278
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES_SUGGESTION_CONTENTS 277
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES_SUFFIX 276
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROME_THEMES 275
+#define IDS_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES_HINT 282
+#define IDS_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES_SUGGESTION_CONTENTS 281
+#define IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES_SUFFIX 280
+#define IDS_ACC_OMNIBOX_PEDAL_CUSTOMIZE_SEARCH_ENGINES 279
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY_HINT 36262
+#define IDS_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY_SUGGESTION_CONTENTS 36263
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY_SUFFIX 36264
+#define IDS_ACC_OMNIBOX_PEDAL_MANAGE_CHROMEOS_ACCESSIBILITY 36265
+#define IDS_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER_HINT 286
+#define IDS_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER_SUGGESTION_CONTENTS 285
+#define IDS_ACC_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER_SUFFIX 284
+#define IDS_ACC_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER 283
+#define IDS_ANDROID_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_HINT 36266
+#define IDS_ANDROID_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_HINT 36267
+#define IDS_ANDROID_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUGGESTION_CONTENTS 36268
+#define IDS_ANDROID_ACC_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUFFIX 36269
+#define IDS_ANDROID_ACC_OMNIBOX_PEDAL_LAUNCH_INCOGNITO 36270
+#define IDS_IOS_OMNIBOX_PEDAL_CLEAR_BROWSING_DATA_HINT 36271
+#define IDS_IOS_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER_HINT 36272
+#define IDS_IOS_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER_SUGGESTION_CONTENTS 36273
+#define IDS_IOS_ACC_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER_SUFFIX 36274
+#define IDS_IOS_ACC_OMNIBOX_PEDAL_SET_CHROME_AS_DEFAULT_BROWSER 36275
+#define IDS_IOS_OMNIBOX_PEDAL_UPDATE_CREDIT_CARD_HINT 36276
+#define IDS_IOS_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_HINT 36277
+#define IDS_IOS_OMNIBOX_PEDAL_RUN_CHROME_SAFETY_CHECK_HINT 36278
+#define IDS_IOS_OMNIBOX_PEDAL_MANAGE_CHROME_SETTINGS_HINT 36279
+#define IDS_IOS_OMNIBOX_PEDAL_VIEW_CHROME_HISTORY_HINT 36280
+#define IDS_IOS_OMNIBOX_PEDAL_PLAY_CHROME_DINO_GAME_HINT 36281
+#define IDS_IOS_OMNIBOX_PEDAL_LAUNCH_INCOGNITO_SUGGESTION_CONTENTS 36282
+#define IDS_IOS_OMNIBOX_PEDAL_MANAGE_PASSWORDS_HINT 36283
+#define IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION 36284
+#define IDS_EMPTY_KEYWORD_VALUE 471
+#define IDS_LINK_FROM_CLIPBOARD 36285
+#define IDS_TEXT_FROM_CLIPBOARD 36286
+#define IDS_IMAGE_FROM_CLIPBOARD 36287
+#define IDS_SECURE_CONNECTION_EV 36288
+#define IDS_SECURE_VERBOSE_STATE 36289
+#define IDS_NOT_SECURE_VERBOSE_STATE 36290
+#define IDS_DANGEROUS_VERBOSE_STATE 36291
+#define IDS_OFFLINE_VERBOSE_STATE 36292
+#define IDS_OMNIBOX_EMPTY_HINT 36293
+#define IDS_OMNIBOX_ADDITIONAL_TEXT_DASH_TEMPLATE 36294
+#define IDS_OMNIBOX_ADDITIONAL_TEXT_PARENTHESIS_TEMPLATE 36295
+#define IDS_OMNIBOX_TAB_SUGGEST_HINT 36296
+#define IDS_OMNIBOX_FILE 36297
+#define IDS_OMNIBOX_READER_MODE 36298
+#define IDS_DRIVE_SUGGESTION_DOCUMENT 36299
+#define IDS_DRIVE_SUGGESTION_FORM 36300
+#define IDS_DRIVE_SUGGESTION_SPREADSHEET 36301
+#define IDS_DRIVE_SUGGESTION_PRESENTATION 36302
+#define IDS_DRIVE_SUGGESTION_GENERAL 36303
+#define IDS_DRIVE_SUGGESTION_DESCRIPTION_TEMPLATE 36304
+#define IDS_DRIVE_SUGGESTION_DESCRIPTION_TEMPLATE_WITHOUT_DATE 36305
+#define IDS_DRIVE_SUGGESTION_DESCRIPTION_TEMPLATE_WITHOUT_OWNER 36306
+#define IDS_ACCURACY_CHECK_VERBOSE_STATE 36307
+#define IDS_OMNIBOX_HISTORY_CLUSTERS_SEARCH_HINT 36308
+#define IDS_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_HINT 36309
+#define IDS_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_SUGGESTION_CONTENTS 36310
+#define IDS_ACC_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_SUFFIX 36311
+#define IDS_ACC_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH 36312
+#define IDS_ACC_OMNIBOX_ACTION_IN_SUGGEST_SUFFIX 36313
+#define IDS_ACC_OMNIBOX_ACTION_IN_SUGGEST 36314
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_CALL_HINT 36315
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_CALL_CONTENTS 36316
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_DIRECTIONS_HINT 36317
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_DIRECTIONS_CONTENTS 36318
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_REVIEWS_HINT 36319
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_REVIEWS_CONTENTS 36320
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_WEBSITE_HINT 36321
+#define IDS_OMNIBOX_ACTION_IN_SUGGEST_WEBSITE_CONTENTS 36322
+#define IDS_ACC_AUTOCOMPLETE_HISTORY 36323
+#define IDS_ACC_AUTOCOMPLETE_SEARCH_HISTORY 36324
+#define IDS_ACC_AUTOCOMPLETE_SEARCH 36325
+#define IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH 36326
+#define IDS_ACC_AUTOCOMPLETE_SUGGESTED_SEARCH_ENTITY 36327
+#define IDS_ACC_AUTOCOMPLETE_QUICK_ANSWER 36328
+#define IDS_ACC_AUTOCOMPLETE_BOOKMARK 36329
+#define IDS_ACC_AUTOCOMPLETE_CLIPBOARD_IMAGE 36330
+#define IDS_ACC_AUTOCOMPLETE_CLIPBOARD_TEXT 36331
+#define IDS_ACC_AUTOCOMPLETE_CLIPBOARD_URL 36332
+#define IDS_ACC_SEARCH_ICON 472
+#define IDS_ACC_AUTOCOMPLETE_N_OF_M 36333
+#define IDS_ACC_TAB_SWITCH_SUFFIX 36334
+#define IDS_ACC_TAB_SWITCH_BUTTON_FOCUSED_PREFIX 36335
+#define IDS_ACC_TAB_SWITCH_BUTTON 36336
+#define IDS_ACC_MULTIPLE_ACTIONS_SUFFIX 36337
+#define IDS_ACC_KEYWORD_SUFFIX 36338
+#define IDS_ACC_KEYWORD_MODE 36339
+#define IDS_ACC_REMOVE_SUGGESTION_SUFFIX 36340
+#define IDS_ACC_REMOVE_SUGGESTION_FOCUSED_PREFIX 36341
+#define IDS_ACC_REMOVE_SUGGESTION_BUTTON 36342
+#define IDS_TOOLTIP_HEADER_SHOW_SUGGESTIONS_BUTTON 670
+#define IDS_TOOLTIP_HEADER_HIDE_SUGGESTIONS_BUTTON 669
+#define IDS_ACC_HEADER_SHOW_SUGGESTIONS_BUTTON 36343
+#define IDS_ACC_HEADER_HIDE_SUGGESTIONS_BUTTON 36344
+#define IDS_ACC_HEADER_SECTION_SHOWN 36345
+#define IDS_ACC_HEADER_SECTION_HIDDEN 36346
+#define IDS_SEARCH_ENGINES_STARTER_PACK_BOOKMARKS_NAME 36347
+#define IDS_SEARCH_ENGINES_STARTER_PACK_BOOKMARKS_KEYWORD 36348
+#define IDS_SEARCH_ENGINES_STARTER_PACK_HISTORY_NAME 36349
+#define IDS_SEARCH_ENGINES_STARTER_PACK_HISTORY_KEYWORD 36350
+#define IDS_SEARCH_ENGINES_STARTER_PACK_TABS_NAME 36351
+#define IDS_SEARCH_ENGINES_STARTER_PACK_TABS_KEYWORD 36352
+#define IDS_SEARCH_ENGINES_STARTER_PACK_GEMINI_NAME 36353
+#define IDS_SEARCH_ENGINES_STARTER_PACK_GEMINI_KEYWORD 36354
+#define IDS_OMNIBOX_INSTANT_KEYWORD_SEARCH_TEXT 36355
+#define IDS_OMNIBOX_INSTANT_KEYWORD_HELP 36356
+#define IDS_OMNIBOX_TAB_SEARCH_NO_RESULTS_FOUND 36357
+#define IDS_OMNIBOX_ONE_LINE_CALCULATOR_SUGGESTION_TEMPLATE 36358
+#define IDS_OMNIBOX_HEADER_POPULAR_TOPICS 36359
+#define IDS_PAGE_INFO_SECURE_SUMMARY 36360
+#define IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY 36361
+#define IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY_SHORT 36362
+#define IDS_PAGE_INFO_NOT_SECURE_SUMMARY 36363
+#define IDS_PAGE_INFO_NOT_SECURE_SUMMARY_SHORT 36364
+#define IDS_PAGE_INFO_MALWARE_SUMMARY 36365
+#define IDS_PAGE_INFO_MALWARE_SUMMARY_NEW 36366
+#define IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY 36367
+#define IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY_NEW 36368
+#define IDS_PAGE_INFO_UNWANTED_SOFTWARE_SUMMARY 36369
+#define IDS_PAGE_INFO_UNWANTED_SOFTWARE_SUMMARY_NEW 36370
+#define IDS_PAGE_INFO_EXTENSION_PAGE 36371
+#define IDS_PAGE_INFO_VIEW_SOURCE_PAGE 36372
+#define IDS_PAGE_INFO_DEVTOOLS_PAGE 36373
+#define IDS_PAGE_INFO_READER_MODE_PAGE_SECURE 36374
+#define IDS_PAGE_INFO_READER_MODE_PAGE 36375
+#define IDS_PAGE_INFO_SAFETY_TIP_MORE_INFO_LINK 36376
+#define IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_LEAVE_BUTTON 36377
+#define IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_TITLE 36378
+#define IDS_PAGE_INFO_SAFETY_TIP_DESCRIPTION 36379
+#define IDS_PAGE_INFO_FILE_PAGE 36380
+#define IDS_PAGE_INFO_SECURE_DETAILS 36381
+#define IDS_PAGE_INFO_ADMIN_PROVIDED_CERT_DETAILS 36382
+#define IDS_PAGE_INFO_MIXED_CONTENT_DETAILS 36383
+#define IDS_PAGE_INFO_LEGACY_TLS_DETAILS 36384
+#define IDS_PAGE_INFO_NOT_SECURE_DETAILS 36385
+#define IDS_PAGE_INFO_MALWARE_DETAILS 36386
+#define IDS_PAGE_INFO_MALWARE_DETAILS_NEW 36387
+#define IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS 36388
+#define IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS_NEW 36389
+#define IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS 36390
+#define IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS_NEW 36391
+#define IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY 36392
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY 36393
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_SAVED_PASSWORD_SUMMARY 36394
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SAVED 36395
+#define IDS_PAGE_INFO_CHECK_PASSWORDS_BUTTON 36396
+#define IDS_PAGE_INFO_INVALID_CERTIFICATE_DESCRIPTION 36397
+#define IDS_PAGE_INFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON 36398
+#define IDS_PAGE_INFO_HELP_CENTER_LINK 36399
+#define IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM 36400
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT 36401
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR 36402
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING 36403
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_FORM_WARNING 36404
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK 36405
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS 36406
+#define IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD 36407
+#define IDS_PAGE_INFO_SECURITY_TAB_NON_UNIQUE_NAME 36408
+#define IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT 36409
+#define IDS_PAGE_INFO_SECURITY_TAB_SSL_VERSION 36410
+#define IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY 36411
+#define IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT 36412
+#define IDS_PAGE_INFO_CERT_INFO_BUTTON 36413
+#define IDS_PAGE_INFO_ADDRESS 36414
+#define IDS_PAGE_INFO_PARTIAL_ADDRESS 36415
+#define IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_VERIFIED 36416
+#define IDS_PAGE_INFO_CERTIFICATE 36417
+#define IDS_PAGE_INFO_CERTIFICATE_VALID_LINK 36418
+#define IDS_PAGE_INFO_CERTIFICATE_INVALID_LINK 36419
+#define IDS_PAGE_INFO_CERTIFICATE_BUTTON_TEXT 36420
+#define IDS_PAGE_INFO_CERTIFICATE_VALID_PARENTHESIZED 36421
+#define IDS_PAGE_INFO_CERTIFICATE_INVALID_PARENTHESIZED 36422
+#define IDS_PAGE_INFO_CERTIFICATE_IS_VALID 36423
+#define IDS_PAGE_INFO_CERTIFICATE_IS_NOT_VALID 36424
+#define IDS_PAGE_INFO_CERTIFICATE_VALID_LINK_TOOLTIP 36425
+#define IDS_PAGE_INFO_CERTIFICATE_INVALID_LINK_TOOLTIP 36426
+#define IDS_PAGE_INFO_COOKIES 36428
+#define IDS_PAGE_INFO_COOKIES_BUTTON_TEXT 36429
+#define IDS_PAGE_INFO_NUM_COOKIES_PARENTHESIZED 36430
+#define IDS_PAGE_INFO_NUM_COOKIES 36431
+#define IDS_PAGE_INFO_COOKIES_TOOLTIP 36432
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_TOOLTIP 36433
+#define IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_USER 36434
+#define IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_ONCE_BY_USER 36435
+#define IDS_PAGE_INFO_BUTTON_TEXT_BLOCKED_BY_USER 36436
+#define IDS_PAGE_INFO_BUTTON_TEXT_MUTED_BY_USER 36437
+#define IDS_PAGE_INFO_BUTTON_TEXT_ASK_BY_USER 36438
+#define IDS_PAGE_INFO_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_USER 36439
+#define IDS_PAGE_INFO_BUTTON_TEXT_ALLOWED_BY_DEFAULT 36440
+#define IDS_PAGE_INFO_BUTTON_TEXT_BLOCKED_BY_DEFAULT 36441
+#define IDS_PAGE_INFO_BUTTON_TEXT_ASK_BY_DEFAULT 36442
+#define IDS_PAGE_INFO_BUTTON_TEXT_AUTOMATIC_BY_DEFAULT 36443
+#define IDS_PAGE_INFO_BUTTON_TEXT_MUTED_BY_DEFAULT 36444
+#define IDS_PAGE_INFO_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_DEFAULT 36445
+#define IDS_PAGE_INFO_MENU_ITEM_DEFAULT_ALLOW 36446
+#define IDS_PAGE_INFO_MENU_ITEM_DEFAULT_BLOCK 36447
+#define IDS_PAGE_INFO_MENU_ITEM_DEFAULT_ASK 36448
+#define IDS_PAGE_INFO_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT 36449
+#define IDS_PAGE_INFO_MENU_ITEM_ALLOW 36450
+#define IDS_PAGE_INFO_MENU_ITEM_BLOCK 36451
+#define IDS_PAGE_INFO_MENU_ITEM_ASK 36452
+#define IDS_PAGE_INFO_MENU_ITEM_DETECT_IMPORTANT_CONTENT 36453
+#define IDS_PAGE_INFO_MENU_ITEM_ADS_BLOCK 36454
+#define IDS_PAGE_INFO_STATE_TEXT_ALLOWED 36455
+#define IDS_PAGE_INFO_STATE_TEXT_ALLOWED_ONCE 36456
+#define IDS_PAGE_INFO_STATE_TEXT_NOT_ALLOWED 36457
+#define IDS_PAGE_INFO_STATE_TEXT_NOT_ALLOWED_IN_INCOGNITO 36458
+#define IDS_PAGE_INFO_STATE_TEXT_NOT_ALLOWED_IN_GUEST 36459
+#define IDS_PAGE_INFO_STATE_TEXT_NOT_ALLOWED_INSECURE 36460
+#define IDS_PAGE_INFO_STATE_TEXT_MUTED 36461
+#define IDS_PAGE_INFO_STATE_TEXT_ALLOWED_BY_DEFAULT 36462
+#define IDS_PAGE_INFO_STATE_TEXT_NOT_ALLOWED_BY_DEFAULT 36463
+#define IDS_PAGE_INFO_SELECTOR_TOOLTIP 36464
+#define IDS_PAGE_INFO_SELECTOR_STORAGE_ACCESS_TOOLTIP 36465
+#define IDS_PAGE_INFO_STATE_TEXT_AR_ASK 36466
+#define IDS_PAGE_INFO_STATE_TEXT_AUTO_PICTURE_IN_PICTURE_ASK 36467
+#define IDS_PAGE_INFO_STATE_TEXT_AUTOMATIC_DOWNLOADS_ASK 36468
+#define IDS_PAGE_INFO_STATE_TEXT_BLUETOOTH_DEVICES_ASK 36469
+#define IDS_PAGE_INFO_STATE_TEXT_CAMERA_ASK 36470
+#define IDS_PAGE_INFO_STATE_TEXT_CAMERA_PAN_TILT_ZOOM_ASK 36471
+#define IDS_PAGE_INFO_STATE_TEXT_CLIPBOARD_ASK 36472
+#define IDS_PAGE_INFO_STATE_TEXT_FILE_SYSTEM_WRITE_ASK 36473
+#define IDS_PAGE_INFO_STATE_TEXT_HID_DEVICES_ASK 36474
+#define IDS_PAGE_INFO_STATE_TEXT_LOCATION_ASK 36475
+#define IDS_PAGE_INFO_STATE_TEXT_MIC_ASK 36476
+#define IDS_PAGE_INFO_STATE_TEXT_MIDI_SYSEX_ASK 36477
+#define IDS_PAGE_INFO_STATE_TEXT_NOTIFICATIONS_ASK 36478
+#define IDS_PAGE_INFO_STATE_TEXT_USB_ASK 36479
+#define IDS_PAGE_INFO_STATE_TEXT_VR_ASK 36480
+#define IDS_PAGE_INFO_STATE_TEXT_FONT_ACCESS_ASK 36481
+#define IDS_PAGE_INFO_STATE_TEXT_SERIAL_ASK 36482
+#define IDS_PAGE_INFO_STATE_TEXT_IDLE_DETECTION_ASK 36483
+#define IDS_PAGE_INFO_STATE_TEXT_WINDOW_MANAGEMENT_ASK 36484
+#define IDS_PAGE_INFO_STATE_TEXT_BLUETOOTH_SCANNING_ASK 36485
+#define IDS_PAGE_INFO_STATE_TEXT_STORAGE_ACCESS_ASK 36486
+#define IDS_PAGE_INFO_USB_DEVICE_SECONDARY_LABEL 36487
+#define IDS_PAGE_INFO_USB_DEVICE_ALLOWED_BY_POLICY_LABEL 36488
+#define IDS_PAGE_INFO_DELETE_USB_DEVICE_WITH_NAME 36489
+#define IDS_PAGE_INFO_SERIAL_PORT_SECONDARY_LABEL 36490
+#define IDS_PAGE_INFO_SERIAL_PORT_ALLOWED_BY_POLICY_LABEL 36491
+#define IDS_PAGE_INFO_DELETE_SERIAL_PORT_WITH_NAME 36492
+#define IDS_PAGE_INFO_BLUETOOTH_DEVICE_SECONDARY_LABEL 36493
+#define IDS_PAGE_INFO_DELETE_BLUETOOTH_DEVICE_WITH_NAME 36494
+#define IDS_PAGE_INFO_HID_DEVICE_SECONDARY_LABEL 36495
+#define IDS_PAGE_INFO_HID_DEVICE_ALLOWED_BY_POLICY_LABEL 36496
+#define IDS_PAGE_INFO_DELETE_HID_DEVICE_WITH_NAME 36497
+#define IDS_PAGE_INFO_SITE_SETTINGS_LINK 36498
+#define IDS_PAGE_INFO_SITE_SETTINGS_TOOLTIP 36499
+#define IDS_PAGE_INFO_PERMISSION_ALLOWED_BY_POLICY 36500
+#define IDS_PAGE_INFO_PERMISSION_BLOCKED_BY_POLICY 36501
+#define IDS_PAGE_INFO_PERMISSION_ASK_BY_POLICY 36502
+#define IDS_PAGE_INFO_PERMISSION_ALLOWED_BY_EXTENSION 36503
+#define IDS_PAGE_INFO_PERMISSION_BLOCKED_BY_EXTENSION 36504
+#define IDS_PAGE_INFO_PERMISSION_ASK_BY_EXTENSION 36505
+#define IDS_PAGE_INFO_PERMISSION_AUTOMATICALLY_BLOCKED 36506
+#define IDS_PAGE_INFO_PERMISSION_ADS_SUBTITLE 36507
+#define IDS_PAGE_INFO_PERMISSION_MANAGED_BY_POLICY 36508
+#define IDS_PAGE_INFO_PERMISSION_MANAGED_BY_EXTENSION 36509
+#define IDS_PAGE_INFO_INFOBAR_TEXT 36510
+#define IDS_PAGE_INFO_INFOBAR_BUTTON 36511
+#define IDS_PAGE_INFO_PERMISSION_USING_NOW 36512
+#define IDS_PAGE_INFO_PERMISSION_RECENTLY_USED 36513
+#define IDS_PAGE_INFO_PERMISSION_USED_TIME_AGO 36514
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS 36515
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC 36516
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SIGNED_IN_NON_SYNC 36517
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE 36518
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE_WITH_ORG_NAME 36519
+#define IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON 36520
+#define IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON 36521
+#define IDS_PAGE_INFO_IGNORE_PASSWORD_WARNING_BUTTON 36522
+#define IDS_PAGE_INFO_ALLOWLIST_PASSWORD_REUSE_BUTTON 36523
+#define IDS_PAGE_INFO_BILLING_SUMMARY 36524
+#define IDS_PAGE_INFO_BILLING_DETAILS 36525
+#define IDS_PAGE_INFO_VR_PRESENTING_TEXT 36526
+#define IDS_PAGE_INFO_VR_TURN_OFF_BUTTON_TEXT 36527
+#define IDS_CERT_INFO_SUBJECT_GROUP 36528
+#define IDS_CERT_INFO_ISSUER_GROUP 36529
+#define IDS_CERT_INFO_COMMON_NAME_LABEL 36530
+#define IDS_CERT_INFO_ORGANIZATION_LABEL 36531
+#define IDS_CERT_INFO_ORGANIZATIONAL_UNIT_LABEL 36532
+#define IDS_CERT_INFO_SERIAL_NUMBER_LABEL 36533
+#define IDS_CERT_INFO_VALIDITY_GROUP 36534
+#define IDS_CERT_INFO_ISSUED_ON_LABEL 36535
+#define IDS_CERT_INFO_EXPIRES_ON_LABEL 36536
+#define IDS_CERT_INFO_FINGERPRINTS_GROUP 36537
+#define IDS_CERT_INFO_SHA256_FINGERPRINT_LABEL 36538
+#define IDS_CERT_INFO_SHA256_SPKI_FINGERPRINT_LABEL 36539
+#define IDS_CERT_DETAILS_EXTENSIONS 36540
+#define IDS_CERT_X509_SUBJECT_ALT_NAME 36541
+#define IDS_PAGE_INFO_SECURITY_SUBPAGE_BUTTON 36542
+#define IDS_PAGE_INFO_SECURITY_SUBPAGE_HEADER 36543
+#define IDS_PAGE_INFO_PERMISSIONS_SUBPAGE_BUTTON_TOOLTIP 36544
+#define IDS_PAGE_INFO_PERMISSIONS_SUBPAGE_MANAGE_BUTTON 36545
+#define IDS_PAGE_INFO_PERMISSIONS_SUBPAGE_MANAGE_BUTTON_TOOLTIP 36546
+#define IDS_PAGE_INFO_PERMISSIONS_SUBPAGE_REMEMBER_THIS_SETTING 36547
+#define IDS_PAGE_INFO_RESET_PERMISSIONS 36548
+#define IDS_PAGE_INFO_ABOUT_THIS_SITE_HEADER 36549
+#define IDS_PAGE_INFO_ABOUT_THIS_PAGE_TITLE 36550
+#define IDS_PAGE_INFO_ABOUT_THIS_PAGE_DESCRIPTION_PLACEHOLDER 36551
+#define IDS_PAGE_INFO_ABOUT_THIS_SITE_TOOLTIP 36552
+#define IDS_PAGE_INFO_ABOUT_THIS_PAGE_TOOLTIP 36553
+#define IDS_PAGE_INFO_ABOUT_THIS_SITE_SUBPAGE_FROM_LABEL 36554
+#define IDS_PAGE_INFO_COOKIES_HEADER 36555
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SITE_INFO_BUTTON_NAME 36556
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SITE_INFO_BUTTON_LABEL_ALLOWED 36557
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SITE_INFO_BUTTON_LABEL_BLOCKED 36558
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SITE_INFO_BUTTON_LABEL_LIMITED 36559
+#define IDS_PAGE_INFO_SUB_PAGE_VIEW_TRACKING_PROTECTION_HEADER 36560
+#define IDS_PAGE_INFO_COOKIES_DESCRIPTION 36561
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SITE_GRANT_DESCRIPTION 36562
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_DESCRIPTION 36563
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_BLOCKED_COOKIES_DESCRIPTION 36564
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_INCOGNITO_BLOCKED_COOKIES_DESCRIPTION 36565
+#define IDS_PAGE_INFO_COOKIES_SETTINGS_LINK 36566
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SETTINGS_LINK 36567
+#define IDS_PAGE_INFO_BLOCK_THIRD_PARTY_COOKIES_TITLE 36568
+#define IDS_PAGE_INFO_BLOCK_THIRD_PARTY_COOKIES_TOGGLE_TOOLTIP 36569
+#define IDS_PAGE_INFO_BLOCK_THIRD_PARTY_COOKIES_MANAGED_BY_SETTINGS_TOOLTIP 36570
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_ALLOWED 36571
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_LIMITED 36572
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_BLOCKED 36573
+#define IDS_PAGE_INFO_COOKIES_ALLOWED_SITES_COUNT 36574
+#define IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TITLE 36575
+#define IDS_PAGE_INFO_COOKIES_DIALOG_BUTTON_TOOLTIP 36576
+#define IDS_PAGE_INFO_FPS_BUTTON_TOOLTIP 36577
+#define IDS_PAGE_INFO_FPS_BUTTON_TITLE 36578
+#define IDS_PAGE_INFO_FPS_BUTTON_SUBTITLE 36579
+#define IDS_PAGE_INFO_HISTORY 36580
+#define IDS_PAGE_INFO_HISTORY_LAST_VISIT_TODAY 36581
+#define IDS_PAGE_INFO_HISTORY_LAST_VISIT_YESTERDAY 36582
+#define IDS_PAGE_INFO_HISTORY_LAST_VISIT_DAYS 36583
+#define IDS_PAGE_INFO_HISTORY_LAST_VISIT_DATE 36584
+#define IDS_PAGE_INFO_ENTERPRISE_WARN_SUMMARY 36585
+#define IDS_PAGE_INFO_ENTERPRISE_WARN_DETAILS 36586
+#define IDS_PAGE_INFO_AD_PRIVACY_HEADER 36587
+#define IDS_PAGE_INFO_AD_PRIVACY_TOOLTIP 36588
+#define IDS_PAGE_INFO_AD_PRIVACY_TOPICS_DESCRIPTION 36589
+#define IDS_PAGE_INFO_AD_PRIVACY_FLEDGE_DESCRIPTION 36590
+#define IDS_PAGE_INFO_AD_PRIVACY_TOPICS_AND_FLEDGE_DESCRIPTION 36591
+#define IDS_PAGE_INFO_AD_PRIVACY_SUBPAGE_MANAGE_BUTTON 36592
+#define IDS_PAGE_INFO_COOKIES_SITE_NOT_WORKING_TITLE 36593
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_SITE_NOT_WORKING_DESCRIPTION_TEMPORARY 36594
+#define IDS_PAGE_INFO_COOKIES_THIRD_PARTY_COOKIES_LABEL 36595
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_LIMITED_RESTART_TITLE 36596
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_BLOCKED_RESTART_TITLE 36597
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_RESTART_DESCRIPTION 36598
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_PERMANENT_ALLOWED_TITLE 36599
+#define IDS_PAGE_INFO_TRACKING_PROTECTION_COOKIES_PERMANENT_ALLOWED_DESCRIPTION 36600
+#define IDS_PAINT_PREVIEW_COMPOSITOR_SERVICE_DISPLAY_NAME 36601
+#define IDS_LEAK_CHECK_CREDENTIALS 36602
+#define IDS_CREDENTIAL_LEAK_TITLE_CHANGE 36603
+#define IDS_CREDENTIAL_LEAK_TITLE_CHECK_GPM 36604
+#define IDS_CREDENTIAL_LEAK_CHECK_PASSWORDS_MESSAGE_GPM_BRANDED 36605
+#define IDS_CREDENTIAL_LEAK_CHANGE_PASSWORD_MESSAGE_GPM_BRANDED 36606
+#define IDS_CREDENTIAL_LEAK_CHANGE_AND_CHECK_PASSWORDS_MESSAGE_GPM_BRANDED 36607
+#define IDS_CREDENTIAL_LEAK_CHECK_PASSWORDS_MESSAGE_GPM_NON_BRANDED 36608
+#define IDS_CREDENTIAL_LEAK_CHANGE_PASSWORD_MESSAGE_GPM_NON_BRANDED 36609
+#define IDS_CREDENTIAL_LEAK_CHANGE_AND_CHECK_PASSWORDS_MESSAGE_GPM_NON_BRANDED 36610
+#define IDS_PASSWORD_MANAGER_LEAK_HELP_MESSAGE 36612
+#define IDS_PASSWORD_MANAGER_LEAK_HELP_MESSAGE_UPDATED 36613
+#define IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE 36614
+#define IDS_PASSWORD_MANAGER_EMPTY_LOGIN 36615
+#define IDS_PASSWORD_MANAGER_OPT_INTO_ACCOUNT_STORE 36616
+#define IDS_PASSWORD_MANAGER_OPT_INTO_ACCOUNT_STORE_WITH_PASSKEYS 36617
+#define IDS_PASSWORD_MANAGER_RE_SIGNIN_ACCOUNT_STORE 36618
+#define IDS_PASSWORD_MANAGER_NO_ACCOUNT_STORE_MATCHES 36619
+#define IDS_PASSWORD_MANAGER_MANAGE_PASSWORDS 36620
+#define IDS_PASSWORD_MANAGER_MANAGE_PASSWORDS_AND_PASSKEYS 36621
+#define IDS_PASSWORD_MANAGER_GENERATE_PASSWORD 36622
+#define IDS_PASSWORD_MANAGER_EXCEPTIONS_TAB_TITLE 36623
+#define IDS_PASSWORD_MANAGER_SHOW_PASSWORDS_TAB_TITLE 36624
+#define IDS_PASSWORD_MANAGER_SMART_LOCK 36625
+#define IDS_PASSWORD_MANAGER_DEFAULT_EXPORT_FILENAME 36626
+#define IDS_PASSWORD_MANAGER_PASSWORD_FOR_ACCOUNT 36627
+#define IDS_PASSWORD_MANAGER_USE_TOUCH_ID 36628
+#define IDS_PASSWORD_MANAGER_USE_SCREEN_LOCK 36629
+#define IDS_PASSWORD_MANAGER_PASSKEY 36630
+#define IDS_PASSWORD_MANAGER_USE_WINDOWS_HELLO 36631
+#define IDS_PASSWORD_MANAGER_USE_GENERIC_DEVICE 36632
+#define IDS_PASSWORD_MANAGER_PASSKEY_FROM_CHROME_PROFILE 36633
+#define IDS_PASSWORD_MANAGER_PASSKEY_FROM_ICLOUD_KEYCHAIN 36634
+#define IDS_PASSWORD_MANAGER_PASSKEY_FROM_CUSTOM_VENDOR 36635
+#define IDS_PASSWORD_MANAGER_PASSKEY_FROM_WINDOWS_HELLO 36636
+#define IDS_PASSWORD_MANAGER_PASSKEY_FROM_PHONE 36637
+#define IDS_PASSWORD_MANAGER_USE_DEVICE_PASSKEY 36638
+#define IDS_PASSWORD_MANAGER_USE_DIFFERENT_PASSKEY 36639
+#define IDS_PASSWORD_MANAGER_USE_PASSKEY 36640
+#define IDS_PASSWORD_MANAGER_FILLING_REAUTH 36641
+#define IDS_PASSWORD_MANAGER_BIOMETRIC_AUTHENTICATION_FOR_FILLING_PROMO_TITLE_WIN 36642
+#define IDS_PASSWORD_MANAGER_BIOMETRIC_AUTHENTICATION_FOR_FILLING_PROMO_MESSAGE_WIN 36643
+#define IDS_PASSWORD_MANAGER_TURN_ON_FILLING_REAUTH_WIN 36644
+#define IDS_PASSWORD_MANAGER_TURN_OFF_FILLING_REAUTH_WIN 36645
+#define IDS_PASSWORD_MANAGER_BIOMETRIC_AUTHENTICATION_CONFIRMATION_TITLE_WIN 36646
+#define IDS_PASSWORD_MANAGER_BIOMETRIC_AUTHENTICATION_CONFIRMATION_DESCRIPTION_WIN 36647
+#define IDS_PASSWORD_MANAGER_BIOMETRIC_AUTHENTICATION_FOR_FILLING_PROMO_ACCEPT_BUTTON 36662
+#define IDS_PASSWORD_MANAGER_SETTINGS 36663
+#define IDS_PASSWORD_MANAGER_BIOMETRIC_AUTHENTICATION_FOR_FILLING_PROMO_CANCEL_BUTTON 36664
+#define IDS_PASSWORD_MANAGER_MANAGEMENT_BUBBLE_FOOTER_MOVE_PASSWORD 36669
+#define IDS_PASSWORD_MANAGER_MANAGEMENT_BUBBLE_LINK_TEXT_MOVE_PASSWORD 36670
+#define IDS_PASSWORD_MANAGER_MANUAL_FALLBACK_FILL_PASSWORD_ENTRY 36671
+#define IDS_PASSWORD_MANAGER_MANUAL_FALLBACK_VIEW_DETAILS_ENTRY 36672
+#define IDS_PAYMENTS_TITLE 36673
+#define IDS_PAYMENTS_ERROR_MESSAGE_DIALOG_TITLE 36674
+#define IDS_PAYMENTS_METHOD_OF_PAYMENT_LABEL 36675
+#define IDS_PAYMENTS_CONTACT_DETAILS_LABEL 36676
+#define IDS_PAYMENTS_ADD_CONTACT_DETAILS_LABEL 36677
+#define IDS_PAYMENTS_EDIT_CONTACT_DETAILS_LABEL 36678
+#define IDS_PAYMENTS_ADD_MORE_INFORMATION 36679
+#define IDS_PAYMENTS_ADD_PHONE_NUMBER 36680
+#define IDS_PAYMENTS_ADD_RECIPIENT 36681
+#define IDS_PAYMENTS_ADD_VALID_ADDRESS 36682
+#define IDS_PAYMENTS_ADD_EMAIL 36683
+#define IDS_PAYMENTS_ADD_NAME 36684
+#define IDS_PAYMENTS_ORDER_SUMMARY_LABEL 36685
+#define IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME 36686
+#define IDS_PAYMENT_REQUEST_CONTACT_INFO_SECTION_NAME 36687
+#define IDS_PAYMENTS_SHIPPING_SUMMARY_LABEL 36688
+#define IDS_PAYMENTS_SHIPPING_ADDRESS_LABEL 36689
+#define IDS_PAYMENTS_SHIPPING_OPTION_LABEL 36690
+#define IDS_PAYMENTS_DELIVERY_SUMMARY_LABEL 36691
+#define IDS_PAYMENTS_DELIVERY_ADDRESS_LABEL 36692
+#define IDS_PAYMENTS_DELIVERY_OPTION_LABEL 36693
+#define IDS_PAYMENTS_PICKUP_SUMMARY_LABEL 36694
+#define IDS_PAYMENTS_PICKUP_ADDRESS_LABEL 36695
+#define IDS_PAYMENTS_PICKUP_OPTION_LABEL 36696
+#define IDS_PAYMENTS_EDIT_BUTTON 36697
+#define IDS_PAYMENTS_PAY_BUTTON 36698
+#define IDS_PAYMENTS_CONTINUE_BUTTON 36699
+#define IDS_PAYMENTS_ADD_CONTACT 36700
+#define IDS_PAYMENTS_ADD_CARD 36701
+#define IDS_PAYMENTS_ADD_ADDRESS 36702
+#define IDS_PAYMENTS_EDIT_ADDRESS 36703
+#define IDS_PAYMENTS_CANCEL_PAYMENT 36704
+#define IDS_PAYMENTS_NAME_FIELD_IN_CONTACT_DETAILS 36705
+#define IDS_PAYMENTS_PHONE_FIELD_IN_CONTACT_DETAILS 36706
+#define IDS_PAYMENTS_EMAIL_FIELD_IN_CONTACT_DETAILS 36707
+#define IDS_PAYMENTS_LOADING_MESSAGE 36708
+#define IDS_PAYMENTS_PROCESSING_MESSAGE 36709
+#define IDS_PAYMENTS_CHECKING_OPTION 36710
+#define IDS_PAYMENTS_UPDATED_LABEL 36711
+#define IDS_PAYMENTS_ERROR_MESSAGE 36712
+#define IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS 36713
+#define IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_IN 36714
+#define IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_OUT 36715
+#define IDS_SETTINGS_CAN_MAKE_PAYMENT_TOGGLE_LABEL 36716
+#define IDS_PAYMENTS_REQUIRED_FIELD_MESSAGE 36717
+#define IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED 36718
+#define IDS_PAYMENTS_VALIDATION_UNSUPPORTED_CREDIT_CARD_TYPE 36719
+#define IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE 36720
+#define IDS_PAYMENTS_EMAIL_INVALID_VALIDATION_MESSAGE 36721
+#define IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE 36722
+#define IDS_PAYMENTS_INVALID_ADDRESS 36723
+#define IDS_PAYMENTS_BILLING_ADDRESS_REQUIRED 36724
+#define IDS_PAYMENTS_MORE_INFORMATION_REQUIRED 36725
+#define IDS_PAYMENTS_PHONE_NUMBER_REQUIRED 36726
+#define IDS_PAYMENTS_RECIPIENT_REQUIRED 36727
+#define IDS_PAYMENTS_EMAIL_REQUIRED 36728
+#define IDS_PAYMENTS_NAME_REQUIRED 36729
+#define IDS_PREF_EDIT_DIALOG_FIELD_REQUIRED_VALIDATION_MESSAGE 36730
+#define IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT 36731
+#define IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SHEET_TOTAL_FORMAT 36732
+#define IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MORE_ITEMS 36733
+#define IDS_PAYMENT_REQUEST_ORDER_SUMMARY_MULTIPLE_CURRENCY_INDICATOR 36734
+#define IDS_PAYMENTS_SELECT_SHIPPING_ADDRESS_FOR_SHIPPING_METHODS 36735
+#define IDS_PAYMENTS_UNSUPPORTED_SHIPPING_ADDRESS 36736
+#define IDS_PAYMENTS_UNSUPPORTED_SHIPPING_OPTION 36737
+#define IDS_PAYMENTS_SELECT_DELIVERY_ADDRESS_FOR_DELIVERY_METHODS 36738
+#define IDS_PAYMENTS_UNSUPPORTED_DELIVERY_ADDRESS 36739
+#define IDS_PAYMENTS_SELECT_PICKUP_ADDRESS_FOR_PICKUP_METHODS 36740
+#define IDS_PAYMENTS_UNSUPPORTED_PICKUP_ADDRESS 36741
+#define IDS_PAYMENTS_ANDROID_APP_ERROR 36742
+#define IDS_PAYMENT_REQUEST_PAYMENT_METHODS_PREVIEW 36744
+#define IDS_PAYMENT_REQUEST_SHIPPING_ADDRESSES_PREVIEW 36745
+#define IDS_PAYMENT_REQUEST_SHIPPING_OPTIONS_PREVIEW 36746
+#define IDS_PAYMENT_REQUEST_CONTACTS_PREVIEW 36747
+#define IDS_PAYMENTS_BACK 36748
+#define IDS_PAYMENTS_CLOSE 36749
+#define IDS_PAYMENTS_EDIT 36750
+#define IDS_PAYMENTS_ROW_ACCESSIBLE_NAME_FORMAT 36751
+#define IDS_PAYMENTS_ROW_ACCESSIBLE_NAME_SELECTED_FORMAT 36752
+#define IDS_PAYMENTS_PROFILE_LABELS_ACCESSIBLE_FORMAT 36753
+#define IDS_PAYMENTS_ACCESSIBLE_LABEL_WITH_ERROR 36754
+#define IDS_PAYMENTS_ORDER_SUMMARY_ACCESSIBLE_LABEL 36755
+#define IDS_PAYMENT_HANDLER_SHEET_DESCRIPTION 36756
+#define IDS_PAYMENT_HANDLER_SHEET_OPENED_HALF 36757
+#define IDS_PAYMENT_HANDLER_SHEET_OPENED_FULL 36758
+#define IDS_PAYMENT_HANDLER_SHEET_CLOSED 36759
+#define IDS_PAYMENT_HANDLER_ICON 36760
+#define IDS_SECURE_PAYMENT_CONFIRMATION_VERIFY_PURCHASE 36761
+#define IDS_SECURE_PAYMENT_CONFIRMATION_OPT_OUT_LABEL 36762
+#define IDS_SECURE_PAYMENT_CONFIRMATION_STORE_LABEL 36765
+#define IDS_SECURE_PAYMENT_CONFIRMATION_TOTAL_LABEL 36766
+#define IDS_SECURE_PAYMENT_CONFIRMATION_VERIFY_BUTTON_LABEL 36767
+#define IDS_SECURE_PAYMENT_CONFIRMATION_OPT_OUT_LINK_LABEL 36768
+#define IDS_NO_MATCHING_CREDENTIAL_DESCRIPTION 36769
+#define IDS_PDF_DOWNLOAD_ORIGINAL 36776
+#define IDS_PDF_DOWNLOAD_EDITED 36777
+#define IDS_PDF_PRESENT 36778
+#define IDS_PDF_NEED_PASSWORD 36779
+#define IDS_PDF_PASSWORD_DIALOG_TITLE 36780
+#define IDS_PDF_PASSWORD_SUBMIT 36781
+#define IDS_PDF_PASSWORD_INVALID 36782
+#define IDS_PDF_PAGE_LOADING 36783
+#define IDS_PDF_ERROR_DIALOG_TITLE 36784
+#define IDS_PDF_PAGE_LOAD_FAILED 36785
+#define IDS_PDF_PAGE_RELOAD_BUTTON 36786
+#define IDS_PDF_BOOKMARKS 36787
+#define IDS_PDF_BOOKMARK_EXPAND_ICON_ARIA_LABEL 36788
+#define IDS_PDF_PROPERTIES_DIALOG_TITLE 36789
+#define IDS_PDF_PROPERTIES_FILE_NAME 36790
+#define IDS_PDF_PROPERTIES_FILE_SIZE 36791
+#define IDS_PDF_PROPERTIES_TITLE 36792
+#define IDS_PDF_PROPERTIES_AUTHOR 36793
+#define IDS_PDF_PROPERTIES_SUBJECT 36794
+#define IDS_PDF_PROPERTIES_KEYWORDS 36795
+#define IDS_PDF_PROPERTIES_CREATED 36796
+#define IDS_PDF_PROPERTIES_MODIFIED 36797
+#define IDS_PDF_PROPERTIES_APPLICATION 36798
+#define IDS_PDF_PROPERTIES_PDF_PRODUCER 36799
+#define IDS_PDF_PROPERTIES_PDF_VERSION 36800
+#define IDS_PDF_PROPERTIES_PAGE_COUNT 36801
+#define IDS_PDF_PROPERTIES_PAGE_SIZE 36802
+#define IDS_PDF_PROPERTIES_PAGE_SIZE_VALUE_INCH 36803
+#define IDS_PDF_PROPERTIES_PAGE_SIZE_VALUE_MM 36804
+#define IDS_PDF_PROPERTIES_PAGE_SIZE_PORTRAIT 36805
+#define IDS_PDF_PROPERTIES_PAGE_SIZE_LANDSCAPE 36806
+#define IDS_PDF_PROPERTIES_PAGE_SIZE_SQUARE 36807
+#define IDS_PDF_PROPERTIES_PAGE_SIZE_VARIABLE 36808
+#define IDS_PDF_PROPERTIES_FAST_WEB_VIEW 36809
+#define IDS_PDF_PROPERTIES_FAST_WEB_VIEW_NO 36810
+#define IDS_PDF_PROPERTIES_FAST_WEB_VIEW_YES 36811
+#define IDS_PDF_TOOLTIP_ROTATE_CCW 36812
+#define IDS_PDF_ROTATION_STATE_LABEL_0 36813
+#define IDS_PDF_ROTATION_STATE_LABEL_90 36814
+#define IDS_PDF_ROTATION_STATE_LABEL_180 36815
+#define IDS_PDF_ROTATION_STATE_LABEL_270 36816
+#define IDS_PDF_TOOLTIP_DOWNLOAD 36817
+#define IDS_PDF_TOOLTIP_PRINT 36818
+#define IDS_PDF_TOOLTIP_FIT_PAGE 36819
+#define IDS_PDF_TOOLTIP_FIT_WIDTH 36820
+#define IDS_PDF_TWO_UP_VIEW_ENABLE 36821
+#define IDS_PDF_ANNOTATIONS_SHOW_TOGGLE 36822
+#define IDS_PDF_ZOOM_TEXT_INPUT_ARIA_LABEL 36823
+#define IDS_PDF_TOOLTIP_ZOOM_IN 36824
+#define IDS_PDF_TOOLTIP_ZOOM_OUT 36825
+#define IDS_PDF_TOOLTIP_THUMBNAILS 36826
+#define IDS_PDF_TOOLTIP_DOCUMENT_OUTLINE 36827
+#define IDS_PDF_TOOLTIP_ATTACHMENTS 36828
+#define IDS_PDF_TOOLTIP_DOWNLOAD_ATTACHMENT 36829
+#define IDS_PDF_LABEL_PAGE_NUMBER 36830
+#define IDS_PDF_LOADING_TO_A11Y_TREE 36831
+#define IDS_PDF_LOADED_TO_A11Y_TREE 36832
+#define IDS_PDF_OVERSIZE_ATTACHMENT_WARNING 36833
+#define IDS_PDF_PAGE_INDEX 36834
+#define IDS_PDF_DOCUMENT_PAGE_COUNT 36835
+#define IDS_PDF_THUMBNAIL_PAGE_ARIA_LABEL 36836
+#define IDS_AX_ROLE_DESCRIPTION_PDF_HIGHLIGHT 36888
+#define IDS_AX_ROLE_DESCRIPTION_PDF_POPUP_NOTE 36889
+#define IDS_PDF_OCR_FEATURE_ALERT 36890
+#define IDS_PDF_OCR_IN_PROGRESS 36891
+#define IDS_PDF_OCR_COMPLETED 36892
+#define IDS_PDF_OCR_NO_RESULT 36893
+#define IDS_PDF_OCR_RESULT_BEGIN 36894
+#define IDS_PDF_OCR_RESULT_END 36895
+#define IDS_PDF_OCR_POSTAMBLE_PAGE 36896
+#define IDS_GEOLOCATION_INFOBAR_TEXT 36897
+#define IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT 36920
+#define IDS_PROTECTED_MEDIA_IDENTIFIER_PER_ORIGIN_PROVISIONING_INFOBAR_TEXT 36921
+#define IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT 36922
+#define IDS_NOTIFICATION_PERMISSIONS_FRAGMENT 36923
+#define IDS_MIDI_SYSEX_PERMISSION_FRAGMENT 36924
+#define IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT 36925
+#define IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT 36926
+#define IDS_MEDIA_CAPTURE_CAMERA_PAN_TILT_ZOOM_PERMISSION_FRAGMENT 36927
+#define IDS_ACCESSIBILITY_EVENTS_PERMISSION_FRAGMENT 36928
+#define IDS_CLIPBOARD_PERMISSION_FRAGMENT 36929
+#define IDS_VR_PERMISSION_FRAGMENT 36930
+#define IDS_AR_PERMISSION_FRAGMENT 36931
+#define IDS_STORAGE_ACCESS_PERMISSION_TWO_ORIGIN_PROMPT_TITLE 36932
+#define IDS_STORAGE_ACCESS_PERMISSION_FRAGMENT 36933
+#define IDS_STORAGE_ACCESS_PERMISSION_EXPLANATION 36934
+#define IDS_STORAGE_ACCESS_PERMISSION_TWO_ORIGIN_EXPLANATION 36935
+#define IDS_STORAGE_ACCESS_PERMISSION_TWO_ORIGIN_LINK 36936
+#define IDS_WINDOW_MANAGEMENT_PERMISSION_FRAGMENT 36937
+#define IDS_FONT_ACCESS_PERMISSION_FRAGMENT 36938
+#define IDS_IDLE_DETECTION_PERMISSION_FRAGMENT 36939
+#define IDS_MULTI_DOWNLOAD_PERMISSION_FRAGMENT 36940
+#define IDS_CAPTURED_SURFACE_CONTROL_PERMISSION_FRAGMENT 36941
+#define IDS_PERMISSION_ALLOW 36942
+#define IDS_PERMISSION_DENY 36943
+#define IDS_PERMISSION_ALLOW_THIS_TIME 36944
+#define IDS_PERMISSION_ALLOW_EVERY_VISIT 36945
+#define IDS_PERMISSION_DONT_ALLOW 36946
+#define IDS_PERMISSION_NEVER_ALLOW 36947
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_PROMPT 36948
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT 36949
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_PAIR_BUTTON_TEXT 36950
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING_LABEL 36951
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING_LABEL_TOOLTIP 36952
+#define IDS_DEVICE_CHOOSER_DEVICE_NAME_WITH_ID 36953
+#define IDS_BLUETOOTH_SCANNING_PROMPT 36954
+#define IDS_BLUETOOTH_SCANNING_DEVICE_UNKNOWN 36955
+#define IDS_BLUETOOTH_SCANNING_PROMPT_NO_DEVICES_FOUND_PROMPT 36956
+#define IDS_BLUETOOTH_SCANNING_PROMPT_ALLOW_BUTTON_TEXT 36957
+#define IDS_BLUETOOTH_SCANNING_PROMPT_BLOCK_BUTTON_TEXT 36958
+#define IDS_DEVICE_CHOOSER_CANCEL_BUTTON_TEXT 36959
+#define IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT 36960
+#define IDS_USB_DEVICE_CHOOSER_PROMPT 36961
+#define IDS_USB_DEVICE_CHOOSER_CONNECT_BUTTON_TEXT 36962
+#define IDS_USB_DEVICE_CHOOSER_LOADING_LABEL 36963
+#define IDS_USB_DEVICE_CHOOSER_LOADING_LABEL_TOOLTIP 36964
+#define IDS_PRIVATE_NETWORK_DEVICE_CHOOSER_PROMPT_ORIGIN 36965
+#define IDS_PRIVATE_NETWORK_DEVICE_CHOOSER_CONNECT_BUTTON_TEXT 36966
+#define IDS_GEOLOCATION_PERMISSION_CHIP 36967
+#define IDS_NOTIFICATION_PERMISSIONS_CHIP 36968
+#define IDS_MIDI_SYSEX_PERMISSION_CHIP 36969
+#define IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_CHIP 36970
+#define IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_CHIP 36971
+#define IDS_MEDIA_CAPTURE_VIDEO_AND_AUDIO_PERMISSION_CHIP 36972
+#define IDS_CLIPBOARD_PERMISSION_CHIP 36973
+#define IDS_SAA_PERMISSION_CHIP 36974
+#define IDS_VR_PERMISSION_CHIP 36975
+#define IDS_AR_PERMISSION_CHIP 36976
+#define IDS_IDLE_DETECTION_PERMISSION_CHIP 36977
+#define IDS_GEOLOCATION_PERMISSION_BLOCKED_CHIP 36978
+#define IDS_NOTIFICATION_PERMISSIONS_BLOCKED_CHIP 36979
+#define IDS_PERMISSIONS_PERMISSION_ALLOWED_CONFIRMATION 36980
+#define IDS_PERMISSIONS_PERMISSION_ALLOWED_ONCE_CONFIRMATION 36981
+#define IDS_PERMISSIONS_PERMISSION_NOT_ALLOWED_CONFIRMATION 36982
+#define IDS_PERMISSIONS_NOTIFICATION_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36983
+#define IDS_PERMISSIONS_NOTIFICATION_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36984
+#define IDS_PERMISSIONS_GEOLOCATION_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36985
+#define IDS_PERMISSIONS_GEOLOCATION_ALLOWED_ONCE_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36986
+#define IDS_PERMISSIONS_GEOLOCATION_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36987
+#define IDS_PERMISSIONS_CAMERA_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36988
+#define IDS_PERMISSIONS_CAMERA_ALLOWED_ONCE_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36989
+#define IDS_PERMISSIONS_CAMERA_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36990
+#define IDS_PERMISSIONS_MICROPHONE_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36991
+#define IDS_PERMISSIONS_MICROPHONE_ALLOWED_ONCE_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36992
+#define IDS_PERMISSIONS_MICROPHONE_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36993
+#define IDS_PERMISSIONS_CAMERA_AND_MICROPHONE_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36994
+#define IDS_PERMISSIONS_CAMERA_AND_MICROPHONE_ALLOWED_ONCE_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36995
+#define IDS_PERMISSIONS_CAMERA_AND_MICROPHONE_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36996
+#define IDS_PERMISSIONS_SAA_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36997
+#define IDS_PERMISSIONS_SAA_NOT_ALLOWED_CONFIRMATION_SCREENREADER_ANNOUNCEMENT 36998
+#define IDS_REQUEST_QUOTA_INFOBAR_TEXT 37002
+#define IDS_REQUEST_LARGE_QUOTA_INFOBAR_TEXT 37003
+#define IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT 37004
+#define IDS_EMBEDDED_PROMPT_ADMIN_BLOCKED 37005
+#define IDS_EMBEDDED_PROMPT_ADMIN_ALLOWED 37006
+#define IDS_EMBEDDED_PROMPT_PREVIOUSLY_ALLOWED 37007
+#define IDS_EMBEDDED_PROMPT_PREVIOUSLY_NOT_ALLOWED 37008
+#define IDS_PERMISSION_OFF_FOR_CHROME 37009
+#define IDS_PERMISSION_CHROME_NEEDS_PERMISSION 37010
+#define IDS_GEOLOCATION_NAME_FRAGMENT 37011
+#define IDS_CAMERA_PERMISSION_NAME_FRAGMENT 37012
+#define IDS_MICROPHONE_PERMISSION_NAME_FRAGMENT 37013
+#define IDS_CAMERA_AND_MICROPHONE_PERMISSION_NAME_FRAGMENT 37014
+#define IDS_MACOS_NAME_FRAGMENT 37015
+#define IDS_EMBEDDED_PROMPT_OK_LABEL 37016
+#define IDS_EMBEDDED_PROMPT_CONTINUE_ALLOWING 37017
+#define IDS_EMBEDDED_PROMPT_STOP_ALLOWING 37018
+#define IDS_EMBEDDED_PROMPT_OPEN_SYSTEM_SETTINGS 37019
+#define IDS_EMBEDDED_PROMPT_CONTINUE_NOT_ALLOWING 37020
+#define IDS_PERMISSION_PROMPT_SURVEY_CUSTOM_INVITATION 37021
+#define IDS_PLUS_ADDRESS_MODAL_TITLE 37022
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_LABEL 37023
+#define IDS_PLUS_ADDRESS_MODAL_PROPOSED_PLUS_ADDRESS_AND_COPY 37024
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_LINK_TEXT 37025
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_DESCRIPTION_START 37026
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_DESCRIPTION_END 37027
+#define IDS_PLUS_ADDRESS_MODAL_ERROR_MESSAGE 37028
+#define IDS_PLUS_ADDRESS_MODAL_ERROR_REPORT_LINK_TEXT 37029
+#define IDS_PLUS_ADDRESS_MODAL_REPORT_ERROR_INSTRUCTION_DESKTOP 37030
+#define IDS_PLUS_ADDRESS_MODAL_REPORT_ERROR_INSTRUCTION_V2 37031
+#define IDS_PLUS_ADDRESS_MODAL_REPORT_ERROR_INSTRUCTION_IOS 37032
+#define IDS_PLUS_ADDRESS_MODAL_PROPOSED_PLUS_ADDRESS_PLACEHOLDER 37033
+#define IDS_PLUS_ADDRESS_MODAL_REGULAR_ADDRESS_LABEL 37034
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_DESCRIPTION 37035
+#define IDS_PLUS_ADDRESS_MODAL_CANCEL_TEXT 37036
+#define IDS_PLUS_ADDRESS_MODAL_OK_TEXT 37037
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_DESCRIPTION_V2 37038
+#define IDS_PLUS_ADDRESS_MODAL_PLUS_ADDRESS_DESCRIPTION_IOS 37039
+#define IDS_PLUS_ADDRESS_SETTINGS_LABEL 37040
+#define IDS_POLICY_DM_STATUS_SUCCESS 37041
+#define IDS_POLICY_DM_STATUS_REQUEST_INVALID 37042
+#define IDS_POLICY_DM_STATUS_REQUEST_FAILED 37043
+#define IDS_POLICY_DM_STATUS_TEMPORARY_UNAVAILABLE 37044
+#define IDS_POLICY_DM_STATUS_HTTP_STATUS_ERROR 37045
+#define IDS_POLICY_DM_STATUS_RESPONSE_DECODING_ERROR 37046
+#define IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED 37047
+#define IDS_POLICY_DM_STATUS_SERVICE_DEVICE_NOT_FOUND 37048
+#define IDS_POLICY_DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID 37049
+#define IDS_POLICY_DM_STATUS_SERVICE_ACTIVATION_PENDING 37050
+#define IDS_POLICY_DM_STATUS_SERVICE_INVALID_SERIAL_NUMBER 37051
+#define IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT 37052
+#define IDS_POLICY_DM_STATUS_SERVICE_MISSING_LICENSES 37053
+#define IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED 37054
+#define IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND 37055
+#define IDS_POLICY_DM_STATUS_UNKNOWN_ERROR 37056
+#define IDS_POLICY_DM_STATUS_INVALID_PACKAGED_DEVICE_FOR_KIOSK 37057
+#define IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH 37058
+#define IDS_POLICY_DM_STATUS_CANNOT_SIGN_REQUEST 37059
+#define IDS_POLICY_DM_STATUS_REQUEST_TOO_LARGE 37060
+#define IDS_POLICY_DM_STATUS_SERVICE_TOO_MANY_REQUESTS 37061
+#define IDS_POLICY_DM_STATUS_SERVICE_DEVICE_NEEDS_RESET 37062
+#define IDS_POLICY_DM_STATUS_CONSUMER_ACCOUNT_WITH_PACKAGED_LICENSE 37063
+#define IDS_POLICY_DM_STATUS_ENTERPRISE_ACCOUNT_IS_NOT_ELIGIBLE_TO_ENROLL 37064
+#define IDS_POLICY_VALIDATION_OK 37065
+#define IDS_POLICY_VALIDATION_BAD_INITIAL_SIGNATURE 37066
+#define IDS_POLICY_VALIDATION_BAD_SIGNATURE 37067
+#define IDS_POLICY_VALIDATION_ERROR_CODE_PRESENT 37068
+#define IDS_POLICY_VALIDATION_PAYLOAD_PARSE_ERROR 37069
+#define IDS_POLICY_VALIDATION_WRONG_POLICY_TYPE 37070
+#define IDS_POLICY_VALIDATION_WRONG_SETTINGS_ENTITY_ID 37071
+#define IDS_POLICY_VALIDATION_BAD_TIMESTAMP 37072
+#define IDS_POLICY_VALIDATION_BAD_DM_TOKEN 37073
+#define IDS_POLICY_VALIDATION_BAD_DEVICE_ID 37074
+#define IDS_POLICY_VALIDATION_BAD_USER 37075
+#define IDS_POLICY_VALIDATION_POLICY_PARSE_ERROR 37076
+#define IDS_POLICY_VALIDATION_BAD_KEY_VERIFICATION_SIGNATURE 37077
+#define IDS_POLICY_VALIDATION_VALUE_WARNING 37078
+#define IDS_POLICY_VALIDATION_VALUE_ERROR 37079
+#define IDS_POLICY_VALIDATION_UNKNOWN_ERROR 37080
+#define IDS_POLICY_STORE_STATUS_OK 37081
+#define IDS_POLICY_STORE_STATUS_LOAD_ERROR 37082
+#define IDS_POLICY_STORE_STATUS_STORE_ERROR 37083
+#define IDS_POLICY_STORE_STATUS_PARSE_ERROR 37084
+#define IDS_POLICY_STORE_STATUS_SERIALIZE_ERROR 37085
+#define IDS_POLICY_STORE_STATUS_VALIDATION_ERROR 37086
+#define IDS_POLICY_STORE_STATUS_BAD_STATE 37087
+#define IDS_POLICY_STORE_STATUS_UNKNOWN_ERROR 37088
+#define IDS_POLICY_ASSOCIATION_STATE_ACTIVE 37089
+#define IDS_POLICY_ASSOCIATION_STATE_UNMANAGED 37090
+#define IDS_POLICY_ASSOCIATION_STATE_DEPROVISIONED 37091
+#define IDS_POLICY_TYPE_ERROR 37092
+#define IDS_POLICY_OUT_OF_RANGE_ERROR 37093
+#define IDS_POLICY_VALUE_FORMAT_ERROR 37094
+#define IDS_POLICY_INVALID_FILE_EXTENSION_ERROR 37095
+#define IDS_POLICY_INVALID_HASH_ERROR 37096
+#define IDS_POLICY_INVALID_SELECTION_ERROR 37097
+#define IDS_POLICY_PAPER_SIZE_CUSTOM_NO_SIZE_ERROR 37098
+#define IDS_POLICY_PAPER_SIZE_NOT_CUSTOM_ERROR 37099
+#define IDS_POLICY_INVALID_ACCOUNT_PATTERN_FORMAT_ERROR 37100
+#define IDS_POLICY_INVALID_PROTOCOL_ERROR 37101
+#define IDS_POLICY_INVALID_ORIGIN_ERROR 37102
+#define IDS_POLICY_EMPTY_ORIGIN_LIST_ERROR 37103
+#define IDS_POLICY_INVALID_EXTENSION_ID_ERROR 37105
+#define IDS_POLICY_INVALID_UPDATE_URL_ERROR 37106
+#define IDS_POLICY_URL_PATH_SPECIFIED_ERROR 37107
+#define IDS_POLICY_MISSING_VENDOR_ID_ERROR 37108
+#define IDS_POLICY_INVALID_NUMBER_OF_URLS_ERROR 37109
+#define IDS_POLICY_BRUSCHETTA_UNINSTALLABLE_ERROR 37110
+#define IDS_POLICY_CLOUD_SOURCE_ONLY_ERROR 37111
+#define IDS_POLICY_CLOUD_USER_ONLY_ERROR 37112
+#define IDS_POLICY_CLOUD_MANAGEMENT_ENROLLMENT_ONLY_ERROR 37113
+#define IDS_POLICY_DEFAULT_SEARCH_DISABLED 37114
+#define IDS_POLICY_NOT_SPECIFIED_ERROR 37115
+#define IDS_POLICY_EXTENSION_SETTINGS_ORIGIN_LIMIT_WARNING 37116
+#define IDS_POLICY_URL_ALLOW_BLOCK_LIST_MAX_FILTERS_LIMIT_WARNING 37117
+#define IDS_POLICY_ERROR_WITH_PATH 37118
+#define IDS_POLICY_SCHEMA_VALIDATION_ERROR 37119
+#define IDS_POLICY_INVALID_JSON_ERROR 37120
+#define IDS_POLICY_INVALID_URL_ERROR 37121
+#define IDS_POLICY_URL_NOT_HTTPS_ERROR 37122
+#define IDS_POLICY_INVALID_SEARCH_URL_ERROR 37123
+#define IDS_POLICY_INVALID_SECURE_DNS_MODE_ERROR 37124
+#define IDS_POLICY_SECURE_DNS_TEMPLATES_INVALID_ERROR 37125
+#define IDS_POLICY_SECURE_DNS_SALT_INVALID_ERROR 37126
+#define IDS_POLICY_SECURE_DNS_SALT_INVALID_SIZE_ERROR 37127
+#define IDS_POLICY_SECURE_DNS_TEMPLATES_IRRELEVANT_MODE_ERROR 37128
+#define IDS_POLICY_SECURE_DNS_TEMPLATES_INVALID_MODE_ERROR 37129
+#define IDS_POLICY_SECURE_DNS_TEMPLATES_UNSET_MODE_ERROR 37130
+#define IDS_POLICY_SECURE_DNS_TEMPLATES_NOT_SPECIFIED_ERROR 37131
+#define IDS_POLICY_INVALID_PROXY_MODE_ERROR 37132
+#define IDS_POLICY_OFF_CWS_URL_ERROR 37134
+#define IDS_POLICY_HOMEPAGE_LOCATION_ERROR 37135
+#define IDS_POLICY_PROXY_MODE_DISABLED_ERROR 37136
+#define IDS_POLICY_PROXY_MODE_AUTO_DETECT_ERROR 37137
+#define IDS_POLICY_PROXY_MODE_PAC_URL_ERROR 37138
+#define IDS_POLICY_PROXY_MODE_FIXED_SERVERS_ERROR 37139
+#define IDS_POLICY_PROXY_MODE_SYSTEM_ERROR 37140
+#define IDS_POLICY_PROXY_BOTH_SPECIFIED_ERROR 37141
+#define IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR 37142
+#define IDS_POLICY_OVERRIDDEN 37143
+#define IDS_POLICY_VALUE_DEPRECATED 37144
+#define IDS_POLICY_DEPENDENCY_ERROR 37145
+#define IDS_POLICY_DEPENDENCY_ERROR_ANY_VALUE 37146
+#define IDS_POLICY_IDLE_TIMEOUT_ACTIONS_DEPENDENCY_ERROR 37147
+#define IDS_POLICY_USER_IS_NOT_AFFILIATED_ERROR 37148
+#define IDS_POLICY_LEVEL_ERROR 37153
+#define IDS_POLICY_OK 37154
+#define IDS_POLICY_UNSET 37155
+#define IDS_POLICY_UNKNOWN 37156
+#define IDS_POLICY_PROTO_PARSING_ERROR 37157
+#define IDS_POLICY_HEX_COLOR_ERROR 37158
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_MAX_PROVIDERS_LIMIT_ERROR 37159
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_MAX_FEATURED_PROVIDERS_LIMIT_ERROR 37160
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_DUPLICATED_SHORTCUT 37161
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_SHORTCUT_CONTAINS_SPACE 37162
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_SHORTCUT_STARTS_WITH_AT 37163
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_NO_VALID_PROVIDER 37164
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_SHORTCUT_IS_EMPTY 37165
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_NAME_IS_EMPTY 37166
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_URL_IS_EMPTY 37167
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_URL_DOESNT_SUPPORT_REPLACEMENT 37168
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_SHORTCUT_EQUALS_DSP_KEYWORD 37169
+#define IDS_POLICY_SITE_SEARCH_SETTINGS_URL_NOT_HTTPS 37170
+#define IDS_POLICY_DATA_CONTROLS_MUTUALLY_EXCLUSIVE_KEYS 37171
+#define IDS_POLICY_DATA_CONTROLS_MUTUALLY_EXCLUSIVE_KEY_SETS 37172
+#define IDS_POLICY_TITLE 37173
+#define IDS_POLICY_FILTER_PLACEHOLDER 37174
+#define IDS_POLICY_RELOAD_POLICIES 37175
+#define IDS_POLICY_RELOADING_POLICIES 37176
+#define IDS_POLICY_RELOAD_POLICIES_DONE 37177
+#define IDS_EXPORT_POLICIES_JSON 37178
+#define IDS_EXPORT_POLICIES_JSON_DONE 37179
+#define IDS_UPLOAD_REPORT 37180
+#define IDS_REPORT_UPLOADING 37181
+#define IDS_REPORT_UPLOADED 37182
+#define IDS_POLICY_STATUS 37183
+#define IDS_POLICY_STATUS_DEVICE 37184
+#define IDS_POLICY_STATUS_USER 37185
+#define IDS_POLICY_STATUS_MACHINE 37186
+#define IDS_POLICY_STATUS_UPDATER 37187
+#define IDS_POLICY_STATUS_ERROR_MANAGED_NO_POLICY 37188
+#define IDS_POLICY_STATUS_FLEX_ORG_NO_POLICY 37189
+#define IDS_POLICY_LABEL_MACHINE_ENROLLMENT_DOMAIN 37190
+#define IDS_POLICY_LABEL_MACHINE_ENROLLMENT_TOKEN 37191
+#define IDS_POLICY_LABEL_MACHINE_ENROLLMENT_DEVICE_ID 37192
+#define IDS_POLICY_LABEL_MACHINE_ENROLLMENT_MACHINE_NAME 37193
+#define IDS_POLICY_LABEL_USERNAME 37194
+#define IDS_POLICY_LABEL_GAIA_ID 37195
+#define IDS_POLICY_LABEL_CLIENT_ID 37196
+#define IDS_POLICY_LABEL_PROFILE_ID 37197
+#define IDS_POLICY_LABEL_ASSET_ID 37198
+#define IDS_POLICY_LABEL_LOCATION 37199
+#define IDS_POLICY_LABEL_DIRECTORY_API_ID 37200
+#define IDS_POLICY_LABEL_MANAGED_BY 37201
+#define IDS_POLICY_LABEL_TIME_SINCE_LAST_FETCH_ATTEMPT 37202
+#define IDS_POLICY_LABEL_TIME_SINCE_LAST_REFRESH 37203
+#define IDS_POLICY_LABEL_LAST_CLOUD_REPORT_SENT_TIMESTAMP 37204
+#define IDS_POLICY_NOT_SPECIFIED 37205
+#define IDS_POLICY_LABEL_PUSH_POLICIES 37206
+#define IDS_POLICY_PUSH_POLICIES_ON 37207
+#define IDS_POLICY_PUSH_POLICIES_OFF 37208
+#define IDS_POLICY_NEVER_FETCHED 37209
+#define IDS_POLICY_LABEL_REFRESH_INTERVAL 37210
+#define IDS_POLICY_LABEL_CONFLICT 37211
+#define IDS_POLICY_LABEL_SUPERSEDING 37212
+#define IDS_POLICY_LABEL_CONFLICT_VALUE 37213
+#define IDS_POLICY_LABEL_SUPERSEDED_VALUE 37214
+#define IDS_POLICY_LABEL_ERROR 37215
+#define IDS_POLICY_LABEL_DEPRECATED 37216
+#define IDS_POLICY_LABEL_FUTURE 37217
+#define IDS_POLICY_LABEL_IGNORED 37218
+#define IDS_POLICY_LABEL_VALUE 37219
+#define IDS_POLICY_LABEL_VERSION 37220
+#define IDS_POLICY_LABEL_STATUS 37221
+#define IDS_POLICY_LABEL_INFO 37222
+#define IDS_POLICY_LABEL_PRECEDENCE 37223
+#define IDS_POLICY_SHOW_UNSET 37224
+#define IDS_POLICY_NO_POLICIES_SET 37225
+#define IDS_POLICY_HEADER_SCOPE 37226
+#define IDS_POLICY_HEADER_LEVEL 37227
+#define IDS_POLICY_HEADER_NAMESPACE 37228
+#define IDS_POLICY_HEADER_NAME 37229
+#define IDS_POLICY_HEADER_VALUE 37230
+#define IDS_POLICY_HEADER_STATUS 37231
+#define IDS_POLICY_HEADER_SOURCE 37232
+#define IDS_POLICY_HEADER_WARNING 37233
+#define IDS_POLICY_SHOW_MORE 37234
+#define IDS_POLICY_SHOW_LESS 37235
+#define IDS_POLICY_LEARN_MORE 37236
+#define IDS_POLICY_SCOPE_USER 37237
+#define IDS_POLICY_SCOPE_ALL_USERS 37238
+#define IDS_POLICY_SCOPE_DEVICE 37239
+#define IDS_POLICY_LEVEL_RECOMMENDED 37240
+#define IDS_POLICY_LEVEL_MANDATORY 37241
+#define IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT 37242
+#define IDS_POLICY_SOURCE_DEFAULT 37243
+#define IDS_POLICY_SOURCE_COMMAND_LINE 37244
+#define IDS_POLICY_SOURCE_CLOUD 37245
+#define IDS_POLICY_SOURCE_MERGED 37246
+#define IDS_POLICY_SOURCE_CLOUD_FROM_ASH 37247
+#define IDS_POLICY_SOURCE_RESTRICTED_MANAGED_GUEST_SESSION_OVERRIDE 37248
+#define IDS_POLICY_SOURCE_ACTIVE_DIRECTORY 37249
+#define IDS_POLICY_SOURCE_PLATFORM 37250
+#define IDS_POLICY_SOURCE_DEVICE_LOCAL_ACCOUNT_OVERRIDE 37251
+#define IDS_POLICY_RISK_TAG_FULL_ADMIN_ACCESS 37252
+#define IDS_POLICY_RISK_TAG_SYSTEM_SECURITY 37253
+#define IDS_POLICY_RISK_TAG_WEBSITE_SHARING 37254
+#define IDS_POLICY_RISK_TAG_ADMIN_SHARING 37255
+#define IDS_POLICY_RISK_TAG_FILTERING 37256
+#define IDS_POLICY_RISK_TAG_LOCAL_DATA_ACCESS 37257
+#define IDS_POLICY_RISK_TAG_GOOGLE_SHARING 37258
+#define IDS_POLICY_SHOW_EXPANDED_STATUS 37259
+#define IDS_POLICY_HIDE_EXPANDED_STATUS 37260
+#define IDS_POLICY_LIST_MERGING_WRONG_POLICY_TYPE_SPECIFIED 37261
+#define IDS_POLICY_DICTIONARY_MERGING_WRONG_POLICY_TYPE_SPECIFIED 37262
+#define IDS_POLICY_DICTIONARY_MERGING_POLICY_NOT_ALLOWED 37263
+#define IDS_POLICY_CONFLICT_SAME_VALUE 37264
+#define IDS_POLICY_CONFLICT_DIFF_VALUE 37265
+#define IDS_POLICY_MIGRATED_OLD_POLICY 37266
+#define IDS_POLICY_MIGRATED_NEW_POLICY 37267
+#define IDS_POLICY_BLOCKED 37268
+#define IDS_POLICY_INVALID 37269
+#define IDS_POLICY_IGNORED_BY_GROUP_MERGING 37270
+#define IDS_POLICY_INVALID_VALUE 37271
+#define IDS_POLICY_IGNORED_MANDATORY_REPORTING_POLICY 37272
+#define IDS_POLICY_IGNORED_CHROME_PROFILE 37273
+#define IDS_POLICY_IGNORED_UNAFFILIATED 37274
+#define IDS_POLICY_PRECEDENCE_PLATFORM_MACHINE 37275
+#define IDS_POLICY_PRECEDENCE_PLATFORM_USER 37276
+#define IDS_POLICY_PRECEDENCE_CLOUD_MACHINE 37277
+#define IDS_POLICY_PRECEDENCE_CLOUD_USER 37278
+#define IDS_POLICY_SPELLCHECK_UNKNOWN_LANGUAGE 37279
+#define IDS_POLICY_SPELLCHECK_BLOCKLIST_IGNORE 37280
+#define IDS_POLICY_LABEL_IS_AFFILIATED 37281
+#define IDS_POLICY_IS_AFFILIATED_YES 37282
+#define IDS_POLICY_IS_AFFILIATED_NO 37283
+#define IDS_POLICY_LABEL_IS_OFFHOURS_ACTIVE 37284
+#define IDS_POLICY_OFFHOURS_ACTIVE 37285
+#define IDS_POLICY_OFFHOURS_NOT_ACTIVE 37286
+#define IDS_POLICY_SIGNIN_PROFILE 37287
+#define IDS_POLICY_COPY_VALUE 37288
+#define IDS_COPY_POLICIES_JSON 37289
+#define IDS_COPY_POLICIES_DONE 37290
+#define IDS_VIEW_POLICY_LOGS 37291
+#define IDS_POLICY_MORE_ACTIONS 37292
+#define IDS_POLICY_LOGS_TITLE 37293
+#define IDS_VERSION_INFO 37294
+#define IDS_EXPORT_POLICY_LOGS_JSON 37295
+#define IDS_REFRESH_POLICY_LOGS 37296
+#define IDS_POLICY_TEST_TITLE 37297
+#define IDS_POLICY_TEST_RESTART_AND_APPLY 37298
+#define IDS_POLICY_TEST_APPLY 37299
+#define IDS_POLICY_TEST_IMPORT 37300
+#define IDS_POLICY_TEST_DESC 37301
+#define IDS_POLICY_TEST_REVERT 37302
+#define IDS_POLICY_TEST_TABLE_SCOPE 37303
+#define IDS_POLICY_TEST_ADD 37304
+#define IDS_POLICY_SELECT_NAME 37305
+#define IDS_POLICY_TEST_TABLE_PRESET 37306
+#define IDS_LOCAL_TEST_POLICIES_ENABLED 37307
+#define IDS_POLICY_TEST_PRESET_CUSTOM 37308
+#define IDS_POLICY_TEST_PRESET_LOCAL_MACHINE 37309
+#define IDS_POLICY_TEST_PRESET_CLOUD_ACCOUNT 37310
+#define IDS_POLICY_TEST_USER_AFFILIATED 37311
+#define IDS_CHROME_URLS_DISABLED_PAGE_HEADER 37312
+#define IDS_CHROME_URLS_DISABLED_PAGE_TITLE 37313
+#define IDS_CHROME_URLS_DISABLED_PAGE_MESSAGE 37314
+#define IDS_POLICY_DLP_CLIPBOARD_BLOCKED_ON_PASTE 37315
+#define IDS_POLICY_DLP_CLIPBOARD_BLOCKED_ON_COPY_VM 37316
+#define IDS_POLICY_DLP_CLIPBOARD_BLOCK_TOAST_BUTTON 37317
+#define IDS_POLICY_DLP_ANDROID_APPS 37318
+#define IDS_POLICY_DLP_CLIPBOARD_BLOCK_DISMISS_BUTTON 37319
+#define IDS_POLICY_DLP_CLIPBOARD_WARN_ON_PASTE 37320
+#define IDS_POLICY_DLP_CLIPBOARD_WARN_PROCEED_BUTTON 37321
+#define IDS_POLICY_DLP_CLIPBOARD_WARN_ON_COPY_VM 37322
+#define IDS_POLICY_DLP_PRINTING_BLOCKED_TITLE 37323
+#define IDS_POLICY_DLP_PRINTING_BLOCKED_MESSAGE 37324
+#define IDS_POLICY_DLP_PRINTING_WARN_TITLE 37325
+#define IDS_POLICY_DLP_PRINTING_WARN_MESSAGE 37326
+#define IDS_POLICY_DLP_PRINTING_WARN_CONTINUE_BUTTON 37327
+#define IDS_POLICY_DLP_SCREEN_SHARE_BLOCKED_TITLE 37328
+#define IDS_POLICY_DLP_SCREEN_SHARE_BLOCKED_MESSAGE 37329
+#define IDS_POLICY_DLP_SCREEN_SHARE_PAUSED_TITLE 37330
+#define IDS_POLICY_DLP_SCREEN_SHARE_PAUSED_MESSAGE 37331
+#define IDS_POLICY_DLP_SCREEN_SHARE_RESUMED_TITLE 37332
+#define IDS_POLICY_DLP_SCREEN_SHARE_RESUMED_MESSAGE 37333
+#define IDS_POLICY_DLP_SCREEN_CAPTURE_DISABLED_TITLE 37334
+#define IDS_POLICY_DLP_SCREEN_CAPTURE_DISABLED_MESSAGE 37335
+#define IDS_POLICY_DLP_VIDEO_CAPTURE_STOPPED_TITLE 37336
+#define IDS_POLICY_DLP_VIDEO_CAPTURE_STOPPED_MESSAGE 37337
+#define IDS_POLICY_DLP_SCREEN_SHARE_WARN_TITLE 37338
+#define IDS_POLICY_DLP_SCREEN_SHARE_WARN_MESSAGE 37339
+#define IDS_POLICY_DLP_SCREEN_SHARE_WARN_CONTINUE_BUTTON 37340
+#define IDS_POLICY_DLP_SCREEN_CAPTURE_WARN_TITLE 37341
+#define IDS_POLICY_DLP_SCREEN_CAPTURE_WARN_MESSAGE 37342
+#define IDS_POLICY_DLP_SCREEN_CAPTURE_WARN_CONTINUE_BUTTON 37343
+#define IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_TITLE 37344
+#define IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_MESSAGE 37345
+#define IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_CONTINUE_BUTTON 37346
+#define IDS_POLICY_DLP_VIDEO_CAPTURE_WARN_CANCEL_BUTTON 37347
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_WARN_TITLE 37348
+#define IDS_POLICY_DLP_FILES_TRANSFER_WARN_TITLE 37349
+#define IDS_POLICY_DLP_FILES_UPLOAD_WARN_TITLE 37350
+#define IDS_POLICY_DLP_FILES_MOVE_WARN_TITLE 37351
+#define IDS_POLICY_DLP_FILES_COPY_WARN_TITLE 37352
+#define IDS_POLICY_DLP_FILES_OPEN_WARN_TITLE 37353
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_REVIEW_TITLE 37354
+#define IDS_POLICY_DLP_FILES_TRANSFER_REVIEW_TITLE 37355
+#define IDS_POLICY_DLP_FILES_UPLOAD_REVIEW_TITLE 37356
+#define IDS_POLICY_DLP_FILES_MOVE_REVIEW_TITLE 37357
+#define IDS_POLICY_DLP_FILES_COPY_REVIEW_TITLE 37358
+#define IDS_POLICY_DLP_FILES_OPEN_REVIEW_TITLE 37359
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_WARN_MESSAGE 37360
+#define IDS_POLICY_DLP_FILES_TRANSFER_WARN_MESSAGE 37361
+#define IDS_POLICY_DLP_FILES_UPLOAD_WARN_MESSAGE 37362
+#define IDS_POLICY_DLP_FILES_MOVE_WARN_MESSAGE 37363
+#define IDS_POLICY_DLP_FILES_COPY_WARN_MESSAGE 37364
+#define IDS_POLICY_DLP_FILES_OPEN_WARN_MESSAGE 37365
+#define IDS_POLICY_DLP_FILES_WARN_MESSAGE 37366
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_WARN_CONTINUE_BUTTON 37367
+#define IDS_POLICY_DLP_FILES_TRANSFER_WARN_CONTINUE_BUTTON 37368
+#define IDS_POLICY_DLP_FILES_UPLOAD_WARN_CONTINUE_BUTTON 37369
+#define IDS_POLICY_DLP_FILES_MOVE_WARN_CONTINUE_BUTTON 37370
+#define IDS_POLICY_DLP_FILES_COPY_WARN_CONTINUE_BUTTON 37371
+#define IDS_POLICY_DLP_FILES_OPEN_WARN_CONTINUE_BUTTON 37372
+#define IDS_POLICY_DLP_FILES_DESTINATION_REMOVABLE_STORAGE 37373
+#define IDS_POLICY_DLP_FILES_REVIEW_BUTTON 37374
+#define IDS_POLICY_DLP_FILES_DISMISS_BUTTON 37375
+#define IDS_POLICY_DLP_FILES_OK_BUTTON 37376
+#define IDS_POLICY_DLP_WARN_CANCEL_BUTTON 37377
+#define IDS_POLICY_DLP_CLIPBOARD_BUBBLE_MESSAGE 37378
+#define IDS_POLICY_DLP_FROM_YOUR_ADMIN_MESSAGE 37379
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_BLOCK_TITLE 37380
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_BLOCK_MESSAGE 37381
+#define IDS_POLICY_DLP_FILES_UPLOAD_BLOCK_TITLE 37382
+#define IDS_POLICY_DLP_FILES_UPLOAD_BLOCK_MESSAGE 37383
+#define IDS_POLICY_DLP_FILES_OPEN_BLOCK_TITLE 37384
+#define IDS_POLICY_DLP_FILES_OPEN_BLOCK_MESSAGE 37385
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_BLOCKED_TITLE 37386
+#define IDS_POLICY_DLP_FILES_TRANSFER_BLOCKED_TITLE 37387
+#define IDS_POLICY_DLP_FILES_UPLOAD_BLOCKED_TITLE 37388
+#define IDS_POLICY_DLP_FILES_MOVE_BLOCKED_TITLE 37389
+#define IDS_POLICY_DLP_FILES_COPY_BLOCKED_TITLE 37390
+#define IDS_POLICY_DLP_FILES_OPEN_BLOCKED_TITLE 37391
+#define IDS_POLICY_DLP_FILES_POLICY_BLOCK_SINGLE_FILE_MESSAGE 37392
+#define IDS_POLICY_DLP_FILES_POLICY_BLOCK_MESSAGE 37393
+#define IDS_POLICY_DLP_FILES_CONTENT_BLOCK_SINGLE_FILE_MESSAGE 37394
+#define IDS_POLICY_DLP_FILES_CONTENT_BLOCK_MESSAGE 37395
+#define IDS_POLICY_DLP_FILES_BLOCK_MESSAGE 37396
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_JUSTIFICATION_LABEL 37397
+#define IDS_POLICY_DLP_FILES_UPLOAD_JUSTIFICATION_LABEL 37398
+#define IDS_POLICY_DLP_FILES_COPY_JUSTIFICATION_LABEL 37399
+#define IDS_POLICY_DLP_FILES_MOVE_JUSTIFICATION_LABEL 37400
+#define IDS_POLICY_DLP_FILES_OPEN_JUSTIFICATION_LABEL 37401
+#define IDS_POLICY_DLP_FILES_TRANSFER_JUSTIFICATION_LABEL 37402
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_TIMEOUT_TITLE 37403
+#define IDS_POLICY_DLP_FILES_TRANSFER_TIMEOUT_TITLE 37404
+#define IDS_POLICY_DLP_FILES_UPLOAD_TIMEOUT_TITLE 37405
+#define IDS_POLICY_DLP_FILES_MOVE_TIMEOUT_TITLE 37406
+#define IDS_POLICY_DLP_FILES_COPY_TIMEOUT_TITLE 37407
+#define IDS_POLICY_DLP_FILES_OPEN_TIMEOUT_TITLE 37408
+#define IDS_POLICY_DLP_FILES_DOWNLOAD_TIMEOUT_MESSAGE 37409
+#define IDS_POLICY_DLP_FILES_TRANSFER_TIMEOUT_MESSAGE 37410
+#define IDS_POLICY_DLP_FILES_UPLOAD_TIMEOUT_MESSAGE 37411
+#define IDS_POLICY_DLP_FILES_MOVE_TIMEOUT_MESSAGE 37412
+#define IDS_POLICY_DLP_FILES_COPY_TIMEOUT_MESSAGE 37413
+#define IDS_POLICY_DLP_FILES_OPEN_TIMEOUT_MESSAGE 37414
+#define IDS_POLICY_DLP_FILES_LEARN_MORE_ABOUT_DATA_CONTROLS_ACCESSIBLE_NAME 37415
+#define IDS_POLICY_DLP_FILES_LEARN_MORE_ABOUT_MALWARE_PROTECTION_ACCESSIBLE_NAME 37416
+#define IDS_POLICY_DLP_FILES_LEARN_MORE_ABOUT_SENSITIVE_DATA_PROTECTION_ACCESSIBLE_NAME 37417
+#define IDS_POLICY_DLP_FILES_JUSTIFICATION_TEXTAREA_ACCESSIBLE_DESCRIPTION 37418
+#define IDS_POLICY_DEVICE_SCHEDULED_REBOOT_TITLE 37419
+#define IDS_POLICY_DEVICE_SCHEDULED_REBOOT_MESSAGE 37420
+#define IDS_POLICY_REBOOT_BUTTON 37421
+#define IDS_POLICY_DEVICE_SCHEDULED_REBOOT_DIALOG_MESSAGE 37422
+#define IDS_REBOOT_SCHEDULED_TITLE_MINUTES 37423
+#define IDS_REBOOT_SCHEDULED_TITLE_SECONDS 37424
+#define IDS_POLICY_DEVICE_POST_REBOOT_TITLE 37425
+#define IDS_POLICY_BROWSING_DATA_DEPENDENCY_APPLIED_INFO 37426
+#define IDS_POLICY_NOT_SUPPORTED_AS_USER_POLICY_ON_IOS 37427
+#define PRINT_PREVIEW_MEDIA_ASME_F_28X40IN 37428
+#define PRINT_PREVIEW_MEDIA_ISO_2A0_1189X1682MM 37429
+#define PRINT_PREVIEW_MEDIA_ISO_A0_841X1189MM 37430
+#define PRINT_PREVIEW_MEDIA_ISO_A0X3_1189X2523MM 37431
+#define PRINT_PREVIEW_MEDIA_ISO_A10_26X37MM 37432
+#define PRINT_PREVIEW_MEDIA_ISO_A1_594X841MM 37433
+#define PRINT_PREVIEW_MEDIA_ISO_A1X3_841X1783MM 37434
+#define PRINT_PREVIEW_MEDIA_ISO_A1X4_841X2378MM 37435
+#define PRINT_PREVIEW_MEDIA_ISO_A2_420X594MM 37436
+#define PRINT_PREVIEW_MEDIA_ISO_A2X3_594X1261MM 37437
+#define PRINT_PREVIEW_MEDIA_ISO_A2X4_594X1682MM 37438
+#define PRINT_PREVIEW_MEDIA_ISO_A2X5_594X2102MM 37439
+#define PRINT_PREVIEW_MEDIA_ISO_A3_297X420MM 37440
+#define PRINT_PREVIEW_MEDIA_ISO_A3_EXTRA_322X445MM 37441
+#define PRINT_PREVIEW_MEDIA_ISO_A3X3_420X891MM 37442
+#define PRINT_PREVIEW_MEDIA_ISO_A3X4_420X1189MM 37443
+#define PRINT_PREVIEW_MEDIA_ISO_A3X5_420X1486MM 37444
+#define PRINT_PREVIEW_MEDIA_ISO_A3X6_420X1783MM 37445
+#define PRINT_PREVIEW_MEDIA_ISO_A3X7_420X2080MM 37446
+#define PRINT_PREVIEW_MEDIA_ISO_A4_210X297MM 37447
+#define PRINT_PREVIEW_MEDIA_ISO_A4_EXTRA_235_5X322_3MM 37448
+#define PRINT_PREVIEW_MEDIA_ISO_A4_TAB_225X297MM 37449
+#define PRINT_PREVIEW_MEDIA_ISO_A4X3_297X630MM 37450
+#define PRINT_PREVIEW_MEDIA_ISO_A4X4_297X841MM 37451
+#define PRINT_PREVIEW_MEDIA_ISO_A4X5_297X1051MM 37452
+#define PRINT_PREVIEW_MEDIA_ISO_A4X6_297X1261MM 37453
+#define PRINT_PREVIEW_MEDIA_ISO_A4X7_297X1471MM 37454
+#define PRINT_PREVIEW_MEDIA_ISO_A4X8_297X1682MM 37455
+#define PRINT_PREVIEW_MEDIA_ISO_A4X9_297X1892MM 37456
+#define PRINT_PREVIEW_MEDIA_ISO_A5_148X210MM 37457
+#define PRINT_PREVIEW_MEDIA_ISO_A5_EXTRA_174X235MM 37458
+#define PRINT_PREVIEW_MEDIA_ISO_A6_105X148MM 37459
+#define PRINT_PREVIEW_MEDIA_ISO_A7_74X105MM 37460
+#define PRINT_PREVIEW_MEDIA_ISO_A8_52X74MM 37461
+#define PRINT_PREVIEW_MEDIA_ISO_A9_37X52MM 37462
+#define PRINT_PREVIEW_MEDIA_ISO_B0_1000X1414MM 37463
+#define PRINT_PREVIEW_MEDIA_ISO_B10_31X44MM 37464
+#define PRINT_PREVIEW_MEDIA_ISO_B1_707X1000MM 37465
+#define PRINT_PREVIEW_MEDIA_ISO_B2_500X707MM 37466
+#define PRINT_PREVIEW_MEDIA_ISO_B3_353X500MM 37467
+#define PRINT_PREVIEW_MEDIA_ISO_B4_250X353MM 37468
+#define PRINT_PREVIEW_MEDIA_ISO_B5_176X250MM 37469
+#define PRINT_PREVIEW_MEDIA_ISO_B5_EXTRA_201X276MM 37470
+#define PRINT_PREVIEW_MEDIA_ISO_B6C4_125X324MM 37471
+#define PRINT_PREVIEW_MEDIA_ISO_B6_125X176MM 37472
+#define PRINT_PREVIEW_MEDIA_ISO_B7_88X125MM 37473
+#define PRINT_PREVIEW_MEDIA_ISO_B8_62X88MM 37474
+#define PRINT_PREVIEW_MEDIA_ISO_B9_44X62MM 37475
+#define PRINT_PREVIEW_MEDIA_ISO_C0_917X1297MM 37476
+#define PRINT_PREVIEW_MEDIA_ISO_C10_28X40MM 37477
+#define PRINT_PREVIEW_MEDIA_ISO_C1_648X917MM 37478
+#define PRINT_PREVIEW_MEDIA_ISO_C2_458X648MM 37479
+#define PRINT_PREVIEW_MEDIA_ISO_C3_324X458MM 37480
+#define PRINT_PREVIEW_MEDIA_ISO_C4_229X324MM 37481
+#define PRINT_PREVIEW_MEDIA_ISO_C5_162X229MM 37482
+#define PRINT_PREVIEW_MEDIA_ISO_C6C5_114X229MM 37483
+#define PRINT_PREVIEW_MEDIA_ISO_C6_114X162MM 37484
+#define PRINT_PREVIEW_MEDIA_ISO_C7C6_81X162MM 37485
+#define PRINT_PREVIEW_MEDIA_ISO_C7_81X114MM 37486
+#define PRINT_PREVIEW_MEDIA_ISO_C8_57X81MM 37487
+#define PRINT_PREVIEW_MEDIA_ISO_C9_40X57MM 37488
+#define PRINT_PREVIEW_MEDIA_ISO_DL_110X220MM 37489
+#define PRINT_PREVIEW_MEDIA_ISO_ID_1_53_98X85_6MM 37490
+#define PRINT_PREVIEW_MEDIA_ISO_RA0_860X1220MM 37491
+#define PRINT_PREVIEW_MEDIA_ISO_RA1_610X860MM 37492
+#define PRINT_PREVIEW_MEDIA_ISO_RA2_430X610MM 37493
+#define PRINT_PREVIEW_MEDIA_ISO_RA3_305X430MM 37494
+#define PRINT_PREVIEW_MEDIA_ISO_RA4_215X305MM 37495
+#define PRINT_PREVIEW_MEDIA_ISO_SRA0_900X1280MM 37496
+#define PRINT_PREVIEW_MEDIA_ISO_SRA1_640X900MM 37497
+#define PRINT_PREVIEW_MEDIA_ISO_SRA2_450X640MM 37498
+#define PRINT_PREVIEW_MEDIA_ISO_SRA3_320X450MM 37499
+#define PRINT_PREVIEW_MEDIA_ISO_SRA4_225X320MM 37500
+#define PRINT_PREVIEW_MEDIA_JIS_B0_1030X1456MM 37501
+#define PRINT_PREVIEW_MEDIA_JIS_B1_728X1030MM 37502
+#define PRINT_PREVIEW_MEDIA_JIS_B2_515X728MM 37503
+#define PRINT_PREVIEW_MEDIA_JIS_B3_364X515MM 37504
+#define PRINT_PREVIEW_MEDIA_JIS_B4_257X364MM 37505
+#define PRINT_PREVIEW_MEDIA_JIS_B5_182X257MM 37506
+#define PRINT_PREVIEW_MEDIA_JIS_B6_128X182MM 37507
+#define PRINT_PREVIEW_MEDIA_JIS_B7_91X128MM 37508
+#define PRINT_PREVIEW_MEDIA_JIS_B8_64X91MM 37509
+#define PRINT_PREVIEW_MEDIA_JIS_B9_45X64MM 37510
+#define PRINT_PREVIEW_MEDIA_JIS_B10_32X45MM 37511
+#define PRINT_PREVIEW_MEDIA_JIS_EXEC_216X330MM 37512
+#define PRINT_PREVIEW_MEDIA_JPN_CHOU2_111_1X146MM 37513
+#define PRINT_PREVIEW_MEDIA_JPN_CHOU3_120X235MM 37514
+#define PRINT_PREVIEW_MEDIA_JPN_CHOU4_90X205MM 37515
+#define PRINT_PREVIEW_MEDIA_JPN_CHOU40_90X225MM 37516
+#define PRINT_PREVIEW_MEDIA_JPN_HAGAKI_100X148MM 37517
+#define PRINT_PREVIEW_MEDIA_JPN_KAHU_240X322_1MM 37518
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU1_270X382MM 37519
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU2_240X332MM 37520
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU3_216X277MM 37521
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU4_197X267MM 37522
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU5_190X240MM 37523
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU7_142X205MM 37524
+#define PRINT_PREVIEW_MEDIA_JPN_KAKU8_119X197MM 37525
+#define PRINT_PREVIEW_MEDIA_JPN_OUFUKU_148X200MM 37526
+#define PRINT_PREVIEW_MEDIA_JPN_YOU4_105X235MM 37527
+#define PRINT_PREVIEW_MEDIA_JPN_YOU6_98X190MM 37528
+#define PRINT_PREVIEW_MEDIA_NA_10X11_10X11IN 37529
+#define PRINT_PREVIEW_MEDIA_NA_10X13_10X13IN 37530
+#define PRINT_PREVIEW_MEDIA_NA_10X14_10X14IN 37531
+#define PRINT_PREVIEW_MEDIA_NA_10X15_10X15IN 37532
+#define PRINT_PREVIEW_MEDIA_NA_11X12_11X12IN 37533
+#define PRINT_PREVIEW_MEDIA_NA_11X15_11X15IN 37534
+#define PRINT_PREVIEW_MEDIA_NA_12X19_12X19IN 37535
+#define PRINT_PREVIEW_MEDIA_NA_5X7_5X7IN 37536
+#define PRINT_PREVIEW_MEDIA_NA_6X9_6X9IN 37537
+#define PRINT_PREVIEW_MEDIA_NA_7X9_7X9IN 37538
+#define PRINT_PREVIEW_MEDIA_NA_9X11_9X11IN 37539
+#define PRINT_PREVIEW_MEDIA_NA_A2_4_375X5_75IN 37540
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_A_9X12IN 37541
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_B_12X18IN 37542
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_C_18X24IN 37543
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_D_24X36IN 37544
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_E_36X48IN 37545
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_E2_26X38IN 37546
+#define PRINT_PREVIEW_MEDIA_NA_ARCH_E3_27X39IN 37547
+#define PRINT_PREVIEW_MEDIA_NA_B_PLUS_12X19_17IN 37548
+#define PRINT_PREVIEW_MEDIA_NA_C5_6_5X9_5IN 37549
+#define PRINT_PREVIEW_MEDIA_NA_C_17X22IN 37550
+#define PRINT_PREVIEW_MEDIA_NA_D_22X34IN 37551
+#define PRINT_PREVIEW_MEDIA_NA_EDP_11X14IN 37552
+#define PRINT_PREVIEW_MEDIA_NA_EUR_EDP_12X14IN 37553
+#define PRINT_PREVIEW_MEDIA_NA_E_34X44IN 37554
+#define PRINT_PREVIEW_MEDIA_NA_EXECUTIVE_7_25X10_5IN 37555
+#define PRINT_PREVIEW_MEDIA_NA_FANFOLD_EUR_8_5X12IN 37556
+#define PRINT_PREVIEW_MEDIA_NA_FANFOLD_US_11X14_875IN 37557
+#define PRINT_PREVIEW_MEDIA_NA_FOOLSCAP_8_5X13IN 37558
+#define PRINT_PREVIEW_MEDIA_NA_F_44X68IN 37559
+#define PRINT_PREVIEW_MEDIA_NA_GOVT_LEGAL_8X13IN 37560
+#define PRINT_PREVIEW_MEDIA_NA_GOVT_LETTER_8X10IN 37561
+#define PRINT_PREVIEW_MEDIA_NA_INDEX_3X5_3X5IN 37562
+#define PRINT_PREVIEW_MEDIA_NA_INDEX_4X6_4X6IN 37563
+#define PRINT_PREVIEW_MEDIA_NA_INDEX_4X6_EXT_6X8IN 37564
+#define PRINT_PREVIEW_MEDIA_NA_INDEX_5X8_5X8IN 37565
+#define PRINT_PREVIEW_MEDIA_NA_INVOICE_5_5X8_5IN 37566
+#define PRINT_PREVIEW_MEDIA_NA_LEDGER_11X17IN 37567
+#define PRINT_PREVIEW_MEDIA_NA_LEGAL_8_5X14IN 37568
+#define PRINT_PREVIEW_MEDIA_NA_LEGAL_EXTRA_9_5X15IN 37569
+#define PRINT_PREVIEW_MEDIA_NA_LETTER_8_5X11IN 37570
+#define PRINT_PREVIEW_MEDIA_NA_LETTER_EXTRA_9_5X12IN 37571
+#define PRINT_PREVIEW_MEDIA_NA_LETTER_PLUS_8_5X12_69IN 37572
+#define PRINT_PREVIEW_MEDIA_NA_MONARCH_3_875X7_5IN 37573
+#define PRINT_PREVIEW_MEDIA_NA_NUMBER_9_3_875X8_875IN 37574
+#define PRINT_PREVIEW_MEDIA_NA_NUMBER_10_4_125X9_5IN 37575
+#define PRINT_PREVIEW_MEDIA_NA_NUMBER_11_4_5X10_375IN 37576
+#define PRINT_PREVIEW_MEDIA_NA_NUMBER_12_4_75X11IN 37577
+#define PRINT_PREVIEW_MEDIA_NA_NUMBER_14_5X11_5IN 37578
+#define PRINT_PREVIEW_MEDIA_NA_OFICIO_8_5X13_4IN 37579
+#define PRINT_PREVIEW_MEDIA_NA_PERSONAL_3_625X6_5IN 37580
+#define PRINT_PREVIEW_MEDIA_NA_QUARTO_8_5X10_83IN 37581
+#define PRINT_PREVIEW_MEDIA_NA_SUPER_A_8_94X14IN 37582
+#define PRINT_PREVIEW_MEDIA_NA_SUPER_B_13X19IN 37583
+#define PRINT_PREVIEW_MEDIA_NA_WIDE_FORMAT_30X42IN 37584
+#define PRINT_PREVIEW_MEDIA_OE_12X16_12X16IN 37585
+#define PRINT_PREVIEW_MEDIA_OE_14X17_14X17IN 37586
+#define PRINT_PREVIEW_MEDIA_OE_18X22_18X22IN 37587
+#define PRINT_PREVIEW_MEDIA_OE_A2PLUS_17X24IN 37588
+#define PRINT_PREVIEW_MEDIA_OE_BUSINESS_CARD_2X3_5IN 37589
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_10R_10X12IN 37590
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_12R_12X15IN 37591
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_14X18_14X18IN 37592
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_16R_16X20IN 37593
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_20R_20X24IN 37594
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_22R_22X29_5IN 37595
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_22X28_22X28IN 37596
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_24R_24X31_5IN 37597
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_24X30_24X30IN 37598
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_30R_30X40IN 37599
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_L_3_5X5IN 37600
+#define PRINT_PREVIEW_MEDIA_OE_PHOTO_S8R_8X12IN 37601
+#define PRINT_PREVIEW_MEDIA_OE_SQUARE_PHOTO_4X4IN 37602
+#define PRINT_PREVIEW_MEDIA_OE_SQUARE_PHOTO_5X5IN 37603
+#define PRINT_PREVIEW_MEDIA_OM_16K_184X260MM 37604
+#define PRINT_PREVIEW_MEDIA_OM_16K_195X270MM 37605
+#define PRINT_PREVIEW_MEDIA_OM_BUSINESS_CARD_55X85MM 37606
+#define PRINT_PREVIEW_MEDIA_OM_BUSINESS_CARD_55X91MM 37607
+#define PRINT_PREVIEW_MEDIA_OM_CARD_54X86MM 37608
+#define PRINT_PREVIEW_MEDIA_OM_DAI_PA_KAI_275X395MM 37609
+#define PRINT_PREVIEW_MEDIA_OM_DSC_PHOTO_89X119MM 37610
+#define PRINT_PREVIEW_MEDIA_OM_FOLIO_210X330MM 37611
+#define PRINT_PREVIEW_MEDIA_OM_FOLIO_SP_215X315MM 37612
+#define PRINT_PREVIEW_MEDIA_OM_INVITE_220X220MM 37613
+#define PRINT_PREVIEW_MEDIA_OM_ITALIAN_110X230MM 37614
+#define PRINT_PREVIEW_MEDIA_OM_JUURO_KU_KAI_198X275MM 37615
+#define PRINT_PREVIEW_MEDIA_OM_LARGE_PHOTO_200X300 37616
+#define PRINT_PREVIEW_MEDIA_OM_MEDIUM_PHOTO_130X180MM 37617
+#define PRINT_PREVIEW_MEDIA_OM_PA_KAI_267X389MM 37618
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_30X40_300X400MM 37619
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_30X45_300X450MM 37620
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_35X46_350X460MM 37621
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_40X60_400X600MM 37622
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_50X75_500X750MM 37623
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_50X76_500X760MM 37624
+#define PRINT_PREVIEW_MEDIA_OM_PHOTO_60X90_600X900MM 37625
+#define PRINT_PREVIEW_MEDIA_OM_SQUARE_PHOTO_89X89MM 37626
+#define PRINT_PREVIEW_MEDIA_OM_WIDE_PHOTO_100X200MM 37627
+#define PRINT_PREVIEW_MEDIA_OM_SMALL_PHOTO_100X150MM 37628
+#define PRINT_PREVIEW_MEDIA_PRC_16K_146X215MM 37629
+#define PRINT_PREVIEW_MEDIA_PRC_1_102X165MM 37630
+#define PRINT_PREVIEW_MEDIA_PRC_2_102X176MM 37631
+#define PRINT_PREVIEW_MEDIA_PRC_32K_97X151MM 37632
+#define PRINT_PREVIEW_MEDIA_PRC_4_110X208MM 37633
+#define PRINT_PREVIEW_MEDIA_PRC_6_120X320MM 37634
+#define PRINT_PREVIEW_MEDIA_PRC_7_160X230MM 37635
+#define PRINT_PREVIEW_MEDIA_PRC_8_120X309MM 37636
+#define PRINT_PREVIEW_MEDIA_ROC_16K_7_75X10_75IN 37637
+#define PRINT_PREVIEW_MEDIA_ROC_8K_10_75X15_5IN 37638
+#define PRINT_PREVIEW_MEDIA_DIMENSIONS_INCHES 37639
+#define PRINT_PREVIEW_MEDIA_DIMENSIONS_MM 37640
+#define PRINT_PREVIEW_MEDIA_NAME_WITH_DIMENSIONS_INCHES 37641
+#define PRINT_PREVIEW_MEDIA_NAME_WITH_DIMENSIONS_MM 37642
+#define IDS_PRINT_PREVIEW_FRIENDLY_WIN_NETWORK_PRINTER_NAME 37643
+#define IDS_PRINT_COMPOSITOR_SERVICE_DISPLAY_NAME 37644
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_TITLE 38046
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_DESCRIPTION_1 38047
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_DESCRIPTION_2 38048
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_DESCRIPTION_3 38049
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_LEARN_MORE_EXPAND_LABEL 38050
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_DESCRIPTION_4 38051
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_DECLINE_BUTTON 38052
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_ACCEPT_BUTTON 38053
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_SAVING_LABEL 38054
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_LEARN_MORE_BULLET_1 38055
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_LEARN_MORE_BULLET_2 38056
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_LEARN_MORE_BULLET_3 38057
+#define IDS_PRIVACY_SANDBOX_M1_CONSENT_LEARN_MORE_LINK 38058
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_TITLE 38059
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_DESCRIPTION_1 38060
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_BULLET_1 38061
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_BULLET_2 38062
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_EXPAND_LABEL 38063
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_DESCRIPTION_2 38064
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_ACK_BUTTON 38065
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_SETTINGS_BUTTON 38066
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_HEADING_1 38067
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_BULLET_1 38068
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_BULLET_2 38069
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_BULLET_3 38070
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_HEADING_2 38071
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_EEA_LEARN_MORE_DESCRIPTION 38072
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_RESTRICTED_TITLE 38073
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_RESTRICTED_DESCRIPTION_1 38074
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_RESTRICTED_DESCRIPTION_2 38075
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_RESTRICTED_DESCRIPTION_3 38076
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_RESTRICTED_ACK_BUTTON 38077
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_RESTRICTED_SETTINGS_BUTTON 38078
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_TITLE 38079
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_DESCRIPTION_1 38080
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_DESCRIPTION_2 38081
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_DESCRIPTION_3 38082
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_EXPAND_LABEL 38083
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_DESCRIPTION_4 38084
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_ACK_BUTTON 38085
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_SETTINGS_BUTTON 38086
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_HEADING_1 38087
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_DESCRIPTION_1 38088
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_BULLET_1 38089
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_BULLET_2 38090
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_DESCRIPTION_2 38091
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_DESCRIPTION_3 38092
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_HEADING_2 38093
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_DESCRIPTION_4 38094
+#define IDS_PRIVACY_SANDBOX_M1_NOTICE_ROW_LEARN_MORE_DESCRIPTION_5 38095
+#define IDS_PRIVACY_SANDBOX_M1_DIALOG_MORE_BUTTON 38096
+#define IDS_SETTINGS_TOPICS_PAGE_TITLE 38097
+#define IDS_SETTINGS_TOPICS_PAGE_TOGGLE_LABEL 38098
+#define IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL 38099
+#define IDS_SETTINGS_TOPICS_PAGE_TOGGLE_SUB_LABEL_V2 38100
+#define IDS_SETTINGS_TOPICS_PAGE_DISCLAIMER 38101
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_HEADING 38102
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_CANONICAL 38103
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_DISABLED 38104
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY 38105
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY_TEXT_V2 38106
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_EMPTY_TEXT_HEADING 38107
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY_TEXT_V2 38108
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY_TEXT_HEADING 38109
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC 38110
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCK_TOPIC_A11Y_LABEL 38111
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING 38112
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION 38113
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_EMPTY 38114
+#define IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC 38115
+#define IDS_SETTINGS_TOPICS_PAGE_ALLOW_TOPIC_A11Y_LABEL 38116
+#define IDS_SETTINGS_TOPICS_PAGE_UNBLOCK_TOPIC_A11Y_LABEL 38117
+#define IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_HEADING 38118
+#define IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_1 38119
+#define IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_2 38120
+#define IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3_CANONICAL 38121
+#define IDS_SETTINGS_TOPICS_PAGE_FOOTER_CANONICAL 38122
+#define IDS_SETTINGS_TOPICS_PAGE_FIRST_LEVEL_TOPIC_DESCRIPTOR 38123
+#define IDS_SETTINGS_MANAGE_TOPICS_DIALOG_TITLE 38124
+#define IDS_SETTINGS_MANAGE_TOPICS_DIALOG_BODY 38125
+#define IDS_SETTINGS_MANAGE_TOPICS_DIALOG_CLANK_TITLE 38126
+#define IDS_SETTINGS_MANAGE_TOPICS_DIALOG_CLANK_BODY 38127
+#define IDS_SETTINGS_MANAGE_TOPICS_PAGE_DESCRIPTION 38128
+#define IDS_SETTINGS_MANAGE_TOPICS_PAGE_LEARN_MORE_LINK 38129
+#define IDS_SETTINGS_MANAGE_TOPICS_PAGE_DESCRIPTION_LEARN_MORE_ARIA_LABEL 38130
+#define IDS_SETTINGS_UNBLOCK_TOPIC_TOAST_BODY 38131
+#define IDS_SETTINGS_UNBLOCK_TOPIC_TOAST_BUTTON_TEXT 38132
+#define IDS_SETTINGS_FLEDGE_PAGE_FOOTER_V2 38133
+#define IDS_SETTINGS_UNBLOCK_TOPIC_BUTTON_TEXT_V2 38134
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_HEADING_NEW 38135
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_DESCRIPTION_NEW 38136
+#define IDS_SETTINGS_TOPICS_PAGE_MANAGE_TOPICS_HEADING 38137
+#define IDS_SETTINGS_TOPICS_PAGE_MANAGE_TOPICS_DESCRIPTION 38138
+#define IDS_SETTINGS_TOPICS_PAGE_MANAGE_TOPICS_EXPLANATION 38139
+#define IDS_SETTINGS_TOPICS_PAGE_ACTIVE_TOPICS_HEADING 38140
+#define IDS_SETTINGS_TOPICS_PAGE_ACTIVE_TOPICS_DESCRIPTION 38141
+#define IDS_SETTINGS_TOPICS_PAGE_FOOTER_NEW 38142
+#define IDS_SETTINGS_FLEDGE_PAGE_FOOTER_NEW 38143
+#define IDS_SETTINGS_FLEDGE_PAGE_EXPLANATION 38144
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_STATUS_LABEL 38145
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_LAST_UPDATE_TIME_LABEL 38146
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_LAST_UPDATE_SOURCE_LABEL 38147
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_LAST_UPDATE_TEXT_LABEL 38148
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_UPDATE_SOURCE_SETTINGS 38149
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_UPDATE_SOURCE_DEFAULT 38150
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_UPDATE_SOURCE_CONFIRMATION 38151
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_ACTIVE 38152
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_INACTIVE 38153
+#define IDS_PRIVACY_SANDBOX_TOPICS_CONSENT_NOT_REQUIRED 38154
+#define IDS_PRIVACY_SANDBOX_TOPICS_INVALID_TOPIC 38155
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_1 38156
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_2 38157
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_3 38158
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_4 38159
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_5 38160
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_6 38161
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_7 38162
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_8 38163
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_9 38164
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_10 38165
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_11 38166
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_12 38167
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_13 38168
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_14 38169
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_15 38170
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_16 38171
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_17 38172
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_18 38173
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_19 38174
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_20 38175
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_21 38176
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_22 38177
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_23 38178
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_24 38179
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_25 38180
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_26 38181
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_27 38182
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_28 38183
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_29 38184
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_30 38185
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_31 38186
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_32 38187
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_33 38188
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_34 38189
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_35 38190
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_36 38191
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_37 38192
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_38 38193
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_39 38194
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_40 38195
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_41 38196
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_42 38197
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_43 38198
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_44 38199
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_45 38200
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_46 38201
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_47 38202
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_48 38203
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_49 38204
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_50 38205
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_51 38206
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_52 38207
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_53 38208
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_54 38209
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_55 38210
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_56 38211
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_57 38212
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_58 38213
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_59 38214
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_60 38215
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_61 38216
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_62 38217
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_63 38218
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_64 38219
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_65 38220
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_66 38221
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_67 38222
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_68 38223
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_69 38224
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_70 38225
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_71 38226
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_72 38227
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_73 38228
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_74 38229
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_75 38230
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_76 38231
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_77 38232
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_78 38233
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_79 38234
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_80 38235
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_81 38236
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_82 38237
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_83 38238
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_84 38239
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_85 38240
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_86 38241
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_87 38242
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_88 38243
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_89 38244
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_90 38245
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_91 38246
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_92 38247
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_93 38248
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_94 38249
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_95 38250
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_96 38251
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_97 38252
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_98 38253
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_99 38254
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_100 38255
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_101 38256
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_102 38257
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_103 38258
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_104 38259
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_105 38260
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_106 38261
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_107 38262
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_108 38263
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_109 38264
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_110 38265
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_111 38266
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_112 38267
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_113 38268
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_114 38269
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_115 38270
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_116 38271
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_117 38272
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_118 38273
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_119 38274
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_120 38275
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_121 38276
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_122 38277
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_123 38278
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_124 38279
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_125 38280
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_126 38281
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_127 38282
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_128 38283
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_129 38284
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_130 38285
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_131 38286
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_132 38287
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_133 38288
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_134 38289
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_135 38290
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_136 38291
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_137 38292
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_138 38293
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_139 38294
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_140 38295
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_141 38296
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_142 38297
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_143 38298
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_144 38299
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_145 38300
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_146 38301
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_147 38302
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_148 38303
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_149 38304
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_150 38305
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_151 38306
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_152 38307
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_153 38308
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_154 38309
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_155 38310
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_156 38311
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_157 38312
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_158 38313
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_159 38314
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_160 38315
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_161 38316
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_162 38317
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_163 38318
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_164 38319
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_165 38320
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_166 38321
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_167 38322
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_168 38323
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_169 38324
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_170 38325
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_171 38326
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_172 38327
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_173 38328
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_174 38329
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_175 38330
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_176 38331
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_177 38332
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_178 38333
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_179 38334
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_180 38335
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_181 38336
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_182 38337
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_183 38338
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_184 38339
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_185 38340
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_186 38341
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_187 38342
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_188 38343
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_189 38344
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_190 38345
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_191 38346
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_192 38347
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_193 38348
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_194 38349
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_195 38350
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_196 38351
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_197 38352
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_198 38353
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_199 38354
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_200 38355
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_201 38356
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_202 38357
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_203 38358
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_204 38359
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_205 38360
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_206 38361
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_207 38362
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_208 38363
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_209 38364
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_210 38365
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_211 38366
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_212 38367
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_213 38368
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_214 38369
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_215 38370
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_216 38371
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_217 38372
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_218 38373
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_219 38374
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_220 38375
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_221 38376
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_222 38377
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_223 38378
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_224 38379
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_225 38380
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_226 38381
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_227 38382
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_228 38383
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_229 38384
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_230 38385
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_231 38386
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_232 38387
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_233 38388
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_234 38389
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_235 38390
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_236 38391
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_237 38392
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_238 38393
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_239 38394
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_240 38395
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_241 38396
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_242 38397
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_243 38398
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_244 38399
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_245 38400
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_246 38401
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_247 38402
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_248 38403
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_249 38404
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_250 38405
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_251 38406
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_252 38407
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_253 38408
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_254 38409
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_255 38410
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_256 38411
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_257 38412
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_258 38413
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_259 38414
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_260 38415
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_261 38416
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_262 38417
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_263 38418
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_264 38419
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_265 38420
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_266 38421
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_267 38422
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_268 38423
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_269 38424
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_270 38425
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_271 38426
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_272 38427
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_273 38428
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_274 38429
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_275 38430
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_276 38431
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_277 38432
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_278 38433
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_279 38434
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_280 38435
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_281 38436
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_282 38437
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_283 38438
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_284 38439
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_285 38440
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_286 38441
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_287 38442
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_288 38443
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_289 38444
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_290 38445
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_291 38446
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_292 38447
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_293 38448
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_294 38449
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_295 38450
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_296 38451
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_297 38452
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_298 38453
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_299 38454
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_300 38455
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_301 38456
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_302 38457
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_303 38458
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_304 38459
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_305 38460
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_306 38461
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_307 38462
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_308 38463
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_309 38464
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_310 38465
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_311 38466
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_312 38467
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_313 38468
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_314 38469
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_315 38470
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_316 38471
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_317 38472
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_318 38473
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_319 38474
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_320 38475
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_321 38476
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_322 38477
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_323 38478
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_324 38479
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_325 38480
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_326 38481
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_327 38482
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_328 38483
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_329 38484
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_330 38485
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_331 38486
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_332 38487
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_333 38488
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_334 38489
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_335 38490
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_336 38491
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_337 38492
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_338 38493
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_339 38494
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_340 38495
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_341 38496
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_342 38497
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_343 38498
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_344 38499
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_345 38500
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_346 38501
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_347 38502
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_348 38503
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V1_TOPIC_ID_349 38504
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_350 38505
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_351 38506
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_352 38507
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_353 38508
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_354 38509
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_355 38510
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_356 38511
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_357 38512
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_358 38513
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_359 38514
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_360 38515
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_361 38516
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_362 38517
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_363 38518
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_364 38519
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_365 38520
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_366 38521
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_367 38522
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_368 38523
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_369 38524
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_370 38525
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_371 38526
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_372 38527
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_373 38528
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_374 38529
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_375 38530
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_376 38531
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_377 38532
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_378 38533
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_379 38534
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_380 38535
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_381 38536
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_382 38537
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_383 38538
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_384 38539
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_385 38540
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_386 38541
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_387 38542
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_388 38543
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_389 38544
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_390 38545
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_391 38546
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_392 38547
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_393 38548
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_394 38549
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_395 38550
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_396 38551
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_397 38552
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_398 38553
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_399 38554
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_400 38555
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_401 38556
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_402 38557
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_403 38558
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_404 38559
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_405 38560
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_406 38561
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_407 38562
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_408 38563
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_409 38564
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_410 38565
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_411 38566
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_412 38567
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_413 38568
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_414 38569
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_415 38570
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_416 38571
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_417 38572
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_418 38573
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_419 38574
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_420 38575
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_421 38576
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_422 38577
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_423 38578
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_424 38579
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_425 38580
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_426 38581
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_427 38582
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_428 38583
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_429 38584
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_430 38585
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_431 38586
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_432 38587
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_433 38588
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_434 38589
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_435 38590
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_436 38591
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_437 38592
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_438 38593
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_439 38594
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_440 38595
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_441 38596
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_442 38597
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_443 38598
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_444 38599
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_445 38600
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_446 38601
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_447 38602
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_448 38603
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_449 38604
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_450 38605
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_451 38606
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_452 38607
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_453 38608
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_454 38609
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_455 38610
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_456 38611
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_457 38612
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_458 38613
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_459 38614
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_460 38615
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_461 38616
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_462 38617
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_463 38618
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_464 38619
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_465 38620
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_466 38621
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_467 38622
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_468 38623
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_469 38624
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_470 38625
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_471 38626
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_472 38627
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_473 38628
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_474 38629
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_475 38630
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_476 38631
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_477 38632
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_478 38633
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_479 38634
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_480 38635
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_481 38636
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_482 38637
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_483 38638
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_484 38639
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_485 38640
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_486 38641
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_487 38642
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_488 38643
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_489 38644
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_490 38645
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_491 38646
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_492 38647
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_493 38648
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_494 38649
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_495 38650
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_496 38651
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_497 38652
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_498 38653
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_499 38654
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_500 38655
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_501 38656
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_502 38657
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_503 38658
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_504 38659
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_505 38660
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_506 38661
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_507 38662
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_508 38663
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_509 38664
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_510 38665
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_511 38666
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_512 38667
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_513 38668
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_514 38669
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_515 38670
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_516 38671
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_517 38672
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_518 38673
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_519 38674
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_520 38675
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_521 38676
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_522 38677
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_523 38678
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_524 38679
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_525 38680
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_526 38681
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_527 38682
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_528 38683
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_529 38684
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_530 38685
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_531 38686
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_532 38687
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_533 38688
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_534 38689
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_535 38690
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_536 38691
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_537 38692
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_538 38693
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_539 38694
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_540 38695
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_541 38696
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_542 38697
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_543 38698
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_544 38699
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_545 38700
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_546 38701
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_547 38702
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_548 38703
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_549 38704
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_550 38705
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_551 38706
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_552 38707
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_553 38708
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_554 38709
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_555 38710
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_556 38711
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_557 38712
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_558 38713
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_559 38714
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_560 38715
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_561 38716
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_562 38717
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_563 38718
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_564 38719
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_565 38720
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_566 38721
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_567 38722
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_568 38723
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_569 38724
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_570 38725
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_571 38726
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_572 38727
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_573 38728
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_574 38729
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_575 38730
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_576 38731
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_577 38732
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_578 38733
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_579 38734
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_580 38735
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_581 38736
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_582 38737
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_583 38738
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_584 38739
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_585 38740
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_586 38741
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_587 38742
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_588 38743
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_589 38744
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_590 38745
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_591 38746
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_592 38747
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_593 38748
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_594 38749
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_595 38750
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_596 38751
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_597 38752
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_598 38753
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_599 38754
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_600 38755
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_601 38756
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_602 38757
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_603 38758
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_604 38759
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_605 38760
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_606 38761
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_607 38762
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_608 38763
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_609 38764
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_610 38765
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_611 38766
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_612 38767
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_613 38768
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_614 38769
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_615 38770
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_616 38771
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_617 38772
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_618 38773
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_619 38774
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_620 38775
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_621 38776
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_622 38777
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_623 38778
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_624 38779
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_625 38780
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_626 38781
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_627 38782
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_628 38783
+#define IDS_PRIVACY_SANDBOX_TOPICS_TAXONOMY_V2_TOPIC_ID_629 38784
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_TITLE 38785
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_DESCRIPTION 38786
+#define IDS_TRACKING_PROTECTION_ONBOARDING_NOTICE_TITLE 38787
+#define IDS_TRACKING_PROTECTION_ONBOARDING_NOTICE_BODY 38788
+#define IDS_TRACKING_PROTECTION_ONBOARDING_NOTICE_SETTINGS_BUTTON_LABEL 38789
+#define IDS_TRACKING_PROTECTION_ONBOARDING_NOTICE_ACK_BUTTON_LABEL 38790
+#define IDS_TRACKING_PROTECTION_ONBOARDING_NOTICE_LEARN_MORE_BUTTON_LABEL 38791
+#define IDS_TRACKING_PROTECTION_ONBOARDING_NOTICE_LEARN_MORE_BUTTON_A11Y_LABEL 38792
+#define IDS_TRACKING_PROTECTION_OFFBOARDING_NOTICE_TITLE 38793
+#define IDS_TRACKING_PROTECTION_OFFBOARDING_NOTICE_BODY 38794
+#define IDS_TRACKING_PROTECTION_OFFBOARDING_NOTICE_SETTINGS_BUTTON_LABEL 38795
+#define IDS_TRACKING_PROTECTION_OFFBOARDING_NOTICE_ACK_BUTTON_LABEL 38796
+#define IDS_TRACKING_PROTECTION_OFFBOARDING_NOTICE_LEARN_MORE_BUTTON_LABEL 38797
+#define IDS_TRACKING_PROTECTION_OFFBOARDING_NOTICE_LEARN_MORE_BUTTON_A11Y_LABEL 38798
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_BULLET_ONE_TITLE 38799
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_BULLET_ONE_DESCRIPTION 38800
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_BULLET_TWO_TITLE 38801
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_BULLET_TWO_DESCRIPTION 38802
+#define IDS_PRIVACY_SANDBOX_TRACKING_PROTECTION_ADVANCED_CATEGORY 38803
+#define IDS_TRACKING_PROTECTION_BLOCK_COOKIES_TOGGLE_TITLE 38804
+#define IDS_TRACKING_PROTECTION_BLOCK_COOKIES_TOGGLE_SUMMARY 38805
+#define IDS_TRACKING_PROTECTION_DNT_TOGGLE_TITLE 38806
+#define IDS_TRACKING_PROTECTION_DNT_TOGGLE_SUMMARY 38807
+#define IDS_TRACKING_PROTECTION_ALLOWED_GROUP_TITLE 38808
+#define IDS_TRACKING_PROTECTION_ALLOWED_GROUP_DESCRIPTION 38809
+#define IDS_TRACKING_PROTECTION_NEVER_EXPIRES_LABEL 38810
+#define IDS_TRACKING_PROTECTION_EXPIRES_TODAY_LABEL 38811
+#define IDS_TRACKING_PROTECTION_EXPIRES_LABEL 38812
+#define IDS_TRACKING_PROTECTION_DELETE_SITE_LABEL 38813
+#define IDS_TRACKING_PROTECTION_SETTINGS_ROLLBACK_NOTICE 38814
+#define IDS_REGISTER_PROTOCOL_HANDLER_TOOLTIP 441
+#define IDS_REGISTER_PROTOCOL_HANDLER_MAILTO_NAME 38815
+#define IDS_REGISTER_PROTOCOL_HANDLER_WEBCAL_NAME 38816
+#define IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM 38817
+#define IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM_REPLACE 38818
+#define IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM_FRAGMENT 38819
+#define IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM_REPLACE_FRAGMENT 38820
+#define IDS_REGISTER_PROTOCOL_HANDLER_ACCEPT 38821
+#define IDS_REGISTER_PROTOCOL_HANDLER_DENY 38822
+#define IDS_REGISTER_PROTOCOL_HANDLER_IGNORE 38823
+#define IDS_RESET_PASSWORD_TITLE 38824
+#define IDS_RESET_PASSWORD_WARNING_HEADING 38825
+#define IDS_RESET_PASSWORD_HEADING 38826
+#define IDS_RESET_PASSWORD_WARNING_EXPLANATION_PARAGRAPH 38827
+#define IDS_RESET_PASSWORD_WARNING_EXPLANATION_PARAGRAPH_WITH_ORG_NAME 38828
+#define IDS_RESET_PASSWORD_BUTTON 38829
+#define IDS_RESET_PASSWORD_EXPLANATION_PARAGRAPH 38830
+#define IDS_RESET_PASSWORD_EXPLANATION_PARAGRAPH_WITH_ORG_NAME 38831
+#define IDS_SEARCH_ENGINE_CHOICE_PAGE_TITLE 38832
+#define IDS_SEARCH_ENGINE_CHOICE_PAGE_SUBTITLE 38833
+#define IDS_SEARCH_ENGINE_CHOICE_PAGE_SUBTITLE_INFO_LINK 38834
+#define IDS_SEARCH_ENGINE_CHOICE_PAGE_SUBTITLE_INFO_LINK_A11Y_LABEL 38835
+#define IDS_SEARCH_ENGINE_CHOICE_BUTTON_TITLE 38836
+#define IDS_SEARCH_ENGINE_CHOICE_INFO_DIALOG_TITLE 38837
+#define IDS_SEARCH_ENGINE_CHOICE_INFO_DIALOG_BODY_FIRST_PARAGRAPH 38840
+#define IDS_SEARCH_ENGINE_CHOICE_INFO_DIALOG_BODY_SECOND_PARAGRAPH 38841
+#define IDS_SEARCH_ENGINE_CHOICE_INFO_DIALOG_BODY_THIRD_PARAGRAPH 38842
+#define IDS_SEARCH_ENGINE_CHOICE_FAKE_OMNIBOX_TEXT 38843
+#define IDS_SEARCH_ENGINE_CHOICE_SETTINGS_SUBTITLE 38844
+#define IDS_SEARCH_ENGINE_CHOICE_SETTINGS_ENTRY_POINT_SUBTITLE 38845
+#define IDS_SEARCH_ENGINE_CHOICE_SETTINGS_CHANGE_DEFAULT_ENGINE 38846
+#define IDS_SEARCH_ENGINE_FALLBACK_MARKETING_SNIPPET 38847
+#define IDS_SEARCH_ENGINE_CHOICE_MORE_BUTTON 38848
+#define IDS_SEARCH_ENGINE_CHOICE_CHEVRON_A11Y_LABEL 38849
+#define IDS_SEARCH_ENGINE_CHOICE_SETTINGS_CONFIRMATION_TOAST_LABEL 38850
+#define IDS_SSL_OPEN_DETAILS_BUTTON 38851
+#define IDS_SSL_CLOSE_DETAILS_BUTTON 38852
+#define IDS_CAPTIVE_PORTAL_AUTHORIZATION_DIALOG_NAME 38853
+#define IDS_CAPTIVE_PORTAL_HEADING_WIRED 38854
+#define IDS_CAPTIVE_PORTAL_HEADING_WIFI 38855
+#define IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH_WIRED 38856
+#define IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH_WIFI 38857
+#define IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH_WIFI_SSID 38858
+#define IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH_NO_LOGIN_URL_WIRED 38859
+#define IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH_NO_LOGIN_URL_WIFI 38860
+#define IDS_CAPTIVE_PORTAL_PRIMARY_PARAGRAPH_NO_LOGIN_URL_WIFI_SSID 38861
+#define IDS_CAPTIVE_PORTAL_BUTTON_OPEN_LOGIN_PAGE 38862
+#define IDS_MITM_SOFTWARE_HEADING 38863
+#define IDS_MITM_SOFTWARE_PRIMARY_PARAGRAPH_ENTERPRISE 38864
+#define IDS_MITM_SOFTWARE_PRIMARY_PARAGRAPH_NONENTERPRISE 38865
+#define IDS_MITM_SOFTWARE_EXPLANATION_ENTERPRISE 38866
+#define IDS_MITM_SOFTWARE_EXPLANATION_NONENTERPRISE 38867
+#define IDS_MITM_SOFTWARE_EXPLANATION 38868
+#define IDS_LOOKALIKE_URL_TITLE 38869
+#define IDS_LOOKALIKE_URL_HEADING 38870
+#define IDS_LOOKALIKE_URL_IGNORE 38871
+#define IDS_LOOKALIKE_URL_CONTINUE 38872
+#define IDS_LOOKALIKE_URL_PRIMARY_PARAGRAPH 38873
+#define IDS_LOOKALIKE_URL_HEADING_NO_SUGGESTED_URL 38874
+#define IDS_LOOKALIKE_URL_PRIMARY_PARAGRAPH_NO_SUGGESTED_URL 38875
+#define IDS_LOOKALIKE_URL_BACK_TO_SAFETY 38876
+#define IDS_LOOKALIKE_URL_CLOSE_PAGE 38877
+#define IDS_ENTERPRISE_BLOCK_TITLE 38878
+#define IDS_ENTERPRISE_BLOCK_HEADING 38879
+#define IDS_ENTERPRISE_BLOCK_PRIMARY_PARAGRAPH 38880
+#define IDS_ENTERPRISE_BLOCK_PRIMARY_PARAGRAPH_CUSTOM_MESSAGE 38881
+#define IDS_ENTERPRISE_BLOCK_GO_BACK 38882
+#define IDS_ENTERPRISE_WARN_TITLE 38883
+#define IDS_ENTERPRISE_WARN_HEADING 38884
+#define IDS_ENTERPRISE_WARN_PRIMARY_PARAGRAPH 38885
+#define IDS_ENTERPRISE_WARN_PRIMARY_PARAGRAPH_CUSTOM_MESSAGE 38886
+#define IDS_ENTERPRISE_WARN_GO_BACK 38887
+#define IDS_ENTERPRISE_WARN_CONTINUE_TO_SITE 38888
+#define IDS_ENTERPRISE_INTERSTITIALS_LEARN_MORE_ACCCESSIBILITY_TEXT 38889
+#define IDS_CLOCK_ERROR_TITLE 38890
+#define IDS_CLOCK_ERROR_AHEAD_HEADING 38891
+#define IDS_CLOCK_ERROR_BEHIND_HEADING 38892
+#define IDS_CLOCK_ERROR_UPDATE_DATE_AND_TIME 38893
+#define IDS_CLOCK_ERROR_PRIMARY_PARAGRAPH 38894
+#define IDS_CLOCK_ERROR_EXPLANATION 38895
+#define IDS_SSL_V2_TITLE 38896
+#define IDS_SSL_V2_HEADING 38897
+#define IDS_SSL_V2_PRIMARY_PARAGRAPH 38898
+#define IDS_SSL_V2_RECURRENT_ERROR_PARAGRAPH 38899
+#define IDS_SSL_OVERRIDABLE_SAFETY_BUTTON 38900
+#define IDS_SSL_OVERRIDABLE_CLOSE_PAGE_BUTTON 38901
+#define IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH 38902
+#define IDS_SSL_RELOAD 38903
+#define IDS_SSL_NONOVERRIDABLE_PINNED 38904
+#define IDS_SSL_NONOVERRIDABLE_HSTS 38905
+#define IDS_SSL_NONOVERRIDABLE_REVOKED 38906
+#define IDS_SSL_NONOVERRIDABLE_MORE 38907
+#define IDS_SSL_NONOVERRIDABLE_INVALID 38908
+#define IDS_SAFEBROWSING_V3_TITLE 38909
+#define IDS_SAFEBROWSING_V3_OPEN_DETAILS_BUTTON 38910
+#define IDS_SAFEBROWSING_V3_CLOSE_DETAILS_BUTTON 38911
+#define IDS_SAFEBROWSING_OVERRIDABLE_SAFETY_BUTTON 38912
+#define IDS_HEADING_NEW 38913
+#define IDS_MALWARE_V3_HEADING 38914
+#define IDS_MALWARE_V3_PRIMARY_PARAGRAPH 38915
+#define IDS_MALWARE_V3_EXPLANATION_PARAGRAPH 38916
+#define IDS_MALWARE_V3_EXPLANATION_PARAGRAPH_SUBRESOURCE 38917
+#define IDS_MALWARE_V3_PROCEED_PARAGRAPH 38918
+#define IDS_MALWARE_V3_PRIMARY_PARAGRAPH_NEW 38919
+#define IDS_MALWARE_V3_EXPLANATION_PARAGRAPH_NEW 38920
+#define IDS_MALWARE_V3_EXPLANATION_PARAGRAPH_SUBRESOURCE_NEW 38921
+#define IDS_MALWARE_V3_PROCEED_PARAGRAPH_NEW 38922
+#define IDS_SAFE_BROWSING_SCOUT_REPORTING_AGREE 38923
+#define IDS_SAFE_BROWSING_ENHANCED_PROTECTION_MESSAGE 38924
+#define IDS_SAFE_BROWSING_ENHANCED_PROTECTION_MESSAGE_NEW 38925
+#define IDS_HARMFUL_V3_HEADING 38926
+#define IDS_HARMFUL_V3_PRIMARY_PARAGRAPH 38927
+#define IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH 38928
+#define IDS_HARMFUL_V3_PROCEED_PARAGRAPH 38929
+#define IDS_HARMFUL_V3_PRIMARY_PARAGRAPH_NEW 38930
+#define IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH_NEW 38931
+#define IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH_SUBRESOURCE_NEW 38932
+#define IDS_HARMFUL_V3_PROCEED_PARAGRAPH_NEW 38933
+#define IDS_PHISHING_V4_HEADING 38934
+#define IDS_PHISHING_V4_PRIMARY_PARAGRAPH 38935
+#define IDS_PHISHING_V4_EXPLANATION_PARAGRAPH 38936
+#define IDS_PHISHING_V4_PROCEED_AND_REPORT_PARAGRAPH 38937
+#define IDS_PHISHING_V4_PRIMARY_PARAGRAPH_NEW 38938
+#define IDS_PHISHING_V4_EXPLANATION_PARAGRAPH_NEW 38939
+#define IDS_PHISHING_V4_EXPLANATION_PARAGRAPH_SUBRESOURCE_NEW 38940
+#define IDS_PHISHING_V4_PROCEED_PARAGRAPH_NEW 38941
+#define IDS_MALWARE_WEBVIEW_HEADING 38942
+#define IDS_MALWARE_WEBVIEW_EXPLANATION_PARAGRAPH 38943
+#define IDS_PHISHING_WEBVIEW_HEADING 38944
+#define IDS_PHISHING_WEBVIEW_EXPLANATION_PARAGRAPH 38945
+#define IDS_HARMFUL_WEBVIEW_HEADING 38946
+#define IDS_HARMFUL_WEBVIEW_EXPLANATION_PARAGRAPH 38947
+#define IDS_BILLING_WEBVIEW_HEADING 38948
+#define IDS_BILLING_WEBVIEW_EXPLANATION_PARAGRAPH 38949
+#define IDS_CONNECTION_HELP_SHOW_MORE 38950
+#define IDS_CONNECTION_HELP_SHOW_LESS 38951
+#define IDS_CONNECTION_HELP_TITLE 38952
+#define IDS_CONNECTION_HELP_HEADING 38953
+#define IDS_CONNECTION_HELP_GENERAL_HELP 38954
+#define IDS_CONNECTION_HELP_SPECIFIC_ERROR_HEADING 38955
+#define IDS_CONNECTION_HELP_CONNECTION_NOT_PRIVATE_TITLE 38956
+#define IDS_CONNECTION_HELP_CONNECT_TO_NETWORK_TITLE 38957
+#define IDS_CONNECTION_HELP_INCORRECT_CLOCK_TITLE 38958
+#define IDS_CONNECTION_HELP_CONNECTION_NOT_PRIVATE_DETAILS 38959
+#define IDS_CONNECTION_HELP_CONNECT_TO_NETWORK_DETAILS 38960
+#define IDS_CONNECTION_HELP_INCORRECT_CLOCK_DETAILS 38961
+#define IDS_CONNECTION_HELP_MITM_SOFTWARE_TITLE 38962
+#define IDS_CONNECTION_HELP_MITM_SOFTWARE_DETAILS 38963
+#define IDS_BILLING_TITLE 38964
+#define IDS_BILLING_HEADING 38965
+#define IDS_BILLING_PRIMARY_PARAGRAPH 38966
+#define IDS_BILLING_PRIMARY_BUTTON 38967
+#define IDS_BILLING_PROCEED_BUTTON 38968
+#define IDS_BLOCKED_INTERCEPTION_HEADING 38969
+#define IDS_KNOWN_INTERCEPTION_TITLE 38970
+#define IDS_KNOWN_INTERCEPTION_HEADER 38971
+#define IDS_KNOWN_INTERCEPTION_BODY1 38972
+#define IDS_KNOWN_INTERCEPTION_BODY2 38973
+#define IDS_KNOWN_INTERCEPTION_INFOBAR_HEADING 38974
+#define IDS_KNOWN_INTERCEPTION_INFOBAR_BUTTON_TEXT 38975
+#define IDS_LEGACY_TLS_HEADING 38976
+#define IDS_LEGACY_TLS_PRIMARY_PARAGRAPH 38977
+#define IDS_LEGACY_TLS_EXPLANATION 38978
+#define IDS_INSECURE_FORM_TITLE 38979
+#define IDS_INSECURE_FORM_HEADING 38980
+#define IDS_INSECURE_FORM_PRIMARY_PARAGRAPH 38981
+#define IDS_INSECURE_FORM_BACK_BUTTON 38982
+#define IDS_INSECURE_FORM_SUBMIT_BUTTON 38983
+#define IDS_HTTPS_ONLY_MODE_TITLE 38984
+#define IDS_HTTPS_ONLY_MODE_HEADING 38985
+#define IDS_HTTPS_ONLY_MODE_PRIMARY_PARAGRAPH 38986
+#define IDS_HTTPS_ONLY_MODE_WITH_ADVANCED_PROTECTION_PRIMARY_PARAGRAPH 38987
+#define IDS_HTTPS_ONLY_MODE_WITH_SITE_ENGAGEMENT_PRIMARY_PARAGRAPH 38988
+#define IDS_HTTPS_ONLY_MODE_FOR_TYPICALLY_SECURE_BROWSING_PRIMARY_PARAGRAPH 38989
+#define IDS_HTTPS_ONLY_MODE_BACK_BUTTON 38990
+#define IDS_HTTPS_ONLY_MODE_SUBMIT_BUTTON 38991
+#define IDS_SHARING_DEVICE_TYPE_COMPUTER 38992
+#define IDS_SHARING_DEVICE_TYPE_DEVICE 38993
+#define IDS_SHARING_DEVICE_TYPE_PHONE 38994
+#define IDS_SHARING_DEVICE_TYPE_TABLET 38995
+#define IDS_SITE_SETTINGS_TYPE_ADS 38996
+#define IDS_SITE_SETTINGS_TYPE_ADS_MID_SENTENCE 38997
+#define IDS_SITE_SETTINGS_TYPE_ANTI_ABUSE 38998
+#define IDS_SITE_SETTINGS_TYPE_AR 38999
+#define IDS_SITE_SETTINGS_TYPE_AR_MID_SENTENCE 39000
+#define IDS_SITE_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS 39001
+#define IDS_SITE_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS_MID_SENTENCE 39002
+#define IDS_SITE_SETTINGS_TYPE_AUTOMATIC_FULLSCREEN 39003
+#define IDS_SITE_SETTINGS_TYPE_AUTOMATIC_FULLSCREEN_MID_SENTENCE 39004
+#define IDS_SITE_SETTINGS_TYPE_AUTO_PICTURE_IN_PICTURE 39005
+#define IDS_SITE_SETTINGS_TYPE_AUTO_PICTURE_IN_PICTURE_MID_SENTENCE 39006
+#define IDS_SITE_SETTINGS_TYPE_BACKGROUND_SYNC 39007
+#define IDS_SITE_SETTINGS_TYPE_BACKGROUND_SYNC_MID_SENTENCE 39008
+#define IDS_SITE_SETTINGS_TYPE_BLUETOOTH_DEVICES 39009
+#define IDS_SITE_SETTINGS_TYPE_BLUETOOTH_DEVICES_MID_SENTENCE 39010
+#define IDS_SITE_SETTINGS_TYPE_BLUETOOTH_SCANNING 39011
+#define IDS_SITE_SETTINGS_TYPE_BLUETOOTH_SCANNING_MID_SENTENCE 39012
+#define IDS_SITE_SETTINGS_TYPE_CAMERA 39013
+#define IDS_SITE_SETTINGS_TYPE_CAMERA_MID_SENTENCE 39014
+#define IDS_SITE_SETTINGS_TYPE_CAMERA_PAN_TILT_ZOOM 39015
+#define IDS_SITE_SETTINGS_TYPE_CAMERA_PAN_TILT_ZOOM_MID_SENTENCE 39016
+#define IDS_SITE_SETTINGS_TYPE_CLIPBOARD 39017
+#define IDS_SITE_SETTINGS_TYPE_CLIPBOARD_MID_SENTENCE 39018
+#define IDS_SITE_SETTINGS_TYPE_COOKIES 39019
+#define IDS_SITE_SETTINGS_TYPE_COOKIES_MID_SENTENCE 39020
+#define IDS_SITE_SETTINGS_TYPE_FEDERATED_IDENTITY_API 39021
+#define IDS_SITE_SETTINGS_TYPE_FEDERATED_IDENTITY_API_MID_SENTENCE 39022
+#define IDS_SITE_SETTINGS_TYPE_IDLE_DETECTION 39023
+#define IDS_SITE_SETTINGS_TYPE_IDLE_DETECTION_MID_SENTENCE 39024
+#define IDS_SITE_SETTINGS_TYPE_JAVASCRIPT 39025
+#define IDS_SITE_SETTINGS_TYPE_JAVASCRIPT_MID_SENTENCE 39026
+#define IDS_SITE_SETTINGS_TYPE_JAVASCRIPT_JIT 39027
+#define IDS_SITE_SETTINGS_TYPE_LOCATION 39028
+#define IDS_SITE_SETTINGS_TYPE_LOCATION_MID_SENTENCE 39029
+#define IDS_SITE_SETTINGS_TYPE_MIC 39030
+#define IDS_SITE_SETTINGS_TYPE_MIC_MID_SENTENCE 39031
+#define IDS_SITE_SETTINGS_TYPE_MIDI_SYSEX 39032
+#define IDS_SITE_SETTINGS_TYPE_MIDI_SYSEX_MID_SENTENCE 39033
+#define IDS_SITE_SETTINGS_TYPE_MOTION_SENSORS 39034
+#define IDS_SITE_SETTINGS_TYPE_MOTION_SENSORS_MID_SENTENCE 39035
+#define IDS_SITE_SETTINGS_TYPE_NFC 39036
+#define IDS_SITE_SETTINGS_TYPE_NFC_MID_SENTENCE 39037
+#define IDS_SITE_SETTINGS_TYPE_NOTIFICATIONS 39038
+#define IDS_SITE_SETTINGS_TYPE_NOTIFICATIONS_MID_SENTENCE 39039
+#define IDS_SITE_SETTINGS_TYPE_POPUPS_REDIRECTS 39040
+#define IDS_SITE_SETTINGS_TYPE_POPUPS_REDIRECTS_MID_SENTENCE 39041
+#define IDS_SITE_SETTINGS_TYPE_PROTECTED_MEDIA_ID 39042
+#define IDS_SITE_SETTINGS_TYPE_PROTECTED_MEDIA_ID_MID_SENTENCE 39043
+#define IDS_SITE_SETTINGS_TYPE_SENSORS 39044
+#define IDS_SITE_SETTINGS_TYPE_SENSORS_MID_SENTENCE 39045
+#define IDS_SITE_SETTINGS_TYPE_SOUND 39046
+#define IDS_SITE_SETTINGS_TYPE_SOUND_MID_SENTENCE 39047
+#define IDS_SITE_SETTINGS_TYPE_USB_DEVICES 39048
+#define IDS_SITE_SETTINGS_TYPE_USB_DEVICES_MID_SENTENCE 39049
+#define IDS_SITE_SETTINGS_TYPE_VR 39050
+#define IDS_SITE_SETTINGS_TYPE_VR_MID_SENTENCE 39051
+#define IDS_SITE_SETTINGS_TYPE_STORAGE_ACCESS 39052
+#define IDS_SITE_SETTINGS_TYPE_STORAGE_ACCESS_MID_SENTENCE 39053
+#define IDS_SITE_SETTINGS_TYPE_FILE_SYSTEM_ACCESS_WRITE 39054
+#define IDS_SITE_SETTINGS_TYPE_FILE_SYSTEM_ACCESS_WRITE_MID_SENTENCE 39055
+#define IDS_SITE_SETTINGS_TYPE_FONT_ACCESS 39056
+#define IDS_SITE_SETTINGS_TYPE_FONT_ACCESS_MID_SENTENCE 39057
+#define IDS_SITE_SETTINGS_TYPE_HANDLERS 39058
+#define IDS_SITE_SETTINGS_TYPE_HANDLERS_MID_SENTENCE 39059
+#define IDS_SITE_SETTINGS_TYPE_HID_DEVICES 39060
+#define IDS_SITE_SETTINGS_TYPE_HID_DEVICES_MID_SENTENCE 39061
+#define IDS_SITE_SETTINGS_TYPE_IMAGES 39062
+#define IDS_SITE_SETTINGS_TYPE_IMAGES_MID_SENTENCE 39063
+#define IDS_SITE_SETTINGS_TYPE_INSECURE_CONTENT 39064
+#define IDS_SITE_SETTINGS_TYPE_INSECURE_CONTENT_MID_SENTENCE 39065
+#define IDS_SITE_SETTINGS_TYPE_PAYMENT_HANDLER 39066
+#define IDS_SITE_SETTINGS_TYPE_PAYMENT_HANDLER_MID_SENTENCE 39067
+#define IDS_SITE_SETTINGS_TYPE_PDF_DOCUMENTS 39068
+#define IDS_SITE_SETTINGS_TYPE_SERIAL_PORTS 39069
+#define IDS_SITE_SETTINGS_TYPE_SERIAL_PORTS_MID_SENTENCE 39070
+#define IDS_SITE_SETTINGS_TYPE_ZOOM_LEVELS 39071
+#define IDS_SITE_SETTINGS_TYPE_ZOOM_LEVELS_MID_SENTENCE 39072
+#define IDS_SITE_SETTINGS_TYPE_WEB_PRINTING 39073
+#define IDS_SITE_SETTINGS_TYPE_WEB_PRINTING_MID_SENTENCE 39074
+#define IDS_SITE_SETTINGS_TYPE_WINDOW_MANAGEMENT 39075
+#define IDS_SITE_SETTINGS_TYPE_WINDOW_MANAGEMENT_MID_SENTENCE 39076
+#define IDS_SITE_SETTINGS_TYPE_PERFORMANCE 39077
+#define IDS_SITE_SETTINGS_TYPE_PERFORMANCE_SUBLABEL 39078
+#define IDS_SMS_INFOBAR_TITLE 39079
+#define IDS_SMS_INFOBAR_STATUS_SMS_RECEIVED 39080
+#define IDS_SMS_INFOBAR_STATUS_SMS_RECEIVED_FROM_EMBEDDED_FRAME 39081
+#define IDS_SMS_INFOBAR_BUTTON_OK 39082
+#define IDS_CERT_ERROR_NO_SUBJECT_ALTERNATIVE_NAMES_DETAILS 39083
+#define IDS_CERT_ERROR_COMMON_NAME_INVALID_DETAILS 39084
+#define IDS_CERT_ERROR_COMMON_NAME_INVALID_DESCRIPTION 39085
+#define IDS_CERT_ERROR_EXPIRED_DETAILS 39086
+#define IDS_CERT_ERROR_EXPIRED_DESCRIPTION 39087
+#define IDS_CERT_ERROR_NOT_YET_VALID_DETAILS 39088
+#define IDS_CERT_ERROR_NOT_YET_VALID_DESCRIPTION 39089
+#define IDS_CERT_ERROR_NOT_VALID_AT_THIS_TIME_DETAILS 39090
+#define IDS_CERT_ERROR_NOT_VALID_AT_THIS_TIME_DESCRIPTION 39091
+#define IDS_CERT_ERROR_AUTHORITY_INVALID_DESCRIPTION 39092
+#define IDS_CERT_ERROR_CONTAINS_ERRORS_DETAILS 39093
+#define IDS_CERT_ERROR_CONTAINS_ERRORS_DESCRIPTION 39094
+#define IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_DETAILS 39095
+#define IDS_CERT_ERROR_UNABLE_TO_CHECK_REVOCATION_DESCRIPTION 39096
+#define IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DETAILS 39097
+#define IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DESCRIPTION 39098
+#define IDS_CERT_ERROR_REVOKED_CERT_DETAILS 39099
+#define IDS_CERT_ERROR_REVOKED_CERT_DESCRIPTION 39100
+#define IDS_CERT_ERROR_INVALID_CERT_DETAILS 39101
+#define IDS_CERT_ERROR_INVALID_CERT_DESCRIPTION 39102
+#define IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_DETAILS 39103
+#define IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_DESCRIPTION 39104
+#define IDS_CERT_ERROR_WEAK_KEY_DETAILS 39105
+#define IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION 39106
+#define IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DETAILS 39107
+#define IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DESCRIPTION 39108
+#define IDS_CERT_ERROR_VALIDITY_TOO_LONG_DETAILS 39109
+#define IDS_CERT_ERROR_VALIDITY_TOO_LONG_DESCRIPTION 39110
+#define IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS 39111
+#define IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION 39112
+#define IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS 39113
+#define IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DESCRIPTION 39114
+#define IDS_CERT_ERROR_CERTIFICATE_TRANSPARENCY_REQUIRED_DETAILS 39115
+#define IDS_CERT_ERROR_CERTIFICATE_TRANSPARENCY_REQUIRED_DESCRIPTION 39116
+#define IDS_SSL_ERROR_OBSOLETE_VERSION_DETAILS 39117
+#define IDS_SSL_ERROR_OBSOLETE_VERSION_DESCRIPTION 39118
+#define IDS_CERT_ERROR_AUTHORITY_INVALID_DETAILS 39119
+#define IDS_ALWAYS_ALLOW_ADS 39120
+#define IDS_BLOCKED_ADS_PROMPT_TITLE 39121
+#define IDS_BLOCKED_ADS_PROMPT_EXPLANATION 39122
+#define IDS_BLOCK_INTERSTITIAL_TITLE 39129
+#define IDS_CHILD_BLOCK_INTERSTITIAL_HEADER 39130
+#define IDS_BLOCK_INTERSTITIAL_HEADER_ACCESS_REQUESTS_DISABLED 39131
+#define IDS_BLOCK_INTERSTITIAL_HEADER_NOT_SIGNED_IN 39132
+#define IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_V2 39133
+#define IDS_REQUEST_SENT_OK 39134
+#define IDS_BLOCK_INTERSTITIAL_ASK_IN_PERSON_BUTTON 39135
+#define IDS_BLOCK_INTERSTITIAL_ASK_IN_PERSON_INSTEAD_BUTTON 39136
+#define IDS_BLOCK_INTERSTITIAL_ASK_IN_A_MESSAGE_BUTTON 39137
+#define IDS_CHILD_BLOCK_INTERSTITIAL_WAITING_APPROVAL_MESSAGE 39138
+#define IDS_CHILD_BLOCK_INTERSTITIAL_WAITING_APPROVAL_DESCRIPTION_SINGLE_PARENT 39139
+#define IDS_CHILD_BLOCK_INTERSTITIAL_WAITING_APPROVAL_DESCRIPTION_MULTI_PARENT 39140
+#define IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE_SINGLE_PARENT 39141
+#define IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE_MULTI_PARENT 39142
+#define IDS_BLOCK_INTERSTITIAL_SHOW_DETAILS 39143
+#define IDS_BLOCK_INTERSTITIAL_HIDE_DETAILS 39144
+#define IDS_GENERIC_SITE_BLOCK_HEADER 39145
+#define IDS_SUPERVISED_USER_BLOCK_HEADER 39146
+#define IDS_CHILD_BLOCK_MESSAGE_DEFAULT_SINGLE_PARENT 39147
+#define IDS_CHILD_BLOCK_MESSAGE_DEFAULT_MULTI_PARENT 39148
+#define IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES 39149
+#define IDS_CHILD_BLOCK_MESSAGE_MANUAL_SINGLE_PARENT 39150
+#define IDS_CHILD_BLOCK_MESSAGE_MANUAL_MULTI_PARENT 39151
+#define IDS_SUPERVISED_USER_NOT_SIGNED_IN 39152
+#define IDS_PARENT_BLOCKED_SITE_BANNER_TITLE 39153
+#define IDS_PARENT_BLOCKED_SITE_BANNER_MESSAGE 39154
+#define IDS_SYNC_BASIC_ENCRYPTION_DATA 39155
+#define IDS_SYNC_DATATYPE_AUTOFILL 39156
+#define IDS_SYNC_DATATYPE_BOOKMARKS 39157
+#define IDS_SYNC_DATATYPE_PASSWORDS 39158
+#define IDS_SYNC_DATATYPE_PREFERENCES 39159
+#define IDS_SYNC_DATATYPE_TABS 39160
+#define IDS_SYNC_DATATYPE_TYPED_URLS 39161
+#define IDS_SYNC_DATATYPE_HISTORY_AND_TABS 39162
+#define IDS_SYNC_DATATYPE_READING_LIST 39163
+#define IDS_SYNC_EMPTY_PASSPHRASE_ERROR 39164
+#define IDS_SYNC_ENCRYPTION_SECTION_TITLE 39165
+#define IDS_SYNC_FULL_ENCRYPTION_DATA 39166
+#define IDS_SYNC_LOGIN_SETTING_UP 39167
+#define IDS_SYNC_PASSPHRASE_LABEL 39168
+#define IDS_SYNC_PASSPHRASE_MISMATCH_ERROR 39169
+#define IDS_SYNC_ENTER_PASSPHRASE_BODY_WITH_DATE 39170
+#define IDS_SYNC_ENTER_PASSPHRASE_BODY 39171
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_MORE_LANGUAGE 39172
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_NOT_SOURCE_LANGUAGE 39173
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_LANG 39174
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_SITE 39175
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_ALWAYS 39176
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_REPORT_ERROR 39177
+#define IDS_TRANSLATE_INFOBAR_OPTIONS_ABOUT 39178
+#define IDS_TRANSLATE_INFOBAR_ACCEPT 39180
+#define IDS_TRANSLATE_INFOBAR_DENY 39181
+#define IDS_TRANSLATE_INFOBAR_NEVER_TRANSLATE 39182
+#define IDS_TRANSLATE_INFOBAR_ALWAYS_TRANSLATE 39183
+#define IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE 39184
+#define IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE_AUTODETERMINED_SOURCE_LANGUAGE 39185
+#define IDS_TRANSLATE_INFOBAR_REVERT 39186
+#define IDS_TRANSLATE_INFOBAR_RETRY 39187
+#define IDS_TRANSLATE_NOTIFICATION_ERROR 39211
+#define IDS_TRANSLATE_NOTIFICATION_ALWAYS_TRANSLATE 39212
+#define IDS_TRANSLATE_NOTIFICATION_LANGUAGE_NEVER 39213
+#define IDS_TRANSLATE_NOTIFICATION_SITE_NEVER 39214
+#define IDS_TRANSLATE_NOTIFICATION_UNDO 39215
+#define IDS_TRANSLATE_DETECTED_LANGUAGE 39216
+#define IDS_TAB_GROUP_COLOR_GREY 39217
+#define IDS_TAB_GROUP_COLOR_BLUE 39218
+#define IDS_TAB_GROUP_COLOR_RED 39219
+#define IDS_TAB_GROUP_COLOR_YELLOW 39220
+#define IDS_TAB_GROUP_COLOR_GREEN 39221
+#define IDS_TAB_GROUP_COLOR_PINK 39222
+#define IDS_TAB_GROUP_COLOR_PURPLE 39223
+#define IDS_TAB_GROUP_COLOR_CYAN 39224
+#define IDS_TAB_GROUP_COLOR_ORANGE 39225
+#define IDS_BOOKMARK_BAR_UNDO 39226
+#define IDS_BOOKMARK_BAR_REDO 39227
+#define IDS_BOOKMARK_BAR_UNDO_ADD 39228
+#define IDS_BOOKMARK_BAR_REDO_ADD 39229
+#define IDS_BOOKMARK_BAR_UNDO_DELETE 39230
+#define IDS_BOOKMARK_BAR_REDO_DELETE 39231
+#define IDS_BOOKMARK_BAR_UNDO_EDIT 39232
+#define IDS_BOOKMARK_BAR_REDO_EDIT 39233
+#define IDS_BOOKMARK_BAR_UNDO_MOVE 39234
+#define IDS_BOOKMARK_BAR_REDO_MOVE 39235
+#define IDS_BOOKMARK_BAR_UNDO_REORDER 39236
+#define IDS_BOOKMARK_BAR_REDO_REORDER 39237
+#define IDS_CLOSE_TUTORIAL 39238
+#define IDS_CLOSE_PROMO 39239
+#define IDS_PROMO_DISMISS_BUTTON 39240
+#define IDS_PROMO_SNOOZE_BUTTON 39241
+#define IDS_PROMO_SHOW_TUTORIAL_BUTTON 385
+#define IDS_TUTORIAL_RESTART_TUTORIAL 39242
+#define IDS_TUTORIAL_CLOSE_TUTORIAL 39243
+#define IDS_TUTORIAL_NEXT_BUTTON 39244
+#define IDS_VERSION_UI_TITLE 39245
+#define IDS_VERSION_UI_OFFICIAL 39246
+#define IDS_VERSION_UI_UNOFFICIAL 39247
+#define IDS_VERSION_UI_32BIT 39248
+#define IDS_VERSION_UI_64BIT 39249
+#define IDS_VERSION_UI_64BIT_ARM 39252
+#define IDS_VERSION_UI_32BIT_TRANSLATED_INTEL 39253
+#define IDS_VERSION_UI_64BIT_TRANSLATED_INTEL 39251
+#define IDS_VERSION_UI_REVISION 39254
+#define IDS_VERSION_UI_OS 39255
+#define IDS_VERSION_UI_USER_AGENT 39257
+#define IDS_VERSION_UI_COMMAND_LINE 39258
+#define IDS_VERSION_UI_COPY_LABEL 39262
+#define IDS_VERSION_UI_COPY_NOTICE 39263
+#define IDS_VERSION_UI_EXECUTABLE_PATH 39264
+#define IDS_VERSION_UI_PROFILE_PATH 39265
+#define IDS_VERSION_UI_PATH_NOTFOUND 39266
+#define IDS_VERSION_UI_VARIATIONS 39267
+#define IDS_VERSION_UI_VARIATIONS_SEED_NAME 39268
+#define IDS_VERSION_UI_VARIATIONS_CMD 39269
+#define IDS_VERSION_UI_COHORT_NAME 39270
+#define IDS_HISTORY_CLUSTERS_ACTION_MENU_DESCRIPTION 39277
+#define IDS_HISTORY_CLUSTERS_DELETE_PRIOR_VISITS_CONFIRM_BUTTON 39278
+#define IDS_HISTORY_CLUSTERS_DELETE_PRIOR_VISITS_WARNING 39279
+#define IDS_HISTORY_CLUSTERS_DISABLE_MENU_ITEM_LABEL 39280
+#define IDS_HISTORY_CLUSTERS_ENABLE_MENU_ITEM_LABEL 39281
+#define IDS_HISTORY_CLUSTERS_JOURNEYS_TAB_LABEL 397
+#define IDS_HISTORY_CLUSTERS_BY_GROUP_TAB_LABEL 39282
+#define IDS_HISTORY_CLUSTERS_LIST_TAB_LABEL 39283
+#define IDS_HISTORY_CLUSTERS_BY_DATE_TAB_LABEL 39284
+#define IDS_HISTORY_CLUSTERS_CLUSTER_LABEL_SEARCH_TERMS 39285
+#define IDS_HISTORY_CLUSTERS_CLUSTER_LABEL_MULTIPLE_HOSTNAMES 39286
+#define IDS_HISTORY_CLUSTERS_CLUSTER_LABEL_OTHER_MATCHING_VISITS 39287
+#define IDS_HISTORY_CLUSTERS_HIDE_PAGE 39288
+#define IDS_HISTORY_CLUSTERS_HIDE_VISITS 39289
+#define IDS_HISTORY_CLUSTERS_LOAD_MORE_BUTTON_LABEL 39290
+#define IDS_HISTORY_CLUSTERS_NO_RESULTS 39291
+#define IDS_HISTORY_CLUSTERS_NO_SEARCH_RESULTS 39292
+#define IDS_HISTORY_CLUSTERS_SHOW_SIDE_PANEL 39293
+#define IDS_HISTORY_CLUSTERS_OPEN_ALL_IN_TABGROUP 39294
+#define IDS_HISTORY_CLUSTERS_OPEN_INCOGNITO 39295
+#define IDS_HISTORY_CLUSTERS_OPEN_IN_NEW_TAB 39296
+#define IDS_HISTORY_CLUSTERS_OPEN_IN_NEW_WINDOW 39297
+#define IDS_HISTORY_CLUSTERS_RELATED_SEARCHES_HEADER 39298
+#define IDS_HISTORY_CLUSTERS_REMOVE_ALL_ITEMS 39299
+#define IDS_HISTORY_CLUSTERS_REMOVE_PAGE 39300
+#define IDS_HISTORY_CLUSTERS_REMOVE_ITEM_TOAST 39301
+#define IDS_HISTORY_CLUSTERS_REMOVE_SELECTED_ITEMS 39302
+#define IDS_HISTORY_CLUSTERS_SAVED_IN_TABGROUP_LABEL 39303
+#define IDS_HISTORY_CLUSTERS_SEARCH_PROMPT 39304
+#define IDS_HISTORY_CLUSTERS_CUT 39305
+#define IDS_HISTORY_CLUSTERS_COPY 39306
+#define IDS_HISTORY_CLUSTERS_PASTE 39307
+#define IDS_HISTORY_CLUSTERS_COPY_LINK 39308
+#define IDS_HISTORY_CLUSTERS_SHOW_LESS_BUTTON_LABEL 39309
+#define IDS_HISTORY_CLUSTERS_SHOW_MORE_BUTTON_LABEL 39310
+#define IDS_CARDBOARD_PRODUCT_SAFETY 39326
+#define IDS_USE_ANOTHER_DEVICE 39327
+#define IDS_VR_MENU 39328
+#define IDS_CANCEL 505
+#define IDS_CLOSE 39329
+#define IDS_CLEAR 39330
+#define IDS_DONE 483
+#define IDS_LEARN_MORE 423
+#define IDS_OK 571
+#define IDS_RELOAD 39331
+#define IDS_ADD 39332
+#define IDS_REMOVE 39333
+#define IDS_SAVE 39334
+#define IDS_MENU 39335
+#define IDS_INSTALL 39336
+#define IDS_UPDATE 39337
+#define IDS_NO_THANKS 39340
+#define IDS_NOT_NOW 39341
+#define IDS_TURN_OFF 39342
+#define IDS_PLUGIN_NOT_SUPPORTED 39343
+#define IDS_PRINT 39344
+#define IDS_RECENT_TABS 39345
+#define IDS_RECENTLY_CLOSED 39346
+#define IDS_YOUR_DEVICES 39347
+#define IDS_CHOOSE 39348
+#define IDS_ACCNAME_BACK 410
+#define IDS_ACCNAME_FORWARD 413
+#define IDS_ACCNAME_OK 39349
+#define IDS_ACCNAME_CANCEL 39350
+#define IDS_ACCNAME_DONE 39351
+#define IDS_ACCNAME_SAVE 39352
+#define IDS_ACCNAME_CLOSE 674
+#define IDS_ACCNAME_OPEN 39353
+#define IDS_ACCNAME_OPEN_IN_NEW_TAB 39354
+#define IDS_ACCNAME_PREVIOUS 39355
+#define IDS_ACCNAME_NEXT 39356
+#define IDS_ACCNAME_LOCATION 473
+#define IDS_ACCNAME_TAB_LIST 39357
+#define IDS_UTILITY_PROCESS_JSON_PARSER_NAME 39358
+#define IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON 39359
+#define IDS_SESSION_CRASHED_VIEW_STARTUP_PAGES_BUTTON 39360
+#define IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY 39361
+#define IDS_OPTIONS_ADVANCED_SECTION_TITLE_SAFETY_CHECK 39362
+#define IDS_PATCH_SERVICE_DISPLAY_NAME 39363
+#define IDS_PASSWORD_MANAGER_CSV_PASSWORD_PARSER_SERVICE_DISPLAY_NAME 39364
+#define IDS_UNZIP_SERVICE_DISPLAY_NAME 39365
+
+// ---------------------------------------------------------------------------
+// From extensions_strings.h:
+
+#define IDS_EXTENSION_BAD_FILE_ENCODING 44890
+#define IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH 44891
+#define IDS_EXTENSION_CONTAINS_PRIVATE_KEY 44892
+#define IDS_EXTENSION_CRX_EXISTS 44893
+#define IDS_EXTENSION_CONTENT_SCRIPT_FILE_TOO_LARGE 44894
+#define IDS_EXTENSION_DIRECTORY_NO_EXISTS 44895
+#define IDS_EXTENSION_ERROR_WHILE_SIGNING 44896
+#define IDS_EXTENSION_FAILED_DURING_PACKAGING 44897
+#define IDS_EXTENSION_LOAD_ABOUT_PAGE_FAILED 44898
+#define IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED 44899
+#define IDS_EXTENSION_LOAD_BACKGROUND_PAGE_FAILED 44900
+#define IDS_EXTENSION_LOAD_CSS_FAILED 44901
+#define IDS_EXTENSION_LOAD_JAVASCRIPT_FAILED 44902
+#define IDS_EXTENSION_LOAD_OPTIONS_PAGE_FAILED 44903
+#define IDS_EXTENSION_LOCALES_NO_DEFAULT_LOCALE_SPECIFIED 44904
+#define IDS_EXTENSION_MANIFEST_UNREADABLE 44905
+#define IDS_EXTENSION_MANIFEST_INVALID 44906
+#define IDS_EXTENSION_PACKAGE_IMAGE_ERROR 44907
+#define IDS_EXTENSION_PACKAGE_UNZIP_ERROR 44908
+#define IDS_EXTENSION_PRIVATE_KEY_EXISTS 44909
+#define IDS_EXTENSION_PRIVATE_KEY_FAILED_TO_READ 44910
+#define IDS_EXTENSION_PRIVATE_KEY_FAILED_TO_EXPORT 44911
+#define IDS_EXTENSION_PRIVATE_KEY_FAILED_TO_GENERATE 44912
+#define IDS_EXTENSION_PRIVATE_KEY_FAILED_TO_OUTPUT 44913
+#define IDS_EXTENSION_PRIVATE_KEY_INVALID 44914
+#define IDS_EXTENSION_PRIVATE_KEY_NO_EXISTS 44915
+#define IDS_EXTENSION_PRIVATE_KEY_INVALID_PATH 44916
+#define IDS_EXTENSION_PRIVATE_KEY_INVALID_FORMAT 44917
+#define IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT 44918
+#define IDS_EXTENSION_SHARING_VIOLATION 44919
+#define IDS_EXTENSION_CANT_INSTALL_POLICY_BLOCKED 44920
+#define IDS_EXTENSION_CANT_MODIFY_POLICY_REQUIRED 44921
+#define IDS_EXTENSION_CANT_UNINSTALL_POLICY_REQUIRED 44922
+#define IDS_EXTENSION_DISABLED_UPDATE_REQUIRED_BY_POLICY 44923
+#define IDS_EXTENSION_DISABLED_PUBLISHED_IN_STORE_REQUIRED_BY_POLICY 44924
+#define IDS_EXTENSION_MANIFEST_VERSION_NOT_SUPPORTED 44925
+#define IDS_DEVICE_NAME_WITH_PRODUCT_SERIAL 44926
+#define IDS_DEVICE_NAME_WITH_PRODUCT_UNKNOWN_VENDOR 44927
+#define IDS_DEVICE_NAME_WITH_PRODUCT_UNKNOWN_VENDOR_SERIAL 44928
+#define IDS_DEVICE_NAME_WITH_PRODUCT_VENDOR 44929
+#define IDS_DEVICE_NAME_WITH_PRODUCT_VENDOR_SERIAL 44930
+#define IDS_DEVICE_NAME_WITH_UNKNOWN_PRODUCT_UNKNOWN_VENDOR 44931
+#define IDS_DEVICE_NAME_WITH_UNKNOWN_PRODUCT_UNKNOWN_VENDOR_SERIAL 44932
+#define IDS_DEVICE_NAME_WITH_UNKNOWN_PRODUCT_VENDOR 44933
+#define IDS_DEVICE_NAME_WITH_UNKNOWN_PRODUCT_VENDOR_SERIAL 44934
+#define IDS_DEVICE_PERMISSIONS_PROMPT_SINGLE_SELECTION 44935
+#define IDS_DEVICE_PERMISSIONS_PROMPT_MULTIPLE_SELECTION 44936
+#define IDS_CAMERA_FACING_USER 44937
+#define IDS_CAMERA_FACING_ENVIRONMENT 44938
+#define IDS_EXTENSION_USB_DEVICE_PRODUCT_NAME_AND_VENDOR 44939
+#define IDS_EXTENSION_TASK_MANAGER_APPVIEW_TAG_PREFIX 44940
+#define IDS_EXTENSION_TASK_MANAGER_EXTENSIONOPTIONS_TAG_PREFIX 44941
+#define IDS_EXTENSION_TASK_MANAGER_MIMEHANDLERVIEW_TAG_PREFIX 44942
+#define IDS_EXTENSION_TASK_MANAGER_WEBVIEW_TAG_PREFIX 44943
+#define IDS_EXTENSION_WARNINGS_NETWORK_DELAY 44944
+#define IDS_EXTENSION_WARNINGS_DOWNLOAD_FILENAME_CONFLICT 44945
+#define IDS_EXTENSION_WARNING_RELOAD_TOO_FREQUENT 44946
+#define IDS_EXTENSION_WARNING_RULESET_FAILED_TO_LOAD 44947
+#define IDS_EXTENSION_WARNING_ENABLED_RULE_COUNT_EXCEEDED 44948
+#define IDS_EXTENSION_INSTALL_PROCESS_CRASHED 44949
+#define IDS_EXTENSION_PACKAGE_ERROR_CODE 44950
+#define IDS_EXTENSION_PACKAGE_ERROR_MESSAGE 44951
+#define IDS_EXTENSION_PACKAGE_INSTALL_ERROR 44952
+#define IDS_EXTENSION_UNPACK_FAILED 44953
+#define IDS_EXTENSION_WEBGL_NOT_SUPPORTED 44954
+
+// ---------------------------------------------------------------------------
+// From generated_resources.h:
+
+#define IDS_ACCESS_CODE_CAST_ACCESS_CODE_MESSAGE 1400
+#define IDS_ACCESS_CODE_CAST_BACK 1401
+#define IDS_ACCESS_CODE_CAST_CAST 1402
+#define IDS_ACCESS_CODE_CAST_CONNECT 1403
+#define IDS_ACCESS_CODE_CAST_DIALOG_TITLE 1404
+#define IDS_ACCESS_CODE_CAST_ENTER_CHARACTER 1405
+#define IDS_ACCESS_CODE_CAST_ERROR_ACCESS_CODE 1406
+#define IDS_ACCESS_CODE_CAST_ERROR_DIFFERENT_NETWORK 1407
+#define IDS_ACCESS_CODE_CAST_ERROR_NETWORK 1408
+#define IDS_ACCESS_CODE_CAST_ERROR_PERMISSION 1409
+#define IDS_ACCESS_CODE_CAST_ERROR_TOO_MANY_REQUESTS 1410
+#define IDS_ACCESS_CODE_CAST_ERROR_UNKNOWN 1411
+#define IDS_ACCESS_CODE_CAST_ERROR_PROFILE_SYNC 1412
+#define IDS_ACCESS_CODE_CAST_INPUT_ARIA_LABEL 1413
+#define IDS_ACCESS_CODE_CAST_MANAGED_FOOTNOTE_DAYS 1414
+#define IDS_ACCESS_CODE_CAST_MANAGED_FOOTNOTE_HOURS 1415
+#define IDS_ACCESS_CODE_CAST_MANAGED_FOOTNOTE_MONTHS 1416
+#define IDS_ACCESS_CODE_CAST_MANAGED_FOOTNOTE_YEARS 1417
+#define IDS_ACCESS_CODE_CAST_SUBMIT 1418
+#define IDS_ACCESS_CODE_CAST_USE_CAMERA 1419
+#define IDS_BOOKMARK_GROUP_FROM_IE 1420
+#define IDS_BOOKMARK_GROUP_FROM_EDGE 1421
+#define IDS_BOOKMARK_GROUP_FROM_FIREFOX 1422
+#define IDS_BOOKMARK_GROUP_FROM_SAFARI 1423
+#define IDS_BOOKMARK_GROUP 1424
+#define IDS_UNNAMED_BOOKMARK_BUTTON_ACCESSIBLE_NAME 1425
+#define IDS_BOOKMARK_BAR_SHOW_APPS_SHORTCUT 1426
+#define IDS_BOOKMARK_BAR_SHOW_READING_LIST 1427
+#define IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS_DEFAULT_NAME 1428
+#define IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS 1429
+#define IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME 675
+#define IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP 676
+#define IDS_BOOKMARK_BAR_OVERFLOW_BUTTON_TOOLTIP 683
+#define IDS_BOOKMARK_BAR_OPEN_ALL 1430
+#define IDS_BOOKMARK_BAR_OPEN_ALL_COUNT 1431
+#define IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_NEW_WINDOW 1432
+#define IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_INCOGNITO 1433
+#define IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_NEW_TAB_GROUP 1434
+#define IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB 1435
+#define IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW 1436
+#define IDS_BOOKMARK_BAR_OPEN_INCOGNITO 1437
+#define IDS_BOOKMARK_BAR_EDIT 1438
+#define IDS_BOOKMARK_BAR_RENAME_FOLDER 1439
+#define IDS_BOOKMARK_BAR_REMOVE 1440
+#define IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK 1441
+#define IDS_BOOKMARK_BAR_NEW_FOLDER 1442
+#define IDS_SHOW_BOOKMARK_BAR 1443
+#define IDS_HIDE_BOOKMARK_BAR 1444
+#define IDS_BOOKMARK_BAR_SHOULD_OPEN_ALL 1445
+#define IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED 1446
+#define IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK 1447
+#define IDS_BOOKMARK_BUBBLE_EDIT_BOOKMARK 1448
+#define IDS_BOOKMARK_BUBBLE_NAME_LABEL 1449
+#define IDS_BOOKMARK_BUBBLE_SAVED_TO 1450
+#define IDS_BOOKMARK_AX_BUBBLE_NAME_LABEL 1451
+#define IDS_BOOKMARK_BUBBLE_FOLDER_LABEL 1452
+#define IDS_BOOKMARK_AX_BUBBLE_FOLDER_LABEL 1453
+#define IDS_BOOKMARK_BUBBLE_OPTIONS 1454
+#define IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER 1455
+#define IDS_BOOKMARK_DICE_PROMO_SYNC_MESSAGE 1456
+#define IDS_BOOKMARK_BUBBLE_DESKTOP_TO_IOS_PROMO_TITLE 1457
+#define IDS_BOOKMARK_BUBBLE_DESKTOP_TO_IOS_PROMO_TITLE_V2 1458
+#define IDS_BOOKMARK_BUBBLE_DESKTOP_TO_IOS_PROMO_TITLE_V3 1459
+#define IDS_BOOKMARK_FOOTNOTE_DESKTOP_TO_IOS_PROMO_MESSAGE 1460
+#define IDS_BOOKMARK_EDITOR_NAME_LABEL 1461
+#define IDS_BOOKMARK_AX_EDITOR_NAME_LABEL 1462
+#define IDS_BOOKMARK_AX_EDITOR_URL_LABEL 1464
+#define IDS_BOOKMARK_EDITOR_URL_LABEL 1465
+#define IDS_BOOKMARK_EDITOR_CONFIRM_DELETE 1466
+#define IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON 1467
+#define IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM 1468
+#define IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE 1469
+#define IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW 1470
+#define IDS_UNNAMED_BOOKMARK_FOLDER 678
+#define IDS_BOOKMARK_ALL_TABS_DIALOG_TITLE 1471
+#define IDS_BOOKMARK_MANAGER_TITLE 396
+#define IDS_BOOKMARK_MANAGER_SEARCH_BUTTON 1472
+#define IDS_BOOKMARK_MANAGER 1473
+#define IDS_BOOKMARK_MANAGER_ORGANIZE_MENU 1474
+#define IDS_BOOKMARK_MANAGER_INVALID_URL 1475
+#define IDS_EXPORT_BOOKMARKS_DEFAULT_FILENAME 1476
+#define IDS_BOOKMARK_MANAGER_ADD_BOOKMARK_TITLE 1477
+#define IDS_BOOKMARK_MANAGER_ADD_FOLDER_TITLE 1478
+#define IDS_BOOKMARK_MANAGER_CLEAR_SEARCH 1479
+#define IDS_BOOKMARK_MANAGER_EMPTY_LIST 1480
+#define IDS_BOOKMARK_MANAGER_EMPTY_UNMODIFIABLE_LIST 1481
+#define IDS_BOOKMARK_MANAGER_FOLDER_LABEL 1482
+#define IDS_BOOKMARK_MANAGER_FOLDER_RENAME_TITLE 1483
+#define IDS_BOOKMARK_MANAGER_FOLDER_LIST_CHANGED 1484
+#define IDS_BOOKMARK_MANAGER_LIST_AX_LABEL 1485
+#define IDS_BOOKMARK_MANAGER_MENU_ADD_BOOKMARK 1486
+#define IDS_BOOKMARK_MANAGER_MENU_ADD_FOLDER 1487
+#define IDS_BOOKMARK_MANAGER_MENU_CUT 1488
+#define IDS_BOOKMARK_MANAGER_MENU_COPY 1489
+#define IDS_BOOKMARK_MANAGER_MENU_PASTE 1490
+#define IDS_BOOKMARK_MANAGER_MENU_EXPORT 1491
+#define IDS_BOOKMARK_MANAGER_MENU_HELP_CENTER 1492
+#define IDS_BOOKMARK_MANAGER_MENU_IMPORT 1493
+#define IDS_BOOKMARK_MANAGER_MENU_IMPORT_BEGAN 1494
+#define IDS_BOOKMARK_MANAGER_MENU_IMPORT_ENDED 1495
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL 1496
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL_WITH_COUNT 1497
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL_NEW_WINDOW 1498
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL_NEW_WINDOW_WITH_COUNT 1499
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL_INCOGNITO 1500
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL_INCOGNITO_WITH_COUNT 1501
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_ALL_NEW_TAB_GROUP_WITH_COUNT 1502
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_IN_NEW_TAB 1503
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_IN_NEW_WINDOW 1504
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_INCOGNITO 1505
+#define IDS_BOOKMARK_MANAGER_MENU_OPEN_IN_NEW_TAB_GROUP 1506
+#define IDS_BOOKMARK_MANAGER_MENU_RENAME 1507
+#define IDS_BOOKMARK_MANAGER_MENU_SHOW_IN_FOLDER 1508
+#define IDS_BOOKMARK_MANAGER_MENU_SORT 1509
+#define IDS_BOOKMARK_MANAGER_MORE_ACTIONS 1510
+#define IDS_BOOKMARK_MANAGER_MORE_ACTIONS_AX_LABEL 1511
+#define IDS_BOOKMARK_MANAGER_MORE_ACTIONS_MULTI_AX_LABEL 1512
+#define IDS_BOOKMARK_MANAGER_OPEN_DIALOG_TITLE 1513
+#define IDS_BOOKMARK_MANAGER_OPEN_DIALOG_CONFIRM 1514
+#define IDS_BOOKMARK_MANAGER_ITEMS_SELECTED 1515
+#define IDS_BOOKMARK_MANAGER_ITEMS_UNSELECTED 1516
+#define IDS_BOOKMARK_MANAGER_SIDEBAR_AX_LABEL 1517
+#define IDS_BOOKMARK_MANAGER_TOAST_FOLDER_SORTED 1518
+#define IDS_BOOKMARK_MANAGER_TOAST_ITEM_DELETED 1519
+#define IDS_BOOKMARK_MANAGER_TOAST_ITEMS_DELETED 1520
+#define IDS_BOOKMARK_MANAGER_TOAST_ITEM_COPIED 1521
+#define IDS_BOOKMARK_MANAGER_TOAST_ITEMS_COPIED 1522
+#define IDS_BOOKMARKS_MENU 1523
+#define IDS_BOOKMARKS_AND_LISTS_MENU 1524
+#define IDS_SHOW_BOOKMARK_SIDE_PANEL 1525
+#define IDS_BOOKMARK_THIS_TAB 1526
+#define IDS_BOOKMARK_ALL_TABS 1527
+#define IDS_BOOKMARKS_LIST_TITLE 1528
+#define IDS_TOOLTIP_STARRED 1529
+#define IDS_BOOKMARK_SCREEN_READER_CREATED 1530
+#define IDS_BOOKMARK_SCREEN_READER_FOLDER_CREATED 1531
+#define IDS_BOOKMARK_SCREEN_READER_REORDERED 1532
+#define IDS_BOOKMARK_SCREEN_READER_MOVED 1533
+#define IDS_APP_MANAGEMENT_CAMERA 1534
+#define IDS_APP_MANAGEMENT_LOCATION 1535
+#define IDS_APP_MANAGEMENT_MICROPHONE 1536
+#define IDS_APP_MANAGEMENT_NO_APPS_FOUND 1537
+#define IDS_APP_MANAGEMENT_NOTIFICATIONS 1538
+#define IDS_APP_MANAGEMENT_PERMISSIONS 1539
+#define IDS_APP_MANAGEMENT_PERMISSIONS_WITH_ORIGIN 1540
+#define IDS_APP_MANAGEMENT_MORE_SETTINGS 1541
+#define IDS_APP_MANAGEMENT_PIN_TO_SHELF 1542
+#define IDS_APP_MANAGEMENT_PRESET_WINDOW_SIZES 1543
+#define IDS_APP_MANAGEMENT_WINDOW 1544
+#define IDS_APP_MANAGEMENT_PRESET_WINDOW_SIZES_TEXT 1545
+#define IDS_APP_MANAGEMENT_PRINTING 1546
+#define IDS_APP_MANAGEMENT_SEARCH_PROMPT 1547
+#define IDS_APP_MANAGEMENT_UNINSTALL_APP 1548
+#define IDS_APP_MANAGEMENT_CONTACTS 1549
+#define IDS_APP_MANAGEMENT_STORAGE 1550
+#define IDS_APP_MANAGEMENT_RUN_ON_OS_LOGIN 1551
+#define IDS_APP_MANAGEMENT_POLICY_APP_POLICY_STRING 1552
+#define IDS_APP_MANAGEMENT_INTENT_SETTINGS_TITLE 1553
+#define IDS_APP_MANAGEMENT_INTENT_SHARING_APP_OPEN 1554
+#define IDS_APP_MANAGEMENT_INTENT_SHARING_BROWSER_OPEN 1555
+#define IDS_APP_MANAGEMENT_INTENT_SHARING_TAB_EXPLANATION 1556
+#define IDS_APP_MANAGEMENT_INTENT_SETTINGS_DIALOG_TITLE 1557
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_CHANGE_BUTTON 1558
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_DIALOG_TITLE 1559
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_DIALOG_TEXT_1_APP 1560
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_DIALOG_TEXT_2_APPS 1561
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_DIALOG_TEXT_3_APPS 1562
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_DIALOG_TEXT_4_APPS 1563
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_DIALOG_TEXT_5_OR_MORE_APPS 1564
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_WARNING_TEXT_1_APP 1565
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_WARNING_TEXT_2_APPS 1566
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_WARNING_TEXT_3_APPS 1567
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_WARNING_TEXT_4_APPS 1568
+#define IDS_APP_MANAGEMENT_INTENT_OVERLAP_WARNING_TEXT_5_OR_MORE_APPS 1569
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TITLE 1570
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TOOLTIP_WEB_A11Y 1571
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_ANDROID 1572
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_CHROME 1573
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_WEB 1574
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_CROS_SYSTEM 1575
+#define IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_WEB_STORE 1576
+#define IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_PLAY_STORE 1577
+#define IDS_APP_MANAGEMENT_APP_DETAILS_INSTALL_SOURCE_BROWSER 1578
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_AND_SOURCE_COMBINED 1579
+#define IDS_APP_MANAGEMENT_APP_DETAILS_TYPE_AND_SOURCE_PREINSTALLED_APP 1580
+#define IDS_APP_MANAGEMENT_APP_DETAILS_VERSION 1581
+#define IDS_APP_MANAGEMENT_APP_DETAILS_STORAGE_TITLE 1582
+#define IDS_APP_MANAGEMENT_APP_DETAILS_APP_SIZE 1583
+#define IDS_APP_MANAGEMENT_APP_DETAILS_DATA_SIZE 1584
+#define IDS_APP_MANAGEMENT_APP_LANGUAGE_LABEL 1585
+#define IDS_APP_MANAGEMENT_ARC_MANAGE_PERMISSIONS 1586
+#define IDS_APP_MANAGEMENT_PERMISSION_ASK 1587
+#define IDS_APP_MANAGEMENT_PERMISSION_ALLOWED 1588
+#define IDS_APP_MANAGEMENT_PERMISSION_ALLOWED_WITH_DETAILS 1589
+#define IDS_APP_MANAGEMENT_PERMISSION_DENIED 1590
+#define IDS_APP_MANAGEMENT_FILE_HANDLING_HEADER 1591
+#define IDS_APP_MANAGEMENT_FILE_HANDLING_OVERFLOW_DIALOG_TITLE 1592
+#define IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK 1593
+#define IDS_APP_MANAGEMENT_FILE_HANDLING_TYPES 1594
+#define IDS_APP_MANAGEMENT_SUB_APPS_LIST_HEADING 1595
+#define IDS_APP_MANAGEMENT_PARENT_APP_PERMISSION_EXPLANATION 1596
+#define IDS_APP_MANAGEMENT_SUB_APP_PERMISSION_EXPLANATION 1597
+#define IDS_APP_MANAGEMENT_APP_CONTENT_TITLE 1598
+#define IDS_APP_MANAGEMENT_APP_CONTENT_SUBTITLE 1599
+#define IDS_APP_MANAGEMENT_APP_CONTENT_DIALOG_SUBTITLE 1600
+#define IDS_MEDIA_ROUTER_ICON_TOOLTIP_TEXT 428
+#define IDS_MEDIA_ROUTER_MENU_ITEM_TITLE 1601
+#define IDS_MEDIA_ROUTER_PRESENTATION_CAST_MODE 1602
+#define IDS_MEDIA_ROUTER_DESKTOP_MIRROR_CAST_MODE 1603
+#define IDS_MEDIA_ROUTER_TAB_MIRROR_CAST_MODE 1604
+#define IDS_MEDIA_ROUTER_ALTERNATIVE_SOURCES_BUTTON 1605
+#define IDS_MEDIA_ROUTER_ABOUT 422
+#define IDS_MEDIA_ROUTER_HELP 424
+#define IDS_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 425
+#define IDS_MEDIA_ROUTER_SHOWN_BY_POLICY 1606
+#define IDS_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 426
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_WITH_HOSTNAME 1607
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT 1608
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_DESKTOP 1609
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB 1610
+#define IDS_MEDIA_ROUTER_ISSUE_UNABLE_TO_CAST_DESKTOP 1611
+#define IDS_MEDIA_ROUTER_ISSUE_TAB_AUDIO_NOT_SUPPORTED 1612
+#define IDS_MEDIA_ROUTER_ISSUE_DESKTOP_AUDIO_NOT_SUPPORTED 1613
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_USER_PENDING_AUTHORIZATION 1615
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_USER_NOT_ALLOWED 1616
+#define IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_NOTIFICATION_DISABLED 1617
+#define IDS_MEDIA_ROUTER_ISSUE_FAILED_TO_CAST 1618
+#define IDS_MEDIA_ROUTER_ISSUE_CANNOT_TERMINATE 1619
+#define IDS_MEDIA_ROUTER_STATUS_LOOKING_FOR_DEVICES 1620
+#define IDS_MEDIA_ROUTER_STATUS_NO_DEVICES_FOUND 1621
+#define IDS_MEDIA_ROUTER_NO_DEVICES_FOUND_BUTTON 1622
+#define IDS_MEDIA_ROUTER_DESTINATION_MISSING 1623
+#define IDS_MEDIA_ROUTER_SINK_AVAILABLE 1624
+#define IDS_MEDIA_ROUTER_SINK_CONNECTING 1625
+#define IDS_MEDIA_ROUTER_SINK_DISCONNECTING 1626
+#define IDS_MEDIA_ROUTER_SINK_PAUSED 1627
+#define IDS_MEDIA_ROUTER_STOP_CASTING 1628
+#define IDS_MEDIA_ROUTER_SOURCE_NOT_SUPPORTED 1629
+#define IDS_MEDIA_ROUTER_AVAILABLE_SPECIFIC_SITES 1630
+#define IDS_MEDIA_ROUTER_CASTING_DESKTOP 1631
+#define IDS_MEDIA_ROUTER_CASTING_TAB 1632
+#define IDS_MEDIA_ROUTER_PRESENTATION_ROUTE_DESCRIPTION 1633
+#define IDS_MEDIA_ROUTER_SINK_VIEW_PAUSE 1634
+#define IDS_MEDIA_ROUTER_SINK_VIEW_PAUSE_GENERIC_ACCESSIBLE_NAME 1635
+#define IDS_MEDIA_ROUTER_SINK_VIEW_PAUSE_SCREEN_ACCESSIBLE_NAME 1636
+#define IDS_MEDIA_ROUTER_SINK_VIEW_PAUSE_TAB_ACCESSIBLE_NAME 1637
+#define IDS_MEDIA_ROUTER_SINK_VIEW_RESUME 1638
+#define IDS_MEDIA_ROUTER_SINK_VIEW_RESUME_GENERIC_ACCESSIBLE_NAME 1639
+#define IDS_MEDIA_ROUTER_SINK_VIEW_RESUME_SCREEN_ACCESSIBLE_NAME 1640
+#define IDS_MEDIA_ROUTER_SINK_VIEW_RESUME_TAB_ACCESSIBLE_NAME 1641
+#define IDS_MEDIA_ROUTER_SINK_VIEW_STOP 1642
+#define IDS_MEDIA_ROUTER_SINK_VIEW_STOP_GENERIC_ACCESSIBLE_NAME 1643
+#define IDS_MEDIA_ROUTER_SINK_VIEW_STOP_SCREEN_ACCESSIBLE_NAME 1644
+#define IDS_MEDIA_ROUTER_SINK_VIEW_STOP_TAB_ACCESSIBLE_NAME 1645
+#define IDS_MEDIA_ROUTER_REMOTING_DIALOG_TITLE 1646
+#define IDS_MEDIA_ROUTER_REMOTING_DIALOG_BODY_TEXT 1647
+#define IDS_MEDIA_ROUTER_REMOTING_DIALOG_CHECKBOX 1648
+#define IDS_MEDIA_ROUTER_REMOTING_DIALOG_OPTIMIZE_BUTTON 1649
+#define IDS_MEDIA_ROUTER_REMOTING_DIALOG_CANCEL_BUTTON 1650
+#define IDS_MEDIA_ROUTER_REMOTING_DIALOG_CANCEL_BUTTON_MACOS 1651
+#define IDS_MEDIA_ROUTER_CAST_TO_MEETING_DEPRECATED 1652
+#define IDS_MEDIA_ROUTER_CAST_TO_MEETING_REMOVED 1653
+#define IDS_MEDIA_ROUTER_WIRED_DISPLAY_SINK_NAME 1654
+#define IDS_MEDIA_ROUTER_FEEDBACK_TITLE 1655
+#define IDS_MEDIA_ROUTER_FEEDBACK_NA 1656
+#define IDS_MEDIA_ROUTER_FEEDBACK_FORM_DESCRIPTION 1657
+#define IDS_MEDIA_ROUTER_FEEDBACK_HEADER 1658
+#define IDS_MEDIA_ROUTER_FEEDBACK_YOUR_ANSWER 1659
+#define IDS_MEDIA_ROUTER_FEEDBACK_REQUIRED 1660
+#define IDS_MEDIA_ROUTER_FEEDBACK_TYPE_QUESTION 1661
+#define IDS_MEDIA_ROUTER_FEEDBACK_PROMPT 1662
+#define IDS_MEDIA_ROUTER_FEEDBACK_MIRRORING_QUALITY_SUBHEADING 1663
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_SMOOTHNESS 1664
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_QUALITY 1665
+#define IDS_MEDIA_ROUTER_FEEDBACK_AUDIO_QUALITY 1666
+#define IDS_MEDIA_ROUTER_FEEDBACK_CONTENT_QUESTION 1667
+#define IDS_MEDIA_ROUTER_FEEDBACK_ADDITIONAL_COMMENTS 1668
+#define IDS_MEDIA_ROUTER_FEEDBACK_ALLOW_CONTACT_BY_EMAIL 1669
+#define IDS_MEDIA_ROUTER_FEEDBACK_YOUR_EMAIL_ADDRESS 1670
+#define IDS_MEDIA_ROUTER_FEEDBACK_EMAIL_FIELD 1671
+#define IDS_MEDIA_ROUTER_FEEDBACK_SEND_BUTTON 1672
+#define IDS_MEDIA_ROUTER_FEEDBACK_DISCARD_CONFIRMATION 1673
+#define IDS_MEDIA_ROUTER_FEEDBACK_TYPE_BUG_OR_ERROR 1674
+#define IDS_MEDIA_ROUTER_FEEDBACK_TYPE_FEATURE_REQUEST 1675
+#define IDS_MEDIA_ROUTER_FEEDBACK_TYPE_PROJECTION_QUALITY 1676
+#define IDS_MEDIA_ROUTER_FEEDBACK_TYPE_DISCOVERY 1677
+#define IDS_MEDIA_ROUTER_FEEDBACK_TYPE_OTHER 1678
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_FREEZES 1679
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_JERKY 1680
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_STUTTER 1681
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_SMOOTH 1682
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_PERFECT 1683
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_UNWATCHABLE 1684
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_POOR 1685
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_ACCEPTABLE 1686
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_GOOD 1687
+#define IDS_MEDIA_ROUTER_FEEDBACK_VIDEO_GREAT 1688
+#define IDS_MEDIA_ROUTER_FEEDBACK_AUDIO_UNINTELLIGIBLE 1689
+#define IDS_MEDIA_ROUTER_FEEDBACK_AUDIO_POOR 1690
+#define IDS_MEDIA_ROUTER_FEEDBACK_AUDIO_ACCEPTABLE 1691
+#define IDS_MEDIA_ROUTER_FEEDBACK_AUDIO_GOOD 1692
+#define IDS_MEDIA_ROUTER_FEEDBACK_AUDIO_PERFECT 1693
+#define IDS_MEDIA_ROUTER_FEEDBACK_SENDING 1694
+#define IDS_MEDIA_ROUTER_FEEDBACK_SEND_FAIL 1695
+#define IDS_MEDIA_ROUTER_FEEDBACK_SEND_SUCCESS 1696
+#define IDS_MEDIA_ROUTER_FEEDBACK_RESENDING 1697
+#define IDS_MEDIA_ROUTER_FEEDBACK_LOGS_HEADER 1698
+#define IDS_MEDIA_ROUTER_FEEDBACK_FINE_LOGS_WARNING 1699
+#define IDS_MEDIA_ROUTER_FEEDBACK_SEND_LOGS_HTML 1700
+#define IDS_MEDIA_ROUTER_FEEDBACK_SEND_LOGS 1701
+#define IDS_MEDIA_ROUTER_FEEDBACK_PRIVACY_DATA_USAGE 1702
+#define IDS_MEDIA_ROUTER_FEEDBACK_SETUP_VISIBILITY_QUESTION 1703
+#define IDS_MEDIA_ROUTER_FEEDBACK_YES 1704
+#define IDS_MEDIA_ROUTER_FEEDBACK_NO 1705
+#define IDS_MEDIA_ROUTER_FEEDBACK_DID_NOT_TRY 1706
+#define IDS_MEDIA_ROUTER_FEEDBACK_SOFTWARE_QUESTION 1707
+#define IDS_MEDIA_ROUTER_FEEDBACK_UNKNOWN 1708
+#define IDS_MEDIA_ROUTER_FEEDBACK_NETWORK_QUESTION 1709
+#define IDS_MEDIA_ROUTER_FEEDBACK_NETWORK_SAME_WIFI 1710
+#define IDS_MEDIA_ROUTER_FEEDBACK_NETWORK_DIFFERENT_WIFI 1711
+#define IDS_MEDIA_ROUTER_FEEDBACK_NETWORK_WIRED_PC 1712
+#define IDS_MEDIA_ROUTER_NOTIFICATION_MESSAGE_CAST_SCREEN 1713
+#define IDS_MEDIA_ROUTER_NOTIFICATION_MESSAGE_PAUSED 1714
+#define IDS_MEDIA_ROUTER_NOTIFICATION_MESSAGE_SCREEN_CAN_PAUSE 1715
+#define IDS_MEDIA_ROUTER_NOTIFICATION_MESSAGE_SCREEN_PAUSED 1716
+#define IDS_MEDIA_ROUTER_NOTIFICATION_MESSAGE_TAB_CAN_PAUSE 1717
+#define IDS_MEDIA_ROUTER_NOTIFICATION_TITLE 1718
+#define IDS_MEDIA_ROUTER_NOTIFICATION_TITLE_UNKNOWN 1719
+#define IDS_GLOBAL_MEDIA_CONTROLS_ICON_TOOLTIP_TEXT 430
+#define IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_LABEL_WITH_COLON 1720
+#define IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_LABEL 1721
+#define IDS_GLOBAL_MEDIA_CONTROLS_STOP_CASTING_BUTTON_LABEL 1722
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_CAPTION_ENGLISH_ONLY 1723
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_CAPTION 1724
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_CAPTION_SHOW_LANGUAGE 1725
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_CAPTION_DOWNLOAD_PROGRESS 1726
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_CAPTION_DOWNLOAD_ERROR 1727
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_CAPTION_DOWNLOAD_ERROR_REBOOT_REQUIRED 1728
+#define IDS_GLOBAL_MEDIA_CONTROLS_CAPTION_SETTINGS 1729
+#define IDS_GLOBAL_MEDIA_CONTROLS_LIVE_TRANSLATE_TARGET_LANGUAGE_ACCNAME 1730
+#define IDS_GLOBAL_MEDIA_CONTROLS_DIALOG_NAME 1731
+#define IDS_GLOBAL_MEDIA_CONTROLS_SHOW_DEVICE_LIST 1732
+#define IDS_GLOBAL_MEDIA_CONTROLS_HIDE_DEVICE_LIST 1733
+#define IDS_GLOBAL_MEDIA_CONTROLS_CONTROL_CAST_SESSIONS_PROMO 1734
+#define IDS_GMC_LOCAL_MEDIA_CAST_SESSIONS_PROMO 1735
+#define IDS_GMC_LOCAL_MEDIA_CAST_START_PROMO 1736
+#define IDS_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 427
+#define IDS_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 429
+#define IDS_MEDIA_PREVIEW_CAMERA_ACCESSIBLE_NAME 1737
+#define IDS_MEDIA_PREVIEW_VIDEO_STREAM_ACCESSIBLE_NAME 1738
+#define IDS_MEDIA_PREVIEW_NO_CAMERAS_FOUND 1739
+#define IDS_MEDIA_PREVIEW_NO_CAMERAS_FOUND_COMBOBOX 1740
+#define IDS_MEDIA_PREVIEW_MIC_ACCESSIBLE_NAME 1741
+#define IDS_MEDIA_PREVIEW_AUDIO_STREAM_ACCESSIBLE_NAME 1742
+#define IDS_MEDIA_PREVIEW_NO_MICS_FOUND 1743
+#define IDS_MEDIA_PREVIEW_NO_MICS_FOUND_COMBOBOX 1744
+#define IDS_MEDIA_PREVIEW_SYSTEM_DEFAULT_MIC 1745
+#define IDS_AVATAR_BUTTON_GUEST 1746
+#define IDS_AVATAR_BUTTON_GUEST_TOOLTIP 1747
+#define IDS_GUEST_BUBBLE_ACCESSIBLE_TITLE 1748
+#define IDS_INCOGNITO_BUBBLE_ACCESSIBLE_TITLE 1749
+#define IDS_AVATAR_BUTTON_INCOGNITO 1750
+#define IDS_AVATAR_BUTTON_INCOGNITO_TOOLTIP 1751
+#define IDS_AVATAR_BUTTON_SYNC_ERROR 1752
+#define IDS_AVATAR_BUTTON_SYNC_ERROR_TOOLTIP 1753
+#define IDS_AVATAR_BUTTON_SYNC_PAUSED 1754
+#define IDS_AVATAR_BUTTON_WORK 1755
+#define IDS_AVATAR_BUTTON_SCHOOL 1756
+#define IDS_PROFILES_MENU_NAME 1757
+#define IDS_PROFILES_PROFILE_BUBBLE_ACCESSIBLE_TITLE 1760
+#define IDS_PROFILES_EXIT_PROFILE_BUTTON 1761
+#define IDS_PROFILES_GAIA_SIGNIN_TITLE 1762
+#define IDS_PROFILES_ACCOUNT_REMOVAL_TITLE 1763
+#define IDS_PROFILES_SYNC_COMPLETE_TITLE 1764
+#define IDS_PROFILES_OPEN_SYNC_SETTINGS_BUTTON 1765
+#define IDS_PROFILES_DICE_SIGNIN_BUTTON 1766
+#define IDS_PROFILES_DICE_WEB_ONLY_SIGNIN_BUTTON 1767
+#define IDS_PROFILES_DICE_NOT_SYNCING_TITLE 1768
+#define IDS_PROFILES_DICE_SIGNIN_FIRST_ACCOUNT_BUTTON 1769
+#define IDS_PROFILES_DICE_SIGNIN_FIRST_ACCOUNT_BUTTON_NO_NAME 1770
+#define IDS_PROFILES_DICE_SYNC_DISABLED_TITLE 1771
+#define IDS_PROFILES_DICE_SYNC_PAUSED_TITLE 1772
+#define IDS_PROFILES_CLOSE_X_WINDOWS_BUTTON 1773
+#define IDS_PROFILES_SIGNIN_PROMO 1774
+#define IDS_PROFILES_CREDIT_CARDS_LINK 1775
+#define IDS_PROFILES_ADDRESSES_LINK 1776
+#define IDS_PROFILES_LIST_PROFILES_TITLE 1777
+#define IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON 1778
+#define IDS_PROFILES_PROFILE_HIDE_MANAGE_ACCOUNTS_BUTTON 1779
+#define IDS_PROFILE_MENU_OPEN_GUEST_PROFILE 1780
+#define IDS_PROFILES_MANAGED_BY 1781
+#define IDS_PROFILES_MANAGE_PROFILES_BUTTON_TOOLTIP 1782
+#define IDS_PROFILES_MANAGE_PROFILES_MANAGED_TOOLTIP 1783
+#define IDS_PROFILES_CUSTOMIZE_PROFILE_BUTTON_TOOLTIP 1784
+#define IDS_PROFILES_GUEST_PROFILE_NAME 1785
+#define IDS_DEFAULT_PROFILE_NAME 1786
+#define IDS_LEGACY_DEFAULT_PROFILE_NAME 1787
+#define IDS_NUMBERED_PROFILE_NAME 1788
+#define IDS_NEW_NUMBERED_PROFILE_NAME 1789
+#define IDS_SINGLE_PROFILE_DISPLAY_NAME 1790
+#define IDS_GUEST_PROFILE_NAME 1791
+#define IDS_DEFAULT_AVATAR_NAME_8 1792
+#define IDS_DEFAULT_AVATAR_NAME_9 1793
+#define IDS_DEFAULT_AVATAR_NAME_10 1794
+#define IDS_DEFAULT_AVATAR_NAME_11 1795
+#define IDS_DEFAULT_AVATAR_NAME_12 1796
+#define IDS_DEFAULT_AVATAR_NAME_13 1797
+#define IDS_DEFAULT_AVATAR_NAME_14 1798
+#define IDS_DEFAULT_AVATAR_NAME_15 1799
+#define IDS_DEFAULT_AVATAR_NAME_16 1800
+#define IDS_DEFAULT_AVATAR_NAME_17 1801
+#define IDS_DEFAULT_AVATAR_NAME_18 1802
+#define IDS_DEFAULT_AVATAR_NAME_19 1803
+#define IDS_DEFAULT_AVATAR_NAME_20 1804
+#define IDS_DEFAULT_AVATAR_NAME_21 1805
+#define IDS_DEFAULT_AVATAR_NAME_22 1806
+#define IDS_DEFAULT_AVATAR_NAME_23 1807
+#define IDS_DEFAULT_AVATAR_NAME_24 1808
+#define IDS_DEFAULT_AVATAR_NAME_25 1809
+#define IDS_DEFAULT_AVATAR_NAME_26 1810
+#define IDS_DEFAULT_AVATAR_LABEL_0 1811
+#define IDS_DEFAULT_AVATAR_LABEL_1 1812
+#define IDS_DEFAULT_AVATAR_LABEL_2 1813
+#define IDS_DEFAULT_AVATAR_LABEL_3 1814
+#define IDS_DEFAULT_AVATAR_LABEL_4 1815
+#define IDS_DEFAULT_AVATAR_LABEL_5 1816
+#define IDS_DEFAULT_AVATAR_LABEL_6 1817
+#define IDS_DEFAULT_AVATAR_LABEL_7 1818
+#define IDS_DEFAULT_AVATAR_LABEL_8 1819
+#define IDS_DEFAULT_AVATAR_LABEL_9 1820
+#define IDS_DEFAULT_AVATAR_LABEL_10 1821
+#define IDS_DEFAULT_AVATAR_LABEL_11 1822
+#define IDS_DEFAULT_AVATAR_LABEL_12 1823
+#define IDS_DEFAULT_AVATAR_LABEL_13 1824
+#define IDS_DEFAULT_AVATAR_LABEL_14 1825
+#define IDS_DEFAULT_AVATAR_LABEL_15 1826
+#define IDS_DEFAULT_AVATAR_LABEL_16 1827
+#define IDS_DEFAULT_AVATAR_LABEL_17 1828
+#define IDS_DEFAULT_AVATAR_LABEL_18 1829
+#define IDS_DEFAULT_AVATAR_LABEL_19 1830
+#define IDS_DEFAULT_AVATAR_LABEL_20 1831
+#define IDS_DEFAULT_AVATAR_LABEL_21 1832
+#define IDS_DEFAULT_AVATAR_LABEL_22 1833
+#define IDS_DEFAULT_AVATAR_LABEL_23 1834
+#define IDS_DEFAULT_AVATAR_LABEL_24 1835
+#define IDS_DEFAULT_AVATAR_LABEL_25 1836
+#define IDS_DEFAULT_AVATAR_LABEL_26 1837
+#define IDS_DEFAULT_AVATAR_LABEL_27 1838
+#define IDS_DEFAULT_AVATAR_LABEL_28 1839
+#define IDS_DEFAULT_AVATAR_LABEL_29 1840
+#define IDS_DEFAULT_AVATAR_LABEL_30 1841
+#define IDS_DEFAULT_AVATAR_LABEL_31 1842
+#define IDS_DEFAULT_AVATAR_LABEL_32 1843
+#define IDS_DEFAULT_AVATAR_LABEL_33 1844
+#define IDS_DEFAULT_AVATAR_LABEL_34 1845
+#define IDS_DEFAULT_AVATAR_LABEL_35 1846
+#define IDS_DEFAULT_AVATAR_LABEL_36 1847
+#define IDS_DEFAULT_AVATAR_LABEL_37 1848
+#define IDS_DEFAULT_AVATAR_LABEL_38 1849
+#define IDS_DEFAULT_AVATAR_LABEL_39 1850
+#define IDS_DEFAULT_AVATAR_LABEL_40 1851
+#define IDS_DEFAULT_AVATAR_LABEL_41 1852
+#define IDS_DEFAULT_AVATAR_LABEL_42 1853
+#define IDS_DEFAULT_AVATAR_LABEL_43 1854
+#define IDS_DEFAULT_AVATAR_LABEL_44 1855
+#define IDS_DEFAULT_AVATAR_LABEL_45 1856
+#define IDS_DEFAULT_AVATAR_LABEL_46 1857
+#define IDS_DEFAULT_AVATAR_LABEL_47 1858
+#define IDS_DEFAULT_AVATAR_LABEL_48 1859
+#define IDS_DEFAULT_AVATAR_LABEL_49 1860
+#define IDS_DEFAULT_AVATAR_LABEL_50 1861
+#define IDS_DEFAULT_AVATAR_LABEL_51 1862
+#define IDS_DEFAULT_AVATAR_LABEL_52 1863
+#define IDS_DEFAULT_AVATAR_LABEL_53 1864
+#define IDS_DEFAULT_AVATAR_LABEL_54 1865
+#define IDS_DEFAULT_AVATAR_LABEL_55 1866
+#define IDS_PROFILES_LOCAL_PROFILE_STATE 1867
+#define IDS_PROFILES_CREATE_BUTTON_LABEL 1868
+#define IDS_PROFILES_MANAGE_BUTTON_LABEL 1869
+#define IDS_PROFILES_DEFAULT_NAME 376
+#define IDS_SYNC_LOGIN_NAME_PROHIBITED 1870
+#define IDS_SUPERVISED_USER_NOT_ALLOWED_BY_POLICY 1871
+#define IDS_OLD_PROFILES_DISABLED_TITLE 1872
+#define IDS_OLD_PROFILES_DISABLED_MESSAGE 1873
+#define IDS_OLD_PROFILES_DISABLED_ADD_PERSON_SUGGESTION 1874
+#define IDS_OLD_PROFILES_DISABLED_ADD_PERSON_SUGGESTION_WITH_DOMAIN 1875
+#define IDS_OLD_PROFILES_DISABLED_REMOVED_OLD_PROFILE 1876
+#define IDS_SYNC_USER_NAME_IN_USE_ERROR 1877
+#define IDS_SYNC_USER_NAME_IN_USE_BY_ERROR 1878
+#define IDS_SCREEN_LOCK_SIGN_OUT 1879
+#define IDS_PROFILE_CUSTOMIZATION_DONE_BUTTON_LABEL 1885
+#define IDS_PROFILE_CUSTOMIZATION_THEMES_CONTAINER_LABEL 1886
+#define IDS_PROFILE_CUSTOMIZATION_WELCOME 1887
+#define IDS_PROFILE_CUSTOMIZATION_INPUT_LABEL 1888
+#define IDS_PROFILE_CUSTOMIZATION_INPUT_PLACEHOLDER 1889
+#define IDS_PROFILE_CUSTOMIZATION_INPUT_ERROR_MESSAGE 1890
+#define IDS_PROFILE_CUSTOMIZATION_SKIP_BUTTON_LABEL 1891
+#define IDS_PROFILE_CUSTOMIZATION_DELETE_PROFILE_BUTTON_LABEL 1892
+#define IDS_PROFILE_CUSTOMIZATION_LOCAL_PROFILE_CREATION_TITLE 1893
+#define IDS_PROFILE_CUSTOMIZATION_AVATAR_SELECTION_BACK_BUTTON_LABEL 1894
+#define IDS_ENTERPRISE_PROFILE_WELCOME_TITLE 1895
+#define IDS_ENTERPRISE_PROFILE_WELCOME_ACCOUNT_MANAGED_BY 1896
+#define IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_MANAGED_STRICT_SEPARATION 1897
+#define IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_MANAGED_SEPARATION 1898
+#define IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_DEVICE_MANAGED 1899
+#define IDS_ENTERPRISE_PROFILE_WELCOME_PROFILE_SEPARATION_DEVICE_MANAGED_BY 1900
+#define IDS_ENTERPRISE_PROFILE_WELCOME_ACCOUNT_EMAIL_MANAGED_BY 1901
+#define IDS_ENTERPRISE_PROFILE_WELCOME_DEVICE_MANAGED_BY 1902
+#define IDS_ENTERPRISE_PROFILE_WELCOME_DEVICE_MANAGED 1903
+#define IDS_ENTERPRISE_PROFILE_WELCOME_MANAGED_DESCRIPTION_WITH_SYNC 1904
+#define IDS_ENTERPRISE_PROFILE_WELCOME_MANAGED_DESCRIPTION_WITHOUT_SYNC 1905
+#define IDS_ENTERPRISE_WELCOME_PROFILE_REQUIRED_TITLE 1906
+#define IDS_ENTERPRISE_WELCOME_PROFILE_WILL_BE_MANAGED_TITLE 1907
+#define IDS_ENTERPRISE_PROFILE_WELCOME_CREATE_PROFILE_BUTTON 1908
+#define IDS_ENTERPRISE_PROFILE_WELCOME_LINK_DATA_CHECKBOX 1909
+#define IDS_PROFILE_PICKER_ADD_SPACE_BUTTON 1910
+#define IDS_PROFILE_PICKER_BROWSE_AS_GUEST_BUTTON 1911
+#define IDS_PROFILE_PICKER_BACK_BUTTON_ARIA_LABEL 1912
+#define IDS_PROFILE_PICKER_BACK_BUTTON_SIGN_IN_LABEL 1913
+#define IDS_PROFILE_PICKER_PROFILE_CARD_NEEDS_SIGNIN_PROMPT 1914
+#define IDS_PROFILE_PICKER_PROFILE_CARD_LABEL 1915
+#define IDS_PROFILE_PICKER_PROFILE_CARD_INPUT_LABEL 1916
+#define IDS_PROFILE_PICKER_PROFILE_MORE_ACTIONS_ARIA_LABEL 1917
+#define IDS_PROFILE_PICKER_PROFILE_MENU_REMOVE_TEXT 1918
+#define IDS_PROFILE_PICKER_PROFILE_MENU_REMOVE_CONFIRM 1919
+#define IDS_PROFILE_PICKER_PROFILE_MENU_CUSTOMIZE_TEXT 1920
+#define IDS_PROFILE_PICKER_PROFILE_MENU_INCOGNITO_TEXT 1921
+#define IDS_PROFILE_PICKER_ASK_ON_STARTUP 1922
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_LOCAL_PROFILE_TITLE 1923
+#define IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_DIALOG_NOT_ALLOWED_TITLE 1924
+#define IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_DIALOG_NOT_ALLOWED_BODY 1925
+#define IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_DIALOG_WRONG_ACCOUNT_TITLE 1926
+#define IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_DIALOG_WRONG_ACCOUNT_BODY 1927
+#define IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_TIMEOUT_TITLE 1928
+#define IDS_PROFILE_PICKER_FORCE_SIGN_IN_ERROR_TIMEOUT_BODY 1929
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_HISTORY 1930
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_PASSWORDS 1931
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_BOOKMARKS 1932
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_AUTOFILL 1933
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_CALCULATING 1934
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_SIGNIN_BUTTON_LABEL 1935
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_NOT_NOW_BUTTON_LABEL 1936
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_CUSTOMIZE_AVATAR_BUTTON_LABEL 1937
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_AVATAR_TEXT 1938
+#define IDS_PROFILE_PICKER_TAKE_A_TOUR_BUTTON_LABEL 1939
+#define IDS_PROFILE_PICKER_IPH_NEXT_BUTTON_LABEL 1940
+#define IDS_PROFILE_PICKER_IPH_DONE_BUTTON_LABEL 1941
+#define IDS_PROFILE_PICKER_IPH_FOR_PROFILES_TITLE 1942
+#define IDS_PROFILE_PICKER_IPH_FOR_ADD_PROFILE_TITLE 1943
+#define IDS_PROFILE_PICKER_IPH_FOR_CUSTOMIZE_PROFILE_TITLE 1944
+#define IDS_PROFILE_PICKER_IPH_FOR_CUSTOMIZE_PROFILE_TEXT 1945
+#define IDS_PROFILE_PICKER_PROFILE_SWITCH_SWITCH_BUTTON_LABEL 1946
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_DEVICE_MANAGED_BY_DESCRIPTION 1947
+#define IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_DEVICE_MANAGED_DESCRIPTION 1948
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_LOCAL_PROFILE 1949
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_SIGNED_IN_PROFILE_TITLE 1950
+#define IDS_PROFILE_PICKER_REMOVE_WARNING_SIGNED_IN_PROFILE 1951
+#define IDS_FRE_SIGN_IN_SUBTITLE_0 1963
+#define IDS_FRE_SIGN_IN_SUBTITLE_1 1964
+#define IDS_FRE_DEVICES_CARD_TITLE 1965
+#define IDS_FRE_DEVICES_CARD_DESCRIPTION 1966
+#define IDS_FRE_SECURITY_CARD_TITLE 1967
+#define IDS_FRE_SECURITY_CARD_DESCRIPTION 1968
+#define IDS_FRE_BACKUP_CARD_TITLE 1969
+#define IDS_FRE_BACKUP_CARD_DESCRIPTION 1970
+#define IDS_FRE_DECLINE_SIGN_IN_BUTTON_TITLE 1971
+#define IDS_FRE_ACCEPT_SIGN_IN_BUTTON_TITLE 1972
+#define IDS_FRE_MANAGED_DESCRIPTION 1973
+#define IDS_FRE_MANAGED_BY_DESCRIPTION 1974
+#define IDS_FRE_DEFAULT_BROWSER_TITLE_NEW 1975
+#define IDS_FRE_DEFAULT_BROWSER_SUBTITLE 1976
+#define IDS_FRE_DEFAULT_BROWSER_SET_AS_DEFAULT 1977
+#define IDS_FRE_DEFAULT_BROWSER_SKIP 1978
+#define IDS_SETTINGS_EMPTY_STRING 6950
+#define IDS_SETTINGS_CONTINUE 6951
+#define IDS_SETTINGS_GOT_IT 6952
+#define IDS_SETTINGS_MORE_ACTIONS 498
+#define IDS_SETTINGS_OPENS_IN_NEW_TAB 6953
+#define IDS_SETTINGS_SEND_FEEDBACK_ROLE_DESCRIPTION 6954
+#define IDS_RELAUNCH_CONFIRMATION_DIALOG_BODY 6955
+#define IDS_SETTINGS_ABOUT_PAGE_BROWSER_VERSION 6956
+#define IDS_SETTINGS_ABOUT_PAGE_LEARN_MORE_UPDATE_ERRORS 6957
+#define IDS_SETTINGS_ABOUT_PAGE_LEARN_MORE_SYSTEM_REQUIREMENTS 6958
+#define IDS_SETTINGS_ABOUT_PAGE_RELAUNCH 4291
+#define IDS_SETTINGS_ACCESSIBILITY 6971
+#define IDS_SETTINGS_ACCESSIBILITY_WEB_STORE 6972
+#define IDS_SETTINGS_MORE_FEATURES_LINK 6973
+#define IDS_SETTINGS_MORE_FEATURES_LINK_DESCRIPTION 6974
+#define IDS_SETTINGS_ACCESSIBLE_IMAGE_LABELS_TITLE 6975
+#define IDS_SETTINGS_ACCESSIBLE_IMAGE_LABELS_SUBTITLE 6976
+#define IDS_SETTINGS_PDF_OCR_DOWNLOAD_COMPLETE 6977
+#define IDS_SETTINGS_PDF_OCR_DOWNLOAD_ERROR 6978
+#define IDS_SETTINGS_PDF_OCR_DOWNLOAD_PROGRESS 6979
+#define IDS_SETTINGS_PDF_OCR_DOWNLOADING 6980
+#define IDS_SETTINGS_PDF_OCR_TITLE 6981
+#define IDS_SETTINGS_PDF_OCR_SUBTITLE 6982
+#define IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_CAPTION_TITLE 6983
+#define IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_TRANSLATE_TITLE 6984
+#define IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_TRANSLATE_SUBTITLE 6985
+#define IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_CAPTION_SUBTITLE_ENGLISH_ONLY 6988
+#define IDS_SETTINGS_CAPTIONS_ENABLE_LIVE_CAPTION_SUBTITLE 6989
+#define IDS_SETTINGS_CAPTIONS_LIVE_CAPTION_DOWNLOAD_PROGRESS 6990
+#define IDS_SETTINGS_CAPTIONS_LIVE_CAPTION_DOWNLOAD_COMPLETE 6991
+#define IDS_SETTINGS_CAPTIONS_LIVE_CAPTION_DOWNLOAD_ERROR 6992
+#define IDS_SETTINGS_CAPTIONS_LIVE_CAPTION_DOWNLOAD_ERROR_REBOOT_REQUIRED 6993
+#define IDS_SETTINGS_CAPTIONS_MASK_OFFENSIVE_WORDS_TITLE 6994
+#define IDS_SETTINGS_ENABLE_CARET_BROWSING_TITLE 6995
+#define IDS_SETTINGS_ENABLE_CARET_BROWSING_SUBTITLE 6996
+#define IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION 4855
+#define IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE 6997
+#define IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE 6998
+#define IDS_SETTINGS_APPEARANCE 6999
+#define IDS_SETTINGS_CUSTOM_WEB_ADDRESS 7000
+#define IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS 7001
+#define IDS_SETTINGS_HOME_BUTTON_DISABLED 7002
+#define IDS_SETTINGS_THEMES 7003
+#define IDS_SETTINGS_RESET_TO_DEFAULT_THEME 7010
+#define IDS_SETTINGS_CHROME_COLORS 7011
+#define IDS_SETTINGS_COLOR_SCHEME_MODE 7012
+#define IDS_SETTINGS_SHOW_HOME_BUTTON 7013
+#define IDS_SETTINGS_SHOW_BOOKMARKS_BAR 7014
+#define IDS_SETTINGS_SHOW_HOVER_CARD_IMAGES 7015
+#define IDS_SETTINGS_SIDE_PANEL 7016
+#define IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT 7017
+#define IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT 7018
+#define IDS_SETTINGS_HOME_PAGE_NTP 7019
+#define IDS_SETTINGS_CHANGE_HOME_PAGE 7020
+#define IDS_SETTINGS_WEB_STORE 7021
+#define IDS_SETTINGS_READER_MODE 7024
+#define IDS_SETTINGS_READER_MODE_DESCRIPTION 7025
+#define IDS_SETTINGS_ADVANCED 7026
+#define IDS_SETTINGS_BASIC 7027
+#define IDS_SETTINGS_MENU_BUTTON_LABEL 7028
+#define IDS_SETTINGS_MENU_EXTENSIONS_LINK_TOOLTIP 7029
+#define IDS_SETTINGS_SEARCH_PROMPT 7030
+#define IDS_SETTINGS_SEARCH_NO_RESULTS_HELP 7031
+#define IDS_SETTINGS_SETTINGS 7032
+#define IDS_SETTINGS_ALT_PAGE_TITLE 7033
+#define IDS_SETTINGS_SUBPAGE_BUTTON 7034
+#define IDS_SETTINGS_RESTART 7035
+#define IDS_SETTINGS_CONTROLLED_BY_EXTENSION 7036
+#define IDS_SETTINGS_CLEAR 7037
+#define IDS_SETTINGS_CUSTOM 7038
+#define IDS_SETTINGS_DELETE 7039
+#define IDS_SETTINGS_EDIT 7040
+#define IDS_SETTINGS_END_TIME 7041
+#define IDS_SETTINGS_NOT_VALID 7042
+#define IDS_SETTINGS_NOT_VALID_WEB_ADDRESS 7043
+#define IDS_SETTINGS_NOT_VALID_WEB_ADDRESS_FOR_CONTENT_TYPE 7044
+#define IDS_SETTINGS_RETRY 7045
+#define IDS_SETTINGS_SLIDER_MIN_MAX_ARIA_ROLE_DESCRIPTION 7046
+#define IDS_SETTINGS_START_TIME 7047
+#define IDS_PASSWORDS_PAGE_AUTHENTICATION_PROMPT_BIOMETRIC_SUFFIX 7048
+#define IDS_PASSWORDS_PAGE_COPY_AUTHENTICATION_PROMPT_BIOMETRIC_SUFFIX 7049
+#define IDS_PASSWORDS_PAGE_EDIT_AUTHENTICATION_PROMPT_BIOMETRIC_SUFFIX 7050
+#define IDS_PASSWORDS_PAGE_EXPORT_AUTHENTICATION_PROMPT_BIOMETRIC_SUFFIX 7051
+#define IDS_SETTINGS_AUTOFILL_AND_PASSWORDS 7052
+#define IDS_PASSWORDS_PAGE_IMPORT_AUTHENTICATION_PROMPT_BIOMETRIC_SUFFIX 7053
+#define IDS_SETTINGS_GOOGLE_PAYMENTS 7054
+#define IDS_SETTINGS_AUTOFILL_ADDRESSES_ADD_TITLE 7055
+#define IDS_SETTINGS_AUTOFILL_ADDRESSES_EDIT_TITLE 7056
+#define IDS_SETTINGS_AUTOFILL_ADDRESSES_COUNTRY 7057
+#define IDS_SETTINGS_AUTOFILL_ADDRESSES_PHONE 7058
+#define IDS_SETTINGS_AUTOFILL_ADDRESSES_EMAIL 7059
+#define IDS_SETTINGS_AUTOFILL_DETAIL 7060
+#define IDS_SETTINGS_AUTOFILL_CARD_DESCRIPTION 7061
+#define IDS_SETTINGS_AUTOFILL_CARD_A11Y_LABELED 7062
+#define IDS_SETTINGS_AUTOFILL_CARD_EXP_DATE_A11Y_LABELED 7063
+#define IDS_SETTINGS_AUTOFILL_MORE_ACTIONS_FOR_ADDRESS 7064
+#define IDS_SETTINGS_AUTOFILL_MORE_ACTIONS_FOR_CREDIT_CARD 7065
+#define IDS_AUTOFILL_ADD_VIRTUAL_CARD 7066
+#define IDS_AUTOFILL_REMOVE_VIRTUAL_CARD 7067
+#define IDS_AUTOFILL_EDIT_SERVER_CREDIT_CARD 7068
+#define IDS_AUTOFILL_VIRTUAL_CARD_TURNED_ON_LABEL 7069
+#define IDS_AUTOFILL_VIRTUAL_CARD_UNENROLL_DIALOG_TITLE 7070
+#define IDS_AUTOFILL_VIRTUAL_CARD_UNENROLL_DIALOG_LABEL 7071
+#define IDS_AUTOFILL_VIRTUAL_CARD_UNENROLL_DIALOG_CONFIRM_BUTTON_LABEL 7072
+#define IDS_SETTINGS_ADDRESS_REMOVE 7073
+#define IDS_SETTINGS_ADDRESS_REMOVE_CONFIRMATION_TITLE 7074
+#define IDS_SETTINGS_ADDRESS_REMOVED_MESSAGE 7075
+#define IDS_SETTINGS_CREDIT_CARD_REMOVE 7076
+#define IDS_SETTINGS_EDIT_CREDIT_CARD_TITLE 7077
+#define IDS_SETTINGS_LOCAL_CARD_REMOVE_CONFIRMATION_TITLE 7078
+#define IDS_SETTINGS_LOCAL_PAYMENT_METHOD_REMOVE_CONFIRMATION_DESCRIPTION 7079
+#define IDS_SETTINGS_PAYMENTS_MANAGE_CREDIT_CARDS 7080
+#define IDS_SETTINGS_PAYMENTS_SAVED_TO_THIS_DEVICE_ONLY 7081
+#define IDS_SETTINGS_ADD_CREDIT_CARD_TITLE 7082
+#define IDS_SETTINGS_MIGRATABLE_CARDS_LABEL 7083
+#define IDS_SETTINGS_SINGLE_MIGRATABLE_CARD_INFO 7084
+#define IDS_SETTINGS_MULTIPLE_MIGRATABLE_CARDS_INFO 7085
+#define IDS_SETTINGS_REMOTE_PAYMENT_METHODS_LINK_LABEL 7086
+#define IDS_SETTINGS_NAME_ON_CREDIT_CARD 7087
+#define IDS_SETTINGS_CREDIT_CARD_NUMBER 7088
+#define IDS_SETTINGS_CREDIT_CARD_EXPIRATION_DATE 7089
+#define IDS_SETTINGS_CREDIT_CARD_EXPIRATION_MONTH 7090
+#define IDS_SETTINGS_CREDIT_CARD_EXPIRATION_YEAR 7091
+#define IDS_SETTINGS_CREDIT_CARD_EXPIRED 7092
+#define IDS_SETTINGS_CREDIT_CARD_NICKNAME 7093
+#define IDS_SETTINGS_CREDIT_CARD_NICKNAME_INVALID 7094
+#define IDS_SETTINGS_CREDIT_CARD_CVC_TITLE 7095
+#define IDS_SETTINGS_CREDIT_CARD_CVC_IMAGE_TITLE 7096
+#define IDS_SETTINGS_CREDIT_CARD_CVC_IMAGE_TITLE_AMEX 7097
+#define IDS_SETTINGS_CREDIT_CARD_CVC_PLACEHOLDER 7098
+#define IDS_SETTINGS_ADD_PAYMENT_METHODS 7099
+#define IDS_SETTINGS_ADD_PAYMENT_METHOD_CREDIT_OR_DEBIT_CARD 7100
+#define IDS_SETTINGS_ADD_PAYMENT_METHOD_IBAN 7101
+#define IDS_SETTINGS_IBAN_SAVED_TO_THIS_DEVICE_ONLY 7102
+#define IDS_IBAN_NICKNAME 7103
+#define IDS_SETTINGS_AUTOFILL_MORE_ACTIONS_FOR_IBAN 7104
+#define IDS_SETTINGS_AUTOFILL_A11Y_IBAN_DESCRIPTION 7105
+#define IDS_SETTINGS_ADD_IBAN_TITLE 7106
+#define IDS_SETTINGS_EDIT_IBAN_TITLE 7107
+#define IDS_SETTINGS_IBAN_EDIT 7108
+#define IDS_SETTINGS_LOCAL_IBAN_REMOVE_CONFIRMATION_TITLE 7109
+#define IDS_SETTINGS_PASSWORD_MANAGER 7110
+#define IDS_SETTINGS_PASSWORD_MANAGER_DESCRIPTION 7111
+#define IDS_SETTINGS_PAYMENT_METHODS_NONE 7112
+#define IDS_SETTINGS_PASSKEYS_LENGTH_ERROR 7113
+#define IDS_SETTINGS_PASSKEYS_SITE_LABEL 7114
+#define IDS_SETTINGS_PASSKEYS_DIALOG_TITLE 7115
+#define IDS_SETTINGS_PASSKEYS_EDIT_DIALOG_FOOTNOTE 7116
+#define IDS_SETTINGS_ADDRESS_NONE 7117
+#define IDS_SETTINGS_PASSWORDS_LEAK_DETECTION_LABEL 7118
+#define IDS_SETTINGS_PASSWORDS_LEAK_DETECTION_LABEL_UPDATED 7119
+#define IDS_SETTINGS_PASSWORDS_LEAK_DETECTION_SIGNED_OUT_ENABLED_DESC 7120
+#define IDS_SETTINGS_CHECK_PASSWORDS_PROGRESS 7121
+#define IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT 7122
+#define IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT_SHORT 7123
+#define IDS_SETTINGS_WEAK_PASSWORDS_COUNT_SHORT 7124
+#define IDS_SETTINGS_REUSED_PASSWORDS_COUNT_SHORT 7125
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_LABEL 7126
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_NO_SUPPORT 7127
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_TITLE 7128
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_SUB_TITLE_WIN 7129
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_SEARCH 7131
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_DELETE_CONFIRMATION_TITLE 7132
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_DELETE_CONFIRMATION_DESCRIPTION 7133
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_CANNOT_DELETE_TITLE 7134
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_CANNOT_DELETE_BODY 7135
+#define IDS_AUTOFILL_MANAGE_PASSKEYS_MORE_ACTIONS_LABEL 7136
+#define IDS_SETTINGS_PASSWORD_SHOW_PASSWORD_A11Y 7137
+#define IDS_SETTINGS_PASSWORD_HIDE_PASSWORD_A11Y 7138
+#define IDS_SETTINGS_PASSWORDS_BIOMETRIC_AUTHENTICATION_FOR_FILLING_TOGGLE_LABEL_WIN 7140
+#define IDS_SETTINGS_DEFAULT_BROWSER 7141
+#define IDS_SETTINGS_DEFAULT_BROWSER_MAKE_DEFAULT_BUTTON 7142
+#define IDS_SETTINGS_CLEAR_PERIOD_TITLE 7222
+#define IDS_SETTINGS_CLEAR_BROWSING_DATA_WITH_SYNC 7223
+#define IDS_SETTINGS_CLEAR_BROWSING_DATA_WITH_SYNC_ERROR 7224
+#define IDS_SETTINGS_CLEAR_BROWSING_DATA_WITH_SYNC_PASSPHRASE_ERROR 7225
+#define IDS_SETTINGS_CLEAR_BROWSING_DATA_WITH_SYNC_PAUSED 7226
+#define IDS_SETTINGS_CLEAR_BROWSING_HISTORY 7227
+#define IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC 7228
+#define IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC_WITH_EXCEPTION 7229
+#define IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC_MAIN_PROFILE 7230
+#define IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC_SUPERVISED_PROFILE 7231
+#define IDS_SETTINGS_CLEAR_COOKIES_AND_SITE_DATA_SUMMARY_BASIC_SIGNED_IN_PROFILE 7232
+#define IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY 7233
+#define IDS_SETTINGS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN_NO_LINK 7234
+#define IDS_SETTINGS_CLEAR_GOOGLE_SEARCH_HISTORY_GOOGLE_DSE 7235
+#define IDS_SETTINGS_CLEAR_GOOGLE_SEARCH_HISTORY_NON_GOOGLE_DSE 7236
+#define IDS_SETTINGS_CLEAR_NON_GOOGLE_SEARCH_HISTORY_PREPOPULATED_DSE 7237
+#define IDS_SETTINGS_CLEAR_NON_GOOGLE_SEARCH_HISTORY_NON_PREPOPULATED_DSE 7238
+#define IDS_SETTINGS_CLEAR_DOWNLOAD_HISTORY 7239
+#define IDS_SETTINGS_CLEAR_CACHE 7240
+#define IDS_SETTINGS_CLEAR_COOKIES 7241
+#define IDS_SETTINGS_CLEAR_PASSWORDS 7242
+#define IDS_SETTINGS_CLEAR_FORM_DATA 7243
+#define IDS_SETTINGS_CLEAR_HOSTED_APP_DATA 7244
+#define IDS_SETTINGS_CLEAR_PERIOD_HOUR 7245
+#define IDS_SETTINGS_CLEAR_PERIOD_24_HOURS 7246
+#define IDS_SETTINGS_CLEAR_PERIOD_7_DAYS 7247
+#define IDS_SETTINGS_CLEAR_PERIOD_FOUR_WEEKS 7248
+#define IDS_SETTINGS_CLEAR_PERIOD_EVERYTHING 7249
+#define IDS_SETTINGS_CLEAR_PERIOD_15_MINUTES 7250
+#define IDS_SETTINGS_CLEAR_PERIOD_NOT_SELECTED 7251
+#define IDS_SETTINGS_NOTIFICATION_WARNING 7252
+#define IDS_SETTINGS_DOWNLOADS 7253
+#define IDS_SETTINGS_DOWNLOAD_LOCATION 7254
+#define IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION 7255
+#define IDS_SETTINGS_PROMPT_FOR_DOWNLOAD 7256
+#define IDS_SETTINGS_OPEN_FILE_TYPES_AUTOMATICALLY 7257
+#define IDS_SETTINGS_DOWNLOADS_SHOW_WHEN_FINISHED 7258
+#define IDS_SETTINGS_ON_STARTUP 7259
+#define IDS_SETTINGS_ON_STARTUP_OPEN_NEW_TAB 7260
+#define IDS_SETTINGS_ON_STARTUP_CONTINUE 7261
+#define IDS_SETTINGS_ON_STARTUP_OPEN_SPECIFIC 7262
+#define IDS_SETTINGS_ON_STARTUP_CONTINUE_AND_OPEN_SPECIFIC 7263
+#define IDS_SETTINGS_ON_STARTUP_USE_CURRENT 7264
+#define IDS_SETTINGS_ON_STARTUP_ADD_NEW_PAGE 7265
+#define IDS_SETTINGS_ON_STARTUP_EDIT_PAGE 7266
+#define IDS_SETTINGS_ON_STARTUP_SITE_URL 7267
+#define IDS_SETTINGS_ON_STARTUP_REMOVE 7268
+#define IDS_SETTINGS_ON_STARTUP_PAGE_TOOLTIP 7269
+#define IDS_SETTINGS_INVALID_URL 7270
+#define IDS_SETTINGS_URL_TOOL_LONG 7271
+#define IDS_SETTINGS_PERFORMANCE_PAGE_TITLE 7272
+#define IDS_SETTINGS_MEMORY_PAGE_TITLE 7273
+#define IDS_SETTINGS_SPEED_PAGE_TITLE 7274
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_SETTING 7275
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_HEURISTICS_LABEL 7276
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_RECOMMENDED_BADGE 7277
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_ON_TIMER_LABEL 7278
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_RADIO_GROUP_ARIA_LABEL 7279
+#define IDS_SETTINGS_PERFORMANCE_MEMORY_SAVER_MODE_CHOOSE_DISCARD_TIME_ARIA_LABEL 7280
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_BUTTON_ARIA_LABEL 7281
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_SAVE_BUTTON_ARIA_LABEL 7282
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_HEADER 7283
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_DESCRIPTION 7284
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADDITIONAL_SITES 7285
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_CURRENT_TABS 7286
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_CURRENT_TABS_EMPTY 7287
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_MANUAL 7288
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ACTIVE_SITE_ARIA_DESCRIPTION 7289
+#define IDS_SETTINGS_PERFORMANCE_TAB_DISCARDING_EXCEPTIONS_ADD_DIALOG_HELP 7290
+#define IDS_SETTINGS_BATTERY_PAGE_TITLE 7291
+#define IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_SETTING 7292
+#define IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_ON_BATTERY_LABEL 7293
+#define IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_BELOW_THRESHOLD_LABEL 7294
+#define IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_RADIO_GROUP_ARIA_LABEL 7295
+#define IDS_SETTINGS_PERFORMANCE_BATTERY_SAVER_MODE_LINK_OS_SETTING_DESCRIPTION 7296
+#define IDS_SETTINGS_LANGUAGES_PAGE_TITLE 7297
+#define IDS_SETTINGS_LANGUAGES_CARD_TITLE 7298
+#define IDS_SETTINGS_LANGUAGE_SEARCH 7299
+#define IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_TO_TOP 7300
+#define IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_UP 7301
+#define IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_DOWN 7302
+#define IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_REMOVE 7303
+#define IDS_SETTINGS_LANGUAGES_LANGUAGES_ADD 7304
+#define IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE 7305
+#define IDS_SETTINGS_LANGUAGES_NO_LANGUAGES_ADDED 7306
+#define IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL 7307
+#define IDS_SETTINGS_LANGUAGES_PREFERRED_LANGUAGES_HEADER 7308
+#define IDS_SETTINGS_LANGUAGES_PREFERRED_LANGUAGES_DESC 7309
+#define IDS_SETTINGS_LANGUAGES_OFFER_TO_ENABLE_TRANSLATE 7310
+#define IDS_SETTINGS_LANGUAGES_OFFER_TO_ENABLE_TRANSLATE_SUBLABEL 7311
+#define IDS_SETTINGS_LANGUAGES_TRANSLATE_TARGET 7312
+#define IDS_SETTINGS_LANGUAGES_MANAGED_DIALOG_TITLE 7313
+#define IDS_SETTINGS_LANGUAGES_MANAGED_DIALOG_BODY 7314
+#define IDS_SETTINGS_LANGUAGES_ADD_ARIA_LABEL 7315
+#define IDS_SETTINGS_LANGUAGES_REMOVE_AUTOMATIC_ARIA_LABEL 7316
+#define IDS_SETTINGS_LANGUAGES_REMOVE_NEVER_ARIA_LABEL 7317
+#define IDS_SETTINGS_TRANSLATE_PAGE_TITLE 7318
+#define IDS_SETTINGS_TARGET_TRANSLATE_LABEL 7319
+#define IDS_SETTINGS_LANGUAGES_AUTOMATIC_TRANSLATE 7320
+#define IDS_SETTINGS_LANGUAGES_AUTOMATIC_TRANSLATE_ADD_ARIA_LABEL 7321
+#define IDS_SETTINGS_LANGUAGES_NEVER_LANGUAGES 7322
+#define IDS_SETTINGS_LANGUAGES_NEVER_TRANSLATE_ADD_ARIA_LABEL 7323
+#define IDS_SETTINGS_LANGUAGES_SPELL_CHECK_TITLE 7324
+#define IDS_SETTINGS_LANGUAGES_SPELL_CHECK_BASIC_LABEL 7325
+#define IDS_SETTINGS_LANGUAGES_SPELL_CHECK_ENHANCED_LABEL 7326
+#define IDS_SETTINGS_LANGUAGES_SPELL_CHECK_ENHANCED_DESCRIPTION 7327
+#define IDS_SETTINGS_LANGUAGES_OFFER_TO_ENABLE_SPELL_CHECK 7328
+#define IDS_SETTING_LANGUAGES_SPELL_CHECK_DISABLED_REASON 7329
+#define IDS_SETTINGS_LANGUAGES_SPELL_CHECK_LANGUAGES_LIST_TITLE 7330
+#define IDS_SETTINGS_LANGUAGES_SPELL_CHECK_MANAGE 7331
+#define IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE 7332
+#define IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD 7333
+#define IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_BUTTON 7334
+#define IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_DUPLICATE_ERROR 7335
+#define IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_LENGTH_ERROR 7336
+#define IDS_SETTINGS_LANGUAGES_DELETE_DICTIONARY_WORD_BUTTON 7337
+#define IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS 7338
+#define IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS_NONE 7339
+#define IDS_SETTINGS_LANGUAGES_DICTIONARY_DOWNLOAD_FAILED 7340
+#define IDS_SETTINGS_LANGUAGES_DICTIONARY_DOWNLOAD_FAILED_HELP 7341
+#define IDS_SETTINGS_PRELOAD_PAGES_TITLE 7344
+#define IDS_SETTINGS_PRELOAD_PAGES_SUMMARY 7345
+#define IDS_SETTINGS_PRELOAD_PAGES_NO_PRELOADING_TITLE 7346
+#define IDS_SETTINGS_PRELOAD_PAGES_NO_PRELOADING_SUMMARY 7347
+#define IDS_SETTINGS_PRELOAD_PAGES_STANDARD_PRELOADING_TITLE 7348
+#define IDS_SETTINGS_PRELOAD_PAGES_STANDARD_PRELOADING_SUMMARY 7349
+#define IDS_SETTINGS_PRELOAD_PAGES_STANDARD_PRELOADING_WHEN_ON_BULLET_ONE 7350
+#define IDS_SETTINGS_PRELOAD_PAGES_EXTENDED_PRELOADING_TITLE 7351
+#define IDS_SETTINGS_PRELOAD_PAGES_EXTENDED_PRELOADING_SUMMARY 7352
+#define IDS_SETTINGS_PRELOAD_PAGES_EXTENDED_PRELOADING_WHEN_ON_BULLET_ONE 7353
+#define IDS_SETTINGS_PRIVACY 7354
+#define IDS_SETTINGS_PRIVACY_V2 7355
+#define IDS_SETTINGS_PRIVACY_MORE 7356
+#define IDS_SETTINGS_ANTI_ABUSE_ENABLED_SUB_LABEL 7358
+#define IDS_SETTINGS_ANTI_ABUSE_DISABLED_SUB_LABEL 7359
+#define IDS_SETTINGS_ANTI_ABUSE_DESCRIPTION 7360
+#define IDS_SETTINGS_ANTI_ABUSE_WHEN_ON_HEADER 7361
+#define IDS_SETTINGS_ANTI_ABUSE_WHEN_ON_SECTION_ONE 7362
+#define IDS_SETTINGS_ANTI_ABUSE_WHEN_ON_SECTION_TWO 7363
+#define IDS_SETTINGS_ANTI_ABUSE_WHEN_ON_SECTION_THREE 7364
+#define IDS_SETTINGS_ANTI_ABUSE_THINGS_TO_CONSIDER_HEADER 7365
+#define IDS_SETTINGS_ANTI_ABUSE_THINGS_TO_CONSIDER_SECTION_ONE 7366
+#define IDS_SETTINGS_PRIVACY_SANDBOX_TITLE 7367
+#define IDS_SETTINGS_PRIVACY_SANDBOX_COOKIES_DIALOG 7368
+#define IDS_SETTINGS_PRIVACY_SANDBOX_COOKIES_DIALOG_MORE 7369
+#define IDS_SETTINGS_AD_PRIVACY_LINK_ROW_LABEL 7370
+#define IDS_SETTINGS_AD_PRIVACY_LINK_ROW_SUB_LABEL 7371
+#define IDS_SETTINGS_AD_PRIVACY_RESTRICTED_LINK_ROW_SUB_LABEL 7372
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_TITLE 7373
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_TOPICS_LINK_ROW_LABEL 7374
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_TOPICS_LINK_ROW_SUB_LABEL_ENABLED 7375
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_TOPICS_LINK_ROW_SUB_LABEL_DISABLED 7376
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_FLEDGE_LINK_ROW_LABEL 7377
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_FLEDGE_LINK_ROW_SUB_LABEL_ENABLED 7378
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_FLEDGE_LINK_ROW_SUB_LABEL_DISABLED 7379
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_AD_MEASUREMENT_LINK_ROW_LABEL 7380
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_AD_MEASUREMENT_LINK_ROW_SUB_LABEL_ENABLED 7381
+#define IDS_SETTINGS_AD_PRIVACY_PAGE_AD_MEASUREMENT_LINK_ROW_SUB_LABEL_DISABLED 7382
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION 7383
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_A11Y_LABEL 7384
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_DESCRIPTION_LEARN_MORE_LINK 7385
+#define IDS_SETTINGS_TOPICS_PAGE_CURRENT_TOPICS_REGION_A11Y_DESCRIPTION 7386
+#define IDS_SETTINGS_TOPICS_PAGE_BLOCKED_TOPICS_REGION_A11Y_DESCRIPTION 7387
+#define IDS_SETTINGS_TOPICS_PAGE_LEARN_MORE_BULLET_3 7388
+#define IDS_SETTINGS_TOPICS_PAGE_FOOTER 7389
+#define IDS_SETTINGS_TOPICS_PAGE_FOOTER_V2 7390
+#define IDS_SETTINGS_FLEDGE_PAGE_TITLE 7391
+#define IDS_SETTINGS_FLEDGE_PAGE_TOGGLE_LABEL 7392
+#define IDS_SETTINGS_FLEDGE_PAGE_TOGGLE_SUB_LABEL 7393
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_HEADING 7394
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION 7395
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_LEARN_MORE 7396
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_DISABLED 7397
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_EMPTY 7398
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_REGION_A11Y_DESCRIPTION 7399
+#define IDS_SETTINGS_FLEDGE_PAGE_SEE_ALL_SITES_LABEL 7400
+#define IDS_SETTINGS_FLEDGE_PAGE_BLOCK_SITE 7401
+#define IDS_SETTINGS_FLEDGE_PAGE_BLOCK_SITE_A11Y_LABEL 7402
+#define IDS_SETTINGS_FLEDGE_PAGE_BLOCKED_SITES_HEADING 7403
+#define IDS_SETTINGS_FLEDGE_PAGE_BLOCKED_SITES_DESCRIPTION 7404
+#define IDS_SETTINGS_FLEDGE_PAGE_BLOCKED_SITES_DESCRIPTION_EMPTY 7405
+#define IDS_SETTINGS_FLEDGE_PAGE_BLOCKED_SITES_REGION_A11Y_DESCRIPTION 7406
+#define IDS_SETTINGS_FLEDGE_PAGE_ALLOW_SITE 7407
+#define IDS_SETTINGS_FLEDGE_PAGE_ALLOW_SITE_A11Y_LABEL 7408
+#define IDS_SETTINGS_FLEDGE_PAGE_FOOTER 7409
+#define IDS_SETTINGS_FLEDGE_PAGE_LEARN_MORE_HEADING 7410
+#define IDS_SETTINGS_FLEDGE_PAGE_LEARN_MORE_BULLET_1 7411
+#define IDS_SETTINGS_FLEDGE_PAGE_LEARN_MORE_BULLET_2 7412
+#define IDS_SETTINGS_FLEDGE_PAGE_LEARN_MORE_BULLET_3 7413
+#define IDS_SETTINGS_FLEDGE_PAGE_CURRENT_SITES_DESCRIPTION_LEARN_MORE_A11Y_LABEL 7414
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_TITLE 7415
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_TOGGLE_LABEL 7416
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_TOGGLE_SUB_LABEL 7417
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_ENABLED_HEADING 7418
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_CONSIDER_HEADING 7419
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_ENABLED_BULLET_1 7420
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_ENABLED_BULLET_2 7421
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_ENABLED_BULLET_3 7422
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_CONSIDER_BULLET_1 7423
+#define IDS_SETTINGS_AD_MEASUREMENT_PAGE_CONSIDER_BULLET_2 7424
+#define IDS_SETTINGS_PRIVACY_GUIDE_LABEL 7425
+#define IDS_SETTINGS_PRIVACY_GUIDE_SUBLABEL 7426
+#define IDS_SETTINGS_PRIVACY_GUIDE_PROMO_HEADER 7427
+#define IDS_SETTINGS_PRIVACY_GUIDE_PROMO_START_BUTTON 7428
+#define IDS_SETTINGS_PRIVACY_GUIDE_BACK_TO_SETTINGS_ARIA_LABEL 7429
+#define IDS_SETTINGS_PRIVACY_GUIDE_BACK_TO_SETTINGS_ARIA_ROLE_DESC 7430
+#define IDS_SETTINGS_PRIVACY_GUIDE_BACK_BUTTON 7431
+#define IDS_SETTINGS_PRIVACY_GUIDE_STEPS 7432
+#define IDS_SETTINGS_PRIVACY_GUIDE_NEXT_BUTTON 7433
+#define IDS_SETTINGS_PRIVACY_GUIDE_FEATURE_DESCRIPTION_HEADER 7434
+#define IDS_SETTINGS_PRIVACY_GUIDE_THINGS_TO_CONSIDER 7435
+#define IDS_SETTINGS_PRIVACY_GUIDE_WELCOME_CARD_HEADER 7436
+#define IDS_SETTINGS_PRIVACY_GUIDE_WELCOME_CARD_SUB_HEADER 7437
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_HEADER 7438
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_SUB_HEADER 7439
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_SUB_HEADER_NO_LINKS 7440
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_LEAVE_BUTTON 7441
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_PRIVACY_SANDBOX_LABEL 7442
+#define IDS_SETTINGS_PRIVACY_GUIDE_COMPLETION_CARD_WAA_LABEL 7443
+#define IDS_SETTINGS_PRIVACY_GUIDE_MSBB_CARD_HEADER 7444
+#define IDS_SETTINGS_PRIVACY_GUIDE_MSBB_FEATURE_DESCRIPTION1 7445
+#define IDS_SETTINGS_PRIVACY_GUIDE_MSBB_FEATURE_DESCRIPTION2 7446
+#define IDS_SETTINGS_PRIVACY_GUIDE_MSBB_PRIVACY_DESCRIPTION1 7447
+#define IDS_SETTINGS_PRIVACY_GUIDE_HISTORY_SYNC_CARD_HEADER 7448
+#define IDS_SETTINGS_PRIVACY_GUIDE_HISTORY_SYNC_SETTING_LABEL 7449
+#define IDS_SETTINGS_PRIVACY_GUIDE_HISTORY_SYNC_FEATURE_DESCRIPTION1 7450
+#define IDS_SETTINGS_PRIVACY_GUIDE_HISTORY_SYNC_FEATURE_DESCRIPTION2 7451
+#define IDS_SETTINGS_PRIVACY_GUIDE_HISTORY_SYNC_PRIVACY_DESCRIPTION1 7452
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_HEADER 7453
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_INCOGNITO_SUBHEADER 7454
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_INCOGNITO_FEATURE_DESCRIPTION1 7455
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_INCOGNITO_FEATURE_DESCRIPTION2 7456
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_INCOGNITO_PRIVACY_DESCRIPTION1 7457
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_INCOGNITO_PRIVACY_DESCRIPTION2 7458
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_SUBHEADER 7459
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_FEATURE_DESCRIPTION1 7460
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_FEATURE_DESCRIPTION2 7461
+#define IDS_SETTINGS_PRIVACY_GUIDE_COOKIES_CARD_BLOCK_TPC_PRIVACY_DESCRIPTION1 7462
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_HEADER 7463
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_ENHANCED_PROTECTION_PRIVACY_DESCRIPTION1 7464
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_ENHANCED_PROTECTION_PRIVACY_DESCRIPTION2 7465
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_ENHANCED_PROTECTION_PRIVACY_DESCRIPTION3 7466
+#define IDS_SETTINGS_PRIVACY_GUIDE_SAFE_BROWSING_CARD_STANDARD_PROTECTION_FEATURE_DESCRIPTION1 7467
+#define IDS_SETTINGS_PRIVACY_GUIDE_SEARCH_SUGGESTIONS_CARD_HEADER 7470
+#define IDS_SETTINGS_PRIVACY_GUIDE_SEARCH_SUGGESTIONS_FEATURE_DESCRIPTION1 7471
+#define IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE 7472
+#define IDS_SETTINGS_SAFETY_CHECK_RUNNING 7473
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER 7474
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_MINS 7475
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_HOURS 7476
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_TIME 7477
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_TODAY 7478
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_YESTERDAY 7479
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_DAYS 7480
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER_DATE 7481
+#define IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_RUNNING 7482
+#define IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_AFTER 7483
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON 7484
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON_ARIA_LABEL 7485
+#define IDS_SETTINGS_SAFETY_CHECK_PARENT_RUN_AGAIN_BUTTON_ARIA_LABEL 7486
+#define IDS_SETTINGS_SAFETY_CHECK_ICON_RUNNING_ARIA_LABEL 7487
+#define IDS_SETTINGS_SAFETY_CHECK_ICON_SAFE_ARIA_LABEL 7488
+#define IDS_SETTINGS_SAFETY_CHECK_ICON_INFO_ARIA_LABEL 7489
+#define IDS_SETTINGS_SAFETY_CHECK_ICON_WARNING_ARIA_LABEL 7490
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW 7491
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_ALLOW_AGAIN_ARIA_LABEL 7492
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_ALLOW_AGAIN_LABEL 7493
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_HEADER_ARIA_LABEL 7494
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_HEADER_LABEL 7495
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_REMOVED_ONE_PERMISSION_LABEL 7496
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_REMOVED_TWO_PERMISSIONS_LABEL 7497
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_REMOVED_THREE_PERMISSIONS_LABEL 7498
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_REMOVED_FOUR_OR_MORE_PERMISSIONS_LABEL 7499
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_PRIMARY_LABEL 7500
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_SECONDARY_LABEL 7501
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_TOAST_BULK_LABEL 7502
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_TOAST_LABEL 7503
+#define IDS_SETTINGS_SAFETY_CHECK_UNUSED_SITE_PERMISSIONS_SETTING_LABEL 7504
+#define IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL 7505
+#define IDS_SETTINGS_SAFETY_CHECK_UPDATES_DISABLED_BY_ADMIN 7506
+#define IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_PRIMARY_LABEL 7507
+#define IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_FEATURE_UNAVAILABLE 7508
+#define IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_BUTTON_ARIA_LABEL 7509
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED 7510
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD 7511
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD_AVAILABLE_ENHANCED 7512
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_ENHANCED 7513
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_BY_ADMIN 7514
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_BY_EXTENSION 7515
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON 7516
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON_ARIA_LABEL 7517
+#define IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL 7518
+#define IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SAFE 7519
+#define IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BLOCKLISTED_OFF 7520
+#define IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BLOCKLISTED_ON_USER 7521
+#define IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BLOCKLISTED_ON_ADMIN 7522
+#define IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON_ARIA_LABEL 7523
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_EXTENSIONS 7524
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_PRIMARY_LABEL 7525
+#define IDS_SETTINGS_SAFETY_CHECK_NOTIFICATION_PERMISSIONS_REVIEW_BUTTON_ARIA_LABEL 7526
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_SECONDARY_LABEL 7527
+#define IDS_SETTINGS_SAFETY_CHECK_NOTIFICATION_PERMISSION_REVIEW_IGNORED_TOAST_LABEL 7528
+#define IDS_SETTINGS_SAFETY_CHECK_NOTIFICATION_PERMISSION_REVIEW_BLOCKED_TOAST_LABEL 7529
+#define IDS_SETTINGS_SAFETY_CHECK_NOTIFICATION_PERMISSION_REVIEW_RESET_TOAST_LABEL 7530
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_COUNT_LABEL 7531
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_DONT_ALLOW_LABEL 7532
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_DONT_ALLOW_ARIA_LABEL 7533
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_IGNORE_LABEL 7534
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_IGNORE_ARIA_LABEL 7535
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_RESET_LABEL 7536
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_RESET_ARIA_LABEL 7537
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_MORE_ACTIONS_ARIA_LABEL 7538
+#define IDS_SETTINGS_SAFETY_CHECK_REVIEW_NOTIFICATION_PERMISSIONS_HEADER_LABEL 7539
+#define IDS_SETTINGS_SAFETY_CHECK_NOTIFICATION_PERMISSION_REVIEW_BLOCK_ALL_LABEL 7540
+#define IDS_SETTINGS_SAFETY_CHECK_NOTIFICATION_PERMISSION_REVIEW_BLOCK_ALL_TOAST_LABEL 7541
+#define IDS_SETTINGS_SAFETY_CHECK_SITE_PERMISSIONS_REVIEW_DONE_LABEL 7542
+#define IDS_SETTINGS_SAFETY_CHECK_TOAST_UNDO_BUTTON_LABEL 7543
+#define IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC 7544
+#define IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION 7545
+#define IDS_SETTINGS_SAFEBROWSING_ENABLEPROTECTION_DESC 7546
+#define IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC 7547
+#define IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL 7548
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED 7549
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_DESC 7550
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_DESC_UPDATED 7551
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_EXPAND_ACCESSIBILITY_LABEL 7552
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_ONE 7553
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_THREE 7554
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FOUR 7555
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_BULLET_FIVE 7556
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_WHEN_ON_LABEL 7557
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_WHEN_ON_BULLET_TWO 7558
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_WHEN_ON_BULLET_THREE 7559
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_WHEN_ON_BULLET_FOUR 7560
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_WHEN_ON_BULLET_FIVE 7561
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_LABEL 7562
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_BULLET_ONE 7563
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_BULLET_TWO 7564
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_BULLET_THREE 7565
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD 7566
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC 7567
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC_UPDATED 7568
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_EXPAND_ACCESSIBILITY_LABEL 7571
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_ONE 7572
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_HELP_IMPROVE 7573
+#define IDS_SETTINGS_SAFEBROWSING_NONE 7574
+#define IDS_SETTINGS_SAFEBROWSING_NONE_DESC 7575
+#define IDS_SETTINGS_SAFEBROWSING_NONE_DESC_UPDATED 7576
+#define IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_TITLE 7577
+#define IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_DESC 7578
+#define IDS_SETTINGS_SAFEBROWSING_DISABLE_DIALOG_CONFIRM 7579
+#define IDS_SETTINGS_ENABLE_DO_NOT_TRACK 7580
+#define IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TITLE 7581
+#define IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT 7582
+#define IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL 7583
+#define IDS_SETTINGS_PERMISSIONS 7584
+#define IDS_SETTINGS_PERMISSIONS_DESCRIPTION 7585
+#define IDS_SETTINGS_SECURITY 7586
+#define IDS_SETTINGS_SECURITY_DESCRIPTION 7587
+#define IDS_SETTINGS_ADVANCED_PROTECTION_PROGRAM 7588
+#define IDS_SETTINGS_ADVANCED_PROTECTION_PROGRAM_DESC 7589
+#define IDS_SETTINGS_HTTPS_ONLY_MODE 7590
+#define IDS_SETTINGS_HTTPS_ONLY_MODE_DESCRIPTION 7591
+#define IDS_SETTINGS_HTTPS_ONLY_MODE_DESCRIPTION_ADVANCED_PROTECTION 7592
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_TITLE 7593
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_ENABLED_FULL_LABEL 7594
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_ENABLED_INCOGNITO_LABEL 7595
+#define IDS_SETTINGS_HTTPS_FIRST_MODE_DISABLED_LABEL 7596
+#define IDS_SETTINGS_MANAGE_CERTIFICATES 7597
+#define IDS_SETTINGS_MANAGE_CERTIFICATES_DESCRIPTION 7598
+#define IDS_SETTINGS_MANAGE_DEVICE_CERTIFICATES 7599
+#define IDS_SETTINGS_MANAGE_DEVICE_CERTIFICATES_DESCRIPTION 7600
+#define IDS_SETTINGS_MANAGE 7601
+#define IDS_SETTINGS_SECURE_DNS 7602
+#define IDS_SETTINGS_AUTOMATIC_MODE_DESCRIPTION 7604
+#define IDS_SETTINGS_SECURE_DNS_DROPDOWN_ACCESSIBILITY_LABEL 7605
+#define IDS_SETTINGS_SECURE_DROPDOWN_MODE_DESCRIPTION 7606
+#define IDS_SETTINGS_SECURE_DROPDOWN_MODE_PRIVACY_POLICY 7607
+#define IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT 7608
+#define IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_PARENTAL_CONTROL 7609
+#define IDS_SETTINGS_SECURE_DNS_CUSTOM_DESCRIPTION 7610
+#define IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER 7611
+#define IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR 7612
+#define IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR 7613
+#define IDS_SETTINGS_SECURITY_V8_LINK_TITLE 7614
+#define IDS_SETTINGS_CONTENT_SETTINGS 7615
+#define IDS_SETTINGS_SITE_SETTINGS 7616
+#define IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION 7617
+#define IDS_SETTINGS_CLEAR_DATA 7618
+#define IDS_SETTINGS_CLEARING_DATA 7619
+#define IDS_SETTINGS_CLEARED_DATA 7620
+#define IDS_SETTINGS_CLEAR_BROWSING_DATA 7621
+#define IDS_SETTINGS_CLEAR_DATA_DESCRIPTION 7622
+#define IDS_SETTINGS_TITLE_AND_COUNT 7623
+#define IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT 7624
+#define IDS_SETTINGS_RECENT_PERMISSIONS_NO_CHANGES 7625
+#define IDS_SETTINGS_RECENT_PERMISSIONS_ALLOWED_ONE_ITEM 7626
+#define IDS_SETTINGS_RECENT_PERMISSIONS_ALLOWED_TWO_ITEMS 7627
+#define IDS_SETTINGS_RECENT_PERMISSIONS_ALLOWED_MORE_THAN_TWO_ITEMS 7628
+#define IDS_SETTINGS_RECENT_PERMISSIONS_AUTOMATICALLY_BLOCKED_ONE_ITEM 7629
+#define IDS_SETTINGS_RECENT_PERMISSIONS_AUTOMATICALLY_BLOCKED_TWO_ITEMS 7630
+#define IDS_SETTINGS_RECENT_PERMISSIONS_AUTOMATICALLY_BLOCKED_MORE_THAN_TWO_ITEMS 7631
+#define IDS_SETTINGS_RECENT_PERMISSIONS_BLOCKED_ONE_ITEM 7632
+#define IDS_SETTINGS_RECENT_PERMISSIONS_BLOCKED_TWO_ITEMS 7633
+#define IDS_SETTINGS_RECENT_PERMISSIONS_BLOCKED_MORE_THAN_TWO_ITEMS 7634
+#define IDS_SETTINGS_RESET_PROMPT_TITLE 7635
+#define IDS_SETTINGS_RESET 7636
+#define IDS_SETTINGS_RESET_SETTINGS_TRIGGER 7637
+#define IDS_SETTINGS_RESET_AUTOMATED_DIALOG_TITLE 7638
+#define IDS_SETTINGS_RESET_BANNER_TEXT 7639
+#define IDS_SETTINGS_RESET_BANNER_RESET_BUTTON_TEXT 7640
+#define IDS_SETTINGS_RESET_LEARN_MORE_ACCESSIBILITY_TEXT 7641
+#define IDS_SETTINGS_SEARCH 7644
+#define IDS_SETTINGS_SEARCH_EXPLANATION 7645
+#define IDS_SETTINGS_SEARCH_EXPLANATION_ACCESSIBILITY_LABEL 7647
+#define IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES 7648
+#define IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES_AND_SITE_SEARCH 7649
+#define IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES_EXPLANATION 7650
+#define IDS_SETTINGS_SEARCH_ENGINES 7651
+#define IDS_SETTINGS_SEARCH_ENGINES_PAGE_EXPLANATION 7652
+#define IDS_SETTINGS_SEARCH_ENGINES_SEARCH 7653
+#define IDS_SETTINGS_SEARCH_ENGINES_ADD_SITE_SEARCH 7654
+#define IDS_SETTINGS_SEARCH_ENGINES_EDIT_SEARCH_ENGINE 7655
+#define IDS_SETTINGS_SEARCH_ENGINES_EDIT_SITE_SEARCH 7656
+#define IDS_SETTINGS_SEARCH_ENGINES_VIEW_SITE_SEARCH 7657
+#define IDS_SETTINGS_SEARCH_ENGINES_DELETE_CONFIRMATION_TITLE 7658
+#define IDS_SETTINGS_SEARCH_ENGINES_DELETE_CONFIRMATION_DESCRIPTION 7659
+#define IDS_SETTINGS_SEARCH_ENGINES_SEARCH_ENGINES 7660
+#define IDS_SETTINGS_SEARCH_ENGINES_SEARCH_ENGINES_EXPLANATION 7661
+#define IDS_SETTINGS_SEARCH_ENGINES_SITE_SEARCH 7662
+#define IDS_SETTINGS_SEARCH_ENGINES_SITE_SEARCH_EXPLANATION 7663
+#define IDS_SETTINGS_SEARCH_ENGINES_SITE_SEARCH_EXPLANATION_STARTER_PACK 7664
+#define IDS_SETTINGS_SEARCH_ENGINES_NO_SITES_ADDED 7665
+#define IDS_SETTINGS_SEARCH_ENGINES_INACTIVE_SHORTCUTS 7666
+#define IDS_SETTINGS_SEARCH_ENGINES_NO_OTHER_ENGINES 7667
+#define IDS_SETTINGS_SEARCH_ENGINES_EXTENSION_ENGINES 7668
+#define IDS_SETTINGS_SEARCH_ENGINES_EXTENSION_ENGINES_EXPLANATION 7669
+#define IDS_SETTINGS_SEARCH_ENGINES_NAME 7670
+#define IDS_SETTINGS_SEARCH_ENGINES_SHORTCUT 7671
+#define IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL 7672
+#define IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION 7673
+#define IDS_SETTINGS_SEARCH_ENGINES_MAKE_DEFAULT 7674
+#define IDS_SETTINGS_SEARCH_ENGINES_ACTIVATE 7675
+#define IDS_SETTINGS_SEARCH_ENGINES_DEACTIVATE 7676
+#define IDS_SETTINGS_SEARCH_ENGINES_VIEW_DETAILS 7677
+#define IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION 7678
+#define IDS_SETTINGS_SEARCH_ENGINES_KEYBOARD_SHORTCUTS_TITLE 7679
+#define IDS_SETTINGS_SEARCH_ENGINES_KEYBOARD_SHORTCUTS_DESCRIPTION 7680
+#define IDS_SETTINGS_SEARCH_ENGINES_KEYBOARD_SHORTCUTS_DESCRIPTION_STARTER_PACK 7681
+#define IDS_SETTINGS_SEARCH_ENGINES_KEYBOARD_SHORTCUTS_SPACE_OR_TAB 7682
+#define IDS_SETTINGS_SEARCH_ENGINES_KEYBOARD_SHORTCUTS_TAB 7683
+#define IDS_SETTINGS_SEARCH_ENGINES_ADDITIONAL_SITES 7684
+#define IDS_SETTINGS_SEARCH_ENGINES_ADDITIONAL_INACTIVE_SITES 7685
+#define IDS_SETTINGS_EXCEPTIONS_EMBEDDED_ON_HOST 7686
+#define IDS_SETTINGS_EXCEPTIONS_EMBEDDED_ON_ANY_HOST 7687
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES 7688
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_DESCRIPTION 7689
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_SEARCH 7690
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_SORT 7691
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_SORT_METHOD_MOST_VISITED 7692
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_SORT_METHOD_STORAGE 7693
+#define IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_SORT_METHOD_NAME 7694
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_SITE_LIST_HEADER 7695
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_SITE_LIST_EDIT_HEADER 7696
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_SITE_LIST_REMOVE_GRANT_LABEL 7697
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_SITE_LIST_REMOVE_GRANTS 7698
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_SITE_LIST_VIEW_HEADER 7699
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_SITE_LIST_VIEW_SITE_DETAILS 7700
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_ENTRY_PARTITIONED_LABEL 7701
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_REPRESENTATION_SEPARATOR 7702
+#define IDS_SETTINGS_SITE_SETTINGS_DEFAULT_BEHAVIOR 7703
+#define IDS_SETTINGS_SITE_SETTINGS_DEFAULT_BEHAVIOR_DESCRIPTION 7704
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_DEFAULT_BEHAVIOR_DESC 7705
+#define IDS_SETTINGS_SITE_SETTINGS_CUSTOMIZED_BEHAVIORS 7706
+#define IDS_SETTINGS_SITE_SETTINGS_CUSTOMIZED_BEHAVIORS_DESCRIPTION 7707
+#define IDS_SETTINGS_SITE_SETTINGS_CUSTOMIZED_BEHAVIORS_DESCRIPTION_SHORT 7708
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_DESCRIPTION 7709
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED 7710
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED 7711
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_ALLOWED_EXCEPTIONS 7712
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCKED_EXCEPTIONS 7713
+#define IDS_SETTINGS_SITE_SETTINGS_AR_DESCRIPTION 7714
+#define IDS_SETTINGS_SITE_SETTINGS_AR_ALLOWED 7715
+#define IDS_SETTINGS_SITE_SETTINGS_AR_BLOCKED 7716
+#define IDS_SETTINGS_SITE_SETTINGS_AR_ALLOWED_EXCEPTIONS 7717
+#define IDS_SETTINGS_SITE_SETTINGS_AR_BLOCKED_EXCEPTIONS 7718
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS_DESCRIPTION 7719
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS_ALLOWED 7720
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS_BLOCKED 7721
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS_ALLOWED_EXCEPTIONS 7722
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS_BLOCKED_EXCEPTIONS 7723
+#define IDS_SETTINGS_SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE_DESCRIPTION 7724
+#define IDS_SETTINGS_SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE_ALLOWED 7725
+#define IDS_SETTINGS_SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE_BLOCKED 7726
+#define IDS_SETTINGS_SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE_ALLOWED_EXCEPTIONS 7727
+#define IDS_SETTINGS_SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE_BLOCKED_EXCEPTIONS 7728
+#define IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_DESCRIPTION 7729
+#define IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOWED 7730
+#define IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED 7731
+#define IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED_SUB_LABEL 7732
+#define IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOWED_EXCEPTIONS 7733
+#define IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED_EXCEPTIONS 7734
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES_DESCRIPTION 7735
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES_ALLOWED 7736
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_DEVICES_BLOCKED 7737
+#define IDS_SETTINGS_SITE_SETTINGS_CAMERA_DESCRIPTION 7738
+#define IDS_SETTINGS_SITE_SETTINGS_CAMERA_ALLOWED 7739
+#define IDS_SETTINGS_SITE_SETTINGS_CAMERA_BLOCKED 7740
+#define IDS_SETTINGS_SITE_SETTINGS_CAMERA_BLOCKED_SUB_LABEL 7741
+#define IDS_SETTINGS_SITE_SETTINGS_CAMERA_ALLOWED_EXCEPTIONS 7742
+#define IDS_SETTINGS_SITE_SETTINGS_CAMERA_BLOCKED_EXCEPTIONS 7743
+#define IDS_SETTINGS_SITE_SETTINGS_CLIPBOARD_DESCRIPTION 7744
+#define IDS_SETTINGS_SITE_SETTINGS_CLIPBOARD_ALLOWED 7745
+#define IDS_SETTINGS_SITE_SETTINGS_CLIPBOARD_BLOCKED 7746
+#define IDS_SETTINGS_SITE_SETTINGS_CLIPBOARD_ALLOWED_EXCEPTIONS 7747
+#define IDS_SETTINGS_SITE_SETTINGS_CLIPBOARD_BLOCKED_EXCEPTIONS 7748
+#define IDS_SETTINGS_SITE_SETTINGS_DEVICE_USE_DESCRIPTION 7749
+#define IDS_SETTINGS_SITE_SETTINGS_DEVICE_USE_ALLOWED 7750
+#define IDS_SETTINGS_SITE_SETTINGS_DEVICE_USE_BLOCKED 7751
+#define IDS_SETTINGS_SITE_SETTINGS_DEVICE_USE_ALLOWED_EXCEPTIONS 7752
+#define IDS_SETTINGS_SITE_SETTINGS_DEVICE_USE_BLOCKED_EXCEPTIONS 7753
+#define IDS_SETTINGS_SITE_SETTINGS_FEDERATED_IDENTITY_API_DESCRIPTION 7754
+#define IDS_SETTINGS_SITE_SETTINGS_FEDERATED_IDENTITY_API_ALLOWED 7755
+#define IDS_SETTINGS_SITE_SETTINGS_FEDERATED_IDENTITY_API_BLOCKED 7756
+#define IDS_SETTINGS_SITE_SETTINGS_FEDERATED_IDENTITY_API_ALLOWED_EXCEPTIONS 7757
+#define IDS_SETTINGS_SITE_SETTINGS_FEDERATED_IDENTITY_API_BLOCKED_EXCEPTIONS 7758
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_WRITE_DESCRIPTION 7759
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_WRITE_ALLOWED 7760
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_WRITE_BLOCKED 7761
+#define IDS_SETTINGS_SITE_SETTINGS_FILE_SYSTEM_WRITE_BLOCKED_EXCEPTIONS 7762
+#define IDS_SETTINGS_SITE_SETTINGS_FONTS_DESCRIPTION 7763
+#define IDS_SETTINGS_SITE_SETTINGS_FONTS_ALLOWED 7764
+#define IDS_SETTINGS_SITE_SETTINGS_FONTS_BLOCKED 7765
+#define IDS_SETTINGS_SITE_SETTINGS_FONTS_ALLOWED_EXCEPTIONS 7766
+#define IDS_SETTINGS_SITE_SETTINGS_FONTS_BLOCKED_EXCEPTIONS 7767
+#define IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES_DESCRIPTION 7768
+#define IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES_ALLOWED 7769
+#define IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES_BLOCKED 7770
+#define IDS_SETTINGS_SITE_SETTINGS_IMAGES_DESCRIPTION 7771
+#define IDS_SETTINGS_SITE_SETTINGS_IMAGES_ALLOWED 7772
+#define IDS_SETTINGS_SITE_SETTINGS_IMAGES_BLOCKED 7773
+#define IDS_SETTINGS_SITE_SETTINGS_IMAGES_BLOCKED_SUB_LABEL 7774
+#define IDS_SETTINGS_SITE_SETTINGS_IMAGES_ALLOWED_EXCEPTIONS 7775
+#define IDS_SETTINGS_SITE_SETTINGS_IMAGES_BLOCKED_EXCEPTIONS 7776
+#define IDS_SETTINGS_SITE_SETTINGS_INSECURE_CONTENT_DESCRIPTION 7777
+#define IDS_SETTINGS_SITE_SETTINGS_INSECURE_CONTENT_ALLOWED_EXCEPTIONS 7778
+#define IDS_SETTINGS_SITE_SETTINGS_INSECURE_CONTENT_BLOCKED_EXCEPTIONS 7779
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_DESCRIPTION 7780
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_ALLOWED 7781
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_BLOCKED 7782
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_ALLOWED_EXCEPTIONS 7783
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_BLOCKED_EXCEPTIONS 7784
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_ALLOWED 7785
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_BLOCKED 7786
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_BLOCKED_SUB_LABEL 7787
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_ALLOWED_EXCEPTIONS 7788
+#define IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT_JIT_BLOCKED_EXCEPTIONS 7789
+#define IDS_SETTINGS_SITE_SETTINGS_LOCATION_DESCRIPTION 7790
+#define IDS_SETTINGS_SITE_SETTINGS_LOCATION_ALLOWED 7791
+#define IDS_SETTINGS_SITE_SETTINGS_LOCATION_BLOCKED 7792
+#define IDS_SETTINGS_SITE_SETTINGS_LOCATION_BLOCKED_SUB_LABEL 7793
+#define IDS_SETTINGS_SITE_SETTINGS_LOCATION_ALLOWED_EXCEPTIONS 7794
+#define IDS_SETTINGS_SITE_SETTINGS_LOCATION_BLOCKED_EXCEPTIONS 7795
+#define IDS_SETTINGS_SITE_SETTINGS_MIC_DESCRIPTION 7796
+#define IDS_SETTINGS_SITE_SETTINGS_MIC_ALLOWED 7797
+#define IDS_SETTINGS_SITE_SETTINGS_MIC_BLOCKED 7798
+#define IDS_SETTINGS_SITE_SETTINGS_MIC_BLOCKED_SUB_LABEL 7799
+#define IDS_SETTINGS_SITE_SETTINGS_MIC_ALLOWED_EXCEPTIONS 7800
+#define IDS_SETTINGS_SITE_SETTINGS_MIC_BLOCKED_EXCEPTIONS 7801
+#define IDS_SETTINGS_SITE_SETTINGS_MIDI_DESCRIPTION 7802
+#define IDS_SETTINGS_SITE_SETTINGS_MIDI_ALLOWED 7803
+#define IDS_SETTINGS_SITE_SETTINGS_MIDI_BLOCKED 7804
+#define IDS_SETTINGS_SITE_SETTINGS_MIDI_ALLOWED_EXCEPTIONS 7805
+#define IDS_SETTINGS_SITE_SETTINGS_MIDI_BLOCKED_EXCEPTIONS 7806
+#define IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS_DESCRIPTION 7807
+#define IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS_ALLOWED 7808
+#define IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS_BLOCKED 7809
+#define IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS_BLOCKED_SUB_LABEL 7810
+#define IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS_ALLOWED_EXCEPTIONS 7811
+#define IDS_SETTINGS_SITE_SETTINGS_MOTION_SENSORS_BLOCKED_EXCEPTIONS 7812
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_DESCRIPTION 7813
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_ALLOWED 7814
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_PARTIAL 7815
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_PARTIAL_SUB_LABEL 7816
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_ASK_STATE 7817
+#define IDS_SETTINGS_SITE_SETTINGS_PERMISSION_QUIET 7818
+#define IDS_SETTINGS_SITE_SETTINGS_PERMISSION_CPSS 7819
+#define IDS_SETTINGS_SITE_SETTINGS_PERMISSION_LOUD 7820
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_BLOCKED 7821
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_BLOCKED_SUB_LABEL 7822
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_ALLOWED_EXCEPTIONS 7823
+#define IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS_BLOCKED_EXCEPTIONS 7824
+#define IDS_SETTINGS_SITE_SETTINGS_PAYMENT_HANDLERS_DESCRIPTION 7825
+#define IDS_SETTINGS_SITE_SETTINGS_PAYMENT_HANDLERS_ALLOWED 7826
+#define IDS_SETTINGS_SITE_SETTINGS_PAYMENT_HANDLERS_BLOCKED 7827
+#define IDS_SETTINGS_SITE_SETTINGS_PAYMENT_HANDLERS_ALLOWED_EXCEPTIONS 7828
+#define IDS_SETTINGS_SITE_SETTINGS_PAYMENT_HANDLERS_BLOCKED_EXCEPTIONS 7829
+#define IDS_SETTINGS_SITE_SETTINGS_PDFS_DESCRIPTION 7830
+#define IDS_SETTINGS_SITE_SETTINGS_PDFS_ALLOWED 7831
+#define IDS_SETTINGS_SITE_SETTINGS_POPUPS_DESCRIPTION 7832
+#define IDS_SETTINGS_SITE_SETTINGS_POPUPS_ALLOWED 7833
+#define IDS_SETTINGS_SITE_SETTINGS_POPUPS_BLOCKED 7834
+#define IDS_SETTINGS_SITE_SETTINGS_POPUPS_ALLOWED_EXCEPTIONS 7835
+#define IDS_SETTINGS_SITE_SETTINGS_POPUPS_BLOCKED_EXCEPTIONS 7836
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_DESCRIPTION 7837
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ALLOWED 7838
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_BLOCKED 7839
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_BLOCKED_SUB_LABEL 7840
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_EXPLANATION 7841
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_ALLOWED 7842
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_BLOCKED 7843
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_BLOCKED_SUB_LABEL 7844
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_ALLOWED_EXCEPTIONS 7845
+#define IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_BLOCKED_EXCEPTIONS 7846
+#define IDS_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_DESCRIPTION 7848
+#define IDS_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_ALLOWED 7849
+#define IDS_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_BLOCKED 7850
+#define IDS_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_BLOCKED_EXCEPTIONS 7851
+#define IDS_SETTINGS_SITE_SETTINGS_SERIAL_PORTS_DESCRIPTION 7852
+#define IDS_SETTINGS_SITE_SETTINGS_SERIAL_PORTS_ALLOWED 7853
+#define IDS_SETTINGS_SITE_SETTINGS_SERIAL_PORTS_BLOCKED 7854
+#define IDS_SETTINGS_SITE_SETTINGS_SOUND_DESCRIPTION 7855
+#define IDS_SETTINGS_SITE_SETTINGS_SOUND_ALLOWED 7856
+#define IDS_SETTINGS_SITE_SETTINGS_SOUND_BLOCKED 7857
+#define IDS_SETTINGS_SITE_SETTINGS_SOUND_BLOCKED_SUB_LABEL 7858
+#define IDS_SETTINGS_SITE_SETTINGS_SOUND_ALLOWED_EXCEPTIONS 7859
+#define IDS_SETTINGS_SITE_SETTINGS_SOUND_BLOCKED_EXCEPTIONS 7860
+#define IDS_SETTINGS_SITE_SETTINGS_USB_DESCRIPTION 7861
+#define IDS_SETTINGS_SITE_SETTINGS_USB_ALLOWED 7862
+#define IDS_SETTINGS_SITE_SETTINGS_USB_BLOCKED 7863
+#define IDS_SETTINGS_SITE_SETTINGS_VR_DESCRIPTION 7864
+#define IDS_SETTINGS_SITE_SETTINGS_VR_ALLOWED 7865
+#define IDS_SETTINGS_SITE_SETTINGS_VR_BLOCKED 7866
+#define IDS_SETTINGS_SITE_SETTINGS_VR_ALLOWED_EXCEPTIONS 7867
+#define IDS_SETTINGS_SITE_SETTINGS_VR_BLOCKED_EXCEPTIONS 7868
+#define IDS_SETTINGS_SITE_SETTINGS_WEB_PRINTING_DESCRIPTION 7869
+#define IDS_SETTINGS_SITE_SETTINGS_WEB_PRINTING_ASK 7870
+#define IDS_SETTINGS_SITE_SETTINGS_WEB_PRINTING_BLOCK 7871
+#define IDS_SETTINGS_SITE_SETTINGS_WEB_PRINTING_ALLOWED_EXCEPTIONS 7872
+#define IDS_SETTINGS_SITE_SETTINGS_WEB_PRINTING_BLOCKED_EXCEPTIONS 7873
+#define IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS_DESCRIPTION 7874
+#define IDS_SETTINGS_SITE_SETTINGS_AR_ASK 7875
+#define IDS_SETTINGS_SITE_SETTINGS_AR_BLOCK 7876
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_DESCRIPTION 7877
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_DEFAULT_BEHAVIOR_HEADING 7878
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_ALIGNED_PAGE_DESCRIPTION 7879
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_DEFAULT_BEHAVIOR_DESCRIPTION 7880
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_CUSTOMIZED_BEHAVIOR_HEADING 7881
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_CUSTOMIZED_BEHAVIOR_DESCRIPTION 7882
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_ALLOW_EXCEPTIONS_SUB_HEADING 7883
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_TITLE 7884
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_LINK_ROW_LABEL 7885
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_LINK_ROW_SUB_LABEL_ENABLED 7886
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_LINK_ROW_SUB_LABEL_DISABLED_INCOGNITO 7887
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_LINK_ROW_SUB_LABEL_DISABLED 7888
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_ALLOW_RADIO_LABEL 7889
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_ALLOW_EXPAND_A11Y_LABEL 7890
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_ALLOW_BULLET_1 7891
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_ALLOW_BULLET_2 7892
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_INCOGNITO_RADIO_LABEL 7893
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_INCOGNITO_EXPAND_A11Y_LABEL 7894
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_INCOGNITO_BULLET_1 7895
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_INCOGNITO_BULLET_2 7896
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_RADIO_LABEL 7897
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_EXPAND_A11Y_LABEL 7898
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_BULLET_1 7899
+#define IDS_SETTINGS_THIRD_PARTY_COOKIES_PAGE_BLOCK_BULLET_2 7900
+#define IDS_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO_BULLET_TWO_FPS 7901
+#define IDS_SETTINGS_COOKIES_FIRST_PARTY_SETS_TOGGLE_LABEL 7902
+#define IDS_SETTINGS_COOKIES_FIRST_PARTY_SETS_TOGGLE_SUB_LABEL 7903
+#define IDS_SETTINGS_COOKIES_ALL_SITES_LINK 7904
+#define IDS_SETTINGS_TRACKING_PROTECTION_LINK_ROW_LABEL 7905
+#define IDS_SETTINGS_TRACKING_PROTECTION_LINK_ROW_SUB_LABEL 7906
+#define IDS_SETTINGS_TRACKING_PROTECTION_PAGE_TITLE 7907
+#define IDS_SETTINGS_TRACKING_PROTECTION_PAGE_DESCRIPTION 7908
+#define IDS_SETTINGS_TRACKING_PROTECTION_BULLET_ONE 7909
+#define IDS_SETTINGS_TRACKING_PROTECTION_BULLET_ONE_DESCRIPTION 7910
+#define IDS_SETTINGS_TRACKING_PROTECTION_BULLET_TWO 7911
+#define IDS_SETTINGS_TRACKING_PROTECTION_BULLET_TWO_DESCRIPTION 7912
+#define IDS_SETTINGS_TRACKING_PROTECTION_BULLET_TWO_LEARN_MORE_ARIA_LABEL 7913
+#define IDS_SETTINGS_TRACKING_PROTECTION_ADVANCED_LABEL 7914
+#define IDS_SETTINGS_TRACKING_PROTECTION_IP_PROTECTION_TOGGLE_LABEL 7915
+#define IDS_SETTINGS_TRACKING_PROTECTION_IP_PROTECTION_TOGGLE_SUB_LABEL 7916
+#define IDS_SETTINGS_TRACKING_PROTECTION_IP_PROTECTION_TOGGLE_LEARN_MORE_ARIA_LABEL 7917
+#define IDS_SETTINGS_TRACKING_PROTECTION_THIRD_PARTY_COOKIES_TOGGLE_LABEL 7918
+#define IDS_SETTINGS_TRACKING_PROTECTION_THIRD_PARTY_COOKIES_TOGGLE_SUB_LABEL 7919
+#define IDS_SETTINGS_TRACKING_PROTECTION_THIRD_PARTY_COOKIES_LEARN_MORE_ARIA_LABEL 7920
+#define IDS_SETTINGS_TRACKING_PROTECTION_DO_NOT_TRACK_TOGGLE_SUB_LABEL 7921
+#define IDS_SETTINGS_TRACKING_PROTECTION_SITES_ALLOWED_COOKIES_TITLE 7922
+#define IDS_SETTINGS_TRACKING_PROTECTION_SITES_ALLOWED_COOKIES_DESCRIPTION 7923
+#define IDS_SETTINGS_TRACKING_PROTECTION_ROLLBACK_NOTICE 7924
+#define IDS_SETTINGS_TRACKING_PROTECTION_ROLLBACK_NOTICE_LEARN_MORE_ARIA_LABEL 7925
+#define IDS_SETTINGS_SITE_SETTINGS_APP_PROTOCOL_HANDLERS 7926
+#define IDS_SETTINGS_SITE_SETTINGS_APP_ALLOWED_PROTOCOL_HANDLERS_DESCRIPTION 7927
+#define IDS_SETTINGS_SITE_SETTINGS_APP_DISALLOWED_PROTOCOL_HANDLERS_DESCRIPTION 7928
+#define IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES_ASK 7929
+#define IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES_BLOCK 7930
+#define IDS_SETTINGS_SITE_SETTINGS_INSECURE_CONTENT_BLOCK 7931
+#define IDS_SETTINGS_SITE_SETTINGS_PDF_DOWNLOAD_PDFS 7932
+#define IDS_SETTINGS_SITE_SETTINGS_RECENT_ACTIVITY 7933
+#define IDS_SETTINGS_SITE_SETTINGS_SERIAL_PORTS_ASK_RECOMMENDED 7934
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_ZOOM_LEVEL 7935
+#define IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING 7936
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATICALLY_BLOCKED_NOTIFICATIONS 7937
+#define IDS_SETTINGS_SITE_SETTINGS_SHOW_BLOCKED_NOTIFICATIONS_INDICATOR 7938
+#define IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW 7939
+#define IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK 7940
+#define IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY 7941
+#define IDS_SETTINGS_SITE_SETTINGS_COOKIES_BLOCK_THIRD_PARTY_INCOGNITO 7942
+#define IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES 7943
+#define IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK_RECOMMENDED 7944
+#define IDS_SETTINGS_SITE_SETTINGS_HANDLERS_BLOCKED 7945
+#define IDS_SETTINGS_SITE_SETTINGS_WINDOW_MANAGEMENT_DESCRIPTION 7946
+#define IDS_SETTINGS_SITE_SETTINGS_WINDOW_MANAGEMENT_ASK 7947
+#define IDS_SETTINGS_SITE_SETTINGS_WINDOW_MANAGEMENT_BLOCKED 7948
+#define IDS_SETTINGS_SITE_SETTINGS_WINDOW_MANAGEMENT_ASK_EXCEPTIONS 7949
+#define IDS_SETTINGS_SITE_SETTINGS_WINDOW_MANAGEMENT_BLOCKED_EXCEPTIONS 7950
+#define IDS_SETTINGS_SITE_SETTINGS_BLOCKED 7951
+#define IDS_SETTINGS_SITE_SETTINGS_ALLOW 7952
+#define IDS_SETTINGS_SITE_SETTINGS_BLOCK 7953
+#define IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY 7954
+#define IDS_SETTINGS_SITE_SETTINGS_ASK_DEFAULT_MENU 7955
+#define IDS_SETTINGS_SITE_SETTINGS_ALLOW_DEFAULT_MENU 7956
+#define IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DEFAULT_MENU 7957
+#define IDS_SETTINGS_SITE_SETTINGS_BLOCK_DEFAULT_MENU 7958
+#define IDS_SETTINGS_SITE_SETTINGS_MUTE_DEFAULT_MENU 7959
+#define IDS_SETTINGS_SITE_SETTINGS_ALLOW_MENU 7960
+#define IDS_SETTINGS_SITE_SETTINGS_BLOCK_MENU 7961
+#define IDS_SETTINGS_SITE_SETTINGS_ASK_MENU 7962
+#define IDS_SETTINGS_SITE_SETTINGS_MUTE_MENU 7963
+#define IDS_SETTINGS_SITE_SETTINGS_RESET_MENU 7964
+#define IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY_MENU 7965
+#define IDS_SETTINGS_SITE_SETTINGS_USAGE 7966
+#define IDS_SETTINGS_SITE_SETTINGS_USAGE_NONE 7967
+#define IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS 7968
+#define IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS_MORE 7969
+#define IDS_SETTINGS_SITE_SETTINGS_CONTENT 7970
+#define IDS_SETTINGS_SITE_SETTINGS_CONTENT_MORE 7971
+#define IDS_SETTINGS_SITE_SETTINGS_ALLOWLISTED 7972
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCK_BLOCKLISTED_SINGULAR 7973
+#define IDS_SETTINGS_SITE_SETTINGS_ADS_BLOCK_NOT_BLOCKLISTED_SINGULAR 7974
+#define IDS_SETTINGS_SITE_SETTINGS_SOURCE_KILL_SWITCH 7975
+#define IDS_SETTINGS_SITE_SETTINGS_SOURCE_INSECURE_ORIGIN 7976
+#define IDS_SETTINGS_SITE_SETTINGS_RESET_BUTTON 7977
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE 7978
+#define IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIES_EXCEPTION_LABEL 7979
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_ALL_STORAGE_DIALOG_TITLE 7980
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_DISPLAYED_STORAGE_DIALOG_TITLE 7981
+#define IDS_SETTINGS_SITE_SETTINGS_FIRST_PARTY_SETS_LEARN_MORE 7982
+#define IDS_SETTINGS_SITE_SETTINGS_FIRST_PARTY_SETS_LEARN_MORE_ACCESSIBILITY 7983
+#define IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_DESCRIPTION 7984
+#define IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_DESCRIPTION 7985
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_ALL_STORAGE_LABEL 7986
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_DISPLAYED_STORAGE_LABEL 7987
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_DETAILS_SUBPAGE_ACCESSIBILITY_LABEL 7988
+#define IDS_SETTINGS_SITE_SETTINGS_FIRST_PARTY_SETS_MEMBERSHIP_LABEL 7989
+#define IDS_SETTINGS_SITE_SETTINGS_FIRST_PARTY_SETS_MORE_ACTIONS_TITLE 7990
+#define IDS_SETTINGS_SITE_SETTINGS_FIRST_PARTY_SETS_SHOW_RELATED_SITES_BUTTON 7991
+#define IDS_SETTINGS_SITE_SETTINGS_FIRST_PARTY_SETS_SITE_DELETE_STORAGE_BUTTON 7992
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_ALL_STORAGE_CONFIRMATION 7993
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_DISPLAYED_STORAGE_CONFIRMATION 7994
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_ALL_STORAGE_CONFIRMATION_INSTALLED 7995
+#define IDS_SETTINGS_SITE_SETTINGS_DELETE_DISPLAYED_STORAGE_CONFIRMATION_INSTALLED 7996
+#define IDS_SETTINGS_SITE_SETTINGS_CLEAR_ALL_STORAGE_SIGN_OUT 7997
+#define IDS_SETTINGS_SITE_SETTINGS_CLEAR_DISPLAYED_STORAGE_SIGN_OUT 7998
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_RESET_CONFIRMATION 7999
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_DELETE_STORAGE_DIALOG_TITLE 8000
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_STORAGE_CONFIRMATION 8001
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_STORAGE_CONFIRMATION_NEW 8002
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_STORAGE_SIGN_OUT 8003
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_DELETE_STORAGE_OFFLINE_DATA 8004
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION 8005
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_GROUP_DELETE_OFFLINE_DATA 8006
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_ORIGIN_DIALOG_TITLE 8007
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_ORIGIN_APP_DIALOG_TITLE 8008
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_ORIGIN_PARTITIONED_DIALOG_TITLE 8009
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_GROUP_DIALOG_TITLE 8010
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_GROUP_APP_DIALOG_TITLE 8011
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_GROUP_APP_PLURAL_DIALOG_TITLE 8012
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_ORIGIN_LOGOUT 8013
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_GROUP_LOGOUT 8014
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_OFFLINE_DATA 8015
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_PERMISSIONS 8016
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE_SITE_CONFIRM 8017
+#define IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_SITE 8018
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_RESET_ALL 8019
+#define IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_STORAGE 8020
+#define IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT 8021
+#define IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT 8022
+#define IDS_SETTINGS_SITE_SETTINGS_REMOVE 8023
+#define IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY 8024
+#define IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_SITE_EXCEPTION_DESC 8025
+#define IDS_SETTINGS_SITE_SETTINGS_NO_ZOOMED_SITES 8026
+#define IDS_SETTINGS_SITE_NO_SITES_ADDED 8027
+#define IDS_SETTINGS_SITE_SETTINGS_BLOCK_AUTOPLAY 8028
+#define IDS_SETTINGS_SITE_SETTINGS_EMPTY_ALL_SITES_PAGE 8029
+#define IDS_SETTINGS_SITE_SETTINGS_NO_SITES_FOUND 8030
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_SCANNING_DESCRIPTION 8031
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_SCANNING_ASK 8032
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_SCANNING_BLOCK 8033
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_SCANNING_ALLOWED_EXCEPTIONS 8034
+#define IDS_SETTINGS_SITE_SETTINGS_BLUETOOTH_SCANNING_BLOCKED_EXCEPTIONS 8035
+#define IDS_SETTINGS_SITE_SETTINGS_EXTENSION_ID_DESCRIPTION 8036
+#define IDS_SETTINGS_SITE_SETTINGS_PAGE_SITE_DATA_ALLOWED_SUB_LABEL 8037
+#define IDS_SETTINGS_SITE_SETTINGS_PAGE_SITE_DATA_BLOCKED_SUB_LABEL 8038
+#define IDS_SETTINGS_SITE_SETTINGS_PAGE_SITE_DATA_DELETE_ON_EXIT_SUB_LABEL 8039
+#define IDS_SETTINGS_EXPIRES_AFTER_TIME_LABEL 8040
+#define IDS_SETTINGS_SITE_DATA_PAGE_TITLE 8041
+#define IDS_SETTINGS_SITE_DATA_PAGE_DESCRIPTION 8042
+#define IDS_SETTINGS_SITE_DATA_PAGE_DEFAULT_BEHAVIOR_HEADING 8043
+#define IDS_SETTINGS_SITE_DATA_PAGE_DEFAULT_BEHAVIOR_DESCRIPTION 8044
+#define IDS_SETTINGS_SITE_DATA_PAGE_ALLOW_RADIO_LABEL 8045
+#define IDS_SETTINGS_SITE_DATA_PAGE_ALLOW_RADIO_SUB_LABEL 8046
+#define IDS_SETTINGS_SITE_DATA_PAGE_CLEAR_ON_EXIT_RADIO_LABEL 8047
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_RADIO_LABEL 8048
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_RADIO_SUB_LABEL 8049
+#define IDS_SETTINGS_SITE_DATA_PAGE_CUSTOMIZED_BEHAVIOR_HEADING 8050
+#define IDS_SETTINGS_SITE_DATA_PAGE_CUSTOMIZED_BEHAVIOR_DESCRIPTION 8051
+#define IDS_SETTINGS_SITE_DATA_PAGE_ALLOW_EXCEPTIONS_SUB_HEADING 8052
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_EXCEPTIONS_SUB_HEADING 8053
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_CONFIRM_DIALOG_TITLE 8054
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_CONFIRM_DIALOG_DESCRIPTION 8055
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_CONFIRM_DIALOG_CONFIRM_BUTTON 8056
+#define IDS_SETTINGS_SITE_DATA_PAGE_BLOCK_CONFIRM_DIALOG_CANCEL_BUTTON 8057
+#define IDS_SETTINGS_STORAGE_ACCESS_DESCRIPTION 8058
+#define IDS_SETTINGS_STORAGE_ACCESS_ALLOWED 8059
+#define IDS_SETTINGS_STORAGE_ACCESS_BLOCKED 8060
+#define IDS_SETTINGS_STORAGE_ACCESS_ALLOWED_EXCEPTIONS 8061
+#define IDS_SETTINGS_STORAGE_ACCESS_BLOCKED_EXCEPTIONS 8062
+#define IDS_SETTINGS_STORAGE_ACCESS_RESET_ALL 8063
+#define IDS_SETTINGS_STORAGE_ACCESS_RESET_SITE 8064
+#define IDS_SETTINGS_STORAGE_ACCESS_OPEN_EXPAND 8065
+#define IDS_SETTINGS_STORAGE_ACCESS_CLOSE_EXPAND 8066
+#define IDS_SETTINGS_STORAGE_ACCESS_ALLOWED_SITE_LABEL 8067
+#define IDS_SETTINGS_STORAGE_ACCESS_BLOCKED_SITE_LABEL 8068
+#define IDS_SETTINGS_NO_BLUETOOTH_DEVICES_FOUND 8069
+#define IDS_SETTINGS_NO_USB_DEVICES_FOUND 8070
+#define IDS_SETTINGS_NO_SERIAL_PORTS_FOUND 8071
+#define IDS_SETTINGS_NO_HID_DEVICES_FOUND 8072
+#define IDS_SETTINGS_RESET_BLUETOOTH_CONFIRMATION 8073
+#define IDS_SETTINGS_RESET_HID_CONFIRMATION 8074
+#define IDS_SETTINGS_RESET_SERIAL_PORTS_CONFIRMATION 8075
+#define IDS_SETTINGS_RESET_USB_CONFIRMATION 8076
+#define IDS_SETTINGS_ADD_SITE_TITLE 8077
+#define IDS_SETTINGS_ADD_SITES_TITLE 8078
+#define IDS_SETTINGS_EDIT_SITE_TITLE 8079
+#define IDS_SETTINGS_ADD_SITE 8080
+#define IDS_SETTINGS_SITE_SETTINGS_NUM_COOKIES 8081
+#define IDS_SETTINGS_PEOPLE 8082
+#define IDS_SETTINGS_CHANGE_PICTURE_PROFILE_PHOTO 8083
+#define IDS_SETTINGS_PEOPLE_SIGN_IN 8084
+#define IDS_SETTINGS_SYNC_DISCONNECT_MANAGED_PROFILE_EXPLANATION 8085
+#define IDS_SETTINGS_TURN_OFF_SYNC_MANAGED_PROFILE_EXPLANATION 8086
+#define IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_TITLE 8087
+#define IDS_SETTINGS_TURN_OFF_SYNC_AND_SIGN_OUT_DIALOG_TITLE 8088
+#define IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_MANAGED_CONFIRM 8089
+#define IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_CHECKBOX 8090
+#define IDS_SETTINGS_SYNC_SETTINGS_SAVED_TOAST_LABEL 8091
+#define IDS_SETTINGS_PROFILE_NAME_INPUT_LABEL 8092
+#define IDS_SETTINGS_PROFILE_SHORTCUT_TOGGLE_LABEL 8093
+#define IDS_SETTINGS_CUSTOMIZE_PROFILE 8094
+#define IDS_SETTINGS_PICK_A_THEME_COLOR 8095
+#define IDS_SETTINGS_PICK_AN_AVATAR 8096
+#define IDS_SETTINGS_CREATE_SHORTCUT 8097
+#define IDS_SETTINGS_CREATE_SHORTCUT_SUBTITLE 8098
+#define IDS_SETTINGS_SYNC_DISCONNECT_EXPLANATION 8099
+#define IDS_SETTINGS_SYNC_DISCONNECT_MAIN_PROFILE_EXPLANATION 8100
+#define IDS_SETTINGS_SYNC_DISCONNECT_AND_SIGN_OUT_EXPLANATION 8101
+#define IDS_SETTINGS_SYNC_DISCONNECT_EXPAND_ACCESSIBILITY_LABEL 8102
+#define IDS_SETTINGS_SYNC_WILL_START 8103
+#define IDS_SETTINGS_MANAGE_GOOGLE_ACCOUNT 8104
+#define IDS_SETTINGS_USER_EVENTS_CHECKBOX_LABEL 8105
+#define IDS_SETTINGS_USER_EVENTS_CHECKBOX_TEXT 8106
+#define IDS_SETTINGS_ENCRYPT_WITH_SYNC_PASSPHRASE_LABEL 8107
+#define IDS_SETTINGS_PASSPHRASE_EXPLANATION_TEXT 8108
+#define IDS_SETTINGS_PASSPHRASE_RESET_HINT_ENCRYPTION 8109
+#define IDS_SETTINGS_PASSPHRASE_RESET_HINT_TOGGLE 8110
+#define IDS_SETTINGS_PASSPHRASE_RECOVER 8111
+#define IDS_SETTINGS_PERSONALIZE_GOOGLE_SERVICES_TITLE 8112
+#define IDS_SETTINGS_IMPORT_SETTINGS_TITLE 8113
+#define IDS_SETTINGS_IMPORT_FROM_LABEL 8114
+#define IDS_SETTINGS_IMPORT_ITEMS_LABEL 8115
+#define IDS_SETTINGS_IMPORT_LOADING_PROFILES 8116
+#define IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX 8117
+#define IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX 8118
+#define IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX 8119
+#define IDS_SETTINGS_IMPORT_SEARCH_ENGINES_CHECKBOX 8120
+#define IDS_SETTINGS_IMPORT_AUTOFILL_FORM_DATA_CHECKBOX 8121
+#define IDS_SETTINGS_IMPORT_CHOOSE_FILE 8122
+#define IDS_SETTINGS_IMPORT_COMMIT 8123
+#define IDS_SETTINGS_IMPORT_SUCCESS 8124
+#define IDS_SETTINGS_IMPORT_NO_PROFILE_FOUND 8125
+#define IDS_SETTINGS_PAGE_CONTENT_LINK_ROW_SUBLABEL_ON 8126
+#define IDS_SETTINGS_PAGE_CONTENT_LINK_ROW_SUBLABEL_OFF 8127
+#define IDS_SETTINGS_PAGE_CONTENT_PAGE_TITLE 8128
+#define IDS_SETTINGS_PAGE_CONTENT_TOGGLE_LABEL 8129
+#define IDS_SETTINGS_PAGE_CONTENT_TOGGLE_SUBLABEL 8130
+#define IDS_SETTINGS_PAGE_CONTENT_WHEN_ON_BULLET_ONE 8131
+#define IDS_SETTINGS_PAGE_CONTENT_THINGS_TO_CONSIDER_BULLET_ONE 8132
+#define IDS_SETTINGS_PAGE_CONTENT_THINGS_TO_CONSIDER_BULLET_THREE 8133
+#define IDS_SETTINGS_PAGE_ZOOM_LABEL 8134
+#define IDS_SETTINGS_FONT_SIZE_LABEL 8135
+#define IDS_SETTINGS_VERY_SMALL_FONT 8136
+#define IDS_SETTINGS_SMALL_FONT 8137
+#define IDS_SETTINGS_MEDIUM_FONT 8138
+#define IDS_SETTINGS_LARGE_FONT 8139
+#define IDS_SETTINGS_VERY_LARGE_FONT 8140
+#define IDS_SETTINGS_CUSTOMIZE_FONTS 8141
+#define IDS_SETTINGS_FONTS 8142
+#define IDS_SETTINGS_STANDARD_FONT_LABEL 8143
+#define IDS_SETTINGS_SERIF_FONT_LABEL 8144
+#define IDS_SETTINGS_SANS_SERIF_FONT_LABEL 8145
+#define IDS_SETTINGS_FIXED_WIDTH_FONT_LABEL 8146
+#define IDS_SETTINGS_MATH_FONT_LABEL 8147
+#define IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL 8148
+#define IDS_SETTINGS_TINY_FONT_SIZE 8149
+#define IDS_SETTINGS_HUGE_FONT_SIZE 8150
+#define IDS_SETTINGS_QUICK_BROWN_FOX 8151
+#define IDS_SETTINGS_SYSTEM 8152
+#define IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL 8153
+#define IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL 8154
+#define IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_EXTENSION_LABEL 8155
+#define IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_POLICY_LABEL 8156
+#define IDS_PAGE_NOT_AVAILABLE_FOR_GUEST_HEADING 8167
+#define IDS_SETTINGS_SECURITY_KEYS_TITLE 8168
+#define IDS_SETTINGS_SECURITY_KEYS_DESC 8169
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN 8170
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN_BUTTON 8171
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN_DESC 8172
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN_INITIAL_TITLE 8173
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN_CREATE_TITLE 8174
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN_CHANGE_TITLE 8175
+#define IDS_SETTINGS_SECURITY_KEYS_RESET 8176
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_DESC 8177
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_TITLE 8178
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_CONFIRM_TITLE 8179
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_STEP1 8180
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_STEP2 8181
+#define IDS_SETTINGS_SECURITY_KEYS_NO_RESET 8182
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_ERROR 8183
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_SUCCESS 8184
+#define IDS_SETTINGS_SECURITY_KEYS_RESET_NOTALLOWED 8185
+#define IDS_SETTINGS_SECURITY_KEYS_NO_PIN 8186
+#define IDS_SETTINGS_SECURITY_KEYS_CURRENT_PIN_INTRO 8187
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_INCORRECT 8188
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_INCORRECT_RETRIES_SIN 8189
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_INCORRECT_RETRIES_PL 8190
+#define IDS_SETTINGS_SECURITY_KEYS_SAME_PIN_AS_CURRENT 8191
+#define IDS_SETTINGS_SECURITY_KEYS_NEW_PIN 8192
+#define IDS_SETTINGS_SECURITY_KEYS_SET_PIN_CONFIRM 8193
+#define IDS_SETTINGS_SECURITY_KEYS_CURRENT_PIN 8194
+#define IDS_SETTINGS_SECURITY_KEYS_PIN 8195
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_TOO_SHORT_SMALL 8196
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_TOO_LONG 8197
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_INVALID 8198
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR_MISMATCH 8199
+#define IDS_SETTINGS_SECURITY_KEYS_CONFIRM_PIN 8200
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_SUCCESS 8201
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_ERROR 8202
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_HARD_LOCK 8203
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_SOFT_LOCK 8204
+#define IDS_SETTINGS_SECURITY_KEYS_SHOW_PINS 8205
+#define IDS_SETTINGS_SECURITY_KEYS_HIDE_PINS 8206
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_LABEL 8207
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_USERNAME_LABEL 8208
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_DISPLAYNAME_LABEL 8209
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_WEBSITE_LABEL 8210
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DESC 8211
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_TITLE 8212
+#define IDS_SETTINGS_SECURITY_KEYS_UPDATE_CREDENTIAL_DIALOG_TITLE 8213
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_CONFIRM_DELETE_TITLE 8214
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_CONFIRM_DELETE_CREDENTIAL 8215
+#define IDS_SETTINGS_SECURITY_KEYS_INPUT_ERROR_TOO_LONG 8216
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_NO_CREDENTIALS 8217
+#define IDS_SETTINGS_SECURITY_KEYS_NO_CREDENTIAL_MANAGEMENT 8218
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_REMOVED 8219
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_NO_PIN 8220
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_ERROR 8221
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DELETE_SUCCESS 8222
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DELETE_FAILED 8223
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_UPDATE_SUCCESS 8224
+#define IDS_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_UPDATE_FAILED 8225
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_SUBPAGE_LABEL 8226
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_SUBPAGE_DESCRIPTION 8227
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_DIALOG_TITLE 8228
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ADD_TITLE 8229
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_CHOOSE_NAME 8230
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_NAME_LABEL 8231
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_NAME_LABEL_TOO_LONG 8232
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_NO_ENROLLMENTS_LABEL 8233
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLMENTS_LABEL 8234
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLING_LABEL 8235
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_TRY_AGAIN_LABEL 8236
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_FAILED_LABEL 8237
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_ENROLLING_COMPLETE_LABEL 8238
+#define IDS_SETTINGS_SECURITY_KEYS_NO_BIOMETRIC_ENROLLMENT 8239
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_DELETE 8240
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_NO_PIN 8241
+#define IDS_SETTINGS_SECURITY_KEYS_BIO_ENROLLMENT_STORAGE_FULL 8242
+#define IDS_SETTINGS_SECURITY_KEYS_TOUCH_TO_CONTINUE 8243
+#define IDS_SETTINGS_SECURITY_KEYS_PIN_PROMPT 8244
+#define IDS_SETTINGS_SECURITY_KEYS_FORCE_PIN_CHANGE 8245
+#define IDS_SETTINGS_SECURITY_KEYS_PHONE_EDIT_DIALOG_TITLE 8246
+#define IDS_SETTINGS_SECURITY_KEYS_PHONES_YOUR_DEVICES 8247
+#define IDS_SETTINGS_SECURITY_KEYS_PHONES_SYNCED_DESC 8248
+#define IDS_SETTINGS_SECURITY_KEYS_PHONES_LINKED_DEVICES 8249
+#define IDS_SETTINGS_SECURITY_KEYS_PHONES_LINKED_DESC 8250
+#define IDS_SETTINGS_SECURITY_KEYS_PHONES_MANAGE 8251
+#define IDS_SETTINGS_SECURITY_KEYS_PHONES_MANAGE_DESC 8252
+#define IDS_SETTINGS_EXTENSION_OR_APP_DISPLAY_NAME 8253
+#define IDS_SETTINGS_SAFETY_HUB 8254
+#define IDS_SETTINGS_SAFETY_HUB_ENTRY_POINT_BUTTON 8255
+#define IDS_SETTINGS_SAFETY_HUB_PAGE_CARD_SECTION_HEADER 8256
+#define IDS_SETTINGS_SAFETY_HUB_PAGE_MODULE_SECTION_HEADER 8257
+#define IDS_SETTINGS_SAFETY_HUB_EMPTY_STATE_MODULE_HEADER 8258
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_SUBHEADER_RECENTLY 8259
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_SUBHEADER_SOME_TIME_AGO 8260
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_HEADER_NO_WEAK_OR_REUSED 8261
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_SUBHEADER_SIGN_IN 8262
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_SUBHEADER_GO_TO_PASSWORD_MANAGER 8263
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_HEADER_NO_PASSWORDS 8264
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_CHECK_SUBHEADER_NO_PASSWORDS_POLICY 8265
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORD_NAVIGATION_ARIA_LABEL 8266
+#define IDS_SETTINGS_SAFETY_HUB_SB_ON_ENHANCED_HEADER 8267
+#define IDS_SETTINGS_SAFETY_HUB_SB_ON_ENHANCED_SUBHEADER 8268
+#define IDS_SETTINGS_SAFETY_HUB_SB_ON_STANDARD_HEADER 8269
+#define IDS_SETTINGS_SAFETY_HUB_SB_ON_STANDARD_SUBHEADER 8270
+#define IDS_SETTINGS_SAFETY_HUB_SB_OFF_HEADER 8271
+#define IDS_SETTINGS_SAFETY_HUB_SB_OFF_MANAGED_SUBHEADER 8272
+#define IDS_SETTINGS_SAFETY_HUB_SB_OFF_EXTENSION_SUBHEADER 8273
+#define IDS_SETTINGS_SAFETY_HUB_SB_OFF_USER_SUBHEADER 8274
+#define IDS_SETTINGS_SAFETY_HUB_SB_NAVIGATION_ARIA_LABEL 8275
+#define IDS_SETTINGS_SAFETY_HUB_GO_SITE_SETTINGS_ITEM 8276
+#define IDS_SETTINGS_SAFETY_HUB_GO_NOTIFICATION_SETTINGS_ITEM 8277
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_INCOGNITO_SUBHEADER 8278
+#define IDS_SETTINGS_SAFETY_HUB_USER_EDU_SAFE_BROWSING_HEADER 8279
+#define IDS_SETTINGS_SAFETY_HUB_VERSION_CARD_SUBHEADER_RESTART 8280
+#define IDS_SETTINGS_SAFETY_HUB_NOTIFICATION_PERMISSIONS_PRIMARY_LABEL 8281
+#define IDS_SETTINGS_SAFETY_HUB_NOTIFICATION_PERMISSIONS_SECONDARY_LABEL 8282
+#define IDS_SETTINGS_SAFETY_HUB_UNUSED_SITE_PERMISSIONS_MENU_NOTIFICATION 8283
+#define IDS_SETTINGS_SAFETY_HUB_REVIEW_NOTIFICATION_PERMISSIONS_MENU_NOTIFICATION 8284
+#define IDS_SETTINGS_SAFETY_HUB_COMPROMISED_PASSWORDS_MENU_NOTIFICATION 8285
+#define IDS_SETTINGS_SAFETY_HUB_EXTENSIONS_MENU_NOTIFICATION 8286
+#define IDS_SETTINGS_SAFETY_HUB_SAFE_BROWSING_MENU_NOTIFICATION 8287
+#define IDS_SETTINGS_SAFETY_HUB_PASSWORDS_MODULE_NAME 8288
+#define IDS_SETTINGS_SAFETY_HUB_SAFE_BROWSING_MODULE_NAME 8289
+#define IDS_SETTINGS_SAFETY_HUB_EXTENSIONS_MODULE_UPPERCASE_NAME 8290
+#define IDS_SETTINGS_SAFETY_HUB_EXTENSIONS_MODULE_LOWERCASE_NAME 8291
+#define IDS_SETTINGS_SAFETY_HUB_NOTIFICATIONS_MODULE_UPPERCASE_NAME 8292
+#define IDS_SETTINGS_SAFETY_HUB_NOTIFICATIONS_MODULE_LOWERCASE_NAME 8293
+#define IDS_SETTINGS_SAFETY_HUB_PERMISSIONS_MODULE_UPPERCASE_NAME 8294
+#define IDS_SETTINGS_SAFETY_HUB_PERMISSIONS_MODULE_LOWERCASE_NAME 8295
+#define IDS_SETTINGS_SAFETY_HUB_MODULE_NAME_SEPARATOR 8296
+#define IDS_SETTINGS_AI_PAGE_TITLE 8297
+#define IDS_SETTINGS_AI_PAGE_MAIN_LABEL 8298
+#define IDS_SETTINGS_AI_PAGE_MAIN_SUBLABEL 8299
+#define IDS_SETTINGS_AI_COMPOSE_LABEL 8300
+#define IDS_SETTINGS_AI_COMPOSE_SUBLABEL 8301
+#define IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE2_LABEL 8302
+#define IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE2_SUBLABEL 8303
+#define IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE3_LABEL 8304
+#define IDS_SETTINGS_EXPERIMENTAL_ADVANCED_FEATURE3_SUBLABEL 8305
+#define IDS_SETTINGS_SUBPAGE_BACK_BUTTON_ARIA_LABEL 8306
+#define IDS_SETTINGS_SUBPAGE_BACK_BUTTON_ARIA_ROLE_DESCRIPTION 8307
+#define IDS_SETTINGS_SUBPAGE_LEARN_MORE_ARIA_LABEL 8308
+#define IDS_SETTINGS_CAPTIONS 8309
+#define IDS_SETTINGS_CAPTIONS_PREFERENCES_TITLE 8310
+#define IDS_SETTINGS_CAPTIONS_PREFERENCES_SUBTITLE 8311
+#define IDS_SETTINGS_CAPTIONS_TEXT_SIZE 8312
+#define IDS_SETTINGS_CAPTIONS_TEXT_FONT 8313
+#define IDS_SETTINGS_CAPTIONS_TEXT_COLOR 8314
+#define IDS_SETTINGS_CAPTIONS_TEXT_OPACITY 8315
+#define IDS_SETTINGS_CAPTIONS_BACKGROUND_OPACITY 8316
+#define IDS_SETTINGS_CAPTIONS_OPACITY_OPAQUE 8317
+#define IDS_SETTINGS_CAPTIONS_OPACITY_SEMI_TRANSPARENT 8318
+#define IDS_SETTINGS_CAPTIONS_OPACITY_TRANSPARENT 8319
+#define IDS_SETTINGS_CAPTIONS_TEXT_SHADOW 8320
+#define IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_NONE 8321
+#define IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_RAISED 8322
+#define IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_DEPRESSED 8323
+#define IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_UNIFORM 8324
+#define IDS_SETTINGS_CAPTIONS_TEXT_SHADOW_DROP_SHADOW 8325
+#define IDS_SETTINGS_CAPTIONS_BACKGROUND_COLOR 8326
+#define IDS_SETTINGS_CAPTIONS_COLOR_BLACK 8327
+#define IDS_SETTINGS_CAPTIONS_COLOR_WHITE 8328
+#define IDS_SETTINGS_CAPTIONS_COLOR_RED 8329
+#define IDS_SETTINGS_CAPTIONS_COLOR_GREEN 8330
+#define IDS_SETTINGS_CAPTIONS_COLOR_BLUE 8331
+#define IDS_SETTINGS_CAPTIONS_COLOR_YELLOW 8332
+#define IDS_SETTINGS_CAPTIONS_COLOR_CYAN 8333
+#define IDS_SETTINGS_CAPTIONS_COLOR_MAGENTA 8334
+#define IDS_SETTINGS_CAPTIONS_DEFAULT_SETTING 8335
+#define IDS_SETTINGS_CAPTIONS_LANGUAGE 8336
+#define IDS_SETTINGS_CAPTIONS_MANAGE_LANGUAGES_TITLE 8337
+#define IDS_SETTINGS_CAPTIONS_MANAGE_LANGUAGES_SUBTITLE 8338
+#define IDS_SETTINGS_CAPTIONS_LIVE_TRANSLATE_TARGET_LANGUAGE 8339
+#define IDS_SETTINGS_CAPTIONS_REMOVE_LANGUAGE_ARIA_LABEL 8340
+#define IDS_SETTINGS_NEARBY_SHARE_TITLE 8341
+#define IDS_SETTINGS_NEARBY_SHARE_TITLE_PH 8342
+#define IDS_SETTINGS_NEARBY_SHARE_SET_UP_BUTTON_TITLE 8343
+#define IDS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_ROW_TITLE 8344
+#define IDS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_TITLE 8345
+#define IDS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_FIELD_LABEL 8346
+#define IDS_SETTINGS_NEARBY_SHARE_EDIT_DEVICE_NAME 8347
+#define IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_TITLE 8348
+#define IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_DESCRIPTION 8349
+#define IDS_SETTINGS_NEARBY_SHARE_FAST_INITIATION_NOTIFICATION_TOGGLE_ARIA_LABEL 8350
+#define IDS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_ARIA_DESCRIPTION 8351
+#define IDS_SETTINGS_NEARBY_SHARE_CONFIRM_DEVICE_NAME 8352
+#define IDS_SETTINGS_NEARBY_SHARE_MANAGE_CONTACTS_LABEL 8353
+#define IDS_SETTINGS_NEARBY_SHARE_MANAGE_CONTACTS_ROW_TITLE 8354
+#define IDS_SETTINGS_NEARBY_SHARE_EDIT_DATA_USAGE 8355
+#define IDS_SETTINGS_NEARBY_SHARE_UPDATE_DATA_USAGE 8356
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_TITLE 8357
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_WIFI_ONLY_LABEL 8358
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_WIFI_ONLY_DESCRIPTION 8359
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_MOBILE_DATA_LABEL 8360
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_MOBILE_DATA_DESCRIPTION 8361
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_MOBILE_DATA_TOOLTIP 8362
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_OFFLINE_LABEL 8363
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_OFFLINE_DESCRIPTION 8364
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_EDIT_BUTTON_DATA_DESCRIPTION 8365
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_EDIT_BUTTON_WIFI_ONLY_DESCRIPTION 8366
+#define IDS_SETTINGS_NEARBY_SHARE_DATA_USAGE_EDIT_BUTTON_OFFLINE_DESCRIPTION 8367
+#define IDS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_ROW_TITLE 8368
+#define IDS_SETTINGS_NEARBY_SHARE_EDIT_VISIBILITY 8369
+#define IDS_SETTINGS_NEARBY_SHARE_VISIBILITY_DIALOG_TITLE 8370
+#define IDS_SETTINGS_NEARBY_SHARE_VISIBILITY_DIALOG_SAVE 8371
+#define IDS_SETTINGS_NEARBY_SHARE_DESCRIPTION 8372
+#define IDS_SETTINGS_NEARBY_SHARE_HIGH_VISIBILITY_TITLE 8373
+#define IDS_SETTINGS_NEARBY_SHARE_HIGH_VISIBILITY_ON 8374
+#define IDS_SETTINGS_NEARBY_SHARE_HIGH_VISIBILITY_OFF 8375
+#define IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION 8376
+#define IDS_SETTINGS_ENABLE_URL_KEYED_ANONYMIZED_DATA_COLLECTION_DESC 8377
+#define IDS_SETTINGS_SPELLING_PREF 8378
+#define IDS_SETTINGS_ENABLE_LOGGING_PREF 8379
+#define IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC 8380
+#define IDS_SETTINGS_LINKDOCTOR_PREF 8381
+#define IDS_SETTINGS_LINKDOCTOR_PREF_DESC 8382
+#define IDS_SETTINGS_SUGGEST_PREF 8383
+#define IDS_SETTINGS_DRIVE_SUGGEST_PREF 8384
+#define IDS_SETTINGS_PEOPLE_SIGNED_IN_TO_ACCOUNT 8385
+#define IDS_SETTINGS_PEOPLE_SYNCING_TO_ACCOUNT 8386
+#define IDS_SETTINGS_PEOPLE_SYNC_PAUSED 8387
+#define IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT 8388
+#define IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF 8389
+#define IDS_SETTINGS_SETTINGS_CHECKBOX_LABEL 8390
+#define IDS_SETTINGS_PEOPLE_SYNC_NOT_WORKING 8391
+#define IDS_SETTINGS_PEOPLE_SYNC_PASSWORDS_NOT_WORKING 8392
+#define IDS_SETTINGS_SYNC_ADVANCED_PAGE_TITLE 8393
+#define IDS_SETTINGS_NEW_SYNC_ADVANCED_PAGE_TITLE 8394
+#define IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT 8395
+#define IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM 8396
+#define IDS_SETTINGS_PEOPLE_SIGN_OUT 8397
+#define IDS_SETTINGS_AUTOFILL_CHECKBOX_LABEL 8398
+#define IDS_SETTINGS_HISTORY_CHECKBOX_LABEL 8399
+#define IDS_SETTINGS_EXTENSIONS_CHECKBOX_LABEL 8400
+#define IDS_SETTINGS_OPEN_TABS_CHECKBOX_LABEL 8401
+#define IDS_SETTINGS_SAVED_TAB_GROUPS_CHECKBOX_LABEL 8402
+#define IDS_SETTINGS_WIFI_CONFIGURATIONS_CHECKBOX_LABEL 8403
+#define IDS_SETTINGS_SYNC_EVERYTHING_CHECKBOX_LABEL 8404
+#define IDS_SETTINGS_APPS_CHECKBOX_LABEL 8405
+#define IDS_SETTINGS_APPS_CHECKBOX_SUBLABEL 8406
+#define IDS_SETTINGS_NON_PERSONALIZED_SERVICES_SECTION_LABEL 8407
+#define IDS_SETTINGS_CUSTOMIZE_SYNC 8408
+#define IDS_SETTINGS_SYNC_DATA 8409
+#define IDS_SETTINGS_PASSWORDS_CHECKBOX_LABEL 8410
+#define IDS_SETTINGS_PASSWORDS_AND_PASSKEYS_CHECKBOX_LABEL 8411
+#define IDS_SETTINGS_PASSPHRASE_PLACEHOLDER 8412
+#define IDS_SETTINGS_EXISTING_PASSPHRASE_TITLE 8413
+#define IDS_SETTINGS_SUBMIT_PASSPHRASE 8414
+#define IDS_SETTINGS_ENCRYPT_WITH_GOOGLE_CREDENTIALS_LABEL 8415
+#define IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL 8416
+#define IDS_SETTINGS_READING_LIST_CHECKBOX_LABEL 8417
+#define IDS_SETTINGS_ENCRYPTION_OPTIONS 8418
+#define IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR 8419
+#define IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR 8420
+#define IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR 8421
+#define IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_TITLE_UNIFIED_CONSENT 8422
+#define IDS_SETTINGS_NEW_SYNC_ADVANCED_DEVICE_PAGE_TITLE 8423
+#define IDS_SETTINGS_NEW_SYNC_ADVANCED_BROWSER_PAGE_TITLE 8424
+#define IDS_SETTINGS_NEW_MANAGE_SYNCED_DATA_SUBTITLE_UNIFIED_CONSENT 8425
+#define IDS_SETTINGS_NEW_MANAGE_BROWSER_SYNCED_DATA_TITLE 8426
+#define IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES 8427
+#define IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER 8428
+#define IDS_SETTINGS_SYNC_LOADING 8429
+#define IDS_SETTINGS_SYNC_TIMEOUT 8430
+#define IDS_SETTINGS_SYNC 8431
+#define IDS_SETTINGS_SYNC_SETTINGS_CANCEL_SYNC 8432
+#define IDS_SETTINGS_SYNC_SETUP_CANCEL_DIALOG_TITLE 8433
+#define IDS_SETTINGS_SYNC_SETUP_CANCEL_DIALOG_BODY 8434
+#define IDS_SETTINGS_ABOUT_UPGRADE_CHECK_STARTED 8436
+#define IDS_SETTINGS_UPDATE_TO_ROLLBACK_VERSION_DISALLOWED 8437
+#define IDS_SETTINGS_THEME_CHECKBOX_LABEL 8439
+#define IDS_SUPPORT_TOOL_ISSUE_DETAILS_PAGE_TITLE 8443
+#define IDS_SUPPORT_TOOL_DATA_SELECTION_PAGE_TITLE 8444
+#define IDS_SUPPORT_TOOL_REVIEW_PII_PAGE_TITLE 8445
+#define IDS_SUPPORT_TOOL_DATA_EXPORT_DONE_PAGE_TITLE 8446
+#define IDS_SUPPORT_TOOL_DATA_EXPORTED_TEXT 8447
+#define IDS_SUPPORT_TOOL_SUPPORT_CASE_ID 8448
+#define IDS_SUPPORT_TOOL_EMAIL 8449
+#define IDS_SUPPORT_TOOL_DESCRIBE_ISSUE_TEXT 8450
+#define IDS_SUPPORT_TOOL_ISSUE_DESCRIPTION_PLACEHOLDER 8451
+#define IDS_SUPPORT_TOOL_PII_WARNING_TEXT 8452
+#define IDS_SUPPORT_TOOL_INCLUDE_ALL_PII_RADIO_BUTTON 8453
+#define IDS_SUPPORT_TOOL_REMOVE_PII_RADIO_BUTTON 8454
+#define IDS_SUPPORT_TOOL_PII_REMOVAL_DISCLAIMER 8455
+#define IDS_SUPPORT_TOOL_MANUALLY_SELECT_PII_RADIO_BUTTON 8456
+#define IDS_SUPPORT_TOOL_CANCEL_BUTTON_TEXT 8457
+#define IDS_SUPPORT_TOOL_EXPORT_BUTTON_TEXT 8458
+#define IDS_SUPPORT_TOOL_BACK_BUTTON_TEXT 8459
+#define IDS_SUPPORT_TOOL_DISMISS_BUTTON_TEXT 8460
+#define IDS_SUPPORT_TOOL_CONTINUE_BUTTON_TEXT 8461
+#define IDS_SUPPORT_TOOL_DATA_COLLECTION_SPINNER 8462
+#define IDS_SUPPORT_TOOL_DATA_EXPORT_SPINNER 8463
+#define IDS_SUPPORT_TOOL_TAB_TITLE 8464
+#define IDS_SUPPORT_TOOL_URL_GENERATOR_PAGE_TITLE 8465
+#define IDS_SUPPORT_TOOL_DATA_COLLECTOR_LIST_TITLE 8466
+#define IDS_SUPPORT_TOOL_GET_LINK_TEXT 8467
+#define IDS_SUPPORT_TOOL_COPY_LINK_DESCRIPTION 8468
+#define IDS_SUPPORT_TOOL_COPY_LINK_BUTTON_TEXT 8469
+#define IDS_SUPPORT_TOOL_COPY_TOKEN_BUTTON_TEXT 8470
+#define IDS_SUPPORT_TOOL_DONT_INCLUDE_EMAIL 8471
+#define IDS_SUPPORT_TOOL_LINK_COPIED_TEXT 8472
+#define IDS_SUPPORT_TOOL_TOKEN_COPIED_TEXT 8473
+#define IDS_SUPPORT_TOOL_SELECT_DATA_COLLECTOR_ERROR 8474
+#define IDS_SUPPORT_TOOL_SELECT_ALL 8475
+#define IDS_SUPPORT_TOOL_SELECT_NONE 8476
+#define IDS_SUPPORT_TOOL_CHROME_SYSTEM_INFO 8477
+#define IDS_SUPPORT_TOOL_CRASH_IDS 8478
+#define IDS_SUPPORT_TOOL_MEMORY_DETAILS 8479
+#define IDS_SUPPORT_TOOL_UI_HIEARCHY 8480
+#define IDS_SUPPORT_TOOL_ADDITIONAL_CROS_PLATFROM_LOGS 8481
+#define IDS_SUPPORT_TOOL_DEVICE_EVENT 8482
+#define IDS_SUPPORT_TOOL_INTEL_WIFI_DEBUG_DUMP 8483
+#define IDS_SUPPORT_TOOL_TOUCH_EVENTS 8484
+#define IDS_SUPPORT_TOOL_LACROS_SYSTEM_INFO 8485
+#define IDS_SUPPORT_TOOL_LACROS 8486
+#define IDS_SUPPORT_TOOL_CHROMEOS_FLEX_LOGS 8487
+#define IDS_SUPPORT_TOOL_DBUS_DETAILS 8488
+#define IDS_SUPPORT_TOOL_CHROMEOS_NETWORK_ROUTES 8489
+#define IDS_SUPPORT_TOOL_CHROMEOS_SHILL_LOGS 8490
+#define IDS_SUPPORT_TOOL_POLICIES 8491
+#define IDS_SUPPORT_TOOL_CHROMEOS_SYSTEM_STATE 8492
+#define IDS_SUPPORT_TOOL_CHROMEOS_SYSTEM_LOGS 8493
+#define IDS_SUPPORT_TOOL_CHROMEOS_CHROME_USER_LOGS 8494
+#define IDS_SUPPORT_TOOL_CHROMEOS_BLUETOOTH_FLOSS 8495
+#define IDS_SUPPORT_TOOL_CHROMEOS_CONNECTED_INPUT_DEVICES 8496
+#define IDS_SUPPORT_TOOL_CHROMEOS_TRAFFIC_COUNTERS 8497
+#define IDS_SUPPORT_TOOL_CHROMEOS_VIRTUAL_KEYBOARD 8498
+#define IDS_SUPPORT_TOOL_CHROMEOS_NETWORK_HEALTH 8499
+#define IDS_SUPPORT_TOOL_PERFORMANCE 8500
+#define IDS_SUPPORT_TOOL_SIGN_IN 8501
+#define IDS_SUPPORT_TOOL_CHROMEOS_APP_SERVICE 8502
+#define IDS_SUPPORT_TOOL_ANDROID_APP_INFO 8503
+#define IDS_SUPPORT_TOOL_WIFI_SSID 8504
+#define IDS_SUPPORT_TOOL_CELLULAR_LOCATION_INFO 8505
+#define IDS_SUPPORT_TOOL_EMAIL_ADDRESS 8506
+#define IDS_SUPPORT_TOOL_GAIA_ID 8507
+#define IDS_SUPPORT_TOOL_STABLE_IDENTIDIERS 8508
+#define IDS_SUPPORT_TOOL_PRINTING_IPP_ADDRESS 8509
+#define IDS_SUPPORT_TOOL_IP_ADDRESS 8510
+#define IDS_SUPPORT_TOOL_MAC_ADDRESS 8511
+#define IDS_SUPPORT_TOOL_WINDOW_TITLES 8512
+#define IDS_SUPPORT_TOOL_URLS 8513
+#define IDS_SUPPORT_TOOL_SERIAL_NUMBERS 8514
+#define IDS_SUPPORT_TOOL_REMOVABLE_STORAGE_NAMES 8515
+#define IDS_SUPPORT_TOOL_EAP 8516
+#define IDS_EXTENSIONS_ALLOW_FILE_ACCESS 8517
+#define IDS_EXTENSIONS_ALLOW_ON_ALL_URLS 8518
+#define IDS_EXTENSIONS_ALLOW_ON_FOLLOWING_SITES 8519
+#define IDS_EXTENSIONS_VIEW_ACTIVITY_LOG 8520
+#define IDS_EXTENSIONS_BACKGROUND_PAGE 8521
+#define IDS_EXTENSIONS_SERVICE_WORKER_BACKGROUND 8522
+#define IDS_EXTENSIONS_CORRUPTED_EXTENSION 8523
+#define IDS_EXTENSIONS_ENABLE_ERROR_COLLECTION 8524
+#define IDS_EXTENSIONS_ENABLE_TOGGLE_TOOLTIP_DISABLED 8525
+#define IDS_EXTENSIONS_ENABLE_TOGGLE_TOOLTIP_ENABLED 8526
+#define IDS_EXTENSIONS_ENABLE_TOGGLE_TOOLTIP_ENABLED_WITH_SITE_ACCESS 8527
+#define IDS_EXTENSIONS_ERROR_NO_ERRORS_CODE_MESSAGE 8528
+#define IDS_EXTENSIONS_INSTALL_DROP_TARGET 8529
+#define IDS_EXTENSIONS_INSTALL_WARNINGS 8530
+#define IDS_EXTENSIONS_LOG_LEVEL_ERROR 8531
+#define IDS_EXTENSIONS_LOG_LEVEL_INFO 8532
+#define IDS_EXTENSIONS_LOG_LEVEL_WARN 8533
+#define IDS_EXTENSIONS_PATH 8534
+#define IDS_EXTENSIONS_PERMISSIONS_OFF 8535
+#define IDS_EXTENSIONS_RELOAD_TERMINATED 8536
+#define IDS_EXTENSIONS_REPAIR_CORRUPTED 8537
+#define IDS_EXTENSIONS_VIEW_IFRAME 8538
+#define IDS_EXTENSIONS_VIEW_INACTIVE 8539
+#define IDS_EXTENSIONS_VIEW_INCOGNITO 8540
+#define IDS_EXTENSIONS_DEVELOPER_MODE 8541
+#define IDS_EXTENSIONS_DISABLED_UPDATE_REQUIRED_BY_POLICY 8542
+#define IDS_EXTENSIONS_DISABLED_PUBLISHED_IN_STORE_REQUIRED_BY_POLICY 8543
+#define IDS_EXTENSIONS_MATCHING_RESTRICTED_SITES_ALLOW 8544
+#define IDS_EXTENSIONS_MATCHING_RESTRICTED_SITES_TITLE 8545
+#define IDS_EXTENSIONS_MATCHING_RESTRICTED_SITES_WARNING 8546
+#define IDS_EXTENSIONS_MENU_BUTTON_LABEL 8547
+#define IDS_EXTENSIONS_ERROR_PAGE_HEADING 8548
+#define IDS_EXTENSIONS_EDIT_SITE_PERMISSIONS_ALLOW_ALL_EXTENSIONS 8549
+#define IDS_EXTENSIONS_EDIT_SITE_PERMISSIONS_CUSTOMIZE_PER_EXTENSION 8550
+#define IDS_EXTENSIONS_EDIT_SITE_PERMISSIONS_RESTRICT_EXTENSIONS 8551
+#define IDS_EXTENSIONS_ERROR_ANONYMOUS_FUNCTION 8552
+#define IDS_EXTENSIONS_ERROR_CONTEXT 8553
+#define IDS_EXTENSIONS_ERROR_CONTEXT_UNKNOWN 8554
+#define IDS_EXTENSIONS_CLEAR_ACTIVITIES 8555
+#define IDS_EXTENSIONS_ERROR_CLEAR_ALL 8556
+#define IDS_EXTENSIONS_A11Y_CLEAR_ENTRY 8557
+#define IDS_EXTENSIONS_ERROR_STACK_TRACE 8558
+#define IDS_EXTENSIONS_ERROR_LINES_NOT_SHOWN 8559
+#define IDS_EXTENSIONS_HOST_PERMISSIONS_DESCRIPTION 8560
+#define IDS_EXTENSIONS_PERMISSIONS_LEARN_MORE_A11Y_LABEL 8561
+#define IDS_EXTENSIONS_HOST_PERMISSIONS_EDIT 8562
+#define IDS_EXTENSIONS_ITEM_ERRORS 8563
+#define IDS_EXTENSIONS_ITEM_HOST_PERMISSIONS_HEADING 8564
+#define IDS_EXTENSIONS_NEW_HOST_PERMISSIONS_HEADING 8565
+#define IDS_EXTENSIONS_HOST_PERMISSIONS_SUB_HEADING 8566
+#define IDS_EXTENSIONS_HOST_ACCESS_ON_CLICK 8567
+#define IDS_EXTENSIONS_HOST_ACCESS_ASK_ON_EVERY_VISIT 8568
+#define IDS_EXTENSIONS_HOST_ACCESS_ON_SPECIFIC_SITES 8569
+#define IDS_EXTENSIONS_HOST_ACCESS_ALLOW_ON_SPECIFIC_SITES 8570
+#define IDS_EXTENSIONS_HOST_ACCESS_ON_ALL_SITES 8571
+#define IDS_EXTENSIONS_HOST_ACCESS_ALLOW_ON_ALL_SITES 8572
+#define IDS_EXTENSIONS_ITEM_ALLOWED_HOSTS 8573
+#define IDS_EXTENSIONS_ACCESSIBILITY_ERROR_LINE 8574
+#define IDS_EXTENSIONS_ACCESSIBILITY_ERROR_MULTI_LINE 8575
+#define IDS_EXTENSIONS_ACTIVITY_LOG_PAGE_HEADING 8576
+#define IDS_EXTENSIONS_ACTIVITY_LOG_SEARCH_LABEL 8577
+#define IDS_EXTENSIONS_ACTIVITY_LOG_TYPE_COLUMN 8578
+#define IDS_EXTENSIONS_ACTIVITY_LOG_NAME_COLUMN 8579
+#define IDS_EXTENSIONS_ACTIVITY_LOG_COUNT_COLUMN 8580
+#define IDS_EXTENSIONS_ACTIVITY_LOG_TIME_COLUMN 8581
+#define IDS_EXTENSIONS_ACTIVITY_LOG_HISTORY_TAB_HEADING 8582
+#define IDS_EXTENSIONS_ACTIVITY_LOG_STREAM_TAB_HEADING 8583
+#define IDS_EXTENSIONS_START_ACTIVITY_STREAM 8584
+#define IDS_EXTENSIONS_STOP_ACTIVITY_STREAM 8585
+#define IDS_EXTENSIONS_EMPTY_STREAM_STARTED 8586
+#define IDS_EXTENSIONS_EMPTY_STREAM_STOPPED 8587
+#define IDS_EXTENSIONS_ACTIVITY_ARGUMENTS_HEADING 8588
+#define IDS_EXTENSIONS_WEB_REQUEST_INFO_HEADING 8589
+#define IDS_EXTENSIONS_ACTIVITY_LOG_MORE_ACTIONS_LABEL 8590
+#define IDS_EXTENSIONS_ACTIVITY_LOG_EXPAND_ALL 8591
+#define IDS_EXTENSIONS_ACTIVITY_LOG_COLLAPSE_ALL 8592
+#define IDS_EXTENSIONS_ACTIVITY_LOG_EXPORT_HISTORY 8593
+#define IDS_EXTENSIONS_ITEM_ID 8594
+#define IDS_EXTENSIONS_ITEM_INSPECT_VIEWS 8595
+#define IDS_EXTENSIONS_ITEM_INSPECT_VIEWS_EXTRA 8596
+#define IDS_EXTENSIONS_ITEM_NO_ACTIVE_VIEWS 8597
+#define IDS_EXTENSIONS_ITEM_ALLOW_INCOGNITO 8598
+#define IDS_EXTENSIONS_ITEM_DEPENDENCIES 8599
+#define IDS_EXTENSIONS_DEPENDENT_ENTRY 8600
+#define IDS_EXTENSIONS_ITEM_DESCRIPTION 8601
+#define IDS_EXTENSIONS_ITEM_DETAILS 8602
+#define IDS_EXTENSIONS_DETAILS_BACK_BUTTON_ARIA_LABEL 8603
+#define IDS_EXTENSIONS_DETAILS_BACK_BUTTON_ARIA_ROLE_DESCRIPTION 8604
+#define IDS_EXTENSIONS_EXTENSION_A11Y_ASSOCIATION 8605
+#define IDS_EXTENSIONS_APP_ICON 8606
+#define IDS_EXTENSIONS_EXTENSION_ICON 8607
+#define IDS_EXTENSIONS_ITEM_ID_HEADING 8608
+#define IDS_EXTENSIONS_EXTENSION_ENABLED 8609
+#define IDS_EXTENSIONS_APP_ENABLED 8610
+#define IDS_EXTENSIONS_ITEM_OFF 8611
+#define IDS_EXTENSIONS_ITEM_ON 8612
+#define IDS_EXTENSIONS_ITEM_EXTENSION_WEBSITE 8613
+#define IDS_EXTENSIONS_ITEM_CHROME_WEB_STORE 8614
+#define IDS_EXTENSIONS_ITEM_OPTIONS 8615
+#define IDS_EXTENSIONS_ITEM_PERMISSIONS 8616
+#define IDS_EXTENSIONS_ITEM_PERMISSIONS_EMPTY 8617
+#define IDS_EXTENSIONS_ITEM_PERMISSIONS_AND_SITE_ACCESS_EMPTY 8618
+#define IDS_EXTENSIONS_ITEM_PIN_TO_TOOLBAR 8619
+#define IDS_EXTENSIONS_ITEM_REMOVE_EXTENSION 8620
+#define IDS_EXTENSIONS_ITEM_SITE_ACCESS 8621
+#define IDS_EXTENSIONS_ITEM_SITE_ACCESS_ADD_HOST 8622
+#define IDS_EXTENSIONS_ITEM_SITE_ACCESS_EMPTY 8623
+#define IDS_EXTENSIONS_REMOVE_SITES_DIALOG_TITLE 8624
+#define IDS_EXTENSIONS_ITEM_SOURCE 8625
+#define IDS_EXTENSIONS_ITEM_SOURCE_INSTALLED_BY_DEFAULT 8626
+#define IDS_EXTENSIONS_ITEM_SOURCE_POLICY 8627
+#define IDS_EXTENSIONS_ITEM_SOURCE_SIDELOADED 8628
+#define IDS_EXTENSIONS_ITEM_SOURCE_UNPACKED 8629
+#define IDS_EXTENSIONS_ITEM_SOURCE_WEBSTORE 8630
+#define IDS_EXTENSIONS_ITEM_VERSION 8631
+#define IDS_EXTENSIONS_ITEM_RELOADED 8632
+#define IDS_EXTENSIONS_ITEM_RELOADING 8633
+#define IDS_EXTENSIONS_LOAD_ERROR_HEADING 8634
+#define IDS_EXTENSIONS_LOAD_ERROR_ERROR_LABEL 8635
+#define IDS_EXTENSIONS_LOAD_ERROR_FILE_LABEL 8636
+#define IDS_EXTENSIONS_LOAD_ERROR_COULD_NOT_LOAD_MANIFEST 8637
+#define IDS_EXTENSIONS_LOAD_ERROR_RETRY 8638
+#define IDS_EXTENSIONS_LOADING_ACTIVITIES 8639
+#define IDS_MISSING_OR_UNINSTALLED_EXTENSION 8640
+#define IDS_EXTENSIONS_NO_ACTIVITIES 8641
+#define IDS_EXTENSIONS_NO_INSTALLED_ITEMS 8642
+#define IDS_EXTENSIONS_NO_DESCRIPTION 8643
+#define IDS_EXTENSIONS_OPENS_IN_NEW_TAB 8644
+#define IDS_EXTENSIONS_PACK_DIALOG_TITLE 8645
+#define IDS_EXTENSIONS_PACK_DIALOG_WARNING_TITLE 8646
+#define IDS_EXTENSIONS_PACK_DIALOG_ERROR_TITLE 8647
+#define IDS_EXTENSIONS_PACK_DIALOG_PROCEED_ANYWAY 8648
+#define IDS_EXTENSIONS_PACK_DIALOG_BROWSE_BUTTON 8649
+#define IDS_EXTENSIONS_PACK_DIALOG_EXTENSION_ROOT_LABEL 8650
+#define IDS_EXTENSIONS_PACK_DIALOG_KEY_FILE_LABEL 8651
+#define IDS_EXTENSIONS_PACK_DIALOG_CONFIRM_BUTTON 8652
+#define IDS_EXTENSIONS_TOOLBAR_TITLE 8653
+#define IDS_EXTENSIONS_SEARCH 8654
+#define IDS_EXTENSIONS_SITE_PERMISSIONS 8655
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_PAGE_TITLE 8656
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_VIEW_ALL_SITES 8657
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ALL_SITES_PAGE_TITLE 8658
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ALL_SITES_ONE_EXTENSION 8659
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ALL_SITES_EXTENSION_COUNT 8660
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ALWAYS_ON_ALL_SITES 8661
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ALWAYS_ON_THIS_SITE 8662
+#define IDS_EXTENSIONS_SITE_SETTINGS 8663
+#define IDS_EXTENSIONS_PERMITTED_SITES 8664
+#define IDS_EXTENSIONS_RESTRICTED_SITES 8665
+#define IDS_EXTENSIONS_NO_SITES_ADDED 8666
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ADD_SITE_DIALOG_TITLE 8667
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_EDIT_SITE_DIALOG_TITLE 8668
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_EDIT_URL 8669
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_EDIT_PERMISSIONS_DIALOG_TITLE 8670
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_EDIT_PERMISSIONS 8671
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_ASK_ON_EVERY_VISIT 8672
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_DIALOG_INPUT_ERROR 8673
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_DIALOG_INPUT_LABEL 8674
+#define IDS_EXTENSIONS_SITE_PERMISSIONS_INCLUDES_SUBDOMAINS 8675
+#define IDS_EXTENSIONS_EDIT_SHORTCUT_INPUT_LABEL 8676
+#define IDS_EXTENSIONS_EDIT_SHORTCUT_BUTTON_LABEL 8677
+#define IDS_EXTENSIONS_SHORTCUT_NOT_SET 8678
+#define IDS_EXTENSIONS_SHORTCUT_SCOPE_LABEL 8679
+#define IDS_EXTENSIONS_SHORTCUT_SCOPE_GLOBAL 8680
+#define IDS_EXTENSIONS_APPS_TITLE 8681
+#define IDS_EXTENSIONS_REMOVE 8682
+#define IDS_EXTENSIONS_RUNTIME_HOSTS_DIALOG_TITLE 8683
+#define IDS_EXTENSIONS_RUNTIME_HOSTS_DIALOG_INPUT_ERROR 8684
+#define IDS_EXTENSIONS_RUNTIME_HOSTS_DIALOG_INPUT_LABEL 8685
+#define IDS_EXTENSIONS_SIDEBAR_EXTENSIONS 8686
+#define IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE 8687
+#define IDS_EXTENSIONS_SIDEBAR_KEYBOARD_SHORTCUTS 8688
+#define IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED 8689
+#define IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE 8690
+#define IDS_EXTENSIONS_TOOLBAR_PACK 8691
+#define IDS_EXTENSIONS_TOOLBAR_UPDATE_NOW 8692
+#define IDS_EXTENSIONS_TOOLBAR_UPDATE_NOW_TOOLTIP 8693
+#define IDS_EXTENSIONS_TOOLBAR_UPDATE_DONE 8694
+#define IDS_EXTENSIONS_TOOLBAR_UPDATING_TOAST 8695
+#define IDS_EXTENSIONS_SHORTCUT_SET 8696
+#define IDS_EXTENSIONS_TYPE_A_SHORTCUT 8697
+#define IDS_EXTENSIONS_SUBPAGE_BUTTON 8698
+#define IDS_EXTENSIONS_SC_MALWARE 8699
+#define IDS_EXTENSIONS_SC_POLICY_VIOLATION_OFF 8700
+#define IDS_EXTENSIONS_SC_POLICY_VIOLATION_ON 8701
+#define IDS_EXTENSIONS_SC_UNPUBLISHED_OFF 8702
+#define IDS_EXTENSIONS_SC_UNPUBLISHED_ON 8703
+#define IDS_EXTENSIONS_SC_TITLE 8704
+#define IDS_EXTENSIONS_SC_DESCRIPTION 8705
+#define IDS_EXTENSIONS_SC_KEEP_EXT 8706
+#define IDS_EXTENSIONS_SC_REMOVE_ALL 8707
+#define IDS_EXTENSIONS_SC_ALL_DONE_FOR_NOW 8708
+#define IDS_EXTENSIONS_SC_ALL_EXTENSIONS 8709
+#define IDS_EXTENSIONS_SC_REMOVE_BUTTON_A11Y_LABEL 8710
+#define IDS_EXTENSIONS_SC_OPTION_MENU_A11Y_LABEL 8711
+#define IDS_EXTENSIONS_INCLUDE_START_MODIFIER 8712
+#define IDS_EXTENSIONS_TOO_MANY_MODIFIERS 8714
+#define IDS_EXTENSIONS_NEED_CHARACTER 8715
+#define IDS_NEARBY_CONFIRMATION_PAGE_ADD_CONTACT_SUBTITLE 8726
+#define IDS_NEARBY_CONFIRMATION_PAGE_ADD_CONTACT_TITLE 8727
+#define IDS_NEARBY_CONFIRMATION_PAGE_TITLE 8728
+#define IDS_NEARBY_CONTACT_VISIBILITY_DOWNLOAD_FAILED 8729
+#define IDS_NEARBY_CONTACT_VISIBILITY_DOWNLOADING 8730
+#define IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_SUBTITLE 8731
+#define IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_SUBTITLE_PH 8732
+#define IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_TITLE 8733
+#define IDS_NEARBY_CONTACT_VISIBILITY_NUM_UNREACHABLE 8734
+#define IDS_NEARBY_CONTACT_VISIBILITY_NUM_UNREACHABLE_PH 8735
+#define IDS_NEARBY_CONTACT_VISIBILITY_OWN_ALL 8736
+#define IDS_NEARBY_CONTACT_VISIBILITY_OWN_ALL_SELF_SHARE 8737
+#define IDS_NEARBY_CONTACT_VISIBILITY_OWN_NONE 8738
+#define IDS_NEARBY_CONTACT_VISIBILITY_OWN_SOME 8739
+#define IDS_NEARBY_CONTACT_VISIBILITY_OWN_SOME_SELF_SHARE 8740
+#define IDS_NEARBY_CONTACT_VISIBILITY_ZERO_STATE_TEXT 8741
+#define IDS_NEARBY_CONTACT_VISIBILITY_OWN_YOUR_DEVICES 8742
+#define IDS_NEARBY_DEVICE_NAME_EMPTY_ERROR 8743
+#define IDS_NEARBY_DEVICE_NAME_TOO_LONG_ERROR 8744
+#define IDS_NEARBY_DEVICE_NAME_INVALID_CHARACTERS_ERROR 8745
+#define IDS_NEARBY_DISCOVERY_PAGE_INFO 8746
+#define IDS_NEARBY_DISCOVERY_PAGE_SUBTITLE 8747
+#define IDS_NEARBY_DISCOVERY_PAGE_TITLE 8748
+#define IDS_NEARBY_DISCOVERY_PAGE_TITLE_PH 8749
+#define IDS_NEARBY_DISCOVERY_PAGE_PLACEHOLDER 8750
+#define IDS_NEARBY_ONBOARDING_PAGE_DEVICE_NAME 8751
+#define IDS_NEARBY_ONBOARDING_PAGE_DEVICE_NAME_HELP 8752
+#define IDS_NEARBY_ONBOARDING_PAGE_SUBTITLE 8753
+#define IDS_NEARBY_ONBOARDING_PAGE_TITLE 8754
+#define IDS_NEARBY_ONBOARDING_PAGE_TITLE_PH 8755
+#define IDS_NEARBY_ONBOARDING_PAGE_DEVICE_VISIBILITY 8756
+#define IDS_NEARBY_ONBOARDING_PAGE_DEVICE_VISIBILITY_HELP_ALL_CONTACTS 8757
+#define IDS_NEARBY_VISIBILITY_PAGE_MANAGE_CONTACTS 8758
+#define IDS_NEARBY_VISIBILITY_PAGE_SUBTITLE 8759
+#define IDS_NEARBY_VISIBILITY_PAGE_TITLE 8760
+#define IDS_NEARBY_SHARE_FEATURE_NAME 8761
+#define IDS_NEARBY_SHARE_FEATURE_NAME_PH 8762
+#define IDS_NEARBY_ACTIONS_ACCEPT 8763
+#define IDS_NEARBY_ACTIONS_CANCEL 8764
+#define IDS_NEARBY_ACTIONS_CLOSE 8765
+#define IDS_NEARBY_ACTIONS_CONFIRM 8766
+#define IDS_NEARBY_ACTIONS_DECLINE 8767
+#define IDS_NEARBY_ACTIONS_NEXT 8768
+#define IDS_NEARBY_ACTIONS_REJECT 8769
+#define IDS_NEARBY_DEFAULT_DEVICE_NAME 8770
+#define IDS_NEARBY_ERROR_CANCELLED 8771
+#define IDS_NEARBY_ERROR_CANT_RECEIVE 8772
+#define IDS_NEARBY_ERROR_CANT_SHARE 8773
+#define IDS_NEARBY_ERROR_NO_RESPONSE 8774
+#define IDS_NEARBY_ERROR_TRANSFER_IN_PROGRESS 8775
+#define IDS_NEARBY_ERROR_NOT_ENOUGH_SPACE 8776
+#define IDS_NEARBY_ERROR_REJECTED 8777
+#define IDS_NEARBY_ERROR_SOMETHING_WRONG 8778
+#define IDS_NEARBY_ERROR_TIME_OUT 8779
+#define IDS_NEARBY_ERROR_TRY_AGAIN 8780
+#define IDS_NEARBY_ERROR_UNSUPPORTED_FILE_TYPE 8781
+#define IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_APPS 8782
+#define IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_APPS 8783
+#define IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_IMAGES 8784
+#define IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_IMAGES 8785
+#define IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_UNKNOWN 8786
+#define IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_UNKNOWN 8787
+#define IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_VIDEOS 8788
+#define IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_VIDEOS 8789
+#define IDS_NEARBY_SECURE_CONNECTION_ID 8790
+#define IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_ADDRESSES 8791
+#define IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_ADDRESSES 8792
+#define IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_LINKS 8793
+#define IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_LINKS 8794
+#define IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_PHONE_NUMBERS 8795
+#define IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_PHONE_NUMBERS 8796
+#define IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_UNKNOWN 8797
+#define IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_UNKNOWN 8798
+#define IDS_NEARBY_CAPITALIZED_UNKNOWN_ATTACHMENTS 8799
+#define IDS_NEARBY_NOT_CAPITALIZED_UNKNOWN_ATTACHMENTS 8800
+#define IDS_NEARBY_HIGH_VISIBILITY_SUB_TITLE 8801
+#define IDS_NEARBY_HIGH_VISIBILITY_SUB_TITLE_MINUTES 8802
+#define IDS_NEARBY_HIGH_VISIBILITY_SUB_TITLE_SECONDS 8803
+#define IDS_NEARBY_HIGH_VISIBILITY_HELP_TEXT 8804
+#define IDS_NEARBY_HIGH_VISIBILITY_TIMEOUT_TEXT 8805
+#define IDS_NEARBY_HIGH_VISIBILITY_TRANSFER_IN_PROGRESS_ERROR 8806
+#define IDS_NEARBY_HIGH_VISIBILITY_TRANSFER_IN_PROGRESS_DESCRIPTION 8807
+#define IDS_NEARBY_HIGH_VISIBILITY_CONNECTION_MEDIUM_ERROR 8808
+#define IDS_NEARBY_HIGH_VISIBILITY_CONNECTION_MEDIUM_DESCRIPTION 8809
+#define IDS_NEARBY_HIGH_VISIBILITY_CONNECTION_MEDIUM_DESCRIPTION_PH 8810
+#define IDS_NEARBY_RECEIVE_CONFIRM_PAGE_TITLE 8811
+#define IDS_NEARBY_RECEIVE_CONFIRM_PAGE_CONNECTION_ID 8812
+#define IDS_NEARBY_PREVIEW_TITLE_MULTIPLE_FILE 8813
+#define IDS_NEARBY_ACCOUNT_ROW_LABEL 8814
+#define IDS_NEARBY_ACCOUNT_ROW_LABEL_PH 8815
+#define IDS_NEARBY_SETTINGS_HELP_CAPTION_TOP 8816
+#define IDS_NEARBY_SETTINGS_HELP_CAPTION_TOP_PH 8817
+#define IDS_NEARBY_SETTINGS_HELP_CAPTION_BOTTOM 8818
+#define IDS_NEARBY_VISIBLITY_ALL_CONTACTS 8819
+#define IDS_NEARBY_VISIBLITY_ALL_CONTACTS_DESCRIPTION 8820
+#define IDS_NEARBY_VISIBILITY_CONTACTS_BUTTON 8821
+#define IDS_NEARBY_VISIBLITY_SOME_CONTACTS 8822
+#define IDS_NEARBY_VISIBLITY_SOME_CONTACTS_DESCRIPTION 8823
+#define IDS_NEARBY_VISIBILITY_YOUR_DEVICES 8824
+#define IDS_NEARBY_VISIBILITY_YOUR_DEVICES_DESCRIPTION 8825
+#define IDS_NEARBY_VISIBILITY_ALL_CONTACTS_TOGGLE 8826
+#define IDS_NEARBY_VISIBLITY_HIDDEN 8827
+#define IDS_NEARBY_VISIBLITY_HIDDEN_DESCRIPTION 8828
+#define IDS_NEARBY_VISIBLITY_UNKNOWN 8829
+#define IDS_NEARBY_VISIBLITY_UNKNOWN_DESCRIPTION 8830
+#define IDS_NEARBY_NOTIFICATION_ACTION_COPY_TO_CLIPBOARD 8831
+#define IDS_NEARBY_NOTIFICATION_ACTION_OPEN_FOLDER 8832
+#define IDS_NEARBY_NOTIFICATION_ACTION_OPEN_NETWORK_LIST 8833
+#define IDS_NEARBY_NOTIFICATION_ACTION_OPEN_URL 8834
+#define IDS_NEARBY_NOTIFICATION_ACCEPT_ACTION 8835
+#define IDS_NEARBY_NOTIFICATION_CONNECTION_REQUEST_MESSAGE 8836
+#define IDS_NEARBY_NOTIFICATION_CONNECTION_REQUEST_MESSAGE_WIFI_CREDENTIALS 8837
+#define IDS_NEARBY_NOTIFICATION_CONNECTION_REQUEST_TITLE 8838
+#define IDS_NEARBY_NOTIFICATION_CONNECTION_REQUEST_TITLE_PH 8839
+#define IDS_NEARBY_NOTIFICATION_DECLINE_ACTION 8840
+#define IDS_NEARBY_NOTIFICATION_ONBOARDING_MESSAGE 8841
+#define IDS_NEARBY_NOTIFICATION_ONBOARDING_MESSAGE_PH 8842
+#define IDS_NEARBY_NOTIFICATION_GO_VISIBLE_MESSAGE 8843
+#define IDS_NEARBY_NOTIFICATION_ONBOARDING_TITLE 8844
+#define IDS_NEARBY_NOTIFICATION_SET_UP_ACTION 8845
+#define IDS_NEARBY_NOTIFICATION_GO_VISIBLE_ACTION 8846
+#define IDS_NEARBY_NOTIFICATION_VISIBILITY_REMINDER_TITLE 8847
+#define IDS_NEARBY_NOTIFICATION_VISIBILITY_REMINDER_MESSAGE 8848
+#define IDS_NEARBY_NOTIFICATION_GO_TO_SETTINGS_ACTION 8849
+#define IDS_NEARBY_NOTIFICATION_DISMISS_ACTION 8850
+#define IDS_NEARBY_NOTIFICATION_RECEIVE_FAILURE_TITLE 8851
+#define IDS_NEARBY_NOTIFICATION_RECEIVE_FAILURE_TITLE_WIFI_CREDENTIALS 8852
+#define IDS_NEARBY_NOTIFICATION_RECEIVE_PROGRESS_TITLE 8853
+#define IDS_NEARBY_NOTIFICATION_RECEIVE_PROGRESS_TITLE_WIFI_CREDENTIALS 8854
+#define IDS_NEARBY_NOTIFICATION_RECEIVE_SUCCESS_TITLE 8855
+#define IDS_NEARBY_NOTIFICATION_RECEIVE_SUCCESS_TITLE_WIFI_CREDENTIALS 8856
+#define IDS_NEARBY_NOTIFICATION_SEND_FAILURE_TITLE 8857
+#define IDS_NEARBY_NOTIFICATION_SEND_PROGRESS_TITLE 8858
+#define IDS_NEARBY_NOTIFICATION_SEND_SUCCESS_TITLE 8859
+#define IDS_NEARBY_NOTIFICATION_SOURCE 8860
+#define IDS_NEARBY_NOTIFICATION_SOURCE_PH 8861
+#define IDS_NEARBY_NOTIFICATION_SENDER_CANCELLED 8862
+#define IDS_WELCOME_NEXT 8863
+#define IDS_WELCOME_SKIP 8864
+#define IDS_WELCOME_STEPS 8865
+#define IDS_WELCOME_BOOKMARK_ADDED 8866
+#define IDS_WELCOME_BOOKMARKS_ADDED 8867
+#define IDS_WELCOME_BOOKMARK_REMOVED 8868
+#define IDS_WELCOME_BOOKMARKS_REMOVED 8869
+#define IDS_DEFAULT_BROWSER_CHANGED 8870
+#define IDS_WELCOME_GOOGLE_APPS_DESCRIPTION 8871
+#define IDS_WELCOME_GOOGLE_GMAIL 8873
+#define IDS_WELCOME_GOOGLE_APPS_MAPS 8874
+#define IDS_WELCOME_GOOGLE_APPS_NEWS 8875
+#define IDS_WELCOME_GOOGLE_APPS_TRANSLATE 8876
+#define IDS_WELCOME_GOOGLE_APPS_YOUTUBE 8877
+#define IDS_WELCOME_NTP_BACKGROUND_DESCRIPTION 8878
+#define IDS_WELCOME_NTP_BACKGROUND_DEFAULT_TITLE 8879
+#define IDS_WELCOME_NTP_BACKGROUND_ART_TITLE 8880
+#define IDS_WELCOME_NTP_BACKGROUND_LANDSCAPE_TITLE 8881
+#define IDS_WELCOME_NTP_BACKGROUND_CITYSCAPE_TITLE 8882
+#define IDS_WELCOME_NTP_BACKGROUND_EARTH_TITLE 8883
+#define IDS_WELCOME_NTP_BACKGROUND_GEOMETRIC_SHAPES_TITLE 8884
+#define IDS_WELCOME_NTP_BACKGROUND_PHOTO_BY_LABEL 8885
+#define IDS_WELCOME_NTP_BACKGROUND_PREVIEW_UPDATED 8886
+#define IDS_WELCOME_NTP_BACKGROUND_RESET 8887
+#define IDS_WELCOME_SET_AS_DEFAULT_HEADER 8888
+#define IDS_WELCOME_SET_AS_DEFAULT_SUB_HEADER 8889
+#define IDS_WELCOME_SET_AS_DEFAULT_SET_AS_DEFAULT 8890
+#define IDS_WELCOME_LANDING_TITLE 8891
+#define IDS_WELCOME_LANDING_DESCRIPTION 8892
+#define IDS_WELCOME_LANDING_NEW_USER 8893
+#define IDS_WELCOME_LANDING_EXISTING_USER 8894
+#define IDS_WELCOME_LANDING_PAUSE_ANIMATIONS 8895
+#define IDS_WELCOME_LANDING_PLAY_ANIMATIONS 8896
+#define IDS_WELCOME_SIGNIN_VIEW_HEADER 8897
+#define IDS_WELCOME_SIGNIN_VIEW_SUB_HEADER 8898
+#define IDS_WELCOME_SIGNIN_VIEW_SIGNIN 8899
+#define IDS_WHATS_NEW_TITLE 8900
+#define IDS_PASSWORD_MANAGER_UI_TITLE 8901
+#define IDS_PASSWORD_MANAGER_UI_SEARCH_PROMPT 8902
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP 8903
+#define IDS_PASSWORD_MANAGER_UI_PASSWORDS 8904
+#define IDS_PASSWORD_MANAGER_UI_SETTINGS 8905
+#define IDS_PASSWORD_MANAGER_UI_SAVE_PASSWORDS_TOGGLE_LABEL 8906
+#define IDS_PASSWORD_MANAGER_UI_AUTOSIGNIN_TOGGLE_LABEL 8907
+#define IDS_PASSWORD_MANAGER_UI_AUTOSIGNIN_TOGGLE_DESC 8908
+#define IDS_PASSWORD_MANAGER_UI_PASSWORDS_DESCRIPTION 8909
+#define IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD_BUTTON 8910
+#define IDS_PASSWORD_MANAGER_UI_ADD_SHORTCUT_TITLE 8911
+#define IDS_PASSWORD_MANAGER_UI_ADD_SHORTCUT_DESCRIPTION 8912
+#define IDS_PASSWORD_MANAGER_UI_TRUSTED_VAULT_OPT_IN_TITLE 8913
+#define IDS_PASSWORD_MANAGER_UI_TRUSTED_VAULT_OPT_IN_DESCRIPTION 8914
+#define IDS_PASSWORD_MANAGER_UI_TRUSTED_VAULT_OPTED_IN_TITLE 8915
+#define IDS_PASSWORD_MANAGER_UI_TRUSTED_VAULT_OPTED_IN_DESCRIPTION 8916
+#define IDS_PASSWORD_MANAGER_UI_SHARE 8917
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_ERROR_DESCRIPTION 8918
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_ERROR_TITLE 8919
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_LOADING_TITLE 8920
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_SUCCESS_TITLE 8921
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_CANCELED_TITLE 8922
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_NOT_FAMILY_MEMBER 8923
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_NO_OTHER_FAMILY_MEMBERS 8924
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_FAMILY_PICKER_DESCRIPTION 8925
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_CONFIRMATION_DESCRIPTION_SINGLE 8926
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_CONFIRMATION_DESCRIPTION_MULTIPLE 8927
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_CONFIRMATION_FOOTER_WEBSITE 8928
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_CONFIRMATION_FOOTER_ANDROID_APP 8929
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_VIEW_FAMILY 8930
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_MEMBER_UNAVAILABLE 8931
+#define IDS_PASSWORD_MANAGER_UI_SHARING_IS_MANAGED_BY_ADMIN 8932
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_NOT_AVAILABLE 8933
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_TRY_AGAIN 8934
+#define IDS_PASSWORD_MANAGER_UI_SHARE_PASSWORD_GOT_IT 8935
+#define IDS_PASSWORD_MANAGER_UI_SHARE_DIALOG_TITLE 8936
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_BANNER_TITLE 8937
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_DESCRIPTION_ACCOUNT_STORE_USERS 8938
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_DESCRIPTION_SYNCING_USERS 8939
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_DESCRIPTION_SIGNEDOUT_USERS 8940
+#define IDS_PASSWORD_MANAGER_UI_STORE_PICKER_OPTION_DEVICE 8941
+#define IDS_PASSWORD_MANAGER_UI_STORE_PICKER_OPTION_ACCOUNT 8942
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_STORE_PICKER_ACCESSIBLE_NAME 8943
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_SELECT_FILE_DESCRIPTION 8944
+#define IDS_PASSWORD_MANAGER_UI_SELECT_FILE 8945
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_MISSING_PASSWORD 8946
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_MISSING_URL 8947
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_INVALID_URL 8948
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_LONG_URL 8949
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_LONG_USERNAME 8950
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_LONG_PASSWORD 8951
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_LONG_NOTE 8952
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_CONFLICT_ACCOUNT 8953
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_CONFLICT_DEVICE 8954
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_ERROR_UNKNOWN 8955
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_ERROR_BAD_FORMAT 8956
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_FILE_SIZE_EXCEEDED 8957
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_ERROR_LIMIT_EXCEEDED 8958
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_ERROR_TITLE 8959
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_SUCCESS_TITLE 8960
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_COMPLETE_TITLE 8961
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_DELETE_FILE_OPTION 8962
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_VIEW_PASSWORDS 8963
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_ALREADY_ACTIVE 8964
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_SUCCESS_TIP 8965
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_FAILURES_SUMMARY 8966
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_BAD_ROWS_FORMAT 8967
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_SUCCESS_SUMMARY_ACCOUNT 8968
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_SUCCESS_SUMMARY_DEVICE 8969
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_CONFLICTS_TITLE 8970
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_CONFLICTS_DESCRIPTION 8971
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_CANCEL 8972
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_SKIP 8973
+#define IDS_PASSWORD_MANAGER_UI_IMPORT_REPLACE 8974
+#define IDS_PASSWORD_MANAGER_UI_EXPORT_TITLE 8975
+#define IDS_PASSWORD_MANAGER_UI_DOWNLOAD_FILE 8976
+#define IDS_PASSWORD_MANAGER_UI_EXPORT_BANNER_DESCRIPTION 8977
+#define IDS_PASSWORD_MANAGER_UI_EXPORT_SUCCESSFUL 8978
+#define IDS_PASSWORD_MANAGER_UI_EXPORT_TRY_AGAIN 8979
+#define IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TITLE 8980
+#define IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIPS 8981
+#define IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIP_ENOUGH_SPACE 8982
+#define IDS_PASSWORD_MANAGER_UI_EXPORTING_FAILURE_TIP_ANOTHER_FOLDER 8983
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_TITLE 8984
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_RESULT 8985
+#define IDS_PASSWORD_MANAGER_UI_JUST_NOW 8986
+#define IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_COUNT 8987
+#define IDS_PASSWORD_MANAGER_UI_NO_COMPROMISED_PASSWORDS 8988
+#define IDS_PASSWORD_MANAGER_UI_HAS_COMPROMISED_PASSWORDS 8989
+#define IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_COUNT 8990
+#define IDS_PASSWORD_MANAGER_UI_NO_REUSED_PASSWORDS 8991
+#define IDS_PASSWORD_MANAGER_UI_HAS_REUSED_PASSWORDS 8992
+#define IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_COUNT 8993
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_GREEN_STATE_A11Y 8994
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_YELLOW_STATE_A11Y 8995
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_RED_STATE_A11Y 8996
+#define IDS_PASSWORD_MANAGER_UI_NO_WEAK_PASSWORDS 8997
+#define IDS_PASSWORD_MANAGER_UI_HAS_WEAK_PASSWORDS 8998
+#define IDS_PASSWORD_MANAGER_UI_CHECK_PASSWORDS_AFTER_ERROR 8999
+#define IDS_PASSWORD_MANAGER_UI_BLOCKED_SITES_TITLE 9000
+#define IDS_PASSWORD_MANAGER_UI_BLOCKED_SITES_DESCRIPTION 9001
+#define IDS_PASSWORD_MANAGER_UI_NUMBER_OF_ACCOUNTS 9002
+#define IDS_PASSWORD_MANAGER_UI_USERNAME_LABEL 9003
+#define IDS_PASSWORD_MANAGER_UI_SITES_LABEL 9004
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_LABEL 9005
+#define IDS_PASSWORD_MANAGER_UI_NOTE_LABEL 9006
+#define IDS_PASSWORD_MANAGER_UI_NO_NOTE_ADDED 9007
+#define IDS_PASSWORD_MANAGER_UI_COPY_PASSWORD 9008
+#define IDS_PASSWORD_MANAGER_UI_COPY_USERNAME 9009
+#define IDS_PASSWORD_MANAGER_UI_SHOW_PASSWORD 9010
+#define IDS_PASSWORD_MANAGER_UI_HIDE_PASSWORD 9011
+#define IDS_PASSWORD_MANAGER_UI_SHOW_PASSWORD_A11Y 9012
+#define IDS_PASSWORD_MANAGER_UI_HIDE_PASSWORD_A11Y 9013
+#define IDS_PASSWORD_MANAGER_UI_FEDERATION_LABEL 9014
+#define IDS_PASSWORD_MANAGER_UI_USERNAME_COPIED_TO_CLIPBOARD 9015
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_COPIED_TO_CLIPBOARD 9016
+#define IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD 9017
+#define IDS_PASSWORD_MANAGER_UI_WEBSITE_LABEL 9018
+#define IDS_PASSWORD_MANAGER_UI_ADD_PASSWORD_FOOTNOTE 9019
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_LEAKED 9020
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED 9021
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_PHISHED_AND_LEAKED 9022
+#define IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON 9023
+#define IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_BUTTON_ARIA_DESCRIPTION 9024
+#define IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS 9025
+#define IDS_PASSWORD_MANAGER_UI_MORE_ACTIONS_ARIA_DESCRIPTION 9026
+#define IDS_PASSWORD_MANAGER_UI_COMPROMISED_PASSWORDS_DESCRIPTION 9027
+#define IDS_PASSWORD_MANAGER_UI_REUSED_PASSWORDS_DESCRIPTION 9028
+#define IDS_PASSWORD_MANAGER_UI_WEAK_PASSWORDS_DESCRIPTION 9029
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_SIGNED_OUT 9030
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_OFFLINE 9031
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_COMPROMISED_SECTION 9032
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_NO_PASSWORDS 9033
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_QUOTA_LIMIT 9034
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_OTHER_ERROR 9035
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_RUNNING_LABEL 9036
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_PROGRESS 9037
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_CANCELED 9038
+#define IDS_PASSWORD_MANAGER_UI_MUTED_COMPROMISED_PASSWORDS 9039
+#define IDS_PASSWORD_MANAGER_UI_MUTE_ISSUE 9040
+#define IDS_PASSWORD_MANAGER_UI_UNMUTE_ISSUE 9041
+#define IDS_PASSWORD_MANAGER_UI_NUMBER_OF_CREDENTIALS_WITH_REUSED_PASSWORD 9042
+#define IDS_PASSWORD_MANAGER_UI_HELP 9043
+#define IDS_PASSWORD_MANAGER_UI_BIOMETRIC_AUTHENTICATION_FOR_FILLING_TOGGLE_LABEL_WIN 9046
+#define IDS_PASSWORD_MANAGER_UI_BIOMETRIC_AUTHENTICATION_FOR_FILLING_TOGGLE_SUBLABEL_WIN 9047
+#define IDS_PASSWORD_MANAGER_UI_EDIT_PASSWORD 9048
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_EDIT_FOOTNOTE 9049
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_DELETED 9050
+#define IDS_PASSWORD_MANAGER_UI_UNDO 9051
+#define IDS_PASSWORD_MANAGER_UI_SEARCH_RESULT 9052
+#define IDS_PASSWORD_MANAGER_UI_CHANGE_PASSWORD_IN_APP 9053
+#define IDS_PASSWORD_MANAGER_UI_ALREADY_CHANGED_PASSWORD 9054
+#define IDS_PASSWORD_MANAGER_UI_EDIT_DISCLAIMER_DESCRIPTION 9055
+#define IDS_PASSWORD_MANAGER_UI_EDIT_DISCLAIMER_TITLE 9056
+#define IDS_PASSWORD_MANAGER_UI_DELETE_PASSWORD_CONFIRMATION_TITLE 9057
+#define IDS_PASSWORD_MANAGER_UI_DELETE_PASSWORD_CONFIRMATION_DESCRIPTION 9058
+#define IDS_PASSWORD_MANAGER_UI_SHOW_MORE 9059
+#define IDS_PASSWORD_MANAGER_UI_NOT_VALID_WEB_ADDRESS 9060
+#define IDS_PASSWORD_MANAGER_UI_MISSING_TLD 9061
+#define IDS_PASSWORD_MANAGER_UI_USERNAME_ALREADY_USED 9062
+#define IDS_PASSWORD_MANAGER_UI_NOTE_CHARACTER_COUNT 9063
+#define IDS_PASSWORD_MANAGER_UI_NOTE_CHARACTER_COUNT_WARNING 9064
+#define IDS_PASSWORD_MANAGER_UI_AUTH_TIMED_OUT 9065
+#define IDS_PASSWORD_MANAGER_UI_AUTH_TIMED_OUT_DESCRIPTION 9066
+#define IDS_PASSWORD_MANAGER_UI_VIEW_EXISTING_PASSWORD 9067
+#define IDS_PASSWORD_MANAGER_UI_VIEW_EXISTING_PASSWORD_ARIA_DESCRIPTION 9068
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_TO_ACCOUNT 9069
+#define IDS_PASSWORD_MANAGER_UI_OPENS_IN_NEW_TAB 9070
+#define IDS_PASSWORD_MANAGER_UI_VIEW_PASSWORD_ARIA_DESCRIPTION 9071
+#define IDS_PASSWORD_MANAGER_UI_RUN_CHECKUP_ARIA_DESCRIPTION 9072
+#define IDS_PASSWORD_MANAGER_UI_REMOVE_BLOCKED_SITE_ARIA_DESCRIPTION 9073
+#define IDS_PASSWORD_MANAGER_UI_EMPTY_STATE_ACCOUNT_STORE_USERS 9074
+#define IDS_PASSWORD_MANAGER_UI_EMPTY_STATE_SYNCING_USERS 9075
+#define IDS_PASSWORD_MANAGER_UI_EMPTY_STATE_SIGNEDOUT_USERS 9076
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_PROMO_CARD_TITLE 9077
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_PROMO_CARD_DESCRIPTION 9078
+#define IDS_PASSWORD_MANAGER_UI_CHECKUP_PROMO_CARD_ACTION 9079
+#define IDS_PASSWORD_MANAGER_UI_WEB_PROMO_CARD_TITLE 9080
+#define IDS_PASSWORD_MANAGER_UI_WEB_PROMO_CARD_DESCRIPTION 9081
+#define IDS_PASSWORD_MANAGER_UI_SHORTCUT_PROMO_CARD_TITLE 9082
+#define IDS_PASSWORD_MANAGER_UI_SHORTCUT_PROMO_CARD_DESCRIPTION 9083
+#define IDS_PASSWORD_MANAGER_UI_ANY_DEVICE_PROMO_CARD_TITLE 9084
+#define IDS_PASSWORD_MANAGER_UI_ANY_DEVICE_PROMO_CARD_DESCRIPTION 9085
+#define IDS_PASSWORD_MANAGER_UI_ACCOUNT_STORAGE_TOGGLE_LABEL 9086
+#define IDS_PASSWORD_MANAGER_UI_ACCOUNT_STORAGE_TOGGLE_SUB_LABEL 9087
+#define IDS_PASSWORD_MANAGER_UI_ACCOUNT_STORAGE_WITH_PASSKEYS_TOGGLE_LABEL 9088
+#define IDS_PASSWORD_MANAGER_UI_DELETE_DIALOG_TITLE 9089
+#define IDS_PASSWORD_MANAGER_UI_DELETE_DIALOG_BODY 9090
+#define IDS_PASSWORD_MANAGER_UI_DELETE_DIALOG_FROM_ACCOUNT_CHECKBOX_LABEL 9091
+#define IDS_PASSWORD_MANAGER_UI_DELETE_DIALOG_FROM_DEVICE_CHECKBOX_LABEL 9092
+#define IDS_PASSWORD_MANAGER_UI_APPS_LABEL 9093
+#define IDS_PASSWORD_MANAGER_UI_SITES_AND_APPS_LABEL 9094
+#define IDS_PASSWORD_MANAGER_UI_BACK_TO_CHECKUP_ARIA_DESCRIPTION 9095
+#define IDS_PASSWORD_MANAGER_UI_BACK_TO_PASSWORDS_ARIA_DESCRIPTION 9096
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_TITLE 9097
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_DESCRIPTION 9098
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_BUTTON 9099
+#define IDS_PASSWORD_MANAGER_UI_MANAGE_PASSKEYS_LABEL 9103
+#define IDS_PASSWORD_MANAGER_UI_NO_PASSWORDS_FOUND 9104
+#define IDS_PASSWORD_MANAGER_UI_EDIT_PASSKEY 9105
+#define IDS_PASSWORD_MANAGER_UI_DISPLAY_NAME_LABEL 9106
+#define IDS_PASSWORD_MANAGER_UI_DISPLAY_NAME_PLACEHOLDER 9107
+#define IDS_PASSWORD_MANAGER_UI_USERNAME_PLACEHOLDER 9108
+#define IDS_PASSWORD_MANAGER_UI_DELETE_PASSKEY_CONFIRMATION_TITLE 9109
+#define IDS_PASSWORD_MANAGER_UI_DELETE_PASSKEY_CONFIRMATION_DESCRIPTION 9110
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_MANAGEMENT_INFO_LABEL 9111
+#define IDS_PASSWORD_MANAGER_UI_COPY_DISPLAY_NAME_LABEL 9112
+#define IDS_PASSWORD_MANAGER_UI_DISPLAY_NAME_COPIED_TO_CLIPBOARD 9113
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DELETED 9114
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_LIST_ARIA_LABEL 9115
+#define IDS_PASSWORD_MANAGER_UI_DEVICE_ONLY_PASSWORDS_ICON_TOOLTIP 9116
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_DETAILS_CARD_ARIA_LABEL 9117
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_DETAILS_CARD_EDIT_BUTTON_ARIA_LABEL 9118
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_DETAILS_CARD_EDIT_BUTTON_NO_USERNAME_ARIA_LABEL 9119
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_DETAILS_CARD_DELETE_BUTTON_ARIA_LABEL 9120
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_DETAILS_CARD_DELETE_BUTTON_NO_USERNAME_ARIA_LABEL 9121
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DETAILS_CARD_NO_USERNAME_ARIA_LABEL 9122
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DETAILS_CARD_ARIA_LABEL 9123
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DETAILS_CARD_EDIT_BUTTON_ARIA_LABEL 9124
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DETAILS_CARD_EDIT_BUTTON_NO_USERNAME_ARIA_LABEL 9125
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DETAILS_CARD_DELETE_BUTTON_ARIA_LABEL 9126
+#define IDS_PASSWORD_MANAGER_UI_PASSKEY_DETAILS_CARD_DELETE_BUTTON_NO_USERNAME_ARIA_LABEL 9127
+#define IDS_PASSWORD_MANAGER_UI_FEDERATED_CREDENTIAL_ARIA_LABEL 9128
+#define IDS_PASSWORD_MANAGER_UI_MOVE_SINGLE_PASSWORD_TO_ACCOUNT 9129
+#define IDS_PASSWORD_MANAGER_UI_MOVE_SINGLE_PASSWORD_TITLE 9130
+#define IDS_PASSWORD_MANAGER_UI_MOVE_SINGLE_PASSWORD_DESCRIPTION 9131
+#define IDS_PASSWORD_MANAGER_UI_MOVE_SINGLE_PASSWORD_ACTION_BUTTON 9132
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_IN_SETTINGS_SUB_LABEL 9133
+#define IDS_PASSWORD_MANAGER_UI_NO_USERNAME 9139
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_MOVED_TOAST_MESSAGE 9140
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_PROMO_CARD_TITLE 9141
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_PROMO_CARD_DESCRIPTION 9142
+#define IDS_PASSWORD_MANAGER_UI_MOVE_PASSWORDS_PROMO_CARD_ACTION_BUTTON 9143
+#define IDS_PASSWORD_MANAGER_SAVE_IN_ACCOUNT_BUBBLE_DESCRIPTION 9144
+#define IDS_PASSWORD_MANAGER_SAVE_IN_ACCOUNT_BUBBLE_TITLE 9145
+#define IDS_PASSWORD_MANAGER_SAVE_IN_ACCOUNT_BUBBLE_SAVE_BUTTON 9146
+#define IDS_PASSWORD_MANAGER_DEFAULT_STORE_CHANGED_BUBBLE_TITLE 9147
+#define IDS_PASSWORD_MANAGER_DEFAULT_STORE_CHANGED_BUBBLE_DESCRIPTION 9148
+#define IDS_PASSWORD_MANAGER_DEFAULT_STORE_CHANGED_BUBBLE_SETTINGS_BUTTON 9149
+#define IDS_PASSWORD_MANAGER_DEFAULT_STORE_CHANGED_BUBBLE_CONTINUE_BUTTON 9150
+#define IDS_PASSWORD_MANAGER_MANAGEMENT_BUBBLE_LIST_ITEM_DEVICE_ONLY_ACCESSIBLE_TEXT 9151
+#define IDS_PASSWORD_MANAGER_MANAGEMENT_BUBBLE_LIST_ITEM_ACCESSIBLE_TEXT 9152
+#define IDS_PASSWORD_MANAGER_UI_PASSWORD_LIST_ITEM_ARIA_LABEL 9153
+#define IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME 9154
+#define IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME 9155
+#define IDS_PRINT_INVALID_PRINTER_SETTINGS 9156
+#define IDS_PRINT_PREVIEW_TITLE 9157
+#define IDS_PRINT_PREVIEW_DESCRIPTION 9158
+#define IDS_PRINT_PREVIEW_LOADING 9159
+#define IDS_PRINT_PREVIEW_FAILED 9160
+#define IDS_PRINT_PREVIEW_INVALID_PRINTER_SETTINGS 9161
+#define IDS_PRINT_PREVIEW_PRINT_BUTTON 9162
+#define IDS_PRINT_PREVIEW_SAVE_BUTTON 9163
+#define IDS_PRINT_PREVIEW_PRINTING 9164
+#define IDS_PRINT_PREVIEW_SAVING 9165
+#define IDS_PRINT_PREVIEW_OPTION_ALL_PAGES 9166
+#define IDS_PRINT_PREVIEW_OPTION_ODD_PAGES 9167
+#define IDS_PRINT_PREVIEW_OPTION_EVEN_PAGES 9168
+#define IDS_PRINT_PREVIEW_OPTION_CUSTOM_PAGES 9169
+#define IDS_PRINT_PREVIEW_DESTINATION_LABEL 9170
+#define IDS_PRINT_PREVIEW_OPTION_BW 9171
+#define IDS_PRINT_PREVIEW_OPTION_COLLATE 9172
+#define IDS_PRINT_PREVIEW_OPTION_COLOR 9173
+#define IDS_PRINT_PREVIEW_OPTION_LANDSCAPE 9174
+#define IDS_PRINT_PREVIEW_OPTION_PORTRAIT 9175
+#define IDS_PRINT_PREVIEW_OPTION_TWO_SIDED 9176
+#define IDS_PRINT_PREVIEW_PRINT_ON_BOTH_SIDES_LABEL 9177
+#define IDS_PRINT_PREVIEW_OPTION_LONG_EDGE 9178
+#define IDS_PRINT_PREVIEW_OPTION_SHORT_EDGE 9179
+#define IDS_PRINT_PREVIEW_BORDERLESS_LABEL 9180
+#define IDS_PRINT_PREVIEW_PAGES_LABEL 9181
+#define IDS_PRINT_PREVIEW_LAYOUT_LABEL 9182
+#define IDS_PRINT_PREVIEW_COPIES_LABEL 9183
+#define IDS_PRINT_PREVIEW_SCALING_LABEL 9184
+#define IDS_PRINT_PREVIEW_OPTION_DEFAULT_SCALING 9185
+#define IDS_PRINT_PREVIEW_OPTION_CUSTOM_SCALING 9186
+#define IDS_PRINT_PREVIEW_PAGES_PER_SHEET_LABEL 9187
+#define IDS_PRINT_PREVIEW_EXAMPLE_PAGE_RANGE_TEXT 9188
+#define IDS_PRINT_PREVIEW_PRINT_TO_PDF 9189
+#define IDS_PRINT_PREVIEW_SHEET_SUMMARY_LABEL 9190
+#define IDS_PRINT_PREVIEW_PAGE_SUMMARY_LABEL 9191
+#define IDS_PRINT_PREVIEW_PAGE_RANGE_SYNTAX_INSTRUCTION 9192
+#define IDS_PRINT_PREVIEW_PAGE_RANGE_LIMIT_INSTRUCTION_WITH_VALUE 9193
+#define IDS_PRINT_PREVIEW_COPIES_INSTRUCTION 9194
+#define IDS_PRINT_PREVIEW_SCALING_INSTRUCTION 9195
+#define IDS_PRINT_PREVIEW_PRINT_PAGES_LABEL 9196
+#define IDS_PRINT_PREVIEW_OPTIONS_LABEL 9197
+#define IDS_PRINT_PREVIEW_OPTION_HEADER_FOOTER 9198
+#define IDS_PRINT_PREVIEW_OPTION_FIT_TO_PAGE 9199
+#define IDS_PRINT_PREVIEW_OPTION_FIT_TO_PAPER 9200
+#define IDS_PRINT_PREVIEW_OPTION_BACKGROUND_COLORS_AND_IMAGES 9201
+#define IDS_PRINT_PREVIEW_OPTION_SELECTION_ONLY 9202
+#define IDS_PRINT_PREVIEW_OPTION_RASTERIZE 9203
+#define IDS_PRINT_PREVIEW_MARGINS_LABEL 9204
+#define IDS_PRINT_PREVIEW_DEFAULT_MARGINS 9205
+#define IDS_PRINT_PREVIEW_NO_MARGINS 9206
+#define IDS_PRINT_PREVIEW_CUSTOM_MARGINS 9207
+#define IDS_PRINT_PREVIEW_MINIMUM_MARGINS 9208
+#define IDS_PRINT_PREVIEW_TOP_MARGIN_LABEL 9209
+#define IDS_PRINT_PREVIEW_BOTTOM_MARGIN_LABEL 9210
+#define IDS_PRINT_PREVIEW_LEFT_MARGIN_LABEL 9211
+#define IDS_PRINT_PREVIEW_RIGHT_MARGIN_LABEL 9212
+#define IDS_PRINT_PREVIEW_MEDIA_SIZE_LABEL 9213
+#define IDS_PRINT_PREVIEW_MEDIA_TYPE_LABEL 9214
+#define IDS_PRINT_PREVIEW_DPI_LABEL 9215
+#define IDS_PRINT_PREVIEW_NON_ISOTROPIC_DPI_ITEM_LABEL 9216
+#define IDS_PRINT_PREVIEW_DPI_ITEM_LABEL 9217
+#define IDS_PRINT_PREVIEW_DESTINATION_SEARCH_TITLE 9218
+#define IDS_PRINT_PREVIEW_SEARCH_BOX_PLACEHOLDER 9219
+#define IDS_PRINT_PREVIEW_NO_DESTINATIONS_MESSAGE 9220
+#define IDS_PRINT_PREVIEW_PRINT_DESTINATIONS_TITLE 9221
+#define IDS_PRINT_PREVIEW_MANAGE 9222
+#define IDS_PRINT_PREVIEW_SEE_MORE 9223
+#define IDS_PRINT_PREVIEW_SEE_MORE_DESTINATIONS_LABEL 9224
+#define IDS_PRINT_PREVIEW_EXTENSION_DESTINATION_ICON_TOOLTIP 9225
+#define IDS_MORE_OPTIONS_LABEL 9226
+#define IDS_PRINT_PREVIEW_COULD_NOT_PRINT 9227
+#define IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_SEARCH_BOX_PLACEHOLDER 9228
+#define IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_DIALOG_TITLE 9229
+#define IDS_PRINT_PREVIEW_NO_ADVANCED_SETTINGS_MATCH_SEARCH_HINT 9230
+#define IDS_PRINT_PREVIEW_ADVANCED_SETTINGS_DIALOG_CONFIRM 9231
+#define IDS_PRINT_PREVIEW_NEW_SHOW_ADVANCED_OPTIONS 9232
+#define IDS_PRINT_PREVIEW_BUTTON_SELECT 9233
+#define IDS_PRINT_PREVIEW_BUTTON_GO_BACK 9234
+#define IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_DIALOG_TITLE 9235
+#define IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_PERMISSION_MESSAGE 9236
+#define IDS_PRINT_PREVIEW_RESOLVE_EXTENSION_USB_ERROR_MESSAGE 9237
+#define IDS_PRINT_PREVIEW_MANAGED_SETTINGS_TEXT 9238
+#define IDS_PRINT_PREVIEW_SYSTEM_DIALOG_OPTION 9267
+#define IDS_DEFAULT_PRINT_DOCUMENT_TITLE 9270
+#define IDS_PRINT_SPOOL_FAILED_TITLE_TEXT 9271
+#define IDS_PRINT_SPOOL_FAILED_ERROR_TEXT 9272
+#define IDS_VR_SHELL_SITE_IS_TRACKING_LOCATION 9273
+#define IDS_VR_SHELL_SITE_IS_USING_MICROPHONE 9274
+#define IDS_VR_SHELL_SITE_IS_USING_CAMERA 9275
+#define IDS_VR_SHELL_SITE_IS_SHARING_SCREEN 9276
+#define IDS_VR_SHELL_BG_IS_USING_MICROPHONE 9277
+#define IDS_VR_SHELL_BG_IS_USING_CAMERA 9278
+#define IDS_VR_SHELL_BG_IS_SHARING_SCREEN 9279
+#define IDS_VR_SHELL_SITE_CAN_TRACK_LOCATION 9280
+#define IDS_VR_SHELL_SITE_CAN_USE_MICROPHONE 9281
+#define IDS_VR_SHELL_SITE_CAN_USE_CAMERA 9282
+#define IDS_VR_SHELL_SITE_CAN_SHARE_SCREEN 9283
+#define IDS_VR_SHELL_SITE_IS_USING_BLUETOOTH 9284
+#define IDS_VR_SHELL_SITE_CAN_USE_BLUETOOTH 9286
+#define IDS_DESKTOP_PROMPT_DOFF_HEADSET 9287
+#define IDS_VR_DESKTOP_GENERIC_PERMISSION_PROMPT 9288
+#define IDS_VR_SHELL_SITE_IS_USING_USB 9289
+#define IDS_VR_SHELL_SITE_IS_USING_MIDI 9290
+#define IDS_VR_SHELL_SITE_CAN_USE_MIDI 9291
+#define IDS_VR_WEB_VR_TIMEOUT_MESSAGE 9292
+#define IDS_BACKGROUND_APP_INSTALLED_BALLOON_TITLE 9293
+#define IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY 9294
+#define IDS_BACKGROUND_CRASHED_APP_BALLOON_MESSAGE 9295
+#define IDS_BACKGROUND_CRASHED_EXTENSION_BALLOON_MESSAGE 9296
+#define IDS_BACKGROUND_APP_NOT_INSTALLED 9297
+#define IDS_PERMISSIONS_REQUESTED_SCREENREADER_ANNOUNCEMENT 9298
+#define IDS_PERMISSIONS_EXPIRED_SCREENREADER_ANNOUNCEMENT 9299
+#define IDS_PERMISSIONS_BUBBLE_PROMPT 9300
+#define IDS_PERMISSIONS_BUBBLE_PROMPT_ACCESSIBLE_TITLE_ONE_PERM 9301
+#define IDS_PERMISSIONS_BUBBLE_PROMPT_ACCESSIBLE_TITLE_TWO_PERMS 9302
+#define IDS_PERMISSIONS_BUBBLE_PROMPT_ACCESSIBLE_TITLE_TWO_PERMS_MORE 9303
+#define IDS_PERMISSIONS_BUBBLE_PROMPT_THIS_FILE 9304
+#define IDS_PERMISSION_CUSTOMIZE 9305
+#define IDS_ALTERNATE_NAV_URL_VIEW_LABEL 9306
+#define IDS_DOWNLOAD_TITLE 9307
+#define IDS_TAB_LOADING_TITLE 696
+#define IDS_HOVER_CARD_FILE_URL_SOURCE 9308
+#define IDS_HOVER_CARD_BLOB_URL_SOURCE 9309
+#define IDS_HOVER_CARD_CRASHED_TITLE 9310
+#define IDS_HISTORY_SEARCH_PROMPT 9311
+#define IDS_HISTORY_DELETE 9312
+#define IDS_HISTORY_ITEMS_SELECTED 9313
+#define IDS_HISTORY_ITEMS_UNSELECTED 9314
+#define IDS_HISTORY_HISTORY_MENU_DESCRIPTION 9315
+#define IDS_HISTORY_HISTORY_MENU_ITEM 9316
+#define IDS_HISTORY_NO_SYNCED_RESULTS 9317
+#define IDS_HISTORY_OPEN_TABS_MENU_ITEM 9318
+#define IDS_HISTORY_TURN_ON_SYNC_BUTTON 9319
+#define IDS_HISTORY_TURN_ON_SYNC_PROMO 9320
+#define IDS_HISTORY_TURN_ON_SYNC_PROMO_DESC 9321
+#define IDS_EDIT 9322
+#define IDS_CLEAR_SEARCH 9323
+#define IDS_CONFIRM 9324
+#define IDS_DISABLE 9325
+#define IDS_SEARCH_CLEARED 9326
+#define IDS_SEARCH_RESULTS 9327
+#define IDS_SEARCH_RESULTS_SINGULAR 9328
+#define IDS_SEARCH_RESULTS_PLURAL 9329
+#define IDS_SEARCH_RESULT_BUBBLE_TEXT 9330
+#define IDS_SEARCH_RESULTS_BUBBLE_TEXT 9331
+#define IDS_SEARCH_NO_RESULTS 9332
+#define IDS_SHOW_BUBBLE_INACTIVE_DESCRIPTION 9333
+#define IDS_FOCUS_HELP_BUBBLE_DESCRIPTION 9334
+#define IDS_FOCUS_HELP_BUBBLE_TOGGLE_DESCRIPTION 9335
+#define IDS_FOCUS_HELP_BUBBLE_TUTORIAL_DESCRIPTION 9336
+#define IDS_CONTENT_CONTEXT_INSPECTELEMENT 9337
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_DIALOG_TITLE 9338
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_ENABLE 9339
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_DISABLE 9340
+#define IDS_CONTENT_CONTEXT_LIVE_CAPTION_ENABLE 9341
+#define IDS_CONTENT_CONTEXT_LIVE_CAPTION_DISABLE 9342
+#define IDS_CONTENT_CONTEXT_AUTOFILL_FALLBACK_TITLE 9343
+#define IDS_CONTENT_CONTEXT_AUTOFILL_FALLBACK_ADDRESS 9344
+#define IDS_CONTENT_CONTEXT_AUTOFILL_FALLBACK_PAYMENTS 9345
+#define IDS_CONTENT_CONTEXT_BACK 9346
+#define IDS_CONTENT_CONTEXT_FORWARD 9347
+#define IDS_CONTENT_CONTEXT_SAVEPAGEAS 9348
+#define IDS_CONTENT_CONTEXT_PRINT 9349
+#define IDS_CONTENT_CONTEXT_VIEWPAGESOURCE 9350
+#define IDS_CONTENT_CONTEXT_OPENLINKWITH 9351
+#define IDS_CONTENT_CONTEXT_OPENLINKWITH_CONFIGURE 9352
+#define IDS_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE 9353
+#define IDS_CONTENT_CONTEXT_READING_MODE 9354
+#define IDS_CONTENT_CONTEXT_RELOAD 9355
+#define IDS_CONTENT_CONTEXT_RESTART_APP 9356
+#define IDS_CONTENT_CONTEXT_RELOAD_PACKAGED_APP 9357
+#define IDS_CONTENT_CONTEXT_TRANSLATE 9358
+#define IDS_CONTENT_CONTEXT_EXIT_FULLSCREEN 9359
+#define IDS_CONTENT_CONTEXT_RELOADFRAME 9360
+#define IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE 9361
+#define IDS_CONTENT_CONTEXT_OPENLINKNEWTAB 9362
+#define IDS_CONTENT_CONTEXT_OPENLINKNEWWINDOW 9363
+#define IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD 9364
+#define IDS_CONTENT_CONTEXT_OPENLINKINPROFILES 9365
+#define IDS_CONTENT_CONTEXT_OPENLINKINPROFILE 9366
+#define IDS_CONTENT_CONTEXT_OPENLINKBOOKMARKAPP 9367
+#define IDS_CONTENT_CONTEXT_OPENLINKBOOKMARKAPP_SAMEAPP 9368
+#define IDS_CONTENT_CONTEXT_OPENLINKWEBAPP_NEWTAB 9369
+#define IDS_CONTENT_CONTEXT_OPENLINKPREVIEW 9370
+#define IDS_CONTENT_CONTEXT_OPENLINKPREVIEW_TRIGGER_ALTCLICK 9371
+#define IDS_CONTENT_CONTEXT_SAVELINKAS 9372
+#define IDS_CONTENT_CONTEXT_COPYLINKLOCATION 9373
+#define IDS_CONTENT_CONTEXT_COPYEMAILADDRESS 9374
+#define IDS_CONTENT_CONTEXT_COPYLINKTEXT 9375
+#define IDS_CONTENT_CONTEXT_COPYLINKTOTEXT 9376
+#define IDS_CONTENT_CONTEXT_ADD_A_NOTE 9377
+#define IDS_CONTENT_CONTEXT_REMOVELINKTOTEXT 9378
+#define IDS_CONTENT_CONTEXT_RESHARELINKTOTEXT 9379
+#define IDS_CONTENT_CONTEXT_SAVEIMAGEAS 9380
+#define IDS_CONTENT_CONTEXT_COPYIMAGELOCATION 9381
+#define IDS_CONTENT_CONTEXT_COPYIMAGE 9382
+#define IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB 9383
+#define IDS_CONTENT_CONTEXT_OPEN_ORIGINAL_IMAGE_NEW_TAB 9384
+#define IDS_CONTENT_CONTEXT_LOAD_IMAGE 9385
+#define IDS_CONTENT_CONTEXT_LOOP 9386
+#define IDS_CONTENT_CONTEXT_CONTROLS 9387
+#define IDS_CONTENT_CONTEXT_ROTATECW 9388
+#define IDS_CONTENT_CONTEXT_ROTATECCW 9389
+#define IDS_CONTENT_CONTEXT_SAVEVIDEOFRAMEAS 9390
+#define IDS_CONTENT_CONTEXT_SAVEVIDEOAS 9391
+#define IDS_CONTENT_CONTEXT_COPYVIDEOLOCATION 9392
+#define IDS_CONTENT_CONTEXT_COPYVIDEOFRAME 9393
+#define IDS_CONTENT_CONTEXT_SEARCHFORVIDEOFRAME 9394
+#define IDS_CONTENT_CONTEXT_OPENVIDEONEWTAB 9395
+#define IDS_CONTENT_CONTEXT_SAVEAUDIOAS 9396
+#define IDS_CONTENT_CONTEXT_COPYAUDIOLOCATION 9397
+#define IDS_CONTENT_CONTEXT_OPENAUDIONEWTAB 9398
+#define IDS_CONTENT_CONTEXT_PICTUREINPICTURE 9399
+#define IDS_CONTENT_CONTEXT_UNDO 9400
+#define IDS_CONTENT_CONTEXT_REDO 9401
+#define IDS_CONTENT_CONTEXT_CUT 9402
+#define IDS_CONTENT_CONTEXT_COPY 9403
+#define IDS_CONTENT_CONTEXT_PASTE 9404
+#define IDS_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE 9405
+#define IDS_CONTENT_CONTEXT_ADD_TO_DICTIONARY 9406
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_MENU_OPTION 9407
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_SEND 9408
+#define IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_SEND_ONCE 9409
+#define IDS_CONTENT_CONTEXT_PDF_OCR_MENU_OPTION 9410
+#define IDS_CONTENT_CONTEXT_RUN_LAYOUT_EXTRACTION 9411
+#define IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE 9412
+#define IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TITLE 9413
+#define IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE 9414
+#define IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE 9415
+#define IDS_CONTENT_CONTEXT_SPELLING_CHECKING 9416
+#define IDS_CONTENT_CONTEXT_SPELLING_NO_SUGGESTIONS_FROM_GOOGLE 9417
+#define IDS_CONTENT_CONTEXT_SELECTALL 9418
+#define IDS_CONTENT_CONTEXT_PARTIAL_TRANSLATE 9419
+#define IDS_CONTENT_CONTEXT_SEARCHWEBFOR 9420
+#define IDS_CONTENT_CONTEXT_SEARCHWEBFORNEWTAB 9421
+#define IDS_CONTENT_CONTEXT_SEARCHWEBFORIMAGE 9422
+#define IDS_CONTENT_CONTEXT_SEARCHLENSFORIMAGE 9423
+#define IDS_CONTENT_CONTEXT_TRANSLATEIMAGE 9424
+#define IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH_ALT1 9425
+#define IDS_CONTENT_CONTEXT_LENS_REGION_SEARCH 9426
+#define IDS_CONTENT_CONTEXT_GOTOURL 9427
+#define IDS_CONTENT_CONTEXT_GENERATEPASSWORD 9428
+#define IDS_CONTENT_CONTEXT_MORE_APPS 9429
+#define IDS_CONTENT_CONTEXT_OPEN_WITH_APP 9430
+#define IDS_CONTENT_CONTEXT_AUTOFILL_FEEDBACK 9431
+#define IDS_SHARE_MENU_TITLE 9432
+#define IDS_CONTENT_CONTEXT_PLUGIN_RUN 9433
+#define IDS_CONTENT_CONTEXT_PLUGIN_HIDE 9434
+#define IDS_CONTENT_CONTEXT_ENABLE_FLASH 9435
+#define IDS_CONTENT_CONTEXT_SPELLCHECK_MENU 9437
+#define IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS 9436
+#define IDS_CONTENT_CONTEXT_SPELLCHECK_MULTI_LINGUAL 9438
+#define IDS_CONTENT_CONTEXT_CHECK_SPELLING_WHILE_TYPING 9439
+#define IDS_ADDRESSES_AND_MORE_SUBMENU_OPTION 9440
+#define IDS_PASSWORDS_AND_AUTOFILL_MENU 9441
+#define IDS_NEW_TAB 9442
+#define IDS_NEW_INCOGNITO_TAB 9443
+#define IDS_SHOW_AS_TAB 9444
+#define IDS_NEW_WINDOW 9445
+#define IDS_NEW_INCOGNITO_WINDOW 9446
+#define IDS_PROFILE_ROW_SIGNED_IN_MESSAGE_WITH_EMAIL 9447
+#define IDS_PROFILE_ROW_SIGNED_IN_MESSAGE 9448
+#define IDS_PROFILE_ROW_SYNC_IS_ON 9449
+#define IDS_PROFILE_ROW_TURN_ON_SYNC 9450
+#define IDS_PROFILE_ROW_SYNC_ERROR_MESSAGE 9451
+#define IDS_PROFILE_ROW_SIGN_IN_AGAIN 9452
+#define IDS_EDIT2 9453
+#define IDS_CUT 9454
+#define IDS_COPY 9455
+#define IDS_PASTE 9456
+#define IDS_DELETE 9457
+#define IDS_FIND 9458
+#define IDS_FIND_AND_EDIT_MENU 9459
+#define IDS_PAYMENT_METHOD_SUBMENU_OPTION 9460
+#define IDS_SAVE_AND_SHARE_MENU 9461
+#define IDS_SAVE_AND_SHARE_MENU_SAVE 9462
+#define IDS_SAVE_AND_SHARE_MENU_SHARE 9463
+#define IDS_SAVE_PAGE 9464
+#define IDS_DISTILL_PAGE 9465
+#define IDS_EXIT_DISTILLED_PAGE 9466
+#define IDS_MORE_TOOLS_MENU 9467
+#define IDS_ZOOM_MENU 9468
+#define IDS_ZOOM_MENU2 9469
+#define IDS_ZOOM_PLUS 9470
+#define IDS_ZOOM_PLUS2 9471
+#define IDS_ZOOM_NORMAL 9472
+#define IDS_ZOOM_MINUS 9473
+#define IDS_ZOOM_MINUS2 9474
+#define IDS_COPY_URL 9475
+#define IDS_OPEN_IN_APP_WINDOW 9476
+#define IDS_MOVE_TAB_TO_NEW_WINDOW 9477
+#define IDS_SEARCH_TABS 9478
+#define IDS_CUSTOMIZE_CHROME 9479
+#define IDS_CLOSE_PROFILE 9480
+#define IDS_MANAGE_GOOGLE_ACCOUNT 9481
+#define IDS_OTHER_CHROME_PROFILES_TITLE 9482
+#define IDS_OPEN_GUEST_PROFILE 9483
+#define IDS_ADD_NEW_PROFILE 9484
+#define IDS_MANAGE_CHROME_PROFILES 9485
+#define IDS_ACCNAME_ZOOM_PLUS2 9487
+#define IDS_ACCNAME_ZOOM_MINUS2 9488
+#define IDS_VIEW_SOURCE 9489
+#define IDS_FEEDBACK 9490
+#define IDS_DEV_TOOLS 9491
+#define IDS_DEV_TOOLS_ELEMENTS 9492
+#define IDS_DEV_TOOLS_CONSOLE 9493
+#define IDS_DEV_TOOLS_DEVICES 9494
+#define IDS_TASK_MANAGER 9495
+#define IDS_TAKE_SCREENSHOT 9496
+#define IDS_RESTORE_ALL_TABS 9497
+#define IDS_RESTORE_TAB 9498
+#define IDS_REOPEN_WINDOW 9499
+#define IDS_REOPEN_GROUP 9500
+#define IDS_RESTORE_WINDOW 9501
+#define IDS_RESTORE_GROUP 9502
+#define IDS_NAME_WINDOW 9503
+#define IDS_CHROMELABS 9504
+#define IDS_TOS_NOTIFICATION_TITLE 9507
+#define IDS_TOS_NOTIFICATION_BODY_TEXT 9508
+#define IDS_TOS_NOTIFICATION_ACK_BUTTON_TEXT 9509
+#define IDS_TOS_NOTIFICATION_REVIEW_BUTTON_TEXT 9510
+#define IDS_TOS_NOTIFICATION_LINK 9511
+#define IDS_HELP_MENU 9512
+#define IDS_MANAGED 9513
+#define IDS_MANAGED_BY 9514
+#define IDS_MANAGED_BY_PARENT 9515
+#define IDS_PROFILE_MANAGED_BY 9516
+#define IDS_BROWSER_PROFILE_MANAGED 9517
+#define IDS_CHROME_TIPS 9518
+#define IDS_CHROME_WHATS_NEW 9519
+#define IDS_IMPORT_SETTINGS_MENU_LABEL 9520
+#define IDS_PROFILING_ENABLED 9521
+#define IDS_FULLSCREEN 9522
+#define IDS_CLEAR_BROWSING_DATA 9523
+#define IDS_SHOW_DOWNLOADS 9524
+#define IDS_SHOW_EXTENSIONS 9525
+#define IDS_EXTENSIONS_SUBMENU 9526
+#define IDS_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS_ITEM 9527
+#define IDS_EXTENSIONS_SUBMENU_CHROME_WEBSTORE_ITEM 9528
+#define IDS_SHOW_PERFORMANCE 9529
+#define IDS_SHOW_SEARCH_COMPANION 9530
+#define IDS_SHOW_TRANSLATE 9531
+#define IDS_SETTINGS 9532
+#define IDS_OPTIONS 9533
+#define IDS_HELP_PAGE 9534
+#define IDS_BETA_FORUM 9535
+#define IDS_GET_HELP 9536
+#define IDS_EXIT 9537
+#define IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR 667
+#define IDS_MANAGE_SEARCH_ENGINES 9538
+#define IDS_MANAGE_SEARCH_ENGINES_AND_SITE_SEARCH 9539
+#define IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN 9540
+#define IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN 9541
+#define IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE 9542
+#define IDS_ACCNAME_DOWNLOADS_BAR 9543
+#define IDS_HIDE_DOWNLOADS 9544
+#define IDS_SHOW_ALL_DOWNLOADS 9545
+#define IDS_DOWNLOAD_STARTED 9546
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS 9547
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_ACCESS_DENIED 9548
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_ACCESS_DENIED 9549
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_PATH_TOO_LONG 9550
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_PATH_TOO_LONG 9551
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_DISK_FULL 9552
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_DISK_FULL 9553
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_FILE_TOO_LARGE 9554
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_FILE_TOO_LARGE 9555
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_TEMPORARY_PROBLEM 9556
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_TEMPORARY_PROBLEM 9557
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_VIRUS 9558
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_VIRUS 9559
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_BLOCKED 9560
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_BLOCKED 9561
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_CONTENT_LENGTH_MISMATCH 9562
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_CONTENT_LENGTH_MISMATCH 9563
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_SECURITY_CHECK_FAILED 9564
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SECURITY_CHECK_FAILED 9565
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_FILE_TOO_SHORT 9566
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_FILE_TOO_SHORT 9567
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_FILE_SAME_AS_SOURCE 9568
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_FILE_SAME_AS_SOURCE 9569
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_TIMEOUT 9570
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NETWORK_TIMEOUT 9571
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_DISCONNECTED 9572
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NETWORK_DISCONNECTED 9573
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_SERVER_DOWN 9574
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SERVER_DOWN 9575
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_NETWORK_ERROR 9576
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NETWORK_ERROR 9577
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_NO_FILE 9578
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_NO_FILE 9579
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_SERVER_PROBLEM 9580
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SERVER_PROBLEM 9581
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_WEB_DRIVE_ERROR 9582
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_SHUTDOWN 9583
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SHUTDOWN 9584
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_CRASH 9585
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_CRASH 9586
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_UNAUTHORIZED 9587
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_UNAUTHORIZED 9588
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_SERVER_CERT_PROBLEM 9589
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SERVER_CERT_PROBLEM 9590
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_FORBIDDEN 9591
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_FORBIDDEN 9592
+#define IDS_DOWNLOAD_INTERRUPTED_STATUS_UNREACHABLE 9593
+#define IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_UNREACHABLE 9594
+#define IDS_DOWNLOAD_NOTIFICATION_LABEL_OPEN_WHEN_COMPLETE 9595
+#define IDS_DOWNLOAD_NOTIFICATION_LABEL_OPEN 9596
+#define IDS_DOWNLOAD_STATUS_STARTING 9597
+#define IDS_DOWNLOAD_STATUS_IN_PROGRESS 9607
+#define IDS_DOWNLOAD_STATUS_SIZES 9608
+#define IDS_DOWNLOAD_STATUS_OPEN_IN 9609
+#define IDS_DOWNLOAD_STATUS_OPEN_WHEN_COMPLETE 9610
+#define IDS_DOWNLOAD_STATUS_OPENING 9611
+#define IDS_DOWNLOAD_STATUS_IN_PROGRESS_SHORT 9612
+#define IDS_DOWNLOAD_STATUS_CANCELLED 9613
+#define IDS_DOWNLOAD_STATUS_REMOVED 9614
+#define IDS_DOWNLOAD_STATUS_UPLOADING 9615
+#define IDS_DOWNLOAD_STATUS_UPLOADED 9616
+#define IDS_DOWNLOAD_STATUS_UPLOAD_INTERRUPTED 9617
+#define IDS_DOWNLOAD_STATUS_INTERRUPTED 9618
+#define IDS_DOWNLOAD_UNCONFIRMED_PREFIX 9619
+#define IDS_PROMPT_DANGEROUS_DOWNLOAD 9620
+#define IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION 9621
+#define IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT 9622
+#define IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION 9623
+#define IDS_PROMPT_DEEP_SCANNING_DOWNLOAD 9624
+#define IDS_PROMPT_DEEP_SCANNING_DOWNLOAD_SHORT 9625
+#define IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD 9626
+#define IDS_PROMPT_CONFIRM_INSECURE_DOWNLOAD 9627
+#define IDS_PROMPT_DOWNLOAD_BLOCKED_TOO_LARGE 9628
+#define IDS_PROMPT_DOWNLOAD_BLOCKED_PASSWORD_PROTECTED 9629
+#define IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_SAFE 9630
+#define IDS_PROMPT_DOWNLOAD_SENSITIVE_CONTENT_WARNING 9631
+#define IDS_PROMPT_DOWNLOAD_SENSITIVE_CONTENT_BLOCKED 9632
+#define IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_OPENED_DANGEROUS 9633
+#define IDS_PROMPT_DOWNLOAD_INSECURE_WARNING 9634
+#define IDS_PROMPT_DOWNLOAD_INSECURE_BLOCKED 9635
+#define IDS_PROMPT_APP_DEEP_SCANNING 9636
+#define IDS_PROMPT_DEEP_SCANNING 9637
+#define IDS_BLOCK_REASON_UNCOMMON_DOWNLOAD 9638
+#define IDS_BLOCK_REASON_UNCOMMON_DOWNLOAD_IN_ADVANCED_PROTECTION 9639
+#define IDS_BLOCK_REASON_GENERIC_DOWNLOAD 9640
+#define IDS_BLOCK_REASON_INSECURE_DOWNLOAD 9641
+#define IDS_BLOCK_REASON_DEEP_SCANNING_UPDATED 9642
+#define IDS_BLOCK_REASON_DEEP_SCANNING_SECOND_UPDATED 9643
+#define IDS_BLOCK_REASON_PROMPT_FOR_SCANNING_UPDATED 9644
+#define IDS_BLOCK_REASON_PROMPT_FOR_LOCAL_PASSWORD_SCANNING 9645
+#define IDS_DEEP_SCANNED_OPENED_DANGEROUS_DESCRIPTION 9646
+#define IDS_BLOCK_REASON_SENSITIVE_CONTENT_WARNING 9647
+#define IDS_SENSITIVE_CONTENT_BLOCKED_DESCRIPTION 9648
+#define IDS_BLOCKED_TOO_LARGE_DESCRIPTION 9649
+#define IDS_BLOCKED_PASSWORD_PROTECTED_DESCRIPTION 9650
+#define IDS_DEEP_SCANNED_FAILED_DESCRIPTION 9651
+#define IDS_DOWNLOADS_TOAST_DELETED_FROM_HISTORY_STILL_ON_DEVICE 9652
+#define IDS_DOWNLOADS_TOAST_DELETED_FROM_HISTORY 9653
+#define IDS_CONFIRM_KEEP_DANGEROUS_DOWNLOAD_TITLE 9657
+#define IDS_KEEP_DANGEROUS_DOWNLOAD_TITLE 9658
+#define IDS_KEEP_UNCOMMON_DOWNLOAD_TITLE 9659
+#define IDS_PROMPT_CONFIRM_KEEP_DANGEROUS_DOWNLOAD 9660
+#define IDS_PROMPT_CONFIRM_KEEP_MALICIOUS_DOWNLOAD_BODY 9661
+#define IDS_CONFIRM_DOWNLOAD_AGAIN 9662
+#define IDS_CONFIRM_DOWNLOAD 9663
+#define IDS_CONFIRM_DOWNLOAD_RESTORE 9664
+#define IDS_CONTINUE_EXTENSION_DOWNLOAD 9665
+#define IDS_DISCARD_DOWNLOAD 9666
+#define IDS_OPEN_DOWNLOAD_NOW 9667
+#define IDS_SCAN_DOWNLOAD 9668
+#define IDS_REVIEW_DOWNLOAD 9669
+#define IDS_OPEN_DOWNLOAD_ANYWAY 9670
+#define IDS_DOWNLOAD_LINK_PAUSE 9671
+#define IDS_DOWNLOAD_SEARCH 9672
+#define IDS_DOWNLOAD_NO_DOWNLOADS 9673
+#define IDS_DOWNLOAD_ITEM_DROPDOWN_BUTTON_ACCESSIBLE_TEXT 9674
+#define IDS_DOWNLOAD_LINK_RESUME 9675
+#define IDS_DOWNLOAD_LINK_REMOVE 9676
+#define IDS_DOWNLOAD_LINK_REMOVE_ARIA_LABEL 9677
+#define IDS_DOWNLOAD_LINK_CANCEL 9678
+#define IDS_DOWNLOAD_LINK_RETRY 9679
+#define IDS_DOWNLOAD_LINK_SHOW_IN_WEB_DRIVE 9680
+#define IDS_DOWNLOAD_LINK_SHOW 9681
+#define IDS_DOWNLOAD_TAB_CANCELLED 9682
+#define IDS_DOWNLOAD_FILE_REMOVED 9683
+#define IDS_DOWNLOAD_TAB_PROGRESS_STATUS_TIME_UNKNOWN 9684
+#define IDS_DOWNLOAD_TAB_PROGRESS_STATUS 9685
+#define IDS_DOWNLOAD_TAB_PROGRESS_SIZE 9686
+#define IDS_DOWNLOAD_PROGRESS_PAUSED 9687
+#define IDS_DOWNLOAD_LINK_CLEAR_ALL 9688
+#define IDS_DOWNLOAD_LINK_OPEN_DOWNLOADS_FOLDER 9689
+#define IDS_DOWNLOAD_MORE_ACTIONS 9690
+#define IDS_DOWNLOAD_ACTION_MENU_DESCRIPTION 9691
+#define IDS_DOWNLOAD_BY_EXTENSION_URL 9692
+#define IDS_DOWNLOAD_IN_INCOGNITO 9693
+#define IDS_UNDO_DESCRIPTION 482
+#define IDS_DOWNLOAD_UNDO 9694
+#define IDS_DOWNLOAD_TOAST_REMOVED_FROM_LIST 9695
+#define IDS_DOWNLOAD_TOAST_CLEARED_ALL 9696
+#define IDS_DOWNLOAD_DEEP_SCAN 9697
+#define IDS_DOWNLOAD_DEEP_SCAN_UPDATED 9698
+#define IDS_DOWNLOAD_BYPASS_DEEP_SCAN 9699
+#define IDS_DOWNLOAD_BYPASS_DEEP_SCAN_UPDATED 9700
+#define IDS_DOWNLOAD_LOCAL_PASSWORD_SCAN 9701
+#define IDS_DOWNLOAD_KEEP_DANGEROUS_FILE 9702
+#define IDS_DOWNLOAD_KEEP_SUSPICIOUS_FILE 9703
+#define IDS_DOWNLOAD_KEEP_UNVERIFIED_FILE 9704
+#define IDS_DOWNLOAD_KEEP_INSECURE_FILE 9705
+#define IDS_DOWNLOAD_DELETE_FROM_HISTORY 9706
+#define IDS_DOWNLOAD_DANGEROUS_ICON_ACCESSIBLE_LABEL 9707
+#define IDS_DOWNLOAD_SUSPICIOUS_ICON_ACCESSIBLE_LABEL 9708
+#define IDS_DOWNLOAD_INSECURE_ICON_ACCESSIBLE_LABEL 9709
+#define IDS_DOWNLOAD_UNVERIFIED_ICON_ACCESSIBLE_LABEL 9710
+#define IDS_DOWNLOAD_SCREENREADER_SAVED_DANGEROUS 9711
+#define IDS_DOWNLOAD_SCREENREADER_SAVED_SUSPICIOUS 9712
+#define IDS_DOWNLOAD_SCREENREADER_SAVED_INSECURE 9713
+#define IDS_DOWNLOAD_SCREENREADER_SAVED_UNVERIFIED 9714
+#define IDS_DOWNLOAD_SCREENREADER_PAUSED 9715
+#define IDS_DOWNLOAD_SCREENREADER_RESUMED 9716
+#define IDS_DOWNLOAD_SCREENREADER_CANCELED 9717
+#define IDS_DOWNLOAD_WARNING_BYPASS_DIALOG_TITLE 9718
+#define IDS_DOWNLOAD_WARNING_BYPASS_DIALOG_DESCRIPTION 9719
+#define IDS_DOWNLOAD_STATUS_IN_PROGRESS_ACCESSIBLE_ALERT 9720
+#define IDS_DOWNLOAD_STATUS_PERCENT_COMPLETE_ACCESSIBLE_ALERT 9721
+#define IDS_DOWNLOAD_STATUS_TIME_REMAINING_ACCESSIBLE_ALERT 9722
+#define IDS_DOWNLOAD_FAILED_ACCESSIBLE_ALERT 9723
+#define IDS_DOWNLOAD_CANCELLED_ACCESSIBLE_ALERT 9724
+#define IDS_DOWNLOAD_COMPLETE_ACCESSIBLE_ALERT 9725
+#define IDS_PROMPT_APP_DEEP_SCANNING_ACCESSIBLE_ALERT 9726
+#define IDS_PROMPT_DEEP_SCANNING_ACCESSIBLE_ALERT 9727
+#define IDS_DEEP_SCANNING_ACCESSIBLE_ALERT 9728
+#define IDS_PROMPT_DOWNLOAD_INSECURE_BLOCKED_ACCESSIBLE_ALERT 9729
+#define IDS_DOWNLOAD_NOTIFICATION_COPY_TO_CLIPBOARD 9730
+#define IDS_DOWNLOAD_MENU_SHOW 9731
+#define IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE 9732
+#define IDS_DOWNLOAD_MENU_OPEN 9733
+#define IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE 9734
+#define IDS_DOWNLOAD_MENU_PLATFORM_OPEN 9735
+#define IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS 9736
+#define IDS_DOWNLOAD_MENU_CANCEL 9737
+#define IDS_DOWNLOAD_MENU_PAUSE_ITEM 9738
+#define IDS_DOWNLOAD_MENU_RESUME_ITEM 9739
+#define IDS_DOWNLOAD_MENU_DISCARD 9740
+#define IDS_DOWNLOAD_MENU_KEEP 9741
+#define IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING 9742
+#define IDS_DOWNLOAD_MENU_LEARN_MORE_INTERRUPTED 9743
+#define IDS_DOWNLOAD_MENU_LEARN_MORE_INSECURE 9744
+#define IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER 9745
+#define IDS_DOWNLOAD_MENU_DEEP_SCAN 9746
+#define IDS_ABANDON_DOWNLOAD_DIALOG_TITLE 9757
+#define IDS_ABANDON_DOWNLOAD_DIALOG_CONTINUE_BUTTON 9758
+#define IDS_ABANDON_DOWNLOAD_DIALOG_INCOGNITO_MESSAGE 9759
+#define IDS_ABANDON_DOWNLOAD_DIALOG_GUEST_MESSAGE 9760
+#define IDS_ABANDON_DOWNLOAD_DIALOG_EXIT_BUTTON 9761
+#define IDS_DOWNLOAD_BUBBLE_HEADER_LABEL 9762
+#define IDS_DOWNLOAD_BUBBLE_FOOTER_LABEL 9763
+#define IDS_DOWNLOAD_BUBBLE_FOOTER_TOOLTIP_LABEL 9764
+#define IDS_DOWNLOAD_BUBBLE_ESB_PROMO 9765
+#define IDS_DOWNLOAD_BUBBLE_ESB_PROMO_CUSTOM_ACTION 9766
+#define IDS_DOWNLOAD_BUBBLE_ESB_PROMO_DISMISS 9767
+#define IDS_DOWNLOAD_BUBBLE_ESB_PROMO_TITLE 9768
+#define IDS_DOWNLOAD_BUBBLE_DOWNLOAD_STATUS_MESSAGE_WITH_SEPARATOR 9769
+#define IDS_DOWNLOAD_BUBBLE_DOWNLOAD_STATUS_WITH_SYMBOL 9770
+#define IDS_DOWNLOAD_BUBBLE_STATUS_RESUMING 9771
+#define IDS_DOWNLOAD_BUBBLE_STATUS_DONE 9772
+#define IDS_DOWNLOAD_BUBBLE_STATUS_DEEP_SCANNING_DONE_UPDATED 9773
+#define IDS_DOWNLOAD_BUBBLE_STATUS_WARNING_INSECURE 9774
+#define IDS_DOWNLOAD_BUBBLE_STATUS_WARNING_SUSPICIOUS 9775
+#define IDS_DOWNLOAD_BUBBLE_STATUS_WARNING_DANGEROUS 9776
+#define IDS_DOWNLOAD_BUBBLE_STATUS_WARNING_UNVERIFIED 9777
+#define IDS_DOWNLOAD_BUBBLE_STATUS_BLOCKED 9778
+#define IDS_DOWNLOAD_BUBBLE_STATUS_MALWARE 9779
+#define IDS_DOWNLOAD_BUBBLE_STATUS_SUSPICIOUS 9780
+#define IDS_DOWNLOAD_BUBBLE_STATUS_DEEP_SCANNED_FAILED_UPDATED 9781
+#define IDS_DOWNLOAD_BUBBLE_CHECKBOX_BYPASS 9782
+#define IDS_DOWNLOAD_BUBBLE_CONTINUE 9783
+#define IDS_DOWNLOAD_BUBBLE_CONTINUE_INSECURE_FILE 9784
+#define IDS_DOWNLOAD_BUBBLE_CONTINUE_SUSPICIOUS_FILE 9785
+#define IDS_DOWNLOAD_BUBBLE_CONTINUE_UNVERIFIED_FILE 9786
+#define IDS_DOWNLOAD_BUBBLE_DELETE 9787
+#define IDS_DOWNLOAD_BUBBLE_DELETE_FROM_HISTORY 9788
+#define IDS_DOWNLOAD_BUBBLE_MAIN_BUTTON_SUBPAGE 9789
+#define IDS_DOWNLOAD_BUBBLE_RESUME 9790
+#define IDS_DOWNLOAD_BUBBLE_SCAN 9791
+#define IDS_DOWNLOAD_BUBBLE_OPEN 9792
+#define IDS_DOWNLOAD_BUBBLE_SCAN_UPDATED 9793
+#define IDS_DOWNLOAD_BUBBLE_OPEN_UPDATED 9794
+#define IDS_DOWNLOAD_BUBBLE_OPEN_NOW 9795
+#define IDS_DOWNLOAD_BUBBLE_REVIEW 9796
+#define IDS_DOWNLOAD_BUBBLE_RETRY 9797
+#define IDS_DOWNLOAD_BUBBLE_OPEN_ANYWAY 9798
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_DISK_FULL 9799
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_SUBPAGE_SUMMARY_DISK_FULL 9800
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_PATH_TOO_LONG 9801
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_SUBPAGE_SUMMARY_PATH_TOO_LONG 9802
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_NEEDS_PERMISSION 9803
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_FILE_TOO_LARGE 9804
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_SUBPAGE_SUMMARY_FILE_TOO_LARGE 9805
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_UNFINISHED 9806
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_BLOCKED_ORGANIZATION 9807
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_SUBPAGE_SUMMARY_BLOCKED_ORGANIZATION 9808
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_WRONG 9809
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_NETWORK_ERROR 9810
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_SITE_UNAVAILABLE 9811
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_FILE_UNAVAILABLE 9812
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_SUBPAGE_SUMMARY_FILE_UNAVAILABLE 9813
+#define IDS_DOWNLOAD_BUBBLE_INTERRUPTED_STATUS_FILE_UNFINISHED 9814
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_INSECURE 9815
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_DANGEROUS 9816
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_DECEPTIVE 9817
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_DANGEROUS_FILE_TYPE 9818
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_UNCOMMON_FILE 9819
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_NO_SAFE_BROWSING 9820
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_SAFE_BROWSING_SETTING_LABEL 9821
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_SAFE_BROWSING_SETTING_LINK 9822
+#define IDS_DOWNLOAD_BUBBLE_STATUS_DANGEROUS 9823
+#define IDS_DOWNLOAD_BUBBLE_STATUS_ENCRYPTED 9824
+#define IDS_DOWNLOAD_BUBBLE_STATUS_TOO_BIG 9825
+#define IDS_DOWNLOAD_BUBBLE_STATUS_ADVANCED_PROTECTION 9826
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ADVANCED_PROTECTION 9827
+#define IDS_DOWNLOAD_BUBBLE_STATUS_UNCOMMON_FILE 9828
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_UNCOMMON_FILE 9829
+#define IDS_DOWNLOAD_BUBBLE_STATUS_UNKNOWN_SOURCE 9830
+#define IDS_DOWNLOAD_BUBBLE_STATUS_SENSITIVE_CONTENT 9831
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SENSITIVE_CONTENT_WARNING 9832
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SENSITIVE_CONTENT_BLOCK 9833
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ENCRYPTED 9834
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_TOO_BIG 9835
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ASYNC_SCANNING 9836
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ASYNC_SCANNING_SECONDARY 9837
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ASYNC_SCANNING_ENTERPRISE_SECONDARY 9838
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ASYNC_SCANNING_DISCARD 9839
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_ASYNC_SCANNING_CANCEL 9840
+#define IDS_DOWNLOAD_BUBBLE_TRY_AGAIN 9841
+#define IDS_DOWNLOAD_BUBBLE_STATUS_ASYNC_SCANNING_ENTERPRISE 9842
+#define IDS_DOWNLOAD_BUBBLE_INCOGNITO_INFORMATION_ROW 9843
+#define IDS_DOWNLOAD_BUBBLE_RESUME_QUICK_ACTION 9844
+#define IDS_DOWNLOAD_BUBBLE_RESUME_QUICK_ACTION_ACCESSIBILITY 9845
+#define IDS_DOWNLOAD_BUBBLE_PAUSE_QUICK_ACTION 9846
+#define IDS_DOWNLOAD_BUBBLE_PAUSE_QUICK_ACTION_ACCESSIBILITY 9847
+#define IDS_DOWNLOAD_BUBBLE_CANCEL_QUICK_ACTION 9848
+#define IDS_DOWNLOAD_BUBBLE_CANCEL_QUICK_ACTION_ACCESSIBILITY 9849
+#define IDS_DOWNLOAD_BUBBLE_OPEN_QUICK_ACTION 9850
+#define IDS_DOWNLOAD_BUBBLE_OPEN_QUICK_ACTION_ACCESSIBILITY 9851
+#define IDS_DOWNLOAD_BUBBLE_SHOW_IN_FOLDER_QUICK_ACTION 9852
+#define IDS_DOWNLOAD_BUBBLE_SHOW_IN_FOLDER_QUICK_ACTION_ACCESSIBILITY 9853
+#define IDS_DOWNLOAD_BUBBLE_BACK_RECENT_DOWNLOADS 9854
+#define IDS_DOWNLOAD_BUBBLE_CANCEL_MAIN_BUTTON_ACCESSIBILITY 9855
+#define IDS_DOWNLOAD_BUBBLE_DELETE_MAIN_BUTTON_ACCESSIBILITY 9856
+#define IDS_DOWNLOAD_BUBBLE_KEEP_MAIN_BUTTON_ACCESSIBILITY 9857
+#define IDS_DOWNLOAD_BUBBLE_SCAN_MAIN_BUTTON_ACCESSIBILITY 9858
+#define IDS_DOWNLOAD_BUBBLE_OPEN_NOW_MAIN_BUTTON_ACCESSIBILITY 9859
+#define IDS_DOWNLOAD_BUBBLE_RESUME_MAIN_BUTTON_ACCESSIBILITY 9860
+#define IDS_DOWNLOAD_BUBBLE_REVIEW_MAIN_BUTTON_ACCESSIBILITY 9861
+#define IDS_DOWNLOAD_BUBBLE_RETRY_MAIN_BUTTON_ACCESSIBILITY 9862
+#define IDS_DOWNLOAD_BUBBLE_OPEN_MAIN_BUTTON_ACCESSIBILITY 9863
+#define IDS_DOWNLOAD_BUBBLE_SUPPRESS_PARTIAL_VIEW 9864
+#define IDS_DOWNLOAD_BUBBLE_SUPPRESS_PARTIAL_VIEW_SETTINGS_REMINDER 9865
+#define IDS_DOWNLOAD_BUBBLE_SUPPRESS_PARTIAL_VIEW_SETTINGS_LINK 9866
+#define IDS_DOWNLOAD_BUBBLE_TOOLTIP_IN_PROGRESS_COUNT 9867
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_COOKIE_THEFT 9868
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_COOKIE_THEFT_AND_ACCOUNT 9869
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_WARNING_ARCHIVE_MALWARE 9870
+#define IDS_DOWNLOAD_BUBBLE_STATUS_DEEP_SCANNING_PROMPT_UPDATED 9871
+#define IDS_DOWNLOAD_BUBBLE_STATUS_ASYNC_SCANNING 9872
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_DEEP_SCANNING_PROMPT_UPDATED 9873
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_DEEP_SCANNING_PROMPT_ENCRYPTED_ARCHIVE 9874
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_DEEP_SCANNING_LINK 9875
+#define IDS_DOWNLOAD_BUBBLE_PASSWORD_PROMPT 9876
+#define IDS_DOWNLOAD_BUBBLE_PASSWORD_PROMPT_EMPTY 9877
+#define IDS_DOWNLOAD_BUBBLE_PASSWORD_PROMPT_INVALID 9878
+#define IDS_DOWNLOAD_BUBBLE_PASSWORD_PROMPT_ACCESSIBLE_ALERT 9879
+#define IDS_DOWNLOAD_BUBBLE_PASSWORD_PROMPT_ACCESSIBLE_ALERT_EMPTY 9880
+#define IDS_DOWNLOAD_BUBBLE_PASSWORD_PROMPT_ACCESSIBLE_ALERT_INVALID 9881
+#define IDS_DOWNLOAD_BUBBLE_STATUS_LOCAL_DECRYPTION_STATUS 9882
+#define IDS_DOWNLOAD_BUBBLE_STATUS_PASSWORD_NEEDED 9883
+#define IDS_DOWNLOAD_BUBBLE_ACCEPT_LOCAL_DECRYPTION 9884
+#define IDS_DOWNLOAD_BUBBLE_BYPASS_LOCAL_DECRYPTION 9885
+#define IDS_DOWNLOAD_BUBBLE_LOCAL_DECRYPTION_CANCEL 9886
+#define IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_LOCAL_DECRYPTION_IN_PROGRESS 9887
+#define IDS_DOWNLOAD_BUBBLE_STATUS_LOCAL_DECRYPTING 9888
+#define IDS_WEB_APP_WITH_APP_TITLE 9889
+#define IDS_OMNIBOX_PWA_INSTALL_ICON_LABEL 453
+#define IDS_OMNIBOX_PWA_INSTALL_ICON_TOOLTIP 688
+#define IDS_ADD_TO_OS_LAUNCH_SURFACE_BUBBLE_TITLE 9890
+#define IDS_CREATE_SHORTCUTS_BUTTON_LABEL 9891
+#define IDS_INSTALL_TO_OS_LAUNCH_SURFACE_BUBBLE_TITLE 9892
+#define IDS_INSTALL_PWA_BUTTON_LABEL 9893
+#define IDS_BOOKMARK_APP_AX_BUBBLE_NAME_LABEL 9894
+#define IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_TAB 9895
+#define IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_WINDOW 9896
+#define IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_TABBED_WINDOW 9897
+#define IDS_WEBAPP_UPDATE_DIALOG_TITLE_NAME 9898
+#define IDS_WEBAPP_UPDATE_DIALOG_TITLE_ICON 9899
+#define IDS_WEBAPP_UPDATE_DIALOG_TITLE_NAME_AND_ICON 9900
+#define IDS_WEBAPP_UPDATE_EXPLANATION 9901
+#define IDS_WEBAPP_UPDATE_CURRENT_ICON 9902
+#define IDS_WEBAPP_UPDATE_NEW_ICON 9903
+#define IDS_WEBAPP_UPDATE_NEGATIVE_BUTTON 9904
+#define IDS_FINISH_POLICY_WEB_APP_INSTALLATION 9905
+#define IDS_FINISH_POLICY_WEB_APP_INSTALATION_RESTART 9906
+#define IDS_FINISH_POLICY_WEB_APP_INSTALLATION_NOT_NOW 9907
+#define IDS_ADD_TO_OS_LAUNCH_SURFACE 9912
+#define IDS_INSTALL_TO_OS_LAUNCH_SURFACE 9913
+#define IDS_UNINSTALL_FROM_OS_LAUNCH_SURFACE 9914
+#define IDS_APPLICATION_INFO_WEB_STORE_LINK 9915
+#define IDS_APPLICATION_INFO_HOMEPAGE_LINK 9916
+#define IDS_ARC_APPLICATION_INFO_MANAGE_LINK 9917
+#define IDS_APPLICATION_INFO_APP_OVERVIEW_TITLE 9918
+#define IDS_APPLICATION_INFO_APP_PERMISSIONS_TITLE 9919
+#define IDS_APPLICATION_INFO_UNINSTALL_BUTTON_TEXT 9920
+#define IDS_APPLICATION_INFO_LICENSES_BUTTON_TEXT 9921
+#define IDS_APPLICATION_INFO_SIZE_LABEL 9922
+#define IDS_APPLICATION_INFO_VERSION_LABEL 9923
+#define IDS_APPLICATION_INFO_CREATE_SHORTCUTS_BUTTON_TEXT 9924
+#define IDS_APPLICATION_INFO_LAUNCH_OPTIONS_ACCNAME 9925
+#define IDS_APPLICATION_INFO_SIZE_LOADING_LABEL 9926
+#define IDS_APPLICATION_INFO_SIZE_SMALL_LABEL 9927
+#define IDS_APPLICATION_INFO_REVOKE_PERMISSION_ALT_TEXT 9928
+#define IDS_APPLICATION_INFO_APP_NO_PERMISSIONS_TEXT 9929
+#define IDS_APPLICATION_INFO_EXTENSION_NO_PERMISSIONS_TEXT 9930
+#define IDS_APPLICATION_INFO_RETAINED_FILES 9931
+#define IDS_APPLICATION_INFO_RETAINED_DEVICES 9932
+#define IDS_CREATE_SHORTCUTS_TITLE 9933
+#define IDS_CREATE_SHORTCUTS_LABEL 9934
+#define IDS_CREATE_SHORTCUTS_DESKTOP_CHKBOX 9935
+#define IDS_CREATE_SHORTCUTS_MENU_CHKBOX 9936
+#define IDS_CREATE_SHORTCUTS_COMMIT 9937
+#define IDS_CREATE_SHORTCUTS_START_MENU_CHKBOX 9938
+#define IDS_PIN_TO_TASKBAR_CHKBOX 9939
+#define IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE 9940
+#define IDS_BLUETOOTH_DEVICE_CREDENTIALS_LABEL 9941
+#define IDS_BLUETOOTH_DEVICE_PAIR_CONFIRM_TITLE 9942
+#define IDS_BLUETOOTH_DEVICE_PAIR_CONFIRM_LABEL 9943
+#define IDS_BLUETOOTH_DEVICE_PASSKEY_CONFIRM_TITLE 9944
+#define IDS_BLUETOOTH_DEVICE_PASSKEY_CONFIRM_LABEL 9945
+#define IDS_MANAGE 9946
+#define IDS_LIST_BULLET 9947
+#define IDS_BLOCKED_DOWNLOAD_NO_ACTION 9948
+#define IDS_BLOCKED_DOWNLOAD_UNBLOCK 9949
+#define IDS_ALLOWED_DOWNLOAD_TITLE 9950
+#define IDS_BLOCKED_DOWNLOAD_TITLE 9951
+#define IDS_BLOCKED_DOWNLOADS_EXPLANATION 9952
+#define IDS_ALLOWED_DOWNLOAD_NO_ACTION 9953
+#define IDS_ALLOWED_DOWNLOAD_BLOCK 9954
+#define IDS_BLOCKED_ON_DEVICE_SITE_DATA_TITLE 9955
+#define IDS_ACCESSED_ON_DEVICE_SITE_DATA_TITLE 9956
+#define IDS_BLOCKED_ON_DEVICE_SITE_DATA_MESSAGE 9957
+#define IDS_ACCESSED_ON_DEVICE_SITE_DATA_MESSAGE 9958
+#define IDS_BLOCKED_COOKIES_INFO 9959
+#define IDS_BLOCKED_IMAGES_TITLE 9960
+#define IDS_BLOCKED_IMAGES_MESSAGE 9961
+#define IDS_BLOCKED_ON_DEVICE_SITE_DATA_UNBLOCK 9962
+#define IDS_BLOCKED_IMAGES_UNBLOCK 9963
+#define IDS_BLOCKED_ON_DEVICE_SITE_DATA_NO_ACTION 9964
+#define IDS_ALLOWED_ON_DEVICE_SITE_DATA_NO_ACTION 9965
+#define IDS_ALLOWED_ON_DEVICE_SITE_DATA_BLOCK 9966
+#define IDS_BLOCKED_IMAGES_NO_ACTION 9967
+#define IDS_BLOCKED_POPUPS_TOOLTIP 9968
+#define IDS_BLOCKED_POPUPS_TITLE 9969
+#define IDS_BLOCKED_POPUPS_REDIRECTS_UNBLOCK 9970
+#define IDS_BLOCKED_POPUPS_REDIRECTS_NO_ACTION 9971
+#define IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ALLOW 9972
+#define IDS_BLOCKED_MEDIASTREAM_MIC_ALLOW 9973
+#define IDS_BLOCKED_MEDIASTREAM_CAMERA_ALLOW 9974
+#define IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ASK 9975
+#define IDS_BLOCKED_MEDIASTREAM_MIC_ASK 9976
+#define IDS_BLOCKED_MEDIASTREAM_CAMERA_ASK 9977
+#define IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK 9978
+#define IDS_ALLOWED_MEDIASTREAM_MIC_BLOCK 9979
+#define IDS_ALLOWED_MEDIASTREAM_CAMERA_BLOCK 9980
+#define IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION 9981
+#define IDS_BLOCKED_MEDIASTREAM_MIC_NO_ACTION 9982
+#define IDS_BLOCKED_MEDIASTREAM_CAMERA_NO_ACTION 9983
+#define IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION 9984
+#define IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_PAN_TILT_ZOOM_NO_ACTION 9985
+#define IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION 9986
+#define IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION 9987
+#define IDS_ALLOWED_CAMERA_PAN_TILT_ZOOM_NO_ACTION 9988
+#define IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT 9989
+#define IDS_BLOCKED_JAVASCRIPT_TITLE 9990
+#define IDS_BLOCKED_JAVASCRIPT_MESSAGE 9991
+#define IDS_BLOCKED_JAVASCRIPT_UNBLOCK 9992
+#define IDS_BLOCKED_JAVASCRIPT_NO_ACTION 9993
+#define IDS_BLOCKED_SOUND_TITLE 9994
+#define IDS_BLOCKED_SOUND_UNBLOCK 9995
+#define IDS_BLOCKED_SOUND_NO_ACTION 9996
+#define IDS_NOTIFICATIONS_OFF_EXPLANATORY_TEXT 442
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_TITLE 9997
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_DESCRIPTION 9998
+#define IDS_GEOLOCATION_QUIET_PERMISSION_BUBBLE_DESCRIPTION 9999
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON 10000
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_COMPACT_ALLOW_BUTTON 10001
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CONTINUE_BLOCKING_BUTTON 10002
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_EARLY_PROMO 10003
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_NEW_REQUEST_PROMO 10004
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_CROWD_DENY_DESCRIPTION 10005
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_ABUSIVE_DESCRIPTION 10006
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_DISRUPTIVE_DESCRIPTION 10007
+#define IDS_NOTIFICATIONS_QUIET_PERMISSION_BUBBLE_PREDICTION_SERVICE_DESCRIPTION 10008
+#define IDS_GEOLOCATION_OFF_EXPLANATORY_TEXT 10009
+#define IDS_GEOLOCATION_QUIET_PERMISSION_BUBBLE_TITLE 10010
+#define IDS_GEOLOCATION_QUIET_PERMISSION_BUBBLE_PREDICTION_SERVICE_DESCRIPTION 10011
+#define IDS_GEOLOCATION_QUIET_PERMISSION_BUBBLE_ALLOW_BUTTON 10012
+#define IDS_STORAGE_ACCESS_PERMISSION_BUBBLE_MESSAGE 10013
+#define IDS_STORAGE_ACCESS_PERMISSION_ALLOWED_TOOLTIP 10014
+#define IDS_STORAGE_ACCESS_PERMISSION_BLOCKED_TOOLTIP 10015
+#define IDS_COOKIE_CONTROLS_BUBBLE_COOKIES_BLOCKED_TITLE 10016
+#define IDS_TRACKING_PROTECTION_BUBBLE_TITLE 10017
+#define IDS_COOKIE_CONTROLS_BUBBLE_COOKIES_ALLOWED_TITLE 10018
+#define IDS_COOKIE_CONTROLS_BUBBLE_SITE_NOT_WORKING_TITLE 10019
+#define IDS_TRACKING_PROTECTION_BUBBLE_SITE_NOT_WORKING_DESCRIPTION 10020
+#define IDS_TRACKING_PROTECTION_BUBBLE_LIMITING_RESTART_TITLE 10021
+#define IDS_TRACKING_PROTECTION_BUBBLE_BLOCKING_RESTART_TITLE 10022
+#define IDS_TRACKING_PROTECTION_BUBBLE_BLOCKING_RESTART_DESCRIPTION 10023
+#define IDS_TRACKING_PROTECTION_BUBBLE_PERMANENT_ALLOWED_TITLE 10024
+#define IDS_TRACKING_PROTECTION_BUBBLE_PERMANENT_ALLOWED_DESCRIPTION 10025
+#define IDS_COOKIE_CONTROLS_BUBBLE_SEND_FEEDBACK_BUTTON_TITLE 10026
+#define IDS_COOKIE_CONTROLS_BUBBLE_SEND_FEEDBACK_BUTTON_DESCRIPTION 10027
+#define IDS_COOKIE_CONTROLS_BUBBLE_RELOADING_LABEL 10028
+#define IDS_COOKIE_CONTROLS_BUBBLE_THIRD_PARTY_COOKIES_LABEL 10029
+#define IDS_COOKIE_CONTROLS_BUBBLE_SEND_FEEDBACK_FORM_PLACEHOLDER 10030
+#define IDS_TRACKING_PROTECTION_BUBBLE_COOKIES_ALLOWED_LABEL 10031
+#define IDS_TRACKING_PROTECTION_BUBBLE_COOKIES_BLOCKED_LABEL 10032
+#define IDS_TRACKING_PROTECTION_BUBBLE_COOKIES_LIMITED_LABEL 10033
+#define IDS_COOKIE_CONTROLS_PAGE_ACTION_COOKIES_ALLOWED_LABEL 10034
+#define IDS_COOKIE_CONTROLS_PAGE_ACTION_COOKIES_BLOCKED_LABEL 10035
+#define IDS_COOKIE_CONTROLS_PAGE_ACTION_COOKIES_LIMITED_LABEL 10036
+#define IDS_TRACKING_PROTECTION_PAGE_ACTION_SITE_NOT_WORKING_LABEL 10037
+#define IDS_TRACKING_PROTECTION_PAGE_ACTION_LABEL 10038
+#define IDS_COOKIE_CONTROLS_PROMO_TITLE 10039
+#define IDS_COOKIE_CONTROLS_PROMO_TEXT 10040
+#define IDS_COOKIE_CONTROLS_PROMO_CLOSE_BUTTON_TEXT 10041
+#define IDS_COOKIE_CONTROLS_PROMO_SEE_HOW_BUTTON_TEXT 10042
+#define IDS_3PCD_USER_BYPASS_PROMO_TITLE 10043
+#define IDS_3PCD_USER_BYPASS_PROMO_TEXT 10044
+#define IDS_3PCD_USER_BYPASS_PROMO_SCREENREADER 10045
+#define IDS_CERT_SELECTOR_SUBJECT_COLUMN 10046
+#define IDS_CERT_SELECTOR_ISSUER_COLUMN 10047
+#define IDS_CERT_SELECTOR_PROVIDER_COLUMN 10048
+#define IDS_CERT_SELECTOR_SERIAL_COLUMN 10049
+#define IDS_CERT_EXPORT_TYPE_BASE64 10050
+#define IDS_CERT_EXPORT_TYPE_BASE64_CHAIN 10051
+#define IDS_CERT_EXPORT_TYPE_DER 10052
+#define IDS_CERT_EXPORT_TYPE_PKCS7 10053
+#define IDS_CERT_EXPORT_TYPE_PKCS7_CHAIN 10054
+#define IDS_CERT_INFO_DIALOG_TITLE 10055
+#define IDS_CERT_INFO_GENERAL_TAB_LABEL 10056
+#define IDS_CERT_INFO_DETAILS_TAB_LABEL 10057
+#define IDS_CERT_USAGE_SSL_CLIENT 10058
+#define IDS_CERT_USAGE_SSL_SERVER 10059
+#define IDS_CERT_USAGE_OBJECT_SIGNER 10060
+#define IDS_CERT_USAGE_SSL_CA 10061
+#define IDS_CERT_INFO_IDN_VALUE_FORMAT 10062
+#define IDS_CERT_INFO_FIELD_NOT_PRESENT 10063
+#define IDS_CERT_DETAILS_CERTIFICATE_HIERARCHY_LABEL 10064
+#define IDS_CERT_DETAILS_CERTIFICATE_FIELDS_LABEL 10065
+#define IDS_CERT_DETAILS_CERTIFICATE_FIELD_VALUE_LABEL 10066
+#define IDS_CERT_DETAILS_CERTIFICATE 10067
+#define IDS_CERT_DETAILS_VERSION 10068
+#define IDS_CERT_DETAILS_VERSION_FORMAT 10069
+#define IDS_CERT_DETAILS_SERIAL_NUMBER 10070
+#define IDS_CERT_DETAILS_CERTIFICATE_SIG_ALG 10071
+#define IDS_CERT_DETAILS_ISSUER 10072
+#define IDS_CERT_DETAILS_VALIDITY 10073
+#define IDS_CERT_DETAILS_NOT_BEFORE 10074
+#define IDS_CERT_DETAILS_NOT_AFTER 10075
+#define IDS_CERT_DETAILS_SUBJECT 10076
+#define IDS_CERT_DETAILS_SUBJECT_KEY_INFO 10077
+#define IDS_CERT_DETAILS_SUBJECT_KEY_ALG 10078
+#define IDS_CERT_DETAILS_SUBJECT_KEY 10079
+#define IDS_CERT_RSA_PUBLIC_KEY_DUMP_FORMAT 10080
+#define IDS_CERT_DETAILS_CERTIFICATE_SIG_VALUE 10081
+#define IDS_CERT_DETAILS_EXPORT_CERTIFICATE 10082
+#define IDS_CERT_DETAILS_EXPORT_CERTIFICATE_A11Y_LABEL 10083
+#define IDS_CERT_OID_AVA_COMMON_NAME 10084
+#define IDS_CERT_OID_AVA_STATE_OR_PROVINCE 10085
+#define IDS_CERT_OID_AVA_ORGANIZATION_NAME 10086
+#define IDS_CERT_OID_AVA_ORGANIZATIONAL_UNIT_NAME 10087
+#define IDS_CERT_OID_AVA_DN_QUALIFIER 10088
+#define IDS_CERT_OID_AVA_COUNTRY_NAME 10089
+#define IDS_CERT_OID_AVA_SERIAL_NUMBER 10090
+#define IDS_CERT_OID_AVA_LOCALITY 10091
+#define IDS_CERT_OID_AVA_DC 10092
+#define IDS_CERT_OID_RFC1274_MAIL 10093
+#define IDS_CERT_OID_RFC1274_UID 10094
+#define IDS_CERT_OID_PKCS9_EMAIL_ADDRESS 10095
+#define IDS_CERT_OID_BUSINESS_CATEGORY 10096
+#define IDS_CERT_OID_EV_INCORPORATION_LOCALITY 10097
+#define IDS_CERT_OID_EV_INCORPORATION_STATE 10098
+#define IDS_CERT_OID_EV_INCORPORATION_COUNTRY 10099
+#define IDS_CERT_OID_AVA_STREET_ADDRESS 10100
+#define IDS_CERT_OID_AVA_POSTAL_CODE 10101
+#define IDS_CERT_OID_PKCS1_RSA_ENCRYPTION 10102
+#define IDS_CERT_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION 10103
+#define IDS_CERT_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION 10104
+#define IDS_CERT_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION 10105
+#define IDS_CERT_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION 10106
+#define IDS_CERT_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION 10107
+#define IDS_CERT_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION 10108
+#define IDS_CERT_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION 10109
+#define IDS_CERT_OID_ANSIX962_ECDSA_SHA1_SIGNATURE 10110
+#define IDS_CERT_OID_ANSIX962_ECDSA_SHA256_SIGNATURE 10111
+#define IDS_CERT_OID_ANSIX962_ECDSA_SHA384_SIGNATURE 10112
+#define IDS_CERT_OID_ANSIX962_ECDSA_SHA512_SIGNATURE 10113
+#define IDS_CERT_OID_ANSIX962_EC_PUBLIC_KEY 10114
+#define IDS_CERT_OID_SECG_EC_SECP256R1 10115
+#define IDS_CERT_OID_SECG_EC_SECP384R1 10116
+#define IDS_CERT_OID_SECG_EC_SECP521R1 10117
+#define IDS_CERT_EXT_NS_CERT_TYPE 10118
+#define IDS_CERT_EXT_NS_CERT_TYPE_EMAIL 10119
+#define IDS_CERT_EXT_NS_CERT_TYPE_EMAIL_CA 10120
+#define IDS_CERT_EXT_NS_CERT_BASE_URL 10121
+#define IDS_CERT_EXT_NS_CERT_REVOCATION_URL 10122
+#define IDS_CERT_EXT_NS_CA_REVOCATION_URL 10123
+#define IDS_CERT_EXT_NS_CERT_RENEWAL_URL 10124
+#define IDS_CERT_EXT_NS_CA_POLICY_URL 10125
+#define IDS_CERT_EXT_NS_SSL_SERVER_NAME 10126
+#define IDS_CERT_EXT_NS_COMMENT 10127
+#define IDS_CERT_EXT_NS_LOST_PASSWORD_URL 10128
+#define IDS_CERT_EXT_NS_CERT_RENEWAL_TIME 10129
+#define IDS_CERT_X509_SUBJECT_DIRECTORY_ATTR 10130
+#define IDS_CERT_X509_SUBJECT_KEYID 10131
+#define IDS_CERT_KEYID_FORMAT 10132
+#define IDS_CERT_ISSUER_FORMAT 10133
+#define IDS_CERT_SERIAL_NUMBER_FORMAT 10134
+#define IDS_CERT_X509_KEY_USAGE 10135
+#define IDS_CERT_X509_ISSUER_ALT_NAME 10136
+#define IDS_CERT_X509_BASIC_CONSTRAINTS 10137
+#define IDS_CERT_X509_NAME_CONSTRAINTS 10138
+#define IDS_CERT_X509_CRL_DIST_POINTS 10139
+#define IDS_CERT_X509_CERT_POLICIES 10140
+#define IDS_CERT_X509_SCT_LIST 10141
+#define IDS_CERT_X509_POLICY_MAPPINGS 10142
+#define IDS_CERT_X509_POLICY_CONSTRAINTS 10143
+#define IDS_CERT_X509_AUTH_KEYID 10144
+#define IDS_CERT_X509_EXT_KEY_USAGE 10145
+#define IDS_CERT_X509_AUTH_INFO_ACCESS 10146
+#define IDS_CERT_X509_KEY_USAGE_SIGNING 10147
+#define IDS_CERT_X509_KEY_USAGE_NONREP 10148
+#define IDS_CERT_X509_KEY_USAGE_ENCIPHERMENT 10149
+#define IDS_CERT_X509_KEY_USAGE_DATA_ENCIPHERMENT 10150
+#define IDS_CERT_X509_KEY_USAGE_KEY_AGREEMENT 10151
+#define IDS_CERT_X509_KEY_USAGE_CERT_SIGNER 10152
+#define IDS_CERT_X509_KEY_USAGE_CRL_SIGNER 10153
+#define IDS_CERT_X509_KEY_USAGE_ENCIPHER_ONLY 10154
+#define IDS_CERT_X509_KEY_USAGE_DECIPHER_ONLY 10155
+#define IDS_CERT_X509_BASIC_CONSTRAINT_IS_CA 10156
+#define IDS_CERT_X509_BASIC_CONSTRAINT_IS_NOT_CA 10157
+#define IDS_CERT_X509_BASIC_CONSTRAINT_PATH_LEN 10158
+#define IDS_CERT_X509_BASIC_CONSTRAINT_PATH_LEN_UNLIMITED 10159
+#define IDS_CERT_PKIX_CPS_POINTER_QUALIFIER 10160
+#define IDS_CERT_PKIX_USER_NOTICE_QUALIFIER 10161
+#define IDS_CERT_REVOCATION_REASON_UNUSED 10162
+#define IDS_CERT_REVOCATION_REASON_KEY_COMPROMISE 10163
+#define IDS_CERT_REVOCATION_REASON_CA_COMPROMISE 10164
+#define IDS_CERT_REVOCATION_REASON_AFFILIATION_CHANGED 10165
+#define IDS_CERT_REVOCATION_REASON_SUPERSEDED 10166
+#define IDS_CERT_REVOCATION_REASON_CESSATION_OF_OPERATION 10167
+#define IDS_CERT_REVOCATION_REASON_CERTIFICATE_HOLD 10168
+#define IDS_CERT_OCSP_RESPONDER_FORMAT 10169
+#define IDS_CERT_CA_ISSUERS_FORMAT 10170
+#define IDS_CERT_UNKNOWN_OID_INFO_FORMAT 10171
+#define IDS_CERT_EXT_KEY_USAGE_FORMAT 10172
+#define IDS_CERT_MULTILINE_INFO_START_FORMAT 10173
+#define IDS_CERT_GENERAL_NAME_RFC822_NAME 10174
+#define IDS_CERT_GENERAL_NAME_DNS_NAME 10175
+#define IDS_CERT_GENERAL_NAME_X400_ADDRESS 10176
+#define IDS_CERT_GENERAL_NAME_DIRECTORY_NAME 10177
+#define IDS_CERT_GENERAL_NAME_EDI_PARTY_NAME 10178
+#define IDS_CERT_GENERAL_NAME_URI 10179
+#define IDS_CERT_GENERAL_NAME_IP_ADDRESS 10180
+#define IDS_CERT_GENERAL_NAME_REGISTERED_ID 10181
+#define IDS_CERT_EXT_MS_APP_POLICIES 10182
+#define IDS_CERT_EXT_MS_CERT_TEMPLATE 10183
+#define IDS_CERT_EXT_MS_CERT_TYPE 10184
+#define IDS_CERT_EXT_MS_CA_VERSION 10185
+#define IDS_CERT_EXT_MS_NT_PRINCIPAL_NAME 10186
+#define IDS_CERT_EXT_MS_NTDS_REPLICATION 10187
+#define IDS_CERT_EKU_ANY_EKU 10188
+#define IDS_CERT_EKU_TLS_WEB_SERVER_AUTHENTICATION 10189
+#define IDS_CERT_EKU_TLS_WEB_CLIENT_AUTHENTICATION 10190
+#define IDS_CERT_EKU_CODE_SIGNING 10191
+#define IDS_CERT_EKU_EMAIL_PROTECTION 10192
+#define IDS_CERT_EKU_TIME_STAMPING 10193
+#define IDS_CERT_EKU_OCSP_SIGNING 10194
+#define IDS_CERT_EKU_MS_INDIVIDUAL_CODE_SIGNING 10195
+#define IDS_CERT_EKU_MS_COMMERCIAL_CODE_SIGNING 10196
+#define IDS_CERT_EKU_MS_TRUST_LIST_SIGNING 10197
+#define IDS_CERT_EKU_MS_TIME_STAMPING 10198
+#define IDS_CERT_EKU_MS_SERVER_GATED_CRYPTO 10199
+#define IDS_CERT_EKU_MS_ENCRYPTING_FILE_SYSTEM 10200
+#define IDS_CERT_EKU_MS_FILE_RECOVERY 10201
+#define IDS_CERT_EKU_MS_WINDOWS_HARDWARE_DRIVER_VERIFICATION 10202
+#define IDS_CERT_EKU_MS_QUALIFIED_SUBORDINATION 10203
+#define IDS_CERT_EKU_MS_KEY_RECOVERY 10204
+#define IDS_CERT_EKU_MS_DOCUMENT_SIGNING 10205
+#define IDS_CERT_EKU_MS_LIFETIME_SIGNING 10206
+#define IDS_CERT_EKU_MS_SMART_CARD_LOGON 10207
+#define IDS_CERT_EKU_MS_KEY_RECOVERY_AGENT 10208
+#define IDS_CERT_EKU_NETSCAPE_INTERNATIONAL_STEP_UP 10209
+#define IDS_CERT_EXTENSION_CRITICAL 10210
+#define IDS_CERT_EXTENSION_NON_CRITICAL 10211
+#define IDS_CERT_DUMP_ERROR 10212
+#define IDS_CERT_EXTENSION_DUMP_ERROR 10213
+#define IDS_CERTIFICATE_MANAGER_TITLE 10214
+#define IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT 10215
+#define IDS_CERT_MANAGER_HARDWARE_BACKED 10216
+#define IDS_CERT_MANAGER_EXTENSION_PROVIDED_FORMAT 10217
+#define IDS_DEV_TOOLS_INFOBAR_LABEL 10218
+#define IDS_DEV_TOOLS_CONFIRM_ADD_FILE_SYSTEM_MESSAGE 10219
+#define IDS_DEV_TOOLS_CONFIRM_ALLOW_BUTTON 10220
+#define IDS_DEV_TOOLS_CONFIRM_DENY_BUTTON 10221
+#define IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM 415
+#define IDS_RELOAD_MENU_HARD_RELOAD_ITEM 416
+#define IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM 417
+#define IDS_TAB_SHARING_INFOBAR_SHARING_CURRENT_TAB_LABEL 10222
+#define IDS_TAB_SHARING_INFOBAR_SHARING_ANOTHER_UNTITLED_TAB_LABEL 10223
+#define IDS_TAB_SHARING_INFOBAR_SHARING_ANOTHER_TAB_LABEL 10224
+#define IDS_TAB_SHARING_INFOBAR_SHARE_BUTTON 10225
+#define IDS_TAB_SHARING_INFOBAR_STOP_BUTTON 10226
+#define IDS_TAB_SHARING_INFOBAR_SWITCH_TO_BUTTON 10227
+#define IDS_TAB_SHARING_INFOBAR_SWITCH_TO_CAPTURER_BUTTON 10228
+#define IDS_TAB_SHARING_INFOBAR_SWITCH_TO_CAPTURED_BUTTON 10229
+#define IDS_TAB_CASTING_INFOBAR_CASTING_CURRENT_TAB_LABEL 10230
+#define IDS_TAB_CASTING_INFOBAR_CASTING_CURRENT_TAB_NO_DEVICE_NAME_LABEL 10231
+#define IDS_TAB_CASTING_INFOBAR_CASTING_ANOTHER_UNTITLED_TAB_LABEL 10232
+#define IDS_TAB_CASTING_INFOBAR_CASTING_ANOTHER_UNTITLED_TAB_NO_DEVICE_NAME_LABEL 10233
+#define IDS_TAB_CASTING_INFOBAR_CASTING_ANOTHER_TAB_LABEL 10234
+#define IDS_TAB_CASTING_INFOBAR_CASTING_ANOTHER_TAB_NO_DEVICE_NAME_LABEL 10235
+#define IDS_TAB_CASTING_INFOBAR_CAST_BUTTON 10236
+#define IDS_TAB_CASTING_INFOBAR_STOP_BUTTON 10237
+#define IDS_TASK_MANAGER_KILL 10238
+#define IDS_TASK_MANAGER_PROCESS_ID_COLUMN 10239
+#define IDS_TASK_MANAGER_GDI_HANDLES_COLUMN 10240
+#define IDS_TASK_MANAGER_USER_HANDLES_COLUMN 10241
+#define IDS_TASK_MANAGER_TASK_COLUMN 10242
+#define IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN 10243
+#define IDS_TASK_MANAGER_NET_COLUMN 10244
+#define IDS_TASK_MANAGER_CPU_COLUMN 10245
+#define IDS_TASK_MANAGER_START_TIME_COLUMN 10246
+#define IDS_TASK_MANAGER_CPU_TIME_COLUMN 10247
+#define IDS_TASK_MANAGER_MEM_FOOTPRINT_COLUMN 10248
+#define IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN 10249
+#define IDS_TASK_MANAGER_PROFILE_NAME_COLUMN 10250
+#define IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN 10251
+#define IDS_TASK_MANAGER_HARD_FAULTS_COLUMN 10252
+#define IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN 10253
+#define IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN 10254
+#define IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN 10255
+#define IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN 10256
+#define IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN 10257
+#define IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN 10258
+#define IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN 10259
+#define IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN 10260
+#define IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN 10261
+#define IDS_TASK_MANAGER_MEM_CELL_TEXT 10262
+#define IDS_TASK_MANAGER_CACHE_SIZE_CELL_TEXT 10263
+#define IDS_TASK_MANAGER_NA_CELL_TEXT 10264
+#define IDS_TASK_MANAGER_BACKGROUNDED_TEXT 10265
+#define IDS_TASK_MANAGER_FOREGROUNDED_TEXT 10266
+#define IDS_TASK_MANAGER_UNKNOWN_VALUE_TEXT 10267
+#define IDS_TASK_MANAGER_DISABLED_NACL_DBG_TEXT 10268
+#define IDS_TASK_MANAGER_HANDLES_CELL_TEXT 10269
+#define IDS_TASK_MANAGER_WEB_BROWSER_CELL_TEXT 10270
+#define IDS_TASK_MANAGER_EXTENSION_PREFIX 10271
+#define IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX 10272
+#define IDS_TASK_MANAGER_APP_PREFIX 10273
+#define IDS_TASK_MANAGER_APP_INCOGNITO_PREFIX 10274
+#define IDS_TASK_MANAGER_TAB_PREFIX 10275
+#define IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX 10276
+#define IDS_TASK_MANAGER_BACKGROUND_APP_PREFIX 10277
+#define IDS_TASK_MANAGER_BACKGROUND_PREFIX 10278
+#define IDS_TASK_MANAGER_BACK_FORWARD_CACHE_PREFIX 10279
+#define IDS_TASK_MANAGER_BACK_FORWARD_CACHE_INCOGNITO_PREFIX 10280
+#define IDS_TASK_MANAGER_PLUGIN_PREFIX 10281
+#define IDS_TASK_MANAGER_PLUGIN_BROKER_PREFIX 10282
+#define IDS_TASK_MANAGER_PRELOADED_RENDERER_FOR_UI 10283
+#define IDS_TASK_MANAGER_NO_STATE_PREFETCH_PREFIX 10284
+#define IDS_TASK_MANAGER_PRERENDER_PREFIX 10285
+#define IDS_TASK_MANAGER_SPARE_RENDERER_PREFIX 10286
+#define IDS_TASK_MANAGER_UNKNOWN_RENDERER_PREFIX 10287
+#define IDS_TASK_MANAGER_DEDICATED_WORKER_PREFIX 10288
+#define IDS_TASK_MANAGER_SHARED_WORKER_PREFIX 10289
+#define IDS_TASK_MANAGER_SERVICE_WORKER_PREFIX 10290
+#define IDS_TASK_MANAGER_UNKNOWN_PLUGIN_NAME 10291
+#define IDS_TASK_MANAGER_UTILITY_PREFIX 10292
+#define IDS_TASK_MANAGER_NACL_PREFIX 10293
+#define IDS_TASK_MANAGER_NACL_BROKER_PREFIX 10294
+#define IDS_TASK_MANAGER_GPU_PREFIX 10295
+#define IDS_TASK_MANAGER_PRINT_PREFIX 10296
+#define IDS_TASK_MANAGER_SUBFRAME_PREFIX 10297
+#define IDS_TASK_MANAGER_SUBFRAME_INCOGNITO_PREFIX 10298
+#define IDS_TASK_MANAGER_BACK_FORWARD_CACHE_SUBFRAME_PREFIX 10299
+#define IDS_TASK_MANAGER_BACK_FORWARD_CACHE_INCOGNITO_SUBFRAME_PREFIX 10300
+#define IDS_TASK_MANAGER_PORTAL_PREFIX 10301
+#define IDS_TASK_MANAGER_PORTAL_INCOGNITO_PREFIX 10302
+#define IDS_TASK_MANAGER_FENCED_FRAME_PREFIX 10303
+#define IDS_TASK_MANAGER_FENCED_FRAME_INCOGNITO_PREFIX 10304
+#define IDS_TASK_MANAGER_ARC_PREFIX 10305
+#define IDS_TASK_MANAGER_TOOL_PREFIX 10306
+#define IDS_TASK_MANAGER_ARC_PREFIX_BACKGROUND_SERVICE 10307
+#define IDS_TASK_MANAGER_ARC_PREFIX_RECEIVER 10308
+#define IDS_TASK_MANAGER_ARC_SYSTEM 10309
+#define IDS_TASK_MANAGER_LINUX_VM_PREFIX 10310
+#define IDS_TASK_MANAGER_PLUGIN_VM_PREFIX 10311
+#define IDS_UTILITY_PROCESS_FILE_UTILITY_NAME 10313
+#define IDS_UTILITY_PROCESS_PROFILE_IMPORTER_NAME 10314
+#define IDS_UTILITY_PROCESS_QRCODE_GENERATOR_SERVICE_NAME 10315
+#define IDS_UTILITY_PROCESS_WIFI_CREDENTIALS_GETTER_NAME 10316
+#define IDS_UTILITY_PROCESS_IMAGE_WRITER_NAME 10317
+#define IDS_UTILITY_PROCESS_MEDIA_GALLERY_UTILITY_NAME 10318
+#define IDS_UTILITY_PROCESS_NOOP_SERVICE_NAME 10319
+#define IDS_SERVICE_PROCESS_DOCUMENT_ANALYSIS_NAME 10320
+#define IDS_THEME_INSTALL_INFOBAR_LABEL 10321
+#define IDS_THEME_INSTALL_INFOBAR_UNDO_BUTTON 10322
+#define IDS_CRITICAL_NOTIFICATION_RESTART 10323
+#define IDS_EXTENSION_DISABLED_ERROR_LABEL 10324
+#define IDS_EXTENSION_IS_BLOCKLISTED 10325
+#define IDS_EXTENSION_DISABLED_REMOTE_INSTALL_ERROR_TITLE 10326
+#define IDS_EXTENSION_DISABLED_ERROR_TITLE 10327
+#define IDS_EXTENSION_SITE_RELOAD_PAGE_BUBBLE_HEADING 10328
+#define IDS_EXTENSION_RELOAD_PAGE_BUBBLE_OK_BUTTON 10329
+#define IDS_EXTENSION_RELOAD_PAGE_BUBBLE_ALLOW_SINGLE_EXTENSION_TITLE 10330
+#define IDS_EXTENSION_RELOAD_PAGE_BUBBLE_ALLOW_MULTIPLE_EXTENSIONS_TITLE 10331
+#define IDS_APP_UNINSTALL_PROMPT_TITLE 10332
+#define IDS_ARC_APP_UNINSTALL_PROMPT_DATA_REMOVAL_WARNING 10333
+#define IDS_EXTENSION_UNINSTALL_PROMPT_TITLE 10334
+#define IDS_EXTENSION_CONFIRM_PERMISSIONS 10335
+#define IDS_EXTENSION_DELEGATED_INSTALL_PROMPT_TITLE 10336
+#define IDS_EXTENSION_INSTALL_PROMPT_TITLE 10337
+#define IDS_EXTENSION_UNINSTALL_PROMPT_HEADING 10338
+#define IDS_EXTENSION_REQUEST_PROMPT_TITLE 10339
+#define IDS_EXTENSION_PENDING_REQUEST_PROMPT_TITLE 10340
+#define IDS_EXTENSION_BLOCKED_BY_POLICY_PROMPT_TITLE 10341
+#define IDS_EXTENSION_PROGRAMMATIC_UNINSTALL_PROMPT_HEADING 10342
+#define IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE 10343
+#define IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE 10344
+#define IDS_EXTENSION_REMOTE_INSTALL_PROMPT_TITLE 10345
+#define IDS_EXTENSION_REPAIR_PROMPT_TITLE 10346
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_TITLE_APP 10347
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_TITLE_EXTENSION 10348
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_TITLE_THEME 10349
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_BUTTON_EXTENSION 10350
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_BUTTON_APP 10351
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ACCEPT_BUTTON_THEME 10352
+#define IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ABORT_BUTTON 10353
+#define IDS_EXTENSION_ALERT_TITLE 10354
+#define IDS_APP_ALERT_TITLE 10355
+#define IDS_EXTENSION_AND_APP_ALERT_TITLE 10356
+#define IDS_POLICY_BLOCKED_EXTENSION_ALERT_TITLE 10357
+#define IDS_POLICY_BLOCKED_EXTENSIONS_ALERT_ITEM_TITLE 10358
+#define IDS_BLOCKLISTED_EXTENSIONS_ALERT_ITEM 10359
+#define IDS_POLICY_BLOCKED_EXTENSION_ALERT_ITEM_DETAIL 10360
+#define IDS_EXTENSION_ALERT_ITEM_OK 10361
+#define IDS_EXTENSION_ALERT_ITEM_DETAILS 10362
+#define IDS_EXTENSION_PROMPT_APP_CONNECT_FROM_INCOGNITO 10363
+#define IDS_EXTENSION_PROMPT_EXTENSION_CONNECT_FROM_INCOGNITO 10364
+#define IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO 10365
+#define IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO 10366
+#define IDS_EXTENSION_PROMPT_WANTS_ACCESS_TO 10367
+#define IDS_EXTENSION_PROMPT_CAN_ACCESS 10368
+#define IDS_EXTENSION_PROMPT_GRANT_PERMISSIONS_CHECKBOX 10369
+#define IDS_EXTENSION_PROMPT_MESSAGE_FROM_ADMIN 10370
+#define IDS_EXTENSION_PERMISSION_LINE 10371
+#define IDS_EXTENSION_RATING_COUNT 10372
+#define IDS_EXTENSION_PROMPT_RATING_ACCESSIBLE_TEXT 10373
+#define IDS_EXTENSION_PROMPT_NO_RATINGS_ACCESSIBLE_TEXT 10374
+#define IDS_EXTENSION_USER_COUNT 10375
+#define IDS_EXTENSION_PROMPT_STORE_LINK 10376
+#define IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS 10377
+#define IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS 10378
+#define IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS_READ_ONLY 10379
+#define IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE 10380
+#define IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE 10381
+#define IDS_EXTENSION_PROMPT_WARNING_AUDIO_AND_VIDEO_CAPTURE 10382
+#define IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH 10383
+#define IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_DEVICES 10384
+#define IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_PRIVATE 10385
+#define IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_SERIAL 10386
+#define IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS 10387
+#define IDS_EXTENSION_PROMPT_WARNING_READING_LIST 10388
+#define IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD 10389
+#define IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD_READWRITE 10390
+#define IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD_WRITE 10391
+#define IDS_EXTENSION_PROMPT_WARNING_DEBUGGER 10392
+#define IDS_EXTENSION_PROMPT_WARNING_DECLARATIVE_WEB_REQUEST 10393
+#define IDS_EXTENSION_PROMPT_WARNING_DECLARATIVE_NET_REQUEST 10394
+#define IDS_EXTENSION_PROMPT_WARNING_DOCUMENT_SCAN 10395
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_HARDWARE_PLATFORM 10396
+#define IDS_EXTENSION_PROMPT_WARNING_FAVICON 10397
+#define IDS_EXTENSION_PROMPT_WARNING_GEOLOCATION 10398
+#define IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ 10399
+#define IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_ON_ALL_DEVICES 10400
+#define IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_ON_ALL_DEVICES 10401
+#define IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE 10402
+#define IDS_EXTENSION_PROMPT_WARNING_1_HOST 10403
+#define IDS_EXTENSION_PROMPT_WARNING_1_HOST_READ_ONLY 10404
+#define IDS_EXTENSION_PROMPT_WARNING_2_HOSTS 10405
+#define IDS_EXTENSION_PROMPT_WARNING_2_HOSTS_READ_ONLY 10406
+#define IDS_EXTENSION_PROMPT_WARNING_3_HOSTS 10407
+#define IDS_EXTENSION_PROMPT_WARNING_3_HOSTS_READ_ONLY 10408
+#define IDS_EXTENSION_PROMPT_WARNING_HOSTS_LIST 10409
+#define IDS_EXTENSION_PROMPT_WARNING_HOSTS_LIST_READ_ONLY 10410
+#define IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN 10411
+#define IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN_LIST 10412
+#define IDS_EXTENSION_PROMPT_WARNING_INPUT 10413
+#define IDS_EXTENSION_PROMPT_WARNING_LOGIN 10414
+#define IDS_EXTENSION_PROMPT_WARNING_LOGIN_SCREEN_UI 10415
+#define IDS_EXTENSION_PROMPT_WARNING_LOGIN_SCREEN_STORAGE 10416
+#define IDS_EXTENSION_PROMPT_WARNING_MANAGEMENT 10417
+#define IDS_EXTENSION_PROMPT_WARNING_MDNS 10418
+#define IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE 10419
+#define IDS_EXTENSION_PROMPT_WARNING_NETWORKING_PRIVATE 10420
+#define IDS_EXTENSION_PROMPT_WARNING_PRINTING 10421
+#define IDS_EXTENSION_PROMPT_WARNING_PRINTING_METRICS 10422
+#define IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE 10423
+#define IDS_EXTENSION_PROMPT_WARNING_SERIAL 10424
+#define IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST 10425
+#define IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN 10426
+#define IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS 10427
+#define IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST 10428
+#define IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS 10429
+#define IDS_EXTENSION_PROMPT_WARNING_SPEECH_RECOGNITION 10430
+#define IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE 10431
+#define IDS_EXTENSION_PROMPT_WARNING_SYSTEM_STORAGE 10432
+#define IDS_EXTENSION_PROMPT_WARNING_TAB_GROUPS 10433
+#define IDS_EXTENSION_PROMPT_WARNING_TOPSITES 10434
+#define IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE 10435
+#define IDS_EXTENSION_PROMPT_WARNING_U2F_DEVICES 10436
+#define IDS_EXTENSION_PROMPT_WARNING_NOTIFICATIONS 10437
+#define IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE 10438
+#define IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST 10439
+#define IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM_UNKNOWN_PRODUCT 10440
+#define IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM_UNKNOWN_VENDOR 10441
+#define IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_PRODUCT 10442
+#define IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR 10443
+#define IDS_EXTENSION_PROMPT_WARNING_VPN 10444
+#define IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS 10445
+#define IDS_EXTENSION_PROMPT_WARNING_PRIVACY 10446
+#define IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS 10447
+#define IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS_OPEN 10448
+#define IDS_EXTENSION_PROMPT_WARNING_IDENTITY_EMAIL 10449
+#define IDS_EXTENSION_PROMPT_WARNING_WALLPAPER 10450
+#define IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_DIRECTORY 10451
+#define IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_WRITE_DIRECTORY 10452
+#define IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ 10453
+#define IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_WRITE 10454
+#define IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_DELETE 10455
+#define IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_WRITE_DELETE 10456
+#define IDS_EXTENSION_PROMPT_WARNING_SYNCFILESYSTEM 10457
+#define IDS_EXTENSION_PROMPT_WARNING_NATIVE_MESSAGING 10458
+#define IDS_EXTENSION_PROMPT_WARNING_SCREENLOCK_PRIVATE 10459
+#define IDS_EXTENSION_PROMPT_WARNING_ACTIVITY_LOG_PRIVATE 10460
+#define IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE 10461
+#define IDS_EXTENSION_PROMPT_WARNING_ACCESSIBILITY_FEATURES_MODIFY 10462
+#define IDS_EXTENSION_PROMPT_WARNING_ACCESSIBILITY_FEATURES_READ 10463
+#define IDS_EXTENSION_PROMPT_WARNING_ACCESSIBILITY_FEATURES_READ_MODIFY 10464
+#define IDS_EXTENSION_PROMPT_WARNING_PLATFORMKEYS 10465
+#define IDS_EXTENSION_PROMPT_WARNING_CERTIFICATEPROVIDER 10466
+#define IDS_EXTENSION_PROMPT_WARNING_SETTINGS_PRIVATE 10467
+#define IDS_EXTENSION_PROMPT_WARNING_AUTOFILL_PRIVATE 10468
+#define IDS_EXTENSION_PROMPT_WARNING_PASSWORDS_PRIVATE 10469
+#define IDS_EXTENSION_PROMPT_WARNING_USERS_PRIVATE 10470
+#define IDS_EXTENSION_PROMPT_WARNING_NEW_TAB_PAGE_OVERRIDE 10471
+#define IDS_EXTENSION_PROMPT_WARNING_TRANSIENT_BACKGROUND 10472
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_DEVICE_ATTRIBUTES 10473
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_KIOSK_INPUT 10474
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_NETWORKING_ATTRIBUTES 10475
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_PLATFORMKEYS 10476
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN 10477
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE 10479
+#define IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REMOTE_APPS 10480
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_ATTACHED_DEVICE_INFO 10481
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_BLUETOOTH_PERIPHERALS_INFO 10482
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_DIAGNOSTICS 10483
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_EVENTS 10484
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_MANAGEMENT_AUDIO 10485
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_TELEMETRY 10486
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_TELEMETRY_SERIAL_NUMBER 10487
+#define IDS_EXTENSION_PROMPT_WARNING_CHROMEOS_TELEMETRY_NETWORK_INFORMATION 10488
+#define IDS_EXTENSION_CANT_DOWNGRADE_VERSION 10489
+#define IDS_APP_CANT_DOWNGRADE_VERSION 10490
+#define IDS_EXTENSION_MOVE_DIRECTORY_TO_PROFILE_FAILED 10493
+#define IDS_EXTENSION_INSTALL_NOT_ENABLED 10494
+#define IDS_EXTENSION_INSTALL_INCORRECT_APP_CONTENT_TYPE 10495
+#define IDS_EXTENSION_INSTALL_INCORRECT_INSTALL_HOST 10496
+#define IDS_EXTENSION_INSTALL_UNEXPECTED_ID 10497
+#define IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE 10498
+#define IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION 10499
+#define IDS_EXTENSION_INSTALL_DEPENDENCY_OLD_VERSION 10500
+#define IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_SHARED_MODULE 10501
+#define IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_ALLOWLISTED 10502
+#define IDS_EXTENSION_INSTALL_GALLERY_ONLY 10503
+#define IDS_EXTENSION_INSTALL_KIOSK_MODE_ONLY 10504
+#define IDS_EXTENSION_OVERLAPPING_WEB_EXTENT 10505
+#define IDS_EXTENSION_INVALID_IMAGE_PATH 10506
+#define IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO 10509
+#define IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO_WITH_SHORTCUT 10510
+#define IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO 10511
+#define IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO_WITH_SHORTCUT 10512
+#define IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO 10513
+#define IDS_EXTENSION_INSTALLED_MANAGE_INFO 10514
+#define IDS_EXTENSION_INSTALLED_MANAGE_SHORTCUTS 10515
+#define IDS_EXTENSION_LAUNCH_WEB_AUTH_FLOW_TAB_INFO_BAR_TEXT 10516
+#define IDS_EXTENSION_INSTALLED_DICE_PROMO_SYNC_MESSAGE 10517
+#define IDS_EXTENSIONS_DIRECTORY_CONFIRMATION_DIALOG_TITLE 10518
+#define IDS_EXTENSIONS_DIRECTORY_CONFIRMATION_DIALOG_MESSAGE_READ_ONLY 10519
+#define IDS_EXTENSIONS_DIRECTORY_CONFIRMATION_DIALOG_MESSAGE_WRITABLE 10520
+#define IDS_DIRECT_SOCKETS_CONNECTION_BUBBLE_TITLE_LABEL 10521
+#define IDS_DIRECT_SOCKETS_CONNECTION_BUBBLE_ADDRESS_LABEL 10522
+#define IDS_DIRECT_SOCKETS_CONNECTION_BUBBLE_PORT_LABEL 10523
+#define IDS_EXTENSIONS_LOAD_ERROR_ALERT_HEADING 10524
+#define IDS_EXTENSIONS_LOAD_ERROR_MESSAGE 10525
+#define IDS_EXTENSIONS_WANTS_ACCESS_TO_SITE 10526
+#define IDS_EXTENSIONS_HAS_ACCESS_TO_SITE 10527
+#define IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON 10528
+#define IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_DISMISSED_TEXT 10529
+#define IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_TOOLTIP_SINGLE_EXTENSION 10530
+#define IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_TOOLTIP_MULTIPLE_EXTENSIONS 10531
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_TITLE_HAS_ACCESS 10532
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_TITLE_BLOCKED_ACCESS 10533
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_TITLE_REQUESTS_ACCESS 10534
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_DESCRIPTION_ALL_EXTENSIONS_ALLOWED_ACCESS 10535
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_DESCRIPTION_ALL_EXTENSIONS_BLOCKED_ACCESS 10536
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_DESCRIPTION_EXTENSION_HAS_ACCESS 10537
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_DESCRIPTION_EXTENSION_REQUESTS_ACCESS 10538
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_POLICY_LABEL_PINNED_TEXT 10539
+#define IDS_EXTENSIONS_TOOLBAR_ACTION_HOVER_CARD_POLICY_LABEL_INSTALLED_TEXT 10540
+#define IDS_EXTENSIONS_CONTEXT_MENU_SITE_PERMISSIONS 10541
+#define IDS_EXTENSIONS_CONTEXT_MENU_CANT_ACCESS_PAGE 10542
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS 10543
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_ALL_EXTENSIONS_GRANTED 10544
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_ALL_EXTENSIONS_BLOCKED 10545
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_CLICK_V2 10546
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_SITE_V2 10547
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_ALL_SITES_V2 10548
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_PERMISSIONS_PAGE 10549
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_CLICK 10550
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_SITE 10551
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_RUN_ON_ALL_SITES 10552
+#define IDS_EXTENSIONS_CONTEXT_MENU_PAGE_ACCESS_LEARN_MORE 10553
+#define IDS_EXTENSIONS_CONTEXT_MENU_PIN_TO_TOOLBAR 10554
+#define IDS_EXTENSIONS_CONTEXT_MENU_UNPIN_FROM_TOOLBAR 10555
+#define IDS_EXTENSIONS_OPTIONS_MENU_ITEM 10556
+#define IDS_EXTENSIONS_INSTALLED_BY_ADMIN 10557
+#define IDS_EXTENSIONS_DISABLE 10558
+#define IDS_EXTENSIONS_PIN_TO_TOOLBAR 10559
+#define IDS_EXTENSIONS_UNPIN_FROM_TOOLBAR 10560
+#define IDS_EXTENSIONS_PINNED_BY_ADMIN 10561
+#define IDS_EXTENSIONS_PIN_TO_TOOLBAR_ACCESSIBLE_NAME 10562
+#define IDS_EXTENSIONS_UNPIN_FROM_TOOLBAR_ACCESSIBLE_NAME 10563
+#define IDS_EXTENSIONS_PINNED_BY_ADMIN_ACCESSIBLE_NAME 10564
+#define IDS_EXTENSIONS_SUBMENU_OPEN_SIDE_PANEL_ITEM 10565
+#define IDS_EXTENSIONS_SUBMENU_CLOSE_SIDE_PANEL_ITEM 10566
+#define IDS_MANAGE_EXTENSION 10567
+#define IDS_MANAGE_EXTENSIONS 10568
+#define IDS_VIEW_WEB_PERMISSIONS 10569
+#define IDS_EXTENSION_ACTION_INSPECT_POPUP 10570
+#define IDS_EXTENSIONS_LOCKED_SUPERVISED_USER 10574
+#define IDS_EXTENSION_LOAD_FROM_DIRECTORY 10575
+#define IDS_EXTENSION_COMMANDS_GENERIC_ACTIVATE 10576
+#define IDS_EXTENSIONS_SUPERVISED_USER_PARENTAL_PERMISSION_FAILURE 10577
+#define IDS_EXTENSION_PACK_DIALOG_HEADING 10578
+#define IDS_EXTENSION_PACK_DIALOG_SELECT_KEY 10579
+#define IDS_EXTENSION_PACK_DIALOG_KEY_FILE_TYPE_DESCRIPTION 10580
+#define IDS_EXTENSION_PACK_DIALOG_ERROR_ROOT_REQUIRED 10581
+#define IDS_EXTENSION_PACK_DIALOG_ERROR_ROOT_INVALID 10582
+#define IDS_EXTENSION_PACK_DIALOG_ERROR_KEY_INVALID 10583
+#define IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_NEW 10584
+#define IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_UPDATE 10585
+#define IDS_EXTENSION_PROMPT_INSTALL_FRICTION_CONTINUE_BUTTON 10586
+#define IDS_EXTENSION_PROMPT_INSTALL_FRICTION_TITLE 10587
+#define IDS_EXTENSION_PROMPT_INSTALL_FRICTION_WARNING_TEXT 10588
+#define IDS_EXTENSION_PROMPT_INSTALL_BUTTON 10589
+#define IDS_EXTENSION_INSTALL_PROMPT_ACCEPT_BUTTON_EXTENSION 10590
+#define IDS_EXTENSION_INSTALL_PROMPT_ACCEPT_BUTTON_APP 10591
+#define IDS_EXTENSION_INSTALL_PROMPT_ACCEPT_BUTTON_THEME 10592
+#define IDS_EXTENSION_INSTALL_PROMPT_ASK_A_PARENT_BUTTON 10593
+#define IDS_EXTENSION_INSTALL_BLOCKED_BY_PARENT_PROMPT_TITLE 10594
+#define IDS_EXTENSION_ENABLE_BLOCKED_BY_PARENT_PROMPT_TITLE 10595
+#define IDS_PARENT_PERMISSION_PROMPT_GO_GET_A_PARENT_FOR_EXTENSION_LABEL 10596
+#define IDS_PARENT_PERMISSION_PROMPT_EXTENSION_TYPE_EXTENSION 10597
+#define IDS_PARENT_PERMISSION_PROMPT_EXTENSION_TYPE_APP 10598
+#define IDS_PARENT_PERMISSION_PROMPT_CHILD_WANTS_TO_INSTALL_LABEL 10599
+#define IDS_PARENT_PERMISSION_PROMPT_APPROVE_BUTTON 10600
+#define IDS_PARENT_PERMISSION_PROMPT_CANCEL_BUTTON 10601
+#define IDS_PARENT_PERMISSION_PROMPT_SELECT_PARENT_LABEL 10602
+#define IDS_PARENT_PERMISSION_PROMPT_PARENT_ACCOUNT_LABEL 10603
+#define IDS_PARENT_PERMISSION_PROMPT_ENTER_PASSWORD_LABEL 10604
+#define IDS_PARENT_PERMISSION_PROMPT_PASSWORD_INCORRECT_LABEL 10605
+#define IDS_EXTENSION_INSTALL_PROMPT_REQUEST_BUTTON 10606
+#define IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON 10607
+#define IDS_EXTENSION_PROMPT_UNINSTALL_REPORT_ABUSE 10608
+#define IDS_EXTENSION_PROMPT_UNINSTALL_REPORT_ABUSE_FROM_EXTENSION 10609
+#define IDS_EXTENSION_PROMPT_UNINSTALL_TITLE 10610
+#define IDS_EXTENSION_PROMPT_UNINSTALL_APP_BUTTON 10611
+#define IDS_EXTENSION_PROMPT_MULTIPLE_UNINSTALL_NAME_BULLET_POINT 10612
+#define IDS_EXTENSION_PROMPT_MULTIPLE_UNINSTALL_TITLE 10613
+#define IDS_EXTENSION_PROMPT_UNINSTALL_TRIGGERED_BY_EXTENSION 10614
+#define IDS_EXTENSION_PROMPT_RE_ENABLE_BUTTON 10615
+#define IDS_EXTENSION_PROMPT_PERMISSIONS_BUTTON 10616
+#define IDS_EXTENSION_PROMPT_PERMISSIONS_ACCEPT_BUTTON 10617
+#define IDS_EXTENSION_PROMPT_PERMISSIONS_ABORT_BUTTON 10618
+#define IDS_EXTENSION_PROMPT_REMOTE_INSTALL_BUTTON_EXTENSION 10619
+#define IDS_EXTENSION_PROMPT_REMOTE_INSTALL_BUTTON_APP 10620
+#define IDS_EXTENSION_PROMPT_REPAIR_BUTTON_EXTENSION 10621
+#define IDS_EXTENSION_PROMPT_REPAIR_BUTTON_APP 10622
+#define IDS_EXTENSION_WEB_STORE_TITLE 10623
+#define IDS_EXTENSION_WEB_STORE_TITLE_SHORT 478
+#define IDS_EXTENSIONS_SHOW_DETAILS 10624
+#define IDS_EXTENSIONS_HIDE_DETAILS 10625
+#define IDS_WEBSTORE_DOWNLOAD_ACCESS_DENIED 10626
+#define IDS_EXTENSION_WARNINGS_WRENCH_MENU_ITEM 10627
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_EXTENSION 10628
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_APP 10629
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_THEME 10630
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_BUBBLE_TITLE 10631
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_BUBBLE_HEADING_APP 10632
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_BUBBLE_HEADING_EXTENSION 10633
+#define IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_BUBBLE_HEADING_THEME 10634
+#define IDS_EXTENSIONS_UNSUPPORTED_DISABLED_TITLE 10635
+#define IDS_EXTENSIONS_DISABLED_AND_N_MORE 10636
+#define IDS_EXTENSIONS_UNSUPPORTED_DISABLED_BUTTON 10637
+#define IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE 10638
+#define IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE 10639
+#define IDS_EXTENSIONS_DISABLE_DEVELOPER_MODE_TITLE 10640
+#define IDS_EXTENSIONS_DISABLE_DEVELOPER_MODE_BODY 10641
+#define IDS_EXTENSION_SETTINGS_OVERRIDDEN_DIALOG_CHANGE_IT_BACK 10642
+#define IDS_EXTENSION_SETTINGS_OVERRIDDEN_DIALOG_KEEP_IT 10643
+#define IDS_EXTENSION_NTP_OVERRIDDEN_DIALOG_TITLE_GENERIC 10644
+#define IDS_EXTENSION_NTP_OVERRIDDEN_DIALOG_TITLE_BACK_TO_GOOGLE 10645
+#define IDS_EXTENSION_NTP_OVERRIDDEN_DIALOG_BODY_GENERIC 10646
+#define IDS_EXTENSION_SEARCH_OVERRIDDEN_DIALOG_TITLE_GENERIC 10647
+#define IDS_EXTENSION_SEARCH_OVERRIDDEN_DIALOG_TITLE_BACK_TO_GOOGLE 10648
+#define IDS_EXTENSION_SEARCH_OVERRIDDEN_DIALOG_TITLE_BACK_TO_OTHER 10649
+#define IDS_EXTENSION_SEARCH_OVERRIDDEN_DIALOG_BODY_GENERIC 10650
+#define IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT 10651
+#define IDS_FORCE_INSTALLED_PREINSTALLED_DEPRECATED_APPS_TITLE 10652
+#define IDS_FORCE_INSTALLED_PREINSTALLED_DEPRECATED_APPS_CONTENT 10653
+#define IDS_FORCE_INSTALLED_PREINSTALLED_DEPRECATED_APPS_GO_TO_SITE_BUTTON 10654
+#define IDS_DEPRECATED_APPS_RENDERER_TITLE_PLURAL 10655
+#define IDS_DEPRECATED_APPS_RENDERER_TITLE_WITH_APP_NAME 10656
+#define IDS_DEPRECATED_APPS_MONITOR_RENDERER 10657
+#define IDS_DEPRECATED_APPS_LEARN_MORE 10658
+#define IDS_DEPRECATED_APPS_LEARN_MORE_AX_LABEL 10659
+#define IDS_DEPRECATED_APPS_DELETION_LINK 10660
+#define IDS_DEPRECATED_APPS_OK_LABEL 10661
+#define IDS_DEPRECATED_APPS_CANCEL_LABEL 10662
+#define IDS_DEPRECATED_APPS_LAUNCH_ANYWAY_LABEL 10663
+#define IDS_EXTENSIONS_MENU_TITLE 10664
+#define IDS_EXTENSIONS_MENU_CONTEXT_MENU_TOOLTIP 10665
+#define IDS_EXTENSIONS_MENU_CONTEXT_MENU_TOOLTIP_ACCESSIBLE_NAME 10666
+#define IDS_EXTENSIONS_MENU_PIN_BUTTON_TOOLTIP 10667
+#define IDS_EXTENSIONS_MENU_UNPIN_BUTTON_TOOLTIP 10668
+#define IDS_EXTENSIONS_MENU_ACCESSING_SITE_DATA_SHORT 10669
+#define IDS_EXTENSIONS_MENU_ACCESSING_SITE_DATA 10670
+#define IDS_EXTENSIONS_MENU_WANTS_TO_ACCESS_SITE_DATA_SHORT 10671
+#define IDS_EXTENSIONS_MENU_WANTS_TO_ACCESS_SITE_DATA 10672
+#define IDS_EXTENSIONS_MENU_CANT_ACCESS_SITE_DATA_SHORT 10673
+#define IDS_EXTENSIONS_MENU_CANT_ACCESS_SITE_DATA 10674
+#define IDS_EXTENSIONS_MENU_SITE_SETTINGS_TOGGLE_ON_TOOLTIP 10675
+#define IDS_EXTENSIONS_MENU_SITE_SETTINGS_TOGGLE_OFF_TOOLTIP 10676
+#define IDS_EXTENSIONS_MENU_SITE_SETTINGS_TOGGLE_ACCESSIBLE_NAME 10677
+#define IDS_EXTENSIONS_MENU_SITE_SETTINGS_TOGGLE_ON_ACCESSIBLE_NAME 10678
+#define IDS_EXTENSIONS_MENU_SITE_SETTINGS_TOGGLE_OFF_ACCESSIBLE_NAME 10679
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_RESTRICTED_ACCESS_TEXT 10680
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_POLICY_BLOCKED_ACCESS_TEXT 10681
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_USER_BLOCKED_ACCESS_TEXT 10682
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_ENTERPRISE_TOOLTIP_ICON_TEXT 10683
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_USER_CUSTOMIZED_ACCESS_TEXT 10684
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_RELOAD_CONTAINER_DESCRIPTION_TEXT 10685
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_RELOAD_CONTAINER_BUTTON_TEXT 10686
+#define IDS_EXTENSIONS_MENU_MESSAGE_SECTION_RELOAD_CONTAINER_BUTTON_TOOLTIP 10687
+#define IDS_EXTENSIONS_MENU_REQUESTS_ACCESS_SECTION_TITLE 10688
+#define IDS_EXTENSIONS_MENU_REQUESTS_ACCESS_SECTION_ALLOW_BUTTON_TEXT 10689
+#define IDS_EXTENSIONS_MENU_REQUESTS_ACCESS_SECTION_ALLOW_BUTTON_TOOLTIP 10690
+#define IDS_EXTENSIONS_MENU_REQUESTS_ACCESS_SECTION_DISMISS_BUTTON_TEXT 10691
+#define IDS_EXTENSIONS_MENU_REQUESTS_ACCESS_SECTION_DISMISS_BUTTON_TOOLTIP 10692
+#define IDS_EXTENSIONS_MENU_EXTENSION_SITE_ACCESS_TOGGLE_ON_TOOLTIP 10693
+#define IDS_EXTENSIONS_MENU_EXTENSION_SITE_ACCESS_TOGGLE_OFF_TOOLTIP 10694
+#define IDS_EXTENSIONS_MENU_EXTENSION_SITE_ACCESS_TOGGLE_ACCESSIBLE_NAME 10695
+#define IDS_EXTENSIONS_MENU_EXTENSION_CONTEXT_MENU_BUTTON_TOOLTIP 10696
+#define IDS_EXTENSIONS_MENU_EXTENSION_CONTEXT_MENU_BUTTON_ACCESSIBLE_NAME 10697
+#define IDS_EXTENSIONS_MENU_EXTENSION_CONTEXT_MENU_BUTTON_PINNED_ACCESSIBLE_NAME 10698
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_SITE_ACCESS_NONE 10699
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_OPEN_CHROME_WEBSTORE_TOOLTIP 10700
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_SITE_ACCESS_TOOLTIP 10701
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_BUTTON_HAS_ACCESS_TOOLTIP 10702
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_BUTTON_BLOCKED_ACCESS_TOOLTIP 10703
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_BUTTON_REQUESTS_TOOLTIP 10704
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_SITE_ACCESS_ACCESSIBLE_NAME 10705
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_SITE_ACCESS_ON_CLICK 10706
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_SITE_ACCESS_ON_SITE 10707
+#define IDS_EXTENSIONS_MENU_MAIN_PAGE_EXTENSION_SITE_ACCESS_ON_ALL_SITES 10708
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SETTINGS_BUTTON 10709
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SETTINGS_BUTTON_TOOLTIP 10710
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SHOW_REQUESTS_LABEL 10711
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SHOW_REQUESTS_TOGGLE_ON 10712
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SHOW_REQUESTS_TOGGLE_OFF 10713
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_LABEL 10714
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_CLICK_TEXT 10715
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_SITE_TEXT 10716
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_ALL_SITES_TEXT 10717
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_CLICK_DESCRIPTION 10718
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_SITE_DESCRIPTION 10719
+#define IDS_EXTENSIONS_MENU_SITE_PERMISSIONS_PAGE_SITE_ACCESS_ON_ALL_SITES_DESCRIPTION 10720
+#define IDS_EXTENSIONS_SETTINGS_API_TITLE_HOME_PAGE_BUBBLE 10721
+#define IDS_EXTENSIONS_SETTINGS_API_FIRST_LINE_HOME_PAGE_SPECIFIC 10722
+#define IDS_EXTENSIONS_SETTINGS_API_FIRST_LINE_HOME_PAGE 10723
+#define IDS_EXTENSIONS_SETTINGS_API_SECOND_LINE_SEARCH_ENGINE 10724
+#define IDS_EXTENSIONS_PRINTING_API_PRINT_REQUEST_BUBBLE_TITLE 10725
+#define IDS_EXTENSIONS_PRINTING_API_PRINT_REQUEST_BUBBLE_HEADING 10726
+#define IDS_EXTENSIONS_PRINTING_API_PRINT_REQUEST_ALLOW 10727
+#define IDS_EXTENSIONS_PRINTING_API_PRINT_REQUEST_DENY 10728
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_DISCOVERY_REQUEST_BUBBLE_TITLE 10729
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_DISCOVERY_REQUEST_BUBBLE_HEADING 10730
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_DISCOVERY_REQUEST_ALLOW 10731
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_DISCOVERY_REQUEST_DENY 10732
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_START_SCAN_REQUEST_BUBBLE_TITLE 10733
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_START_SCAN_REQUEST_BUBBLE_HEADING 10734
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_START_SCAN_REQUEST_ALLOW 10735
+#define IDS_EXTENSIONS_DOCUMENT_SCAN_API_START_SCAN_REQUEST_DENY 10736
+#define IDS_EXTENSIONS_NTP_CONTROLLED_FIRST_LINE 10737
+#define IDS_EXTENSIONS_PROXY_CONTROLLED_FIRST_LINE 10738
+#define IDS_EXTENSIONS_PROXY_CONTROLLED_FIRST_LINE_EXTENSION_SPECIFIC 10739
+#define IDS_EXTENSIONS_SETTINGS_API_THIRD_LINE_CONFIRMATION 10740
+#define IDS_EXTENSION_CONTROLLED_RESTORE_SETTINGS 10741
+#define IDS_EXTENSION_CONTROLLED_KEEP_CHANGES 10742
+#define IDS_WEB_APP_DETAILED_INSTALL_DIALOG_DESCRIPTION_TITLE 10743
+#define IDS_SUB_APPS_INSTALL_DIALOG_TITLE 10744
+#define IDS_SUB_APPS_INSTALL_DIALOG_DESCRIPTION 10745
+#define IDS_SUB_APPS_INSTALL_DIALOG_PERMISSIONS_DESCRIPTION 10746
+#define IDS_SUB_APPS_INSTALL_DIALOG_MANAGE_PERMISSIONS_LINK 10747
+#define IDS_SUB_APPS_INSTALL_DIALOG_PERMISSIONS_BUTTON 10748
+#define IDS_SUB_APPS_INSTALL_DIALOG_CANCEL_BUTTON 10749
+#define IDS_WEB_APP_MENU_BUTTON_TOOLTIP 10750
+#define IDS_WEB_APP_ENABLE_WINDOW_CONTROLS_OVERLAY_TOOLTIP 10751
+#define IDS_WEB_APP_DISABLE_WINDOW_CONTROLS_OVERLAY_TOOLTIP 10752
+#define IDS_WEB_APP_WINDOW_CONTROLS_OVERLAY_ENABLED_ALERT 10753
+#define IDS_WEB_APP_WINDOW_CONTROLS_OVERLAY_DISABLED_ALERT 10754
+#define IDS_APP_HOME_TITLE 10755
+#define IDS_APP_HOME_OPEN_IN_WINDOW 10756
+#define IDS_APP_HOME_LAUNCH_AT_STARTUP 10757
+#define IDS_APP_HOME_CREATE_SHORTCUT 10758
+#define IDS_APP_HOME_INSTALL_LOCALLY 10759
+#define IDS_APP_HOME_UNINSTALL_APP 10760
+#define IDS_APP_HOME_REMOVE_APP 10761
+#define IDS_APP_HOME_APP_SETTINGS 10762
+#define IDS_ACCNAME_APP_HOME_NOT_INSTALLED 10763
+#define IDS_APP_HOME_APP_NO_APPS 10764
+#define IDS_APP_HOME_APP_LEARN_INSTALL 10765
+#define IDS_WEB_APP_SETTINGS_TITLE 10766
+#define IDS_WEB_APP_SETTINGS_LINK 10767
+#define IDS_WEB_APP_SETTINGS_LINK_TOOLTIP 10768
+#define IDS_COMPONENTS_TITLE 10769
+#define IDS_COMPONENTS_VERSION 10770
+#define IDS_COMPONENTS_NONE_INSTALLED 10771
+#define IDS_COMPONENTS_NO_COMPONENTS 10772
+#define IDS_COMPONENTS_CHECK_FOR_UPDATE 10773
+#define IDS_COMPONENTS_STATUS_LABEL 10774
+#define IDS_COMPONENTS_CHECKING_LABEL 10775
+#define IDS_COMPONENTS_SVC_STATUS_NEW 10779
+#define IDS_COMPONENTS_SVC_STATUS_CHECKING 10780
+#define IDS_COMPONENTS_SVC_STATUS_UPDATE 10781
+#define IDS_COMPONENTS_SVC_STATUS_DNL_DIFF 10782
+#define IDS_COMPONENTS_SVC_STATUS_DNL 10783
+#define IDS_COMPONENTS_SVC_STATUS_DOWNLOADED 10784
+#define IDS_COMPONENTS_SVC_STATUS_UPDT_DIFF 10785
+#define IDS_COMPONENTS_SVC_STATUS_UPDATING 10786
+#define IDS_COMPONENTS_SVC_STATUS_UPDATED 10787
+#define IDS_COMPONENTS_SVC_STATUS_UPTODATE 10788
+#define IDS_COMPONENTS_SVC_STATUS_UPDATE_ERROR 10789
+#define IDS_COMPONENTS_UNKNOWN 10790
+#define IDS_COMPONENTS_EVT_STATUS_STARTED 10791
+#define IDS_COMPONENTS_EVT_STATUS_SLEEPING 10792
+#define IDS_COMPONENTS_EVT_STATUS_FOUND 10793
+#define IDS_COMPONENTS_EVT_STATUS_READY 10794
+#define IDS_COMPONENTS_EVT_STATUS_UPDATED 10795
+#define IDS_COMPONENTS_EVT_STATUS_ALREADY_UP_TO_DATE 10796
+#define IDS_COMPONENTS_EVT_STATUS_UPDATE_ERROR 10797
+#define IDS_COMPONENTS_EVT_STATUS_DOWNLOADING 10798
+#define IDS_COMPONENTS_EVT_STATUS_UPDATING 10799
+#define IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_TITLE 10800
+#define IDS_PASSWORD_GENERATION_SUGGESTION_GPM 10801
+#define IDS_PASSWORD_GENERATION_SUGGESTION_TRUSTED_ADVICE 10802
+#define IDS_PASSWORD_GENERATION_SUGGESTION_SAFETY_FIRST 10803
+#define IDS_PASSWORD_GENERATION_SUGGESTION_TRY_SOMETHING_NEW 10804
+#define IDS_PASSWORD_GENERATION_SUGGESTION_CONVENIENCE 10805
+#define IDS_PASSWORD_GENERATION_EDIT_PASSWORD 10806
+#define IDS_PASSWORD_GENERATION_NUDGE_CANCEL_BUTTON 10807
+#define IDS_PASSWORD_MANAGER_CONFIRM_SAVED_TITLE 10808
+#define IDS_PASSWORD_MANAGER_CONFIRM_UPDATE_TITLE 10809
+#define IDS_PASSWORD_GENERATION_EDITING_SUGGESTION 10810
+#define IDS_SAVE_PASSWORD 10811
+#define IDS_SAVE_ACCOUNT 10812
+#define IDS_ADD_USERNAME_TITLE 10813
+#define IDS_ADD_USERNAME 10814
+#define IDS_ADD_USERNAME_BODY 10815
+#define IDS_UPDATE_PASSWORD 10816
+#define IDS_VERIFY_IT_IS_YOU 10817
+#define IDS_PASSWORD_ERROR_DESCRIPTION_SIGN_IN 10818
+#define IDS_PASSWORD_ERROR_DESCRIPTION_SIGN_UP 10819
+#define IDS_PASSWORD_ERROR_VERIFY_BUTTON_TITLE 10820
+#define IDS_SAVE_PASSWORD_DIFFERENT_DOMAINS_TITLE 10822
+#define IDS_UPDATE_PASSWORD_DIFFERENT_DOMAINS_TITLE 10823
+#define IDS_SAVE_PASSWORD_FOOTER 10824
+#define IDS_PASSWORD_BUBBLES_PASSWORD_MANAGER_LINK_TEXT_SYNCED_TO_ACCOUNT 10825
+#define IDS_PASSWORD_BUBBLES_FOOTER_SYNCED_TO_ACCOUNT 10826
+#define IDS_PASSWORD_BUBBLES_FOOTER_SAVING_ON_DEVICE 10827
+#define IDS_PASSWORD_GENERATION_CONFIRMATION_GOOGLE_PASSWORD_MANAGER 10828
+#define IDS_PASSWORD_GENERATION_PROMPT_GOOGLE_PASSWORD_MANAGER 10829
+#define IDS_PASSWORD_GENERATION_HELP_TEXT_TRUSTED_ADVICE 10830
+#define IDS_PASSWORD_GENERATION_HELP_TEXT_SAFETY_FIRST 10831
+#define IDS_PASSWORD_GENERATION_HELP_TEXT_TRY_SOMETHING_NEW 10832
+#define IDS_PASSWORD_GENERATION_HELP_TEXT_CONVENIENCE 10833
+#define IDS_PASSWORD_GENERATION_NUDGE_TITLE 10834
+#define IDS_PASSWORD_GENERATION_BENEFITS 10835
+#define IDS_PASSWORD_GENERATION_CROSS_DEVICE 10836
+#define IDS_PASSWORD_GENERATION_SECURITY 10837
+#define IDS_PASSWORD_GENERATION_PROACTIVE_CHECK 10838
+#define IDS_PASSWORD_GENERATION_HELP_TEXT 10839
+#define IDS_PASSWORD_MANAGEMENT_BUBBLE_FOOTER_ACCOUNT_STORE_USERS 10840
+#define IDS_PASSWORD_MANAGER_GENERATED_PASSWORD_SAVED_MESSAGE_DESCRIPTION 10841
+#define IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SIGNED_IN_MESSAGE_DESCRIPTION 10842
+#define IDS_PASSWORD_MANAGER_UPDATE_PASSWORD_SIGNED_IN_MESSAGE_DESCRIPTION 10843
+#define IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN 10844
+#define IDS_PASSWORD_MANAGER_MANAGE_PASSWORDS_BUTTON 10845
+#define IDS_SETTINGS_PASSWORDS_ANDROID_APP 10846
+#define IDS_SHARED_PASSWORDS_NOTIFICATION_GOT_IT_BUTTON 10847
+#define IDS_SHARED_PASSWORDS_NOTIFICATION_TEXT_SINGLE_PASSWORD 10848
+#define IDS_SHARED_PASSWORDS_NOTIFICATION_TEXT_MULTIPLE_PASSWORD 10849
+#define IDS_SHARED_PASSWORDS_NOTIFICATION_TITLE 10850
+#define IDS_PASSWORD_MANAGER_ONBOARDING_TITLE_A 10851
+#define IDS_PASSWORD_MANAGER_ONBOARDING_TITLE_B 10852
+#define IDS_PASSWORD_MANAGER_ONBOARDING_TITLE_C 10853
+#define IDS_PASSWORD_MANAGER_ONBOARDING_DETAILS_A 10854
+#define IDS_PASSWORD_MANAGER_ONBOARDING_DETAILS_B 10855
+#define IDS_PASSWORD_MANAGER_DICE_PROMO_SIGNIN_MESSAGE 10856
+#define IDS_PASSWORD_MANAGER_DICE_PROMO_SYNC_MESSAGE 10857
+#define IDS_WEBRTC_LOGS_TITLE 10858
+#define IDS_WEBRTC_TEXT_LOGS_LOG_COUNT_BANNER_FORMAT 10859
+#define IDS_WEBRTC_EVENT_LOGS_LOG_COUNT_BANNER_FORMAT 10860
+#define IDS_WEBRTC_LOGS_LOG_HEADER_FORMAT 10861
+#define IDS_WEBRTC_LOGS_LOG_LOCAL_FILE_LABEL_FORMAT 10862
+#define IDS_WEBRTC_LOGS_NO_LOCAL_LOG_FILE_MESSAGE 10863
+#define IDS_WEBRTC_LOGS_LOG_UPLOAD_TIME_FORMAT 10864
+#define IDS_WEBRTC_LOGS_LOG_FAILED_UPLOAD_TIME_FORMAT 10865
+#define IDS_WEBRTC_LOGS_LOG_REPORT_ID_FORMAT 10866
+#define IDS_WEBRTC_LOGS_BUG_LINK_LABEL 10867
+#define IDS_WEBRTC_LOGS_LOG_PENDING_MESSAGE 10868
+#define IDS_WEBRTC_LOGS_LOG_ACTIVELY_UPLOADED_MESSAGE 10869
+#define IDS_WEBRTC_LOGS_LOG_NOT_UPLOADED_MESSAGE 10870
+#define IDS_WEBRTC_LOGS_EVENT_LOG_LOCAL_LOG_ID 10871
+#define IDS_WEBRTC_LOGS_NO_TEXT_LOGS_MESSAGE 10872
+#define IDS_WEBRTC_LOGS_NO_EVENT_LOGS_MESSAGE 10873
+#define IDS_PLUGIN_HIDE 10874
+#define IDS_PLUGIN_BLOCKED 10875
+#define IDS_PLUGIN_BLOCKED_BY_POLICY 10876
+#define IDS_PLUGIN_NOT_AUTHORIZED 10878
+#define IDS_PLUGIN_DISABLED 10879
+#define IDS_PLUGIN_DEPRECATED 10880
+#define IDS_SESSION_CRASHED_BUBBLE_TITLE 10881
+#define IDS_SESSION_CRASHED_BUBBLE_UMA_LINK_TEXT 10882
+#define IDS_IDLE_BUBBLE_TITLE_CLEAR 10883
+#define IDS_SETTINGS_STORAGE_PRESSURE_BUBBLE_VIEW_TITLE 10884
+#define IDS_SETTINGS_STORAGE_PRESSURE_BUBBLE_VIEW_MESSAGE 10885
+#define IDS_SETTINGS_STORAGE_PRESSURE_BUBBLE_VIEW_BUTTON_LABEL 10886
+#define IDS_BAD_FLAGS_WARNING_MESSAGE 10887
+#define IDS_BAD_FEATURES_WARNING_MESSAGE 10888
+#define IDS_BAD_ENVIRONMENT_VARIABLES_WARNING_MESSAGE 10889
+#define IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT_TITLE 10890
+#define IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT 10891
+#define IDS_ALLOW_INSECURE_CONTENT_BUTTON 10892
+#define IDS_ADD_TO_SHELF_INFOBAR_TITLE 10893
+#define IDS_ADD_TO_SHELF_INFOBAR_ADD_BUTTON 10894
+#define IDS_ABOUT_SYS_TITLE 10895
+#define IDS_ABOUT_SYS_DESC 10896
+#define IDS_ABOUT_SYS_TABLE_TITLE 10897
+#define IDS_ABOUT_SYS_LOG_FILE_TABLE_TITLE 10898
+#define IDS_ABOUT_SYS_EXPAND_ALL 10899
+#define IDS_ABOUT_SYS_COLLAPSE_ALL 10900
+#define IDS_ABOUT_SYS_EXPAND 10901
+#define IDS_ABOUT_SYS_COLLAPSE 10902
+#define IDS_ABOUT_SYS_PARSE_ERROR 10903
+#define IDS_ABOUT_BROWSER_SWITCH_TITLE 10905
+#define IDS_ABOUT_BROWSER_SWITCH_OPENING_TITLE_UNKNOWN_BROWSER 10906
+#define IDS_ABOUT_BROWSER_SWITCH_OPENING_TITLE_KNOWN_BROWSER 10907
+#define IDS_ABOUT_BROWSER_SWITCH_ERROR_TITLE_UNKNOWN_BROWSER 10908
+#define IDS_ABOUT_BROWSER_SWITCH_ERROR_TITLE_KNOWN_BROWSER 10909
+#define IDS_ABOUT_BROWSER_SWITCH_COUNTDOWN_TITLE_UNKNOWN_BROWSER 10910
+#define IDS_ABOUT_BROWSER_SWITCH_COUNTDOWN_TITLE_KNOWN_BROWSER 10911
+#define IDS_ABOUT_BROWSER_SWITCH_GENERIC_ERROR_UNKNOWN_BROWSER 10912
+#define IDS_ABOUT_BROWSER_SWITCH_GENERIC_ERROR_KNOWN_BROWSER 10913
+#define IDS_ABOUT_BROWSER_SWITCH_PROTOCOL_ERROR 10914
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_DESC 10915
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_TITLE 10916
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_NOTHING_SHOWN 10917
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_LBS_DISABLED 10918
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_URL_CHECKER_TITLE 10919
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_URL_CHECKER_DESC 10920
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_OPEN_BROWSER 10921
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_OPEN_BROWSER_PROTOCOL_REASON 10922
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_OPEN_BROWSER_RULE_REASON 10923
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_OPEN_BROWSER_INVERT_RULE_REASON 10924
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_OPEN_BROWSER_DEFAULT_REASON 10925
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_INVALID_URL 10926
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_TITLE 10927
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_DESC 10928
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_SOURCE 10929
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_NOT_CONFIGURED 10930
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_SITELIST_NOT_FETCHED 10931
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_SITELIST_DOWNLOAD_BUTTON 10932
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_SITELIST_LAST_DOWNLOAD_DATE 10933
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_XML_SITELIST_NEXT_DOWNLOAD_DATE 10934
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_IN_TITLE 10935
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_IN_DESCRIPTION 10936
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_IN_FIRST_PARAGRAPH 10937
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_IN_SECOND_PARAGRAPH 10938
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_TABLE_COLUMN_RULE 10939
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_TABLE_COLUMN_OPENS_IN 10940
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_FORCE_OPEN_TABLE_COLUMN_SOURCE 10941
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_IGNORE_TITLE 10942
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_IGNORE_DESCRIPTION 10943
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_IGNORE_FIRST_PARAGRAPH 10944
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_IGNORE_SECOND_PARAGRAPH 10945
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_IGNORE_TABLE_COLUMN_RULE 10946
+#define IDS_ABOUT_BROWSER_SWITCH_INTERNALS_IGNORE_TABLE_COLUMN_SOURCE 10947
+#define IDS_NACL_APP_MISSING_ARCH_MESSAGE 10951
+#define IDS_ABOUT_BOX_ERROR_DURING_UPDATE_CHECK 10952
+#define IDS_ABOUT_BOX_ERROR_UPDATE_CHECK_FAILED 10953
+#define IDS_ABOUT_BOX_EXTERNAL_UPDATE_IS_RUNNING 10954
+#define IDS_ABOUT_BOX_GOOGLE_UPDATE_ERROR 10955
+#define IDS_OMNIBOX_PLACEHOLDER_TEXT 440
+#define IDS_PASTE_AND_GO 10956
+#define IDS_PASTE_AND_SEARCH 10957
+#define IDS_PASTE_AND_GO_EMPTY 10958
+#define IDS_OMNIBOX_KEYWORD_HINT 10959
+#define IDS_OMNIBOX_EXTENSION_KEYWORD_HINT 10960
+#define IDS_OMNIBOX_KEYWORD_HINT_KEY_ACCNAME 10961
+#define IDS_OMNIBOX_KEYWORD_HINT_TOUCH 10962
+#define IDS_OMNIBOX_EXTENSION_KEYWORD_HINT_TOUCH 10963
+#define IDS_OMNIBOX_KEYWORD_TEXT 10964
+#define IDS_OMNIBOX_KEYWORD_TEXT_MD 10965
+#define IDS_OMNIBOX_CLEAR_ALL 470
+#define IDS_OMNIBOX_WHY_THIS_SUGGESTION 10966
+#define IDS_OMNIBOX_REMOVE_SUGGESTION 668
+#define IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_TITLE 10967
+#define IDS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_DESCRIPTION 10968
+#define IDS_CONTEXT_MENU_SHOW_FULL_URLS 10969
+#define IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT 10970
+#define IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD 671
+#define IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_SHORT 10971
+#define IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP 10972
+#define IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TITLE 487
+#define IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT_TOOLTIP 10973
+#define IDS_NTP_CUSTOM_LINKS_EDIT_SHORTCUT 488
+#define IDS_NTP_CUSTOM_LINKS_MORE_ACTIONS 10974
+#define IDS_UPLOAD_IMAGE_FORMAT 10975
+#define IDS_NTP_CUSTOM_LINKS_NAME 499
+#define IDS_NTP_CUSTOM_LINKS_URL 503
+#define IDS_NTP_CUSTOM_LINKS_REMOVE 496
+#define IDS_NTP_CUSTOM_LINKS_CANCEL 491
+#define IDS_NTP_CUSTOM_LINKS_DONE 494
+#define IDS_NTP_CUSTOM_LINKS_INVALID_URL 489
+#define IDS_NTP_CUSTOM_LINKS_CANT_CREATE 492
+#define IDS_NTP_CUSTOM_LINKS_CANT_EDIT 493
+#define IDS_NTP_CUSTOM_LINKS_CANT_REMOVE 10976
+#define IDS_NTP_CONFIRM_MSG_SHORTCUT_REMOVED 497
+#define IDS_NTP_CONFIRM_MSG_SHORTCUT_EDITED 495
+#define IDS_NTP_CONFIRM_MSG_SHORTCUT_ADDED 490
+#define IDS_NTP_CUSTOM_LINKS_ALREADY_EXISTS 502
+#define IDS_NTP_CONFIRM_MSG_RESTORE_DEFAULTS 500
+#define IDS_NTP_CUSTOM_BG_CHROME_WALLPAPERS 10977
+#define IDS_NTP_CUSTOM_BG_UPLOAD_AN_IMAGE 10978
+#define IDS_NTP_CUSTOM_BG_SELECT_A_COLLECTION 10979
+#define IDS_NTP_CUSTOM_BG_DAILY_REFRESH 518
+#define IDS_NTP_CUSTOM_BG_RESTORE_DEFAULT 10980
+#define IDS_NTP_CUSTOM_BG_CANCEL 10981
+#define IDS_NTP_CONNECTION_ERROR_NO_PERIOD 10982
+#define IDS_NTP_CONNECTION_ERROR 10983
+#define IDS_NTP_ERROR_MORE_INFO 10984
+#define IDS_NTP_CUSTOM_BG_BACKGROUNDS_UNAVAILABLE 10985
+#define IDS_NTP_CUSTOM_BG_BACK_LABEL 10986
+#define IDS_NTP_CUSTOM_BG_IMAGE_SELECTED 10987
+#define IDS_NTP_CUSTOM_BG_CUSTOMIZE_NTP_LABEL 509
+#define IDS_NTP_CUSTOM_BG_CUSTOMIZE_NTP_WALLPAPER_SEARCH_LABEL 10988
+#define IDS_NTP_DISMISS_PROMO 10989
+#define IDS_NTP_DOODLE_SHARE_LABEL 566
+#define IDS_NTP_DOODLE_SHARE_DIALOG_CLOSE_LABEL 10990
+#define IDS_NTP_DOODLE_SHARE_DIALOG_FACEBOOK_LABEL 565
+#define IDS_NTP_DOODLE_SHARE_DIALOG_TWITTER_LABEL 567
+#define IDS_NTP_DOODLE_SHARE_DIALOG_MAIL_LABEL 564
+#define IDS_NTP_DOODLE_SHARE_DIALOG_COPY_LABEL 562
+#define IDS_NTP_DOODLE_SHARE_DIALOG_LINK_LABEL 563
+#define IDS_NTP_CUSTOMIZE_APPEARANCE_LABEL 10991
+#define IDS_NTP_CUSTOMIZE_THEMES_HEADER 10992
+#define IDS_NTP_CUSTOMIZE_MENU_BACKGROUND_LABEL 504
+#define IDS_NTP_CUSTOMIZE_MENU_BACKGROUND_DISABLED_LABEL 507
+#define IDS_NTP_CUSTOMIZE_MENU_SHORTCUTS_LABEL 520
+#define IDS_NTP_CUSTOMIZE_MENU_MODULES_LABEL 521
+#define IDS_NTP_CUSTOMIZE_MENU_COLOR_LABEL 524
+#define IDS_NTP_CUSTOMIZE_NO_BACKGROUND_LABEL 517
+#define IDS_NTP_CUSTOMIZE_CHROME_COLORS_LABEL 10993
+#define IDS_NTP_CUSTOMIZE_CHROME_CHANGE_THEME_LABEL 10994
+#define IDS_NTP_CUSTOMIZE_CHROME_RESET_TO_CLASSIC_CHROME_LABEL 10995
+#define IDS_NTP_CUSTOMIZE_CHROME_FOLLOW_THEME_LABEL 10996
+#define IDS_NTP_CUSTOMIZE_UPLOADED_IMAGE_LABEL 10997
+#define IDS_NTP_CUSTOMIZE_YOUR_UPLOADED_IMAGE_LABEL 10998
+#define IDS_NTP_CUSTOMIZE_YOUR_SEARCHED_IMAGE_LABEL 10999
+#define IDS_NTP_CUSTOMIZE_UPLOAD_FROM_DEVICE_LABEL 527
+#define IDS_NTP_CUSTOMIZE_CHROME_CURRENT_THEME_LABEL 11000
+#define IDS_NTP_CUSTOMIZE_HIDE_SHORTCUTS_LABEL 511
+#define IDS_NTP_CUSTOMIZE_HIDE_SHORTCUTS_DESC 512
+#define IDS_NTP_CUSTOMIZE_SHOW_CARDS_LABEL 11001
+#define IDS_NTP_CUSTOMIZE_SHOW_SHORTCUTS_LABEL 11002
+#define IDS_NTP_CUSTOMIZE_MY_SHORTCUTS_LABEL 516
+#define IDS_NTP_CUSTOMIZE_MOST_VISITED_LABEL 515
+#define IDS_NTP_CUSTOMIZE_MOST_VISITED_DESC 522
+#define IDS_NTP_CUSTOMIZE_MY_SHORTCUTS_DESC 519
+#define IDS_NTP_CUSTOMIZE_HIDE_ALL_CARDS_LABEL 513
+#define IDS_NTP_CUSTOMIZE_CUSTOMIZE_CARDS_LABEL 514
+#define IDS_NTP_CUSTOMIZE_3PT_THEME_DESC 525
+#define IDS_NTP_CUSTOMIZE_3PT_THEME_UNINSTALL 526
+#define IDS_NTP_CUSTOMIZE_COLOR_PICKER_LABEL 506
+#define IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_TITLE 11003
+#define IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_TITLE 11004
+#define IDS_NTP_CUSTOMIZE_COLOR_HUE_SLIDER_DELETE_A11Y_LABEL 11005
+#define IDS_NTP_THEME_MANAGED_DIALOG_TITLE 569
+#define IDS_NTP_THEME_MANAGED_DIALOG_BODY 570
+#define IDS_NTP_THEMES_CONTAINER_LABEL 523
+#define IDS_NTP_CUSTOMIZE_DEFAULT_LABEL 510
+#define IDS_NTP_CUSTOMIZE_GREY_DEFAULT_LABEL 11006
+#define IDS_NTP_CUSTOMIZE_MAIN_COLOR_LABEL 11007
+#define IDS_NTP_COLORS_WARM_GREY 11008
+#define IDS_NTP_COLORS_COOL_GREY 11009
+#define IDS_NTP_COLORS_MIDNIGHT_BLUE 11010
+#define IDS_NTP_COLORS_BLACK 11011
+#define IDS_NTP_COLORS_BEIGE_AND_WHITE 11012
+#define IDS_NTP_COLORS_YELLOW_AND_WHITE 11013
+#define IDS_NTP_COLORS_GREEN_AND_WHITE 11014
+#define IDS_NTP_COLORS_LIGHT_TEAL_AND_WHITE 11015
+#define IDS_NTP_COLORS_LIGHT_PURPLE_AND_WHITE 11016
+#define IDS_NTP_COLORS_PINK_AND_WHITE 11017
+#define IDS_NTP_COLORS_BEIGE 11018
+#define IDS_NTP_COLORS_ORANGE 11019
+#define IDS_NTP_COLORS_LIGHT_GREEN 11020
+#define IDS_NTP_COLORS_LIGHT_TEAL 11021
+#define IDS_NTP_COLORS_LIGHT_BLUE 11022
+#define IDS_NTP_COLORS_PINK 11023
+#define IDS_NTP_COLORS_DARK_PINK_AND_RED 11024
+#define IDS_NTP_COLORS_DARK_RED_AND_ORANGE 11025
+#define IDS_NTP_COLORS_DARK_GREEN 11026
+#define IDS_NTP_COLORS_DARK_TEAL 11027
+#define IDS_NTP_COLORS_DARK_BLUE 11028
+#define IDS_NTP_COLORS_DARK_PURPLE 11029
+#define IDS_NTP_COLORS_BLUE 11030
+#define IDS_NTP_COLORS_GREY 11031
+#define IDS_NTP_COLORS_AQUA 11032
+#define IDS_NTP_COLORS_GREEN 11033
+#define IDS_NTP_COLORS_VIRIDIAN 11034
+#define IDS_NTP_COLORS_CITRON 11035
+#define IDS_NTP_COLORS_APRICOT 11036
+#define IDS_NTP_COLORS_ROSE 11037
+#define IDS_NTP_COLORS_FUCHSIA 11038
+#define IDS_NTP_COLORS_VIOLET 11039
+#define IDS_NTP_UNDO_DISMISS_PROMO_BUTTON_TOAST 660
+#define IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_GROUP_LABEL 11040
+#define IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_LIGHT_LABEL 11041
+#define IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_DARK_LABEL 11042
+#define IDS_NTP_CUSTOMIZE_CHROME_COLOR_SCHEME_MODE_SYSTEM_LABEL 11043
+#define IDS_NTP_CUSTOMIZE_CHROME_WEBSTORE_LABEL 11044
+#define IDS_NTP_WEBSTORE_SHOPPING_CATEOGRY_LABEL 11045
+#define IDS_NTP_WEBSTORE_WRITTING_HELP_COLLECTION_LABEL 11046
+#define IDS_NTP_WEBSTORE_PRODUCTIVITY_CATEOGRY_LABEL 11047
+#define IDS_NTP_WEBSTORE_TOAST_MESSAGE 11048
+#define IDS_NTP_WEBSTORE_TOAST_BUTTON_TEXT 11049
+#define IDS_NTP_WALLPAPER_SEARCH_FEEDBACK_PLACEHOLDER 11050
+#define IDS_NTP_WALLPAPER_SEARCH_GENERIC_ERROR_DESCRIPTION 11051
+#define IDS_NTP_WALLPAPER_SEARCH_GENERIC_ERROR_DESCRIPTION_WITH_HISTORY 11052
+#define IDS_NTP_WALLPAPER_SEARCH_GENERIC_ERROR_DESCRIPTION_WITH_INSPIRATION 11053
+#define IDS_NTP_WALLPAPER_SEARCH_GENERIC_ERROR_DESCRIPTION_WITH_HISTORY_AND_INSPIRATION 11054
+#define IDS_NTP_WALLPAPER_SEARCH_GENERIC_ERROR_TITLE 11055
+#define IDS_NTP_WALLPAPER_SEARCH_TILE_LABEL 11056
+#define IDS_NTP_WALLPAPER_SEARCH_PAGE_HEADER 11057
+#define IDS_NTP_WALLPAPER_SEARCH_HISTORY_HEADER 11058
+#define IDS_NTP_WALLPAPER_SEARCH_OFFLINE_DESCRIPTION 11059
+#define IDS_NTP_WALLPAPER_SEARCH_OFFLINE_DESCRIPTION_WITH_HISTORY 11060
+#define IDS_NTP_WALLPAPER_SEARCH_OFFLINE_TITLE 11061
+#define IDS_NTP_WALLPAPER_SEARCH_OPTIONAL_DETAILS_LABEL 11062
+#define IDS_NTP_WALLPAPER_SEARCH_COLOR_RED_LABEL 11063
+#define IDS_NTP_WALLPAPER_SEARCH_COLOR_BLUE_LABEL 11064
+#define IDS_NTP_WALLPAPER_SEARCH_COLOR_YELLOW_LABEL 11065
+#define IDS_NTP_WALLPAPER_SEARCH_COLOR_GREEN_LABEL 11066
+#define IDS_NTP_WALLPAPER_SEARCH_COLOR_BLACK_LABEL 11067
+#define IDS_NTP_WALLPAPER_SEARCH_REQUEST_THROTTLED_DESCRIPTION 11068
+#define IDS_NTP_WALLPAPER_SEARCH_REQUEST_THROTTLED_TITLE 11069
+#define IDS_NTP_WALLPAPER_SEARCH_SUBMIT_BTN_TEXT 11070
+#define IDS_NTP_WALLPAPER_SEARCH_TRY_AGAIN_CTA 11071
+#define IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_NO_DESCRIPTOR 11072
+#define IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL 11073
+#define IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTOR_B 11074
+#define IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTOR_C 11075
+#define IDS_NTP_WALLPAPER_SEARCH_HISTORY_RESULT_LABEL_WITH_DESCRIPTORS_B_AND_C 11076
+#define IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL 11077
+#define IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTOR_B 11078
+#define IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTOR_C 11079
+#define IDS_NTP_WALLPAPER_SEARCH_RESULT_LABEL_WITH_DESCRIPTORS_B_AND_C 11080
+#define IDS_NTP_WALLPAPER_SEARCH_SUBJECT_LABEL 11081
+#define IDS_NTP_WALLPAPER_SEARCH_SUBJECT_DEFAULT_OPTION_LABEL 11082
+#define IDS_NTP_WALLPAPER_SEARCH_MOOD_LABEL 11083
+#define IDS_NTP_WALLPAPER_SEARCH_MOOD_DEFAULT_OPTION_LABEL 11084
+#define IDS_NTP_WALLPAPER_SEARCH_STYLE_LABEL 11085
+#define IDS_NTP_WALLPAPER_SEARCH_STYLE_DEFAULT_OPTION_LABEL 11086
+#define IDS_LEARN_MORE_ABOUT_FEATURE_A11Y_LABEL 11087
+#define IDS_THUMBS_DOWN_OPENS_FEEDBACK_FORM_A11Y_LABEL 11088
+#define IDS_THUMBS_UP_RESULTS_A11Y_LABEL 11089
+#define IDS_NTP_WALLPAPER_SEARCH_INSPIRATION_HEADER 11090
+#define IDS_NTP_WALLPAPER_SEARCH_LOADING_A11Y_MESSAGE 11091
+#define IDS_NTP_WALLPAPER_SEARCH_SUCCESS_A11Y_MESSAGE 11092
+#define IDS_NTP_WALLPAPER_SEARCH_DISCLAIMER 11093
+#define IDS_NTP_WALLPAPER_SEARCH_INSPIRATION_CARD_TOGGLE_TITLE 11094
+#define IDS_NTP_WALLPAPER_SEARCH_DESCRIPTORS_CHANGED_A11Y_MESSAGE 11095
+#define IDS_NTP_WALLPAPER_SEARCH_SIGNED_OUT_DESCRIPTION 11096
+#define IDS_NTP_WALLPAPER_SEARCH_SIGNED_OUT_TITLE 11097
+#define IDS_NTP_MODULES_INFO_BUTTON_TITLE 574
+#define IDS_NTP_MODULES_DISMISS_TOAST_MESSAGE 572
+#define IDS_NTP_MODULES_DISABLE_TOAST_MESSAGE 573
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_DISABLE_TOAST_MESSAGE 11098
+#define IDS_NTP_MODULES_DISMISS_BUTTON_TEXT 575
+#define IDS_NTP_MODULES_DRIVE_MORE_ACTIONS_BUTTON_TEXT 11099
+#define IDS_NTP_MODULES_DISABLE_BUTTON_TEXT 576
+#define IDS_NTP_MODULES_DISABLE_BUTTON_TEXT_V2 11100
+#define IDS_NTP_MODULES_MORE_ACTIONS 11101
+#define IDS_NTP_MODULES_CUSTOMIZE_BUTTON_TEXT 577
+#define IDS_NTP_MODULES_STATEFUL_TASKS_VIEWED_TODAY 11102
+#define IDS_NTP_MODULES_STATEFUL_TASKS_VIEWED_YESTERDAY 11103
+#define IDS_NTP_MODULES_STATEFUL_TASKS_VIEWED_PAST_WEEK 11104
+#define IDS_NTP_MODULES_STATEFUL_TASKS_VIEWED_PAST_MONTH 11105
+#define IDS_NTP_MODULES_STATEFUL_TASKS_VIEWED_PREVIOUSLY 11106
+#define IDS_NTP_MODULES_SHOPPING_TASKS_SENTENCE 11107
+#define IDS_NTP_MODULES_SHOPPING_TASKS_LOWER 11108
+#define IDS_NTP_MODULES_RECIPE_INFO 578
+#define IDS_NTP_MODULES_RECIPE_EXTENDED_INFO 579
+#define IDS_NTP_MODULES_RECIPE_TASKS_SENTENCE 580
+#define IDS_NTP_MODULES_RECIPE_TASKS_LOWER 581
+#define IDS_NTP_MODULES_RECIPE_TASKS_LOWER_THESE 582
+#define IDS_NTP_MODULES_RECIPE_VIEWED_TASKS_SENTENCE 583
+#define IDS_NTP_MODULES_RECIPE_VIEWED_TASKS_LOWER 584
+#define IDS_NTP_MODULES_RECIPE_VIEWED_TASKS_LOWER_THESE 585
+#define IDS_NTP_MODULES_CART_SENTENCE 588
+#define IDS_NTP_MODULES_CART_SENTENCE_V2 589
+#define IDS_NTP_MODULES_CART_LOWER 590
+#define IDS_NTP_MODULES_CART_LOWER_THESE 591
+#define IDS_NTP_MODULES_CART_LOWER_YOUR 592
+#define IDS_NTP_MODULES_QUEST_CART_ANNOTATION 656
+#define IDS_NTP_MODULES_QUEST_CART_TILE_LABEL_PLURAL 657
+#define IDS_NTP_MODULES_QUEST_CART_TILE_LABEL_SINGULAR 658
+#define IDS_NTP_MODULES_QUEST_CART_TILE_LABEL_DEFAULT 659
+#define IDS_NTP_MODULES_CART_INFO 587
+#define IDS_NTP_MODULES_CART_ITEM_COUNT_SINGULAR 636
+#define IDS_NTP_MODULES_CART_ITEM_COUNT_MULTIPLE 637
+#define IDS_NTP_MODULES_DRIVE_DISABLE_BUTTON_TEXT 11109
+#define IDS_NTP_MODULES_DRIVE_DISABLE_BUTTON_TEXT_V2 11110
+#define IDS_NTP_MODULES_DRIVE_DISMISS_BUTTON_TEXT 11111
+#define IDS_NTP_MODULES_DRIVE_SENTENCE 593
+#define IDS_NTP_MODULES_DRIVE_SENTENCE2 594
+#define IDS_NTP_MODULES_DRIVE_FILES_SENTENCE 595
+#define IDS_NTP_MODULES_DUMMY_LOWER 597
+#define IDS_NTP_MODULES_DUMMY_TITLE 600
+#define IDS_NTP_MODULES_DRIVE_TITLE 598
+#define IDS_NTP_MODULES_DRIVE_TITLE_V2 11112
+#define IDS_NTP_MODULES_DRIVE_INFO 599
+#define IDS_NTP_MODULES_PHOTOS_TITLE 606
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_TITLE 605
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_HIDE_TODAY 609
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_HIDDEN_TODAY 610
+#define IDS_NTP_MODULES_PHOTOS_SOFT_OPT_OUT 617
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_DISABLE 607
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_DISABLED 608
+#define IDS_NTP_MODULES_PHOTOS_INFO 604
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_EXPLORE 611
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_WELCOME_TITLE 612
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_PERSONALIZED_WELCOME_TITLE_TEMPLATE 11113
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_RH_WELCOME_TITLE 11114
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_FAVORITE_PEOPLE_WELCOME_TITLE 11115
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_TRIPS_WELCOME_TITLE 11116
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_WELCOME_TEXT 613
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_WELCOME_BUTTON_OPT_IN 614
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_WELCOME_BUTTON_OPT_OUT 615
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_WELCOME_BUTTON_SOFT_OPT_OUT 616
+#define IDS_NTP_MODULES_PHOTOS_MEMORIES_WELCOME_EXAMPLE 618
+#define IDS_NTP_MODULES_PHOTOS_BALOON_ILLUSTRATION_TITLE 619
+#define IDS_NTP_MODULES_PHOTOS_NEW 620
+#define IDS_NTP_MODULES_KALEIDOSCOPE_TITLE 603
+#define IDS_NTP_MODULES_SHOPPING_TASKS_INFO_TITLE 621
+#define IDS_NTP_MODULES_TASKS_INFO 586
+#define IDS_NTP_MODULES_SHOPPING_TASKS_INFO_CLOSE 622
+#define IDS_NTP_MODULES_SHOPPING_TASKS_RELATED 11117
+#define IDS_NTP_MODULES_RECIPE_TASKS_RECOMMENDED 11118
+#define IDS_NTP_MODULES_CART_WARM_WELCOME 623
+#define IDS_NTP_MODULES_CART_MODULE_MENU_HIDE_TOAST_MESSAGE 624
+#define IDS_NTP_MODULES_CART_CART_MENU_HIDE_MERCHANT 625
+#define IDS_NTP_MODULES_CART_CART_MENU_HIDE_MERCHANT_TOAST_MESSAGE 626
+#define IDS_NTP_MODULES_CART_CART_MENU_REMOVE_MERCHANT 627
+#define IDS_NTP_MODULES_CART_CART_MENU_REMOVE_MERCHANT_TOAST_MESSAGE 628
+#define IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT 629
+#define IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT 630
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_CONTENT 11119
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_ACCEPT 631
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_ACCEPT_CONFIRMATION 632
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_REJECT 633
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_REJECT_CONFIRMATION 634
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_CONFIRMATION_DISMISS 635
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_CONTENT_V2 661
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_CONTENT_V3 638
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_STEP_1_WITH_MERCHANT_NAME 663
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_STEP_1_WITH_TWO_MERCHANT_NAMES 664
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_STEP_1_WITH_THREE_MERCHANT_NAMES 665
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_STEP_1_CONTINUE 666
+#define IDS_NTP_MODULES_CART_DISCOUNT_CONSENT_TITLE 639
+#define IDS_NTP_MODULES_CUSTOMIZE_IPH 11120
+#define IDS_NTP_MODULES_NEW_TAG_LABEL 640
+#define IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_TITLE 641
+#define IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_BODY_LINE_1 642
+#define IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_BODY_LINE_2 643
+#define IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_OPT_IN 644
+#define IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_OPT_OUT 645
+#define IDS_NTP_MODULES_FIRST_RUN_EXPERIENCE_OPT_OUT_TOAST 646
+#define IDS_NTP_MODULES_FEED_TITLE 602
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_RESUME_BROWSING 11121
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_RESUME_BROWSING_FOR 11122
+#define IDS_NTP_MODULES_SHOW_ALL 648
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_BOOKMARKED 654
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_INFO 649
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_WITH_DISCOUNT_INFO 11123
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_SENTENCE2 650
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_DISABLE_TOAST_NAME 11124
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_DISMISS_BUTTON 11125
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_DISABLE_DROPDOWN_TEXT 11126
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_DONE_BUTTON 11127
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_OPEN_ALL_IN_NEW_TAB_GROUP_BUTTON_TEXT 655
+#define IDS_NTP_MODULES_HISTORY_CLUSTERS_SHOW_ALL_BUTTON 11128
+#define IDS_ACCNAME_SHOW_ALL 652
+#define IDS_ACCNAME_SEARCH_SUGG 653
+#define IDS_NTP_MODULES_TAB_RESUMPTION_DISMISS_BUTTON 11129
+#define IDS_NTP_TAB_RESUMPTION_TITLE 11130
+#define IDS_NTP_MODULES_TAB_RESUMPTION_INFO 11131
+#define IDS_NTP_MODULES_TAB_RESUMPTION_SENTENCE 11132
+#define IDS_NTP_MODULES_TAB_RESUMPTION_RECENTLY_OPENED 11133
+#define IDS_NTP_MODULES_TAB_RESUMPTION_DEVICE_PREFIX 11134
+#define IDS_EXTENSIONS_PROMO_PERFORMANCE 11135
+#define IDS_EXTENSIONS_PROMO_PRIVACY 11136
+#define IDS_EXTENSIONS_PROMO_NEUTRAL 11137
+#define IDS_STAR_VIEW_MENU_ADD_BOOKMARK 11138
+#define IDS_STAR_VIEW_MENU_EDIT_BOOKMARK 11139
+#define IDS_STAR_VIEW_MENU_MOVE_TO_READ_LATER 11140
+#define IDS_STAR_VIEW_MENU_MARK_AS_READ 11141
+#define IDS_READ_LATER_TITLE 395
+#define IDS_READ_LATER_MENU_UNREAD_HEADER 11142
+#define IDS_READ_LATER_MENU_READ_HEADER 11143
+#define IDS_READ_LATER_MENU_TOOLTIP_MARK_AS_READ 11144
+#define IDS_READ_LATER_MENU_TOOLTIP_MARK_AS_UNREAD 11145
+#define IDS_READ_LATER_MENU_EMPTY_STATE_ADD_FROM_DIALOG_SUBHEADER 11146
+#define IDS_READ_LATER_MENU_EMPTY_STATE_HEADER 11147
+#define IDS_READ_LATER_MENU_EMPTY_STATE_SUBHEADER 11148
+#define IDS_READ_LATER_ADD_CURRENT_TAB 11149
+#define IDS_READ_LATER_CANT_ADD_CURRENT_TAB 11150
+#define IDS_READ_LATER_MARK_CURRENT_TAB_READ 11151
+#define IDS_READ_LATER_REMOVE_CURRENT_TAB 11152
+#define IDS_READ_LATER_CONTEXT_MENU_MARK_AS_UNREAD 11153
+#define IDS_READ_LATER_CONTEXT_MENU_MARK_AS_READ 11154
+#define IDS_READ_LATER_CONTEXT_MENU_DELETE 11155
+#define IDS_READING_LIST_MENU 11156
+#define IDS_READING_LIST_MENU_ADD_TAB 11157
+#define IDS_READING_LIST_MENU_SHOW_UI 11158
+#define IDS_ACCNAME_SIDE_PANEL_RESIZE 11159
+#define IDS_ACCNAME_SIDE_PANEL_SELECTOR 11160
+#define IDS_ACCNAME_SIDE_PANEL_COMPANION_SHOW 11161
+#define IDS_ACCNAME_SIDE_PANEL_COMPANION_HIDE 11162
+#define IDS_SIDE_PANEL_COMPANION_TITLE 11163
+#define IDS_SIDE_PANEL_COMPANION_TOOLBAR_TOOLTIP 11164
+#define IDS_SIDE_PANEL_COMPANION_PROMO 11165
+#define IDS_SIDE_PANEL_COMPANION_PROMO_PINNING 11166
+#define IDS_SIDE_PANEL_COMPANION_PROMO_SCREEN_READER 11167
+#define IDS_SIDE_PANEL_COMPANION_ERROR_PAGE_FIRST_LINE 11168
+#define IDS_SIDE_PANEL_COMPANION_ERROR_PAGE_SECOND_LINE 11169
+#define IDS_SIDE_PANEL_CUSTOMIZE_CHROME_TITLE 672
+#define IDS_SIDE_PANEL_TOOLBAR_BUTTON_CXMENU_UNPIN 11170
+#define IDS_SIDE_PANEL_TOOLBAR_BUTTON_CXMENU_PIN 11171
+#define IDS_SIDE_PANEL_HEADER_UNPIN_BUTTON_TOOLTIP 11172
+#define IDS_SIDE_PANEL_HEADER_PIN_BUTTON_TOOLTIP 11173
+#define IDS_SIDE_PANEL_UNPINNED 11174
+#define IDS_SIDE_PANEL_PINNED 11175
+#define IDS_PINNED_ACTION_BUTTON_ACCESSIBLE_TITLE 11176
+#define IDS_SIDE_PANEL_GENERIC_MENU_IPH 11177
+#define IDS_SIDE_PANEL_GENERIC_MENU_IPH_SCREENREADER 11178
+#define IDS_SIDE_PANEL_GENERIC_PINNABLE_IPH 11179
+#define IDS_SIDE_PANEL_GENERIC_PINNABLE_IPH_SCREENREADER 11180
+#define IDS_BOOKMARKS_SORT_BY_TYPE 11181
+#define IDS_BOOKMARKS_ALL_BOOKMARKS 11182
+#define IDS_BOOKMARKS_ALL_BOOKMARKS_OPEN_SIDE_PANEL 11183
+#define IDS_BOOKMARKS_LABEL_TRACKED_PRODUCTS 11184
+#define IDS_BOOKMARKS_SORT_NEWEST 11185
+#define IDS_BOOKMARKS_SORT_NEWEST_LOWER 11186
+#define IDS_BOOKMARKS_SORT_OLDEST 11187
+#define IDS_BOOKMARKS_SORT_OLDEST_LOWER 11188
+#define IDS_BOOKMARKS_SORT_ALPHABETICALLY 11189
+#define IDS_BOOKMARKS_SORT_REVERSE_ALPHABETICALLY 11190
+#define IDS_BOOKMARKS_SORT_LAST_OPENED 11191
+#define IDS_BOOKMARKS_SORT_LAST_OPENED_LOWER 11192
+#define IDS_BOOKMARKS_VISUAL_VIEW 11193
+#define IDS_BOOKMARKS_COMPACT_VIEW 11194
+#define IDS_BOOKMARKS_SORT_MENU_A11Y_LABEL 11195
+#define IDS_BOOKMARKS_CREATE_NEW_FOLDER_A11Y_LABEL 11196
+#define IDS_BOOKMARKS_NEW_FOLDER_TOOLTIP 11197
+#define IDS_BOOKMARKS_EDIT_BOOKMARK_LIST_A11Y_LABEL 11198
+#define IDS_BOOKMARKS_EMPTY_STATE_TITLE 11199
+#define IDS_BOOKMARKS_EMPTY_STATE_BODY 11200
+#define IDS_BOOKMARKS_EMPTY_STATE_TITLE_FOLDER 11201
+#define IDS_BOOKMARKS_EMPTY_STATE_BODY_FOLDER 11202
+#define IDS_BOOKMARKS_EMPTY_STATE_TITLE_GUEST 11203
+#define IDS_BOOKMARKS_EMPTY_STATE_BODY_GUEST 11204
+#define IDS_BOOKMARKS_EMPTY_STATE_TITLE_SEARCH 11205
+#define IDS_BOOKMARKS_EMPTY_STATE_BODY_SEARCH 11206
+#define IDS_BOOKMARK_FOLDER_CHILD_COUNT 11207
+#define IDS_BOOKMARKS_EDIT_BOOKMARK 11208
+#define IDS_BOOKMARKS_EDIT_MOVE_TO_ANOTHER_FOLDER 11209
+#define IDS_BOOKMARKS_EDIT_MORE 11210
+#define IDS_BOOKMARKS_EDIT_MOVE_TO 11211
+#define IDS_BOOKMARKS_EDIT_NEW_FOLDER 11212
+#define IDS_BOOKMARKS_EDIT_CANCEL 11213
+#define IDS_BOOKMARKS_EDIT_SAVE 11214
+#define IDS_BOOKMARKS_EDIT_NAME 11215
+#define IDS_BOOKMARKS_EDIT_URL 11216
+#define IDS_BOOKMARK_DELETION_COUNT 11217
+#define IDS_UNDO_BOOKMARK_DELETION 11218
+#define IDS_BOOKMARKS_MOVE_TO_BOOKMARKS_BAR 11219
+#define IDS_BOOKMARKS_MOVE_TO_ALL_BOOKMARKS 11220
+#define IDS_BOOKMARKS_EDIT 11221
+#define IDS_BOOKMARKS_RENAME 11222
+#define IDS_BOOKMARKS_URL_FOLDER_DESCRIPTION 11223
+#define IDS_BOOKMARKS_DISABLED_FEATURE 11224
+#define IDS_BOOKMARKS_BACK_BUTTON_LABEL 11225
+#define IDS_BOOKMARKS_BACK_BUTTON_TOOLTIP 11226
+#define IDS_BOOKMARKS_FORWARD_BUTTON_LABEL 11227
+#define IDS_BOOKMARK_OPTIONS_LABEL 11228
+#define IDS_FOLDER_OPTIONS_LABEL 11229
+#define IDS_BOOKMARKS_OPEN_FOLDER_LABEL 11230
+#define IDS_BOOKMARKS_OPEN_BOOKMARK_LABEL 11231
+#define IDS_BOOKMARKS_SELECT_FOLDER_LABEL 11232
+#define IDS_BOOKMARKS_SELECT_BOOKMARK_LABEL 11233
+#define IDS_BOOKMARKS_DESELECT_FOLDER_LABEL 11234
+#define IDS_BOOKMARKS_DESELECT_BOOKMARK_LABEL 11235
+#define IDS_BOOKMARK_ACCESSIBLE_DESCRIPTION_PRICE_TRACKING 11236
+#define IDS_BOOKMARK_ACCESSIBLE_DESCRIPTION_PRICE_CHANGE 11237
+#define IDS_BOOKMARKS_CHECKBOX_LABEL 11238
+#define IDS_BOOKMARKS_PRIMARY_FILTER_HEADING 11239
+#define IDS_BOOKMARKS_SECONDARY_FILTER_HEADING 11240
+#define IDS_SHOW_READING_MODE_SIDE_PANEL 11241
+#define IDS_READING_MODE_TITLE 11242
+#define IDS_READING_MODE_NOT_SELECTABLE_HEADER 11243
+#define IDS_READING_MODE_EMPTY_STATE_HEADER 11244
+#define IDS_READING_MODE_EMPTY_STATE_SUBHEADER 11245
+#define IDS_READING_MODE_TOOLBAR_LABEL 11246
+#define IDS_READING_MODE_FONT_SIZE 11247
+#define IDS_READING_MODE_FONT_NAME_COMBOBOX_LABEL 11248
+#define IDS_READING_MODE_DECREASE_FONT_SIZE_BUTTON_LABEL 11249
+#define IDS_READING_MODE_INCREASE_FONT_SIZE_BUTTON_LABEL 11250
+#define IDS_READING_MODE_DISABLE_LINKS_BUTTON_LABEL 11251
+#define IDS_READING_MODE_ENABLE_LINKS_BUTTON_LABEL 11252
+#define IDS_READING_MODE_COLORS_COMBOBOX_LABEL 11253
+#define IDS_READING_MODE_LINE_SPACING_COMBOBOX_LABEL 11254
+#define IDS_READING_MODE_LETTER_SPACING_COMBOBOX_LABEL 11255
+#define IDS_READING_MODE_SPACING_COMBOBOX_STANDARD 11256
+#define IDS_READING_MODE_SPACING_COMBOBOX_LOOSE 11257
+#define IDS_READING_MODE_SPACING_COMBOBOX_VERY_LOOSE 11258
+#define IDS_READING_MODE_SPACING_COMBOBOX_WIDE 11259
+#define IDS_READING_MODE_SPACING_COMBOBOX_VERY_WIDE 11260
+#define IDS_READING_MODE_DEFAULT_COLOR_LABEL 11261
+#define IDS_READING_MODE_LIGHT_COLOR_LABEL 11262
+#define IDS_READING_MODE_DARK_COLOR_LABEL 11263
+#define IDS_READING_MODE_YELLOW_COLOR_LABEL 11264
+#define IDS_READING_MODE_BLUE_COLOR_LABEL 11265
+#define IDS_READ_ANYTHING_LOADING 11266
+#define IDS_READING_MODE_FONT_RESET 11267
+#define IDS_READING_MODE_TURN_HIGHLIGHT_OFF 11268
+#define IDS_READING_MODE_TURN_HIGHLIGHT_ON 11269
+#define IDS_READING_MODE_PLAY_DESCRIPTION 11270
+#define IDS_READING_MODE_PLAY_SPEECH 11271
+#define IDS_READING_MODE_PAUSE_SPEECH 11272
+#define IDS_READING_MODE_NAVIGATE_PREVIOUS_SENTENCE 11273
+#define IDS_READING_MODE_NAVIGATE_NEXT_SENTENCE 11274
+#define IDS_READING_MODE_MORE_OPTIONS 11275
+#define IDS_READING_MODE_VOICE_SPEED 11276
+#define IDS_READING_MODE_VOICE_SELECTION 11277
+#define IDS_READING_MODE_SIDE_PANEL_PROMO 11278
+#define IDS_READING_MODE_SIDE_PANEL_PROMO_PINNING 11279
+#define IDS_READING_MODE_VOICE_PREVIEW_STRING 11280
+#define IDS_USER_NOTE_TITLE 11281
+#define IDS_ADD_NEW_USER_NOTE_PLACEHOLDER_TEXT 11282
+#define IDS_USER_NOTES_SORT_MENU_A11Y_LABEL 11283
+#define IDS_LEARN_MORE_USER_NOTE 11284
+#define IDS_ALL_NOTES 11285
+#define IDS_USER_NOTES_CURRENT_TAB_HEADER 11286
+#define IDS_NOTES_COUNT 11287
+#define IDS_USER_NOTES_MENU_OPEN_IN_NEW_TAB 11288
+#define IDS_USER_NOTES_MENU_OPEN_IN_NEW_WINDOW 11289
+#define IDS_USER_NOTES_MENU_OPEN_IN_INCOGNITO 11290
+#define IDS_USER_NOTES_EMPTY_STATE_TITLE 11291
+#define IDS_USER_NOTES_EMPTY_STATE_BODY 11292
+#define IDS_USER_NOTES_EMPTY_STATE_TITLE_GUEST 11293
+#define IDS_USER_NOTES_EMPTY_STATE_BODY_GUEST 11294
+#define IDS_FEED_TITLE 11295
+#define IDS_GOOGLE_LENS_TITLE 11296
+#define IDS_LENS_DEFAULT_TITLE 11297
+#define IDS_TOOLTIP_BACK 409
+#define IDS_ACCDESCRIPTION_BACK 411
+#define IDS_TOOLTIP_CHROMELABS_BUTTON 11298
+#define IDS_TOOLTIP_LEFT_ALIGNED_SIDE_PANEL_BUTTON 11299
+#define IDS_TOOLTIP_CHROMELABS_COMBOBOX 11300
+#define IDS_TOOLTIP_CHROMELABS_FEEDBACK_BUTTON 11301
+#define IDS_TOOLTIP_FORWARD 412
+#define IDS_ACCDESCRIPTION_FORWARD 414
+#define IDS_TOOLTIP_DOWNLOAD_ICON 11302
+#define IDS_TOOLTIP_HOME 419
+#define IDS_TOOLTIP_RELOAD 11303
+#define IDS_TOOLTIP_RELOAD_WITH_MENU 11304
+#define IDS_TOOLTIP_STOP 695
+#define IDS_TOOLTIP_EXTENSIONS_BUTTON 421
+#define IDS_TOOLTIP_OVERFLOW_BUTTON 11305
+#define IDS_TOOLTIP_EXTENSIONS_BUTTON_ALL_EXTENSIONS_BLOCKED 11306
+#define IDS_TOOLTIP_EXTENSIONS_BUTTON_ANY_EXTENSION_HAS_ACCESS 11307
+#define IDS_TOOLTIP_EXTENSIONS_SITE_ACCESS_BUTTON 11308
+#define IDS_TOOLTIP_SIDE_PANEL_SHOW 433
+#define IDS_TOOLTIP_SIDE_PANEL_HIDE 11309
+#define IDS_TOOLTIP_SIDE_PANEL 11310
+#define IDS_TOOLTIP_LOCATION_ICON 439
+#define IDS_TOOLTIP_NEW_TAB 393
+#define IDS_TOOLTIP_MIC_SEARCH 541
+#define IDS_TOOLTIP_LENS_SEARCH 543
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_CLOSE_BUTTON_LABEL 544
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_TITLE 545
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_DRAG_TITLE 546
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_UPLOAD_FILE_TITLE 547
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_OR_TEXT 548
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_TEXT_PLACEHOLDER 549
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_SEARCH_BUTTON_LABEL 550
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_DRAG_DROP_TITLE 551
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_LOADING_TEXT 552
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_OFFLINE_TEXT 553
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_OFFLINE_SUBTITLE_TEXT 554
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_OFFLINE_BUTTON_LABEL 555
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_ERROR_FILE_TYPE 556
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_ERROR_FILE_SIZE 557
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_ERROR_MULTIPLE_FILES 558
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_VALIDATION_ERROR_SCHEME 559
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_VALIDATION_ERROR_CONFORMANCE 560
+#define IDS_LENS_SEARCH_UPLOAD_DIALOG_ERROR_MULTIPLE_URLS 561
+#define IDS_TOOLTIP_SAVE_CREDIT_CARD 461
+#define IDS_TOOLTIP_SAVE_CREDIT_CARD_PENDING 11312
+#define IDS_TOOLTIP_SAVE_CVC 11313
+#define IDS_TOOLTIP_SAVE_IBAN 11314
+#define IDS_TOOLTIP_MIGRATE_LOCAL_CARD 462
+#define IDS_TOOLTIP_TRANSLATE 455
+#define IDS_TOOLTIP_ZOOM 456
+#define IDS_TOOLTIP_ZOOM_EXTENSION_ICON 11315
+#define IDS_ZOOM_SET_DEFAULT 11316
+#define IDS_TOOLTIP_FIND 454
+#define IDS_TOOLTIP_TAB_SEARCH 406
+#define IDS_TOOLTIP_TAB_ORGANIZE 11317
+#define IDS_TAB_ORGANIZE 11318
+#define IDS_TOOLTIP_TAB_ORGANIZE_CLOSE 11319
+#define IDS_TAB_ORGANIZATION_FEEDBACK_PLACEHOLDER 11320
+#define IDS_TAB_ORGANIZE_MENU 11321
+#define IDS_TAB_ORGANIZATION_SUCCESS_IPH 11322
+#define IDS_TAB_ORGANIZATION_SUCCESS_IPH_SCREENREADER 11323
+#define IDS_IPH_EXPERIMENTAL_AI_PROMO 11324
+#define IDS_IPH_EXPERIMENTAL_AI_PROMO_BODY 11325
+#define IDS_IPH_EXPERIMENTAL_AI_PROMO_BUTTON_CONTINUE 11326
+#define IDS_TOOLTIP_INTENT_PICKER_ICON 452
+#define IDS_INTENT_PICKER_BUBBLE_VIEW_OPEN_WITH 11327
+#define IDS_INTENT_PICKER_BUBBLE_VIEW_REMEMBER_SELECTION 11328
+#define IDS_INTENT_PICKER_BUBBLE_VIEW_OPEN 11329
+#define IDS_INTENT_PICKER_BUBBLE_VIEW_STAY_IN_CHROME 11330
+#define IDS_INTENT_PICKER_BUBBLE_VIEW_INITIATING_ORIGIN 11331
+#define IDS_INTENT_CHIP_OPEN_IN_APP 11332
+#define IDR_INTENT_PICKER_SUPPORTED_LINKS_INFOBAR_MESSAGE 11333
+#define IDR_INTENT_PICKER_SUPPORTED_LINKS_INFOBAR_OK_LABEL 11334
+#define IDS_INTENT_PICKER_SELECT_AN_APP_GENERIC_SUBTITLE 11336
+#define IDS_ACCESSIBLE_INCOGNITO_WINDOW_TITLE_FORMAT 11344
+#define IDS_ACCESSIBLE_GUEST_WINDOW_TITLE_FORMAT 11345
+#define IDS_ACCESSIBLE_WINDOW_TITLE_WITH_PROFILE_FORMAT 11346
+#define IDS_ACCNAME_APP_UPGRADE_RECOMMENDED 11347
+#define IDS_ACCNAME_FULLSCREEN 11348
+#define IDS_ACCNAME_EXIT_FULLSCREEN 11349
+#define IDS_ACCNAME_HOME 420
+#define IDS_ACCNAME_RELOAD 418
+#define IDS_ACCNAME_FIND 11350
+#define IDS_ACCNAME_BOOKMARKS 686
+#define IDS_ACCNAME_SAVED_TAB_GROUPS 679
+#define IDS_ACCNAME_SAVED_TAB_GROUPS_CHEVRON 680
+#define IDS_SAVED_TAB_GROUPS_OVERFLOW_BUTTON_TOOLTIP 681
+#define IDS_ACCNAME_BOOKMARKS_CHEVRON 682
+#define IDS_ACCNAME_BOOKMARK_BUTTON_ROLE_DESCRIPTION 11351
+#define IDS_ACCNAME_BOOKMARK_FOLDER_BUTTON_ROLE_DESCRIPTION 689
+#define IDS_ACCNAME_SAVED_TAB_GROUP_BUTTON_ROLE_DESCRIPTION 11352
+#define IDS_ACCNAME_CHROMELABS_BUTTON 11353
+#define IDS_ACCNAME_LEFT_ALIGNED_SIDE_PANEL_BUTTON 11354
+#define IDS_ACCESSIBLE_TEXT_CHROMELABS_BUTTON_ADDED_BY_ENTERPRISE_POLICY 11355
+#define IDS_ACCESSIBLE_TEXT_CHROMELABS_BUTTON_REMOVED_BY_ENTERPRISE_POLICY 11356
+#define IDS_ACCNAME_CHROMELABS_COMBOBOX 11357
+#define IDS_ACCNAME_CHROMELABS_COMBOBOX_MAC 11358
+#define IDS_ACCNAME_SEPARATOR 690
+#define IDS_ACCNAME_EXTENSIONS 11359
+#define IDS_ACCNAME_NEWTAB 394
+#define IDS_ACCNAME_MINIMIZE 11360
+#define IDS_ACCNAME_MAXIMIZE 11361
+#define IDS_ACCNAME_RESTORE 11362
+#define IDS_ACCNAME_CLOSE_TAB 11363
+#define IDS_ACCNAME_ZOOM_SET_DEFAULT 11364
+#define IDS_ACCNAME_TAB_SEARCH 405
+#define IDS_ACCNAME_TAB_ORGANIZE 11365
+#define IDS_ACCNAME_TAB_SCROLL_LEADING 11366
+#define IDS_ACCNAME_TAB_SCROLL_TRAILING 11367
+#define IDS_ACCNAME_MUTE_TAB 673
+#define IDS_ACCNAME_WEB_APP_DETAILED_INSTALL_DIALOG_LEADING_SCROLL_BUTTON 11368
+#define IDS_ACCNAME_WEB_APP_DETAILED_INSTALL_DIALOG_TRAILING_SCROLL_BUTTON 11369
+#define IDS_ALLOWED_CLIPBOARD_TITLE 11370
+#define IDS_BLOCKED_CLIPBOARD_TITLE 11371
+#define IDS_ALLOWED_CLIPBOARD_MESSAGE 11372
+#define IDS_ALLOWED_CLIPBOARD_BLOCK 11373
+#define IDS_ALLOWED_CLIPBOARD_NO_ACTION 11374
+#define IDS_BLOCKED_CLIPBOARD_MESSAGE 11375
+#define IDS_BLOCKED_CLIPBOARD_UNBLOCK 11376
+#define IDS_BLOCKED_CLIPBOARD_NO_ACTION 11377
+#define IDS_BACK_NAVIGATION_MENU_PROMO 11378
+#define IDS_BACK_NAVIGATION_MENU_PROMO_ACCESSIBLE_TEXT 11379
+#define IDS_BOOKMARK_PROMO_0 11380
+#define IDS_BOOKMARK_PROMO_1 11381
+#define IDS_BOOKMARK_PROMO_2 11382
+#define IDS_CHROME_TIP 11383
+#define IDS_EXTENSIONS_MENU_IPH_ENTRY_POINT_TITLE 11384
+#define IDS_EXTENSIONS_MENU_IPH_ENTRY_POINT_BODY 11385
+#define IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_IPH_ENTRY_POINT_TITLE 11386
+#define IDS_EXTENSIONS_REQUEST_ACCESS_BUTTON_IPH_ENTRY_POINT_BODY 11387
+#define IDS_GLOBAL_MEDIA_CONTROLS_PROMO 11388
+#define IDS_INCOGNITOWINDOW_PROMO_0 11389
+#define IDS_INCOGNITOWINDOW_PROMO_1 11390
+#define IDS_INCOGNITOWINDOW_PROMO_2 11391
+#define IDS_INCOGNITOWINDOW_PROMO_3 11392
+#define IDS_NEWTAB_PROMO_0 11393
+#define IDS_NEWTAB_PROMO_1 11394
+#define IDS_NEWTAB_PROMO_2 11395
+#define IDS_POWER_BOOKMARKS_SIDE_PANEL_PROMO 11396
+#define IDS_POWER_BOOKMARKS_SIDE_PANEL_PROMO_PINNING 11397
+#define IDS_READING_LIST_DISCOVERY_PROMO 11398
+#define IDS_READING_LIST_DISCOVERY_PROMO_PINNING 11399
+#define IDS_READING_LIST_ENTRY_POINT_PROMO 11400
+#define IDS_DESKTOP_PWA_INSTALL_PROMO 11401
+#define IDS_DESKTOP_PWA_LINK_CAPTURING_TEXT 11402
+#define IDS_DESKTOP_PWA_LINK_CAPTURING_SETTINGS 11403
+#define IDS_UPDATED_CONNECTION_SECURITY_INDICATORS_PROMO 11404
+#define IDS_READING_LIST_IN_SIDE_PANEL_PROMO 11405
+#define IDS_READING_LIST_IN_SIDE_PANEL_PROMO_PINNING 11406
+#define IDS_TAB_GROUPS_NEW_GROUP_PROMO 11407
+#define IDS_TAB_GROUPS_UNNAMED_GROUP_TOOLTIP 11408
+#define IDS_TAB_GROUPS_NAMED_GROUP_TOOLTIP 11409
+#define IDS_TAB_AUDIO_MUTING_PROMO 11410
+#define IDS_SHARED_HIGHLIGHTING_PROMO 11411
+#define IDS_BATTERY_SAVER_MODE_PROMO_TITLE 388
+#define IDS_BATTERY_SAVER_MODE_PROMO_TEXT 11412
+#define IDS_BATTERY_SAVER_MODE_PROMO_ACTION_TEXT 387
+#define IDS_MEMORY_SAVER_MODE_PROMO_TEXT 11413
+#define IDS_MEMORY_SAVER_MODE_PROMO_ACTION_TEXT 389
+#define IDS_TUTORIAL_GENERIC_SUCCESS_TITLE 11414
+#define IDS_TUTORIAL_TAB_GROUP_ADD_TAB_TO_GROUP 11415
+#define IDS_TUTORIAL_ADD_TAB_TO_GROUP_WITH_EXISTING_GROUP_IN_TAB_STRIP 11416
+#define IDS_TUTORIAL_TAB_GROUP_EDIT_BUBBLE 11417
+#define IDS_TUTORIAL_TAB_GROUP_DRAG_TAB 11418
+#define IDS_TUTORIAL_TAB_GROUP_COLLAPSE 11419
+#define IDS_TUTORIAL_TAB_GROUP_SUCCESS_DESCRIPTION 11420
+#define IDS_TUTORIAL_SAVED_TAB_GROUP_ADD_TAB_TO_GROUP 11421
+#define IDS_TUTORIAL_SAVED_TAB_GROUP_OPEN_EDITOR 11422
+#define IDS_TUTORIAL_SAVED_TAB_GROUP_NAME_SAVE_GROUP 11423
+#define IDS_TUTORIAL_SAVED_TAB_GROUP_HIDE_GROUP 11424
+#define IDS_TUTORIAL_SAVED_TAB_GROUP_REOPEN_GROUP 11425
+#define IDS_TUTORIAL_SAVED_TAB_GROUP_SUCCESS_DESCRIPTION 11426
+#define IDS_TUTORIAL_SIDE_PANEL_READING_LIST_OPEN_SIDE_PANEL 11427
+#define IDS_TUTORIAL_SIDE_PANEL_READING_LIST_ADD_TAB 11428
+#define IDS_TUTORIAL_SIDE_PANEL_READING_LIST_MARK_READ 11429
+#define IDS_TUTORIAL_SIDE_PANEL_READING_LIST_CLICK_DROPDOWN 11430
+#define IDS_TUTORIAL_SIDE_PANEL_READING_LIST_SUCCESS_BODY 11431
+#define IDS_IPH_CUSTOMIZE_CHROME_REFRESH_BODY 11432
+#define IDS_IPH_CUSTOMIZE_CHROME_REFRESH_POINTER_BODY 11433
+#define IDS_IPH_CUSTOMIZE_CHROME_REFRESH_CUSTOM_ACTION 11434
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_START_TUTORIAL_IPH 11435
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_OPEN_SIDE_PANEL 11436
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_CHANGE_THEME 11437
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_SELECT_COLLECTION 11438
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_APPLY_THEME 11439
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_CLICK_BACK_ARROW 11440
+#define IDS_TUTORIAL_CUSTOMIZE_CHROME_SUCCESS_BODY 11441
+#define IDS_TUTORIAL_PASSWORD_MANAGER_OPEN_MENU 11442
+#define IDS_TUTORIAL_PASSWORD_MANAGER_CLICK_PASSWORDS_MENU 11443
+#define IDS_TUTORIAL_PASSWORD_MANAGER_SELECT_SETTINGS 11444
+#define IDS_TUTORIAL_PASSWORD_MANAGER_ADD_SHORTCUT 11445
+#define IDS_TUTORIAL_PASSWORD_MANAGER_CLICK_INSTALL 11446
+#define IDS_BROWSER_HANGMONITOR 11447
+#define IDS_BROWSER_HANGMONITOR_RENDERER_TITLE 11448
+#define IDS_BROWSER_HANGMONITOR_RENDERER 11449
+#define IDS_BROWSER_HANGMONITOR_IFRAME_TITLE 11450
+#define IDS_BROWSER_HANGMONITOR_RENDERER_WAIT 11451
+#define IDS_BROWSER_HANGMONITOR_RENDERER_END 11452
+#define IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR 11453
+#define IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON 11454
+#define IDS_PASSWORDS_AUTO_SIGNIN_TITLE 11455
+#define IDS_PASSWORDS_AUTO_SIGNIN_DESCRIPTION 11456
+#define IDS_PASSWORDS_VIA_FEDERATION 11457
+#define IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL 11458
+#define IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL 11459
+#define IDS_NEAR_OOM_REDUCTION_MESSAGE_TITLE 11460
+#define IDS_NEAR_OOM_REDUCTION_MESSAGE_DESCRIPTION 11461
+#define IDS_TAILORED_SECURITY_UNCONSENTED_MESSAGE_TITLE 11462
+#define IDS_TAILORED_SECURITY_UNCONSENTED_MESSAGE_ACCEPT 11463
+#define IDS_TAILORED_SECURITY_DISPLAY_SOURCE 11464
+#define IDS_PASSWORD_MANAGER_CANCEL_BUTTON 11465
+#define IDS_PASSWORD_MANAGER_USERNAME_LABEL 11466
+#define IDS_PASSWORD_MANAGER_PASSWORD_LABEL 11467
+#define IDS_PASSWORD_MANAGER_UPDATED_BUBBLE_TITLE 11468
+#define IDS_PASSWORD_MANAGER_MORE_TO_FIX_BODY_MESSAGE_GOOGLE_PASSWORD_MANAGER 11469
+#define IDS_PASSWORD_MANAGER_SAFE_STATE_BODY_MESSAGE_GOOGLE_PASSWORD_MANAGER 11470
+#define IDS_PASSWORD_MANAGER_CHECK_REMAINING_BUTTON 11471
+#define IDS_PASSWORD_MANAGER_SAVE_BUTTON 11472
+#define IDS_PASSWORD_MANAGER_SAVE_BUBBLE_OPT_IN_BUTTON 11473
+#define IDS_PASSWORD_MANAGER_MOVE_BUBBLE_OK_BUTTON 11474
+#define IDS_PASSWORD_MANAGER_MOVE_BUBBLE_CANCEL_BUTTON 11475
+#define IDS_PASSWORD_MANAGER_UPDATE_BUTTON 11476
+#define IDS_PASSWORD_MANAGER_BUBBLE_BLOCKLIST_BUTTON 11477
+#define IDS_PASSWORD_MANAGER_DESTINATION_DROPDOWN_ACCESSIBLE_NAME 11478
+#define IDS_PASSWORD_MANAGER_DESTINATION_DROPDOWN_SAVE_TO_ACCOUNT 11479
+#define IDS_PASSWORD_MANAGER_DESTINATION_DROPDOWN_SAVE_TO_DEVICE 11480
+#define IDS_PASSWORD_MANAGER_IPH_TITLE_SAVE_TO_ACCOUNT 386
+#define IDS_PASSWORD_MANAGER_IPH_BODY_SAVE_REAUTH_FAIL 11481
+#define IDS_PASSWORD_MANAGER_IPH_BODY_SAVE_TO_ACCOUNT 11482
+#define IDS_PASSWORD_MANAGER_IPH_MANAGEMENT_BUBBLE_AFTER_SAVE 11483
+#define IDS_PASSWORD_MANAGER_IPH_MANAGEMENT_BUBBLE_AFTER_SAVE_SCREENREADER 11484
+#define IDS_PASSWORD_MANAGER_IPH_SHARE_PASSWORD_BUTTON 11485
+#define IDS_PASSWORD_MANAGER_IPH_SHARE_PASSWORD_BUTTON_SCREENREADER 11486
+#define IDS_PASSWORD_MANAGER_IPH_ACCOUNT_STORAGE_TOGGLE 11487
+#define IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_TITLE 11488
+#define IDS_PASSWORD_MANAGER_IPH_MANAGEMENT_BUBBLE_DURING_SIGNIN 11489
+#define IDS_PASSWORD_MANAGER_IPH_MANAGEMENT_BUBBLE_DURING_SIGNIN_SCREENREADER 11490
+#define IDS_PASSWORD_MANAGER_TOOLTIP_SAVE 11491
+#define IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE 451
+#define IDS_PASSWORD_MANAGER_TOOLTIP_MOVE 11492
+#define IDS_PASSWORD_MANAGER_TOOLTIP_PROTECT 11493
+#define IDS_PASSWORD_MANAGER_TOOLTIP_SHARED_NOTIFICATION 11494
+#define IDS_PASSWORD_MANAGER_TOOLTIP_KEYCHAIN_ERROR 11495
+#define IDS_PASSWORD_MANAGER_IMPORT_DIALOG_TITLE 11496
+#define IDS_PASSWORD_MANAGER_EXPORT_DIALOG_TITLE 11497
+#define IDS_PASSWORD_MANAGER_MOVE_TITLE 11498
+#define IDS_PASSWORD_MANAGER_MOVE_HINT 11499
+#define IDS_PASSWORD_MANAGER_UNSYNCED_CREDENTIALS_BUBBLE_TITLE_GPM 11500
+#define IDS_PASSWORD_MANAGER_UNSYNCED_CREDENTIALS_BUBBLE_DESCRIPTION_GPM 11501
+#define IDS_PASSWORD_MANAGER_SAVE_UNSYNCED_CREDENTIALS_BUTTON_GPM 11502
+#define IDS_PASSWORD_MANAGER_DISCARD_UNSYNCED_CREDENTIALS_BUTTON 11503
+#define IDS_IMPORT_FROM_IE 11521
+#define IDS_IMPORT_FROM_EDGE 11522
+#define IDS_IMPORT_FROM_FIREFOX 11523
+#define IDS_IMPORT_FROM_ICEWEASEL 11524
+#define IDS_IMPORT_FROM_SAFARI 11525
+#define IDS_IMPORT_FROM_BOOKMARKS_HTML_FILE 11526
+#define IDS_IMPORTER_LOCK_TITLE 11530
+#define IDS_IMPORTER_LOCK_TEXT 11531
+#define IDS_IMPORTER_LOCK_OK 11532
+#define IDS_FEEDBACK_REPORT_APP_TITLE 11533
+#define IDS_FEEDBACK_REPORT_PAGE_TITLE 11534
+#define IDS_FEEDBACK_REPORT_PAGE_TITLE_SAD_TAB_FLOW 11535
+#define IDS_FEEDBACK_MINIMIZE_BUTTON_LABEL 11536
+#define IDS_FEEDBACK_CLOSE_BUTTON_LABEL 11537
+#define IDS_FEEDBACK_FREE_TEXT_LABEL 11538
+#define IDS_FEEDBACK_FREE_TEXT_AI_LABEL 11539
+#define IDS_FEEDBACK_REPORT_URL_LABEL 11540
+#define IDS_FEEDBACK_USER_EMAIL_LABEL 11541
+#define IDS_FEEDBACK_ANONYMOUS_EMAIL_OPTION 11542
+#define IDS_FEEDBACK_CONSENT_CHECKBOX_LABEL 11543
+#define IDS_FEEDBACK_SCREENSHOT_LABEL 11544
+#define IDS_FEEDBACK_SCREENSHOT_A11Y_TEXT 11545
+#define IDS_FEEDBACK_INCLUDE_PERFORMANCE_TRACE_CHECKBOX 11546
+#define IDS_FEEDBACK_BLUETOOTH_LOGS_CHECKBOX 11547
+#define IDS_FEEDBACK_ASSISTANT_LOGS_MESSAGE 11548
+#define IDS_FEEDBACK_BLUETOOTH_LOGS_MESSAGE 11549
+#define IDS_FEEDBACK_OFFLINE_DIALOG_TITLE 11550
+#define IDS_FEEDBACK_OFFLINE_DIALOG_TEXT 11551
+#define IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_CHKBOX 11552
+#define IDS_FEEDBACK_INCLUDE_ASSISTANT_INFORMATION_CHKBOX 11555
+#define IDS_FEEDBACK_ATTACH_FILE_NOTE 11556
+#define IDS_FEEDBACK_ATTACH_FILE_LABEL 11557
+#define IDS_FEEDBACK_ATTACH_FILE_TO_BIG 11558
+#define IDS_FEEDBACK_INCLUDE_AUTOFILL_METADATA_CHECKBOX 11559
+#define IDS_FEEDBACK_IWLWIFI_DEBUG_DUMP_EXPLAINER 11560
+#define IDS_FEEDBACK_LOG_ID_CHECKBOX_LABEL 11561
+#define IDS_FEEDBACK_PRIVACY_NOTE 11562
+#define IDS_FEEDBACK_NO_DESCRIPTION 11563
+#define IDS_FEEDBACK_OFFENSIVE_CHECKBOX_LABEL 11564
+#define IDS_FEEDBACK_SEND_REPORT 11565
+#define IDS_FEEDBACK_AUTOFILL_METADATA_PAGE_TITLE 11566
+#define IDS_FEEDBACK_SYSINFO_PAGE_TITLE 11567
+#define IDS_FEEDBACK_SYSINFO_PAGE_LOADING 11568
+#define IDS_FEEDBACK_ADDITIONAL_INFO_LABEL 11569
+#define IDS_CLEAR_BROWSING_DATA_TITLE 11570
+#define IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE 11571
+#define IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE 11572
+#define IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OK 11573
+#define IDS_CLEAR_BROWSING_DATA_PASSWORDS_NOTICE 11574
+#define IDS_CLEAR_BROWSING_DATA_PASSWORDS_NOTICE_TITLE 11575
+#define IDS_CLEAR_BROWSING_DATA_PASSWORDS_NOTICE_OK 11576
+#define IDS_MEDIA_SELECTED_MIC_LABEL 11577
+#define IDS_MEDIA_SELECTED_CAMERA_LABEL 11578
+#define IDS_MEDIA_MENU_NO_DEVICE_TITLE 11579
+#define IDS_MEDIA_CONTROLS_TITLE_PLACEHOLDER_INCOGNITO 11580
+#define IDS_ZOOMLEVELS_CHROME_ERROR_PAGES_LABEL 11581
+#define IDS_STORAGE_ACCESS_MANAGE_TEXT 11582
+#define IDS_STORAGE_ACCESS_MANAGE_TOOLTIP 11583
+#define IDS_UPGRADE_ERROR 11590
+#define IDS_UPGRADE_ERROR_DETAILS 11591
+#define IDS_UPGRADE_DISABLED_BY_POLICY 11592
+#define IDS_UPGRADE_DISABLED_BY_POLICY_MANUAL 11593
+#define IDS_REPORT_AN_ISSUE 11594
+#define IDS_REENABLE_UPDATES 11595
+#define IDS_PICTURE_IN_PICTURE_TITLE_TEXT 11596
+#define IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT 11597
+#define IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT 11598
+#define IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT 11599
+#define IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT 11600
+#define IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT 11601
+#define IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT 11602
+#define IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT 11603
+#define IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT 11604
+#define IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT 11605
+#define IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT 11606
+#define IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT 11607
+#define IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT 11608
+#define IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT 11609
+#define IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT 11610
+#define IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT 11611
+#define IDS_PICTURE_IN_PICTURE_PREVIOUS_SLIDE_CONTROL_ACCESSIBLE_TEXT 11612
+#define IDS_PICTURE_IN_PICTURE_NEXT_SLIDE_CONTROL_ACCESSIBLE_TEXT 11613
+#define IDS_AUTO_PICTURE_IN_PICTURE_DESCRIPTION 11614
+#define IDS_LOAD_STATE_WAITING_FOR_SOCKET_SLOT 11615
+#define IDS_LOAD_STATE_WAITING_FOR_DELEGATE 11616
+#define IDS_LOAD_STATE_WAITING_FOR_DELEGATE_GENERIC 11617
+#define IDS_LOAD_STATE_WAITING_FOR_CACHE 11618
+#define IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL 11619
+#define IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL 11620
+#define IDS_LOAD_STATE_RESOLVING_HOST_IN_PAC_FILE 11621
+#define IDS_LOAD_STATE_DOWNLOADING_PAC_FILE 11622
+#define IDS_LOAD_STATE_RESOLVING_HOST 11623
+#define IDS_LOAD_STATE_CONNECTING 11624
+#define IDS_LOAD_STATE_SSL_HANDSHAKE 11625
+#define IDS_LOAD_STATE_SENDING_REQUEST 11626
+#define IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS 11627
+#define IDS_LOAD_STATE_WAITING_FOR_RESPONSE 11628
+#define IDS_TAB_CXMENU_NEWTABTORIGHT 11629
+#define IDS_TAB_CXMENU_NEWTABTOLEFT 11630
+#define IDS_TAB_CXMENU_RELOAD 11631
+#define IDS_TAB_CXMENU_DUPLICATE 11632
+#define IDS_TAB_CXMENU_CLOSETAB 11633
+#define IDS_TAB_CXMENU_CLOSEOTHERTABS 11634
+#define IDS_TAB_CXMENU_CLOSETABSTORIGHT 11635
+#define IDS_TAB_CXMENU_CLOSETABSTOLEFT 11636
+#define IDS_TAB_CXMENU_CLOSEALLTABS 11637
+#define IDS_TAB_CXMENU_FOCUS_THIS_TAB 11638
+#define IDS_TAB_CXMENU_PIN_TAB 11639
+#define IDS_TAB_CXMENU_UNPIN_TAB 11640
+#define IDS_TAB_CXMENU_SOUND_MUTE_SITE 11641
+#define IDS_TAB_CXMENU_SOUND_UNMUTE_SITE 11642
+#define IDS_TAB_CXMENU_READ_LATER 11643
+#define IDS_TAB_CXMENU_ADD_TAB_TO_GROUP 11644
+#define IDS_TAB_CXMENU_ADD_TAB_TO_NEW_GROUP 11645
+#define IDS_TAB_CXMENU_SUBMENU_NEW_GROUP 11646
+#define IDS_TAB_CXMENU_REMOVE_TAB_FROM_GROUP 11647
+#define IDS_TAB_CXMENU_PLACEHOLDER_GROUP_TITLE 11648
+#define IDS_TAB_CXMENU_MOVE_TABS_TO_NEW_WINDOW 11649
+#define IDS_TAB_CXMENU_MOVETOANOTHERWINDOW 11650
+#define IDS_TAB_CXMENU_MOVETOANOTHERNEWWINDOW 11651
+#define IDS_TAB_CXMENU_ORGANIZE_TABS 11652
+#define IDS_TAB_CXMENU_FOLLOW_SITE 11653
+#define IDS_TAB_CXMENU_UNFOLLOW_SITE 11654
+#define IDS_WEBUI_TAB_STRIP_PROMO 11658
+#define IDS_TOOLTIP_WEBUI_TAB_STRIP_TAB_COUNTER 11659
+#define IDS_WEBUI_TAB_STRIP_TAB_COUNTER_CXMENU_NEW_TAB 11660
+#define IDS_WEBUI_TAB_STRIP_TAB_COUNTER_CXMENU_CLOSE_TAB 11661
+#define IDS_TAB_SEARCH_PROMO 11662
+#define IDS_TAB_SEARCH_SEARCH_TABS 11663
+#define IDS_TAB_SEARCH_NO_RESULTS_FOUND 11664
+#define IDS_TAB_SEARCH_CLOSE_TAB 11665
+#define IDS_TAB_SEARCH_SUBMIT_FEEDBACK 11666
+#define IDS_TAB_SEARCH_A11Y_TAB_CLOSED 11667
+#define IDS_TAB_SEARCH_A11Y_FOUND_TAB 11668
+#define IDS_TAB_SEARCH_A11Y_FOUND_TABS 11669
+#define IDS_TAB_SEARCH_A11Y_FOUND_TAB_FOR 11670
+#define IDS_TAB_SEARCH_A11Y_FOUND_TABS_FOR 11671
+#define IDS_TAB_SEARCH_A11Y_OPEN_TAB 11672
+#define IDS_TAB_SEARCH_A11Y_RECENTLY_CLOSED_TAB 11673
+#define IDS_TAB_SEARCH_A11Y_RECENTLY_CLOSED_TAB_GROUP 11674
+#define IDS_TAB_SEARCH_MEDIA_TABS 11675
+#define IDS_TAB_SEARCH_OPEN_TABS 11676
+#define IDS_TAB_SEARCH_RECENTLY_CLOSED 11677
+#define IDS_TAB_SEARCH_RECENTLY_CLOSED_TABS 11678
+#define IDS_TAB_SEARCH_ONE_TAB 11679
+#define IDS_TAB_SEARCH_TAB_COUNT 11680
+#define IDS_TAB_SEARCH_EXPAND_RECENTLY_CLOSED_ITEMS 11681
+#define IDS_TAB_SEARCH_EXPAND_RECENTLY_CLOSED 11682
+#define IDS_TAB_SEARCH_COLLAPSE_RECENTLY_CLOSED 11683
+#define IDS_TAB_SEARCH_TAB_NAME 11684
+#define IDS_TAB_ORGANIZATION_TAB_NAME 11685
+#define IDS_TAB_ORGANIZATION_CREATE_GROUP 11686
+#define IDS_TAB_ORGANIZATION_DISMISS 11687
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_TITLE 11688
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_TITLE_FRE 11689
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY 11690
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY_FRE 11691
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY_LINK_FRE 11692
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY_SIGNED_OUT 11693
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY_UNSYNCED 11694
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY_UNSYNCED_HISTORY 11695
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BODY_SYNC_PAUSED 11696
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON 11697
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_FRE 11698
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED 11699
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_HISTORY 11700
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_SYNC_PAUSED 11701
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_ARIA_LABEL 11702
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_FRE_ARIA_LABEL 11703
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_ARIA_LABEL 11704
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_UNSYNCED_HISTORY_ARIA_LABEL 11705
+#define IDS_TAB_ORGANIZATION_NOT_STARTED_BUTTON_SYNC_PAUSED_ARIA_LABEL 11706
+#define IDS_TAB_ORGANIZATION_IN_PROGRESS_TITLE 11707
+#define IDS_TAB_ORGANIZATION_SUCCESS_TITLE 11708
+#define IDS_TAB_ORGANIZATION_FAILURE_TITLE_GENERIC 11709
+#define IDS_TAB_ORGANIZATION_FAILURE_TITLE_GROUPING 11710
+#define IDS_TAB_ORGANIZATION_FAILURE_BODY_GENERIC_PRE_LINK 11711
+#define IDS_TAB_ORGANIZATION_FAILURE_BODY_GENERIC_LINK 11712
+#define IDS_TAB_ORGANIZATION_FAILURE_BODY_GENERIC_POST_LINK 11713
+#define IDS_TAB_ORGANIZATION_FAILURE_BODY_GROUPING_PRE_LINK 11714
+#define IDS_TAB_ORGANIZATION_FAILURE_BODY_GROUPING_LINK 11715
+#define IDS_TAB_ORGANIZATION_FAILURE_BODY_GROUPING_POST_LINK 11716
+#define IDS_TAB_ORGANIZATION_TIP_TITLE 11717
+#define IDS_TAB_ORGANIZATION_TIP_BODY 11718
+#define IDS_TAB_ORGANIZATION_TIP_ACTION 11719
+#define IDS_TAB_ORGANIZATION_TIP_ARIA_DESCRIPTION 11720
+#define IDS_TAB_ORGANIZATION_DISCLAIMER 11721
+#define IDS_TAB_ORGANIZATION_LEARN_MORE 11722
+#define IDS_TAB_ORGANIZATION_LEARN_MORE_ARIA_LABEL 11723
+#define IDS_TAB_ORGANIZATION_CLOSE_TAB_ARIA_LABEL 11724
+#define IDS_TAB_ORGANIZATION_CLOSE_TAB_TOOLTIP 11725
+#define IDS_TAB_ORGANIZATION_REJECT_SUGGESTION 11726
+#define IDS_TAB_ORGANIZATION_REJECT_FINAL_SUGGESTION 11727
+#define IDS_TAB_ORGANIZATION_INPUT_ARIA_LABEL 11728
+#define IDS_TAB_ORGANIZATION_THUMBS_DOWN 11729
+#define IDS_TAB_ORGANIZATION_THUMBS_UP 11730
+#define IDS_BROWSER_WINDOW_TITLE_MENU_ENTRY 11731
+#define IDS_TAB_GROUP_HEADER_CXMENU_TAB_GROUP_TITLE_ACCESSIBLE_NAME 11732
+#define IDS_TAB_GROUP_HEADER_CXMENU_SAVE_GROUP 11733
+#define IDS_TAB_GROUP_HEADER_CXMENU_UNSAVE_GROUP 11734
+#define IDS_TAB_GROUP_HEADER_CXMENU_NEW_TAB_IN_GROUP 11735
+#define IDS_TAB_GROUP_HEADER_CXMENU_UNGROUP 11736
+#define IDS_TAB_GROUP_HEADER_CXMENU_CLOSE_GROUP 11737
+#define IDS_TAB_GROUP_HEADER_CXMENU_HIDE_GROUP 11738
+#define IDS_TAB_GROUP_HEADER_CXMENU_DELETE_GROUP 11739
+#define IDS_TAB_GROUP_HEADER_CXMENU_MOVE_GROUP_TO_NEW_WINDOW 11740
+#define IDS_TAB_GROUP_HEADER_CXMENU_OPEN_GROUP_IN_NEW_WINDOW 11741
+#define IDS_TAB_GROUP_HEADER_CXMENU_SEND_FEEDBACK 11742
+#define IDS_TAB_GROUP_HEADER_BUBBLE_TITLE_PLACEHOLDER 11743
+#define IDS_APP_MENU_RELOAD 11744
+#define IDS_APP_MENU_NEW_WEB_PAGE 11745
+#define IDS_APP_MENU_COPY_LINK 11746
+#define IDS_APP_MENU_CREATE_QR_CODE 11747
+#define IDS_APP_MENU_BUTTON_UPDATE 11748
+#define IDS_APP_MENU_BUTTON_UPDATE_ALT1 11749
+#define IDS_APP_MENU_BUTTON_UPDATE_ALT2 11750
+#define IDS_APP_MENU_BUTTON_UPDATE_ALT3 11751
+#define IDS_APP_MENU_BUTTON_ERROR 11752
+#define IDS_MEDIA_SCREEN_CAPTURE_CONFIRMATION_TITLE 11753
+#define IDS_MEDIA_SCREEN_CAPTURE_CONFIRMATION_TEXT 11754
+#define IDS_MEDIA_SCREEN_AND_AUDIO_CAPTURE_CONFIRMATION_TEXT 11755
+#define IDS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_TEXT 11756
+#define IDS_MEDIA_SCREEN_CAPTURE_WITH_AUDIO_NOTIFICATION_TEXT 11757
+#define IDS_MEDIA_WINDOW_CAPTURE_NOTIFICATION_TEXT 11758
+#define IDS_MEDIA_TAB_CAPTURE_NOTIFICATION_TEXT 11759
+#define IDS_MEDIA_TAB_CAPTURE_WITH_AUDIO_NOTIFICATION_TEXT 11760
+#define IDS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_HIDE 11761
+#define IDS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_SOURCE 11762
+#define IDS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_STOP 11763
+#define IDS_PLATFORM_KEYS_SELECT_CERT_DIALOG_TEXT 11766
+#define IDS_UNSAFE_FRAME_MESSAGE 11767
+#define IDS_CLIENT_CERT_DIALOG_TITLE 11768
+#define IDS_CLIENT_CERT_DIALOG_TEXT 11769
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_TITLE 11770
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_ENROLLMENT 11771
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CLIENT_AUTH 11772
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_LIST_CERTS 11773
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_IMPORT 11774
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_TEXT_CERT_EXPORT 11775
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_PASSWORD_FIELD 11776
+#define IDS_CRYPTO_MODULE_AUTH_DIALOG_OK_BUTTON_LABEL 11777
+#define IDS_FR_ENABLE_LOGGING 11779
+#define IDS_CRASHED_TAB_FEEDBACK_MESSAGE 11783
+#define IDS_CRASHED_TAB_FEEDBACK_LINK 11784
+#define IDS_KILLED_TAB_FEEDBACK_MESSAGE 11786
+#define IDS_HIDE_ICONS_NOT_SUPPORTED 11787
+#define IDS_RELAUNCH_BUTTON 11788
+#define IDS_HELP_MANAGED_BY_YOUR_PARENT 11789
+#define IDS_TOOLBAR_INFORM_SET_HOME_PAGE 11792
+#define IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE 11793
+#define IDS_CONTROLLED_SETTING_POLICY 486
+#define IDS_CONTROLLED_SETTING_EXTENSION 11794
+#define IDS_CONTROLLED_SETTING_EXTENSION_WITHOUT_NAME 11795
+#define IDS_CONTROLLED_SETTING_RECOMMENDED 11796
+#define IDS_CONTROLLED_SETTING_HAS_RECOMMENDATION 11797
+#define IDS_CONTROLLED_SETTING_CHILD_RESTRICTION 11798
+#define IDS_CONTROLLED_SETTING_PARENT 11799
+#define IDS_EXTENSIONS_INSTALL_LOCATION_UNKNOWN 11800
+#define IDS_EXTENSIONS_INSTALL_LOCATION_3RD_PARTY 11801
+#define IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE 11802
+#define IDS_EXTENSIONS_INSTALL_LOCATION_SHARED_MODULE 11803
+#define IDS_EXTENSIONS_BLOCKLISTED_MALWARE 11804
+#define IDS_EXTENSIONS_BLOCKLISTED_SECURITY_VULNERABILITY 11805
+#define IDS_EXTENSIONS_BLOCKLISTED_CWS_POLICY_VIOLATION 11806
+#define IDS_EXTENSIONS_BLOCKLISTED_POTENTIALLY_UNWANTED 11807
+#define IDS_EXTENSIONS_SAFE_BROWSING_CRX_ALLOWLIST_WARNING 11808
+#define IDS_EXTENSIONS_SAFE_BROWSING_CRX_ALLOWLIST_WARNING_LEARN_MORE 11809
+#define IDS_EXTENSIONS_ACCESS_REQUESTS_LEARN_MORE 11810
+#define IDS_RESET_PROFILE_SETTINGS_EXPLANATION 11811
+#define IDS_RESET_PROFILE_SETTINGS_EXPLANATION_IN_BULLET_POINTS 11812
+#define IDS_TRIGGERED_RESET_PROFILE_SETTINGS_TITLE 11813
+#define IDS_TRIGGERED_RESET_PROFILE_SETTINGS_EXPLANATION 11814
+#define IDS_TRIGGERED_RESET_PROFILE_SETTINGS_DEFAULT_TOOL_NAME 11815
+#define IDS_RESET_PROFILE_SETTINGS_LOCALE 11816
+#define IDS_RESET_PROFILE_SETTINGS_STARTUP_URLS 11817
+#define IDS_RESET_PROFILE_SETTINGS_STARTUP_TYPE 11818
+#define IDS_RESET_PROFILE_SETTINGS_HOMEPAGE 11819
+#define IDS_RESET_PROFILE_SETTINGS_HOMEPAGE_IS_NTP 11820
+#define IDS_RESET_PROFILE_SETTINGS_YES 11821
+#define IDS_RESET_PROFILE_SETTINGS_NO 11822
+#define IDS_RESET_PROFILE_SETTINGS_SHOW_HOME_BUTTON 11823
+#define IDS_RESET_PROFILE_SETTINGS_DSE 11824
+#define IDS_RESET_PROFILE_SETTINGS_EXTENSIONS 11825
+#define IDS_RESET_PROFILE_SETTINGS_SHORTCUTS 11826
+#define IDS_RESET_PROFILE_SETTINGS_PROCESSING_SHORTCUTS 11827
+#define IDS_AUTOFILL_DIALOG_PLACEHOLDER_EXPIRY_MONTH 11829
+#define IDS_AUTOFILL_DIALOG_PLACEHOLDER_EXPIRY_YEAR 11830
+#define IDS_AUTOFILL_FROM_GOOGLE_ACCOUNT 11831
+#define IDS_OMNIBOX_ICON_SEND_TAB_TO_SELF 447
+#define IDS_OMNIBOX_TOOLTIP_SEND_TAB_TO_SELF 448
+#define IDS_OMNIBOX_BUBBLE_ITEM_SUBTITLE_TODAY_SEND_TAB_TO_SELF 11833
+#define IDS_OMNIBOX_BUBBLE_ITEM_SUBTITLE_DAY_SEND_TAB_TO_SELF 11834
+#define IDS_OMNIBOX_BUBBLE_ITEM_SUBTITLE_DAYS_SEND_TAB_TO_SELF 11835
+#define IDS_TOOLBAR_BUTTON_SEND_TAB_TO_SELF_FROM_DEVICE 11836
+#define IDS_TOOLBAR_BUTTON_SEND_TAB_TO_SELF_TITLE 432
+#define IDS_TOOLBAR_BUTTON_SEND_TAB_TO_SELF_BUTTON_LABEL 11837
+#define IDS_TOOLBAR_BUTTON_SEND_TAB_TO_SELF_BUTTON_A11Y_NAME 431
+#define IDS_TOOLBAR_BUTTON_SEND_TAB_TO_SELF_BUTTON_HINT_TEXT 11838
+#define IDS_MENU_SEND_TAB_TO_SELF 11839
+#define IDS_SEND_TAB_TO_SELF 11840
+#define IDS_SEND_TAB_TO_SELF_SENDING_ANNOUNCE 11843
+#define IDS_SEND_TAB_TO_SELF_MANAGE_DEVICES_LINK 11844
+#define IDS_SEND_TAB_TO_SELF_SIGN_IN_PROMO_LABEL 11845
+#define IDS_SEND_TAB_TO_SELF_NO_TARGET_DEVICE_LABEL 11846
+#define IDS_CONTEXT_MENU_GENERATE_QR_CODE_PAGE 11847
+#define IDS_CONTEXT_MENU_GENERATE_QR_CODE_IMAGE 11848
+#define IDS_CONTEXT_MENU_GENERATE_QR_CODE_LINK 11849
+#define IDS_OMNIBOX_QRCODE_GENERATOR_ICON_LABEL 449
+#define IDS_OMNIBOX_QRCODE_GENERATOR_ICON_TOOLTIP 450
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_TITLE 11850
+#define IDS_SHARING_HUB_GENERATE_QR_CODE_LABEL 11851
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_URL_TEXTFIELD_ACCESSIBLE_NAME 11852
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_TOOLTIP 11853
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_DOWNLOAD_BUTTON_LABEL 11854
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_COPY_BUTTON_LABEL 11855
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_ERROR_TOO_LONG 11856
+#define IDS_BROWSER_SHARING_QR_CODE_DIALOG_ERROR_UNKNOWN 11857
+#define IDS_SHARING_HUB_TITLE 11858
+#define IDS_SHARING_HUB_TOOLTIP 468
+#define IDS_SHARING_HUB_SCREENSHOT_LABEL 11859
+#define IDS_SHARING_HUB_COPY_LINK_LABEL 11860
+#define IDS_SHARING_HUB_SAVE_PAGE_LABEL 11861
+#define IDS_SHARING_HUB_MEDIA_ROUTER_LABEL 11862
+#define IDS_SHARING_HUB_SHARE_LABEL 11863
+#define IDS_SHARING_HUB_FOLLOW_LABEL 11864
+#define IDS_SHARING_HUB_FOLLOWING_LABEL 11865
+#define IDS_BROWSER_SHARING_SCREENSHOT_POST_CAPTURE_TITLE 11866
+#define IDS_BROWSER_SHARING_SCREENSHOT_DIALOG_DOWNLOAD_BUTTON_LABEL 11867
+#define IDS_BROWSER_SHARING_SCREENSHOT_DIALOG_EDIT_BUTTON_LABEL 11868
+#define IDS_BROWSER_SHARING_SCREENSHOT_DIALOG_SHARE_BUTTON_LABEL 11869
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_SELECTION 11870
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_CROP 11871
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_TEXT 11872
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ELLIPSE 11873
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_RECTANGLE 11874
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_LINE 11875
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ARROW 11876
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_BRUSH 11877
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_EMOJI 11878
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_HIGHLIGHTER 11879
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_UNDO 11880
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_REDO 11881
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ZOOM_IN 11882
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ZOOM_OUT 11883
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_COMMIT_CROP 11884
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_COMMIT_CROP 11885
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_CANCEL_CROP 11886
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_CANCEL_CROP 11887
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_BUTTON_DOWNLOAD_IMAGE 11888
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_BUTTON_COPY 11889
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TITLE 11890
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_BUTTON_TEXT_CLEAR 11891
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ALIGN_LEFT 11892
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ALIGN_CENTER 11893
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_ALIGN_RIGHT 11894
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_SHADOW_NONE 11895
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_SHADOW_SMALL 11896
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_SHADOW_LARGE 11897
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_FONT_DEFAULT 11898
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_FONT_MONOSPACE 11899
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_FONT_ITALIC 11900
+#define IDS_BROWSER_SHARING_SCREENSHOT_IMAGE_EDITOR_TOOLTIP_FONT_OUTLINE 11901
+#define IDS_CONTEXT_MENU_SHOW_CLIPBOARD_HISTORY_MENU 11902
+#define IDS_CONTEXT_MENU_PASTE_FROM_CLIPBOARD 11903
+#define IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_TEXT_CONTENT_UNKNOWN_DEVICE 11904
+#define IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_TEXT_CONTENT 11905
+#define IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_IMAGE_CONTENT_UNKNOWN_DEVICE 11906
+#define IDS_SHARING_REMOTE_COPY_NOTIFICATION_TITLE_IMAGE_CONTENT 11907
+#define IDS_SHARING_REMOTE_COPY_NOTIFICATION_DESCRIPTION 11908
+#define IDS_CONTENT_CONTEXT_SHARING_CLICK_TO_CALL_MULTIPLE_DEVICES 11909
+#define IDS_CONTENT_CONTEXT_SHARING_CLICK_TO_CALL_SINGLE_DEVICE 11910
+#define IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_MULTIPLE_DEVICES 11911
+#define IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_SINGLE_DEVICE 11912
+#define IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_NOTIFICATION_TITLE_UNKNOWN_DEVICE 11913
+#define IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_NOTIFICATION_TITLE 11914
+#define IDS_CONTENT_CONTEXT_SHARING_SHARED_CLIPBOARD_NOTIFICATION_DESCRIPTION 11915
+#define IDS_OMNIBOX_TOOLTIP_SHARED_CLIPBOARD 11916
+#define IDS_COLLECTED_COOKIES_DIALOG_TITLE 11917
+#define IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL 11918
+#define IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL 11919
+#define IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED 11920
+#define IDS_COLLECTED_COOKIES_ALLOW_BUTTON 11921
+#define IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON 11922
+#define IDS_COLLECTED_COOKIES_BLOCK_BUTTON 11923
+#define IDS_COLLECTED_COOKIES_ALLOW_RULE_CREATED 11924
+#define IDS_COLLECTED_COOKIES_BLOCK_RULE_CREATED 11925
+#define IDS_COLLECTED_COOKIES_SESSION_RULE_CREATED 11926
+#define IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL 11927
+#define IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL 11928
+#define IDS_COLLECTED_COOKIES_ALLOWED_AUX_TEXT 11929
+#define IDS_COLLECTED_COOKIES_BLOCKED_AUX_TEXT 11930
+#define IDS_COLLECTED_COOKIES_CLEAR_ON_EXIT_AUX_TEXT 11931
+#define IDS_COLLECTED_COOKIES_INFOBAR_MESSAGE 11932
+#define IDS_COLLECTED_COOKIES_INFOBAR_BUTTON 11933
+#define IDS_COLLECTED_COOKIES_PARTITIONED_COOKIE 11934
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_TITLE 11935
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_SUBTITLE 11936
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_SETTINGS_LINK 11937
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_FIRST_PARTY_TITLE 11938
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_FIRST_PARTY_SUBTITLE 11939
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_THIRD_PARTY_TITLE 11940
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_THIRD_PARTY_SUBTITLE 11941
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_EMPTY_STATE_LABEL 11942
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_ALLOW_MENU_ITEM 11943
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_ALLOW_THIRD_PARTY_MENU_ITEM 11944
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_BLOCK_MENU_ITEM 11945
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_SESSION_ONLY_MENU_ITEM 11946
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_ALLOWED_STATE_SUBTITLE 11947
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_BLOCKED_STATE_SUBTITLE 11948
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_SESSION_ONLY_STATE_SUBTITLE 11949
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_PARTITIONED_STATE_SUBTITLE 11950
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_PARTITIONED_SESSION_ONLY_STATE_SUBTITLE 11951
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_CONTEXT_MENU_TOOLTIP 11952
+#define IDS_PAGE_SPECIFIC_SITE_DATA_DIALOG_DELETE_BUTTON_TOOLTIP 11953
+#define IDS_ACCNAME_INFOBAR_CONTAINER 476
+#define IDS_ACCNAME_INFOBAR 11954
+#define IDS_ONE_CLICK_BUBBLE_UNDO 11955
+#define IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE 11956
+#define IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON 11957
+#define IDS_ONE_CLICK_SIGNIN_DIALOG_UNDO_BUTTON 11958
+#define IDS_ONE_CLICK_SIGNIN_DIALOG_ADVANCED 11959
+#define IDS_ENTERPRISE_SIGNIN_CANCEL 11960
+#define IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE 11961
+#define IDS_ENTERPRISE_SIGNIN_CREATE_NEW_WORK_PROFILE 11962
+#define IDS_ENTERPRISE_SIGNIN_CONTINUE 11963
+#define IDS_ENTERPRISE_SIGNIN_ALERT 11964
+#define IDS_PROFILE_WILL_BE_DELETED_DIALOG_TITLE 11965
+#define IDS_PROFILE_WILL_BE_DELETED_DIALOG_DESCRIPTION 11966
+#define IDS_MANAGED_WITH_HYPERLINK 11969
+#define IDS_MANAGED_BY_WITH_HYPERLINK 11970
+#define IDS_PROFILE_MANAGED_BY_WITH_HYPERLINK 11971
+#define IDS_BROWSER_MANAGED_AND_PROFILE_MANAGED_BY_WITH_HYPERLINK 11972
+#define IDS_BROWSER_AND_PROFILE_DIFFERENT_MANAGED_BY_WITH_HYPERLINK 11973
+#define IDS_BROWSER_AND_PROFILE_SAME_MANAGED_BY_WITH_HYPERLINK 11974
+#define IDS_MANAGED_BY_PARENT_WITH_HYPERLINK 11975
+#define IDS_BROWSER_MANAGED_AND_PROFILE_MANAGED_BY_TOOLTIP 11976
+#define IDS_BROWSER_AND_PROFILE_DIFFERENT_MANAGED_BY_TOOLTIP 11977
+#define IDS_COOKIES_COOKIE_EXPIRES_SESSION 11978
+#define IDS_COOKIES_COOKIE_SENDFOR_ANY 11979
+#define IDS_COOKIES_COOKIE_SENDFOR_SECURE 11980
+#define IDS_COOKIES_COOKIE_SENDFOR_SAME_SITE 11981
+#define IDS_COOKIES_COOKIE_SENDFOR_SECURE_SAME_SITE 11982
+#define IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_YES 11983
+#define IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_NO 11984
+#define IDS_COOKIES_COOKIES 11985
+#define IDS_COOKIES_WEB_DATABASES 11986
+#define IDS_COOKIES_LOCAL_STORAGE 11987
+#define IDS_COOKIES_SESSION_STORAGE 11988
+#define IDS_COOKIES_INDEXED_DBS 11989
+#define IDS_COOKIES_FILE_SYSTEMS 11990
+#define IDS_COOKIES_FILE_SYSTEM_USAGE_NONE 11991
+#define IDS_COOKIES_SERVICE_WORKER 11992
+#define IDS_COOKIES_SERVICE_WORKERS 11993
+#define IDS_COOKIES_SHARED_WORKERS 11994
+#define IDS_COOKIES_CACHE_STORAGE 11995
+#define IDS_APP_DEFAULT_PAGE_NAME 11996
+#define IDS_APP_LAUNCHER_TAB_TITLE 11997
+#define IDS_NEW_TAB_GUEST_SESSION_HEADING 11998
+#define IDS_NEW_TAB_GUEST_SESSION_DESCRIPTION 11999
+#define IDS_NEW_TAB_GUEST_SESSION_LEARN_MORE_ACCESSIBILITY_TEXT 12000
+#define IDS_NEW_TAB_TILE_GRID_ACCESSIBLE_DESCRIPTION 12001
+#define IDS_NEW_TAB_APP_INSTALL_HINT_LABEL 12002
+#define IDS_NEW_TAB_MOST_VISITED 12003
+#define IDS_NEW_TAB_RESTORE_THUMBNAILS_SHORT_LINK 501
+#define IDS_NEW_TAB_ATTRIBUTION_INTRO 568
+#define IDS_NEW_TAB_THUMBNAIL_REMOVED_NOTIFICATION 12004
+#define IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP 12005
+#define IDS_NEW_TAB_PAGE_SWITCHER_CHANGE_TITLE 12006
+#define IDS_NEW_TAB_PAGE_SWITCHER_SAME_TITLE 12007
+#define IDS_NEW_TAB_VOICE_AUDIO_ERROR 528
+#define IDS_NEW_TAB_VOICE_CLOSE_TOOLTIP 529
+#define IDS_NEW_TAB_VOICE_DETAILS 530
+#define IDS_NEW_TAB_VOICE_LANGUAGE_ERROR 531
+#define IDS_NEW_TAB_VOICE_LISTENING 533
+#define IDS_NEW_TAB_VOICE_NETWORK_ERROR 534
+#define IDS_NEW_TAB_VOICE_NO_TRANSLATION 535
+#define IDS_NEW_TAB_VOICE_NO_VOICE 536
+#define IDS_NEW_TAB_VOICE_OTHER_ERROR 537
+#define IDS_NEW_TAB_VOICE_PERMISSION_ERROR 538
+#define IDS_NEW_TAB_VOICE_LEARN_MORE_ACCESSIBILITY_LABEL 532
+#define IDS_NEW_TAB_VOICE_READY 539
+#define IDS_NEW_TAB_VOICE_TRY_AGAIN 540
+#define IDS_NEW_TAB_VOICE_WAITING 542
+#define IDS_NEW_TAB_VOICE_SEARCH_CLOSED 12008
+#define IDS_NEW_TAB_APP_OPTIONS 12009
+#define IDS_NEW_TAB_APP_DETAILS 12010
+#define IDS_NEW_TAB_APP_CREATE_SHORTCUT 12011
+#define IDS_NEW_TAB_APP_INSTALL_LOCALLY 12012
+#define IDS_APP_CONTEXT_MENU_SHOW_INFO 12013
+#define IDS_APP_CONTEXT_MENU_OPEN_PINNED 12014
+#define IDS_APP_CONTEXT_MENU_OPEN_REGULAR 12015
+#define IDS_APP_CONTEXT_MENU_OPEN_WINDOW 12016
+#define IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN 12017
+#define IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED 12018
+#define IDS_APP_CONTEXT_MENU_OPEN_TAB 12019
+#define IDS_APP_CONTEXT_MENU_RUN_ON_OS_LOGIN 12024
+#define IDS_APPS_PAGE_DEPRECATED_APP_TITLE 12027
+#define IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE 12028
+#define IDS_DEVICE_SIGNALS_CONSENT_DIALOG_PROCEED_BUTTON 12029
+#define IDS_DEVICE_SIGNALS_CONSENT_DIALOG_CANCEL_BUTTON 12030
+#define IDS_DEVICE_SIGNALS_CONSENT_DIALOG_BODY_TEXT 12031
+#define IDS_DEVICE_SIGNALS_CONSENT_DIALOG_DEFAULT_BODY_TEXT 12032
+#define IDS_SYNC_CONFIRMATION_SETTINGS_INFO 12033
+#define IDS_SYNC_CONFIRMATION_CONFIRM_BUTTON_LABEL 12034
+#define IDS_SYNC_CONFIRMATION_SETTINGS_BUTTON_LABEL 12035
+#define IDS_SYNC_CONFIRMATION_REFRESHED_SETTINGS_BUTTON_LABEL 12036
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_TITLE 12037
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_INFO_TITLE 12038
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_INFO_TITLE_SIGNIN_INTERCEPT_V2 12040
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_BOOKMARKS 12041
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_READING_LIST 12042
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_AUTOFILL 12043
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_EXTENSIONS 12044
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_HISTORY_AND_MORE 12045
+#define IDS_SYNC_CONFIRMATION_TANGIBLE_SYNC_INFO_DESC 12046
+#define IDS_SYNC_CONFIRMATION_WELCOME_TITLE_SIGNIN_INTERCEPT 12048
+#define IDS_SYNC_CONFIRMATION_TURN_ON_SYNC_BUTTON_LABEL 12049
+#define IDS_SYNC_DISABLED_CONFIRMATION_CHROME_SYNC_TITLE 12050
+#define IDS_SYNC_DISABLED_CONFIRMATION_DETAILS 12051
+#define IDS_SYNC_DISABLED_CONFIRMATION_CONFIRM_BUTTON_LABEL 12052
+#define IDS_SYNC_DISABLED_CONFIRMATION_CONFIRM_BUTTON_MANAGED_ACCOUNT_SIGNOUT_DISALLOWED_LABEL 12053
+#define IDS_SYNC_DISABLED_CONFIRMATION_UNDO_BUTTON_LABEL 12054
+#define IDS_SYNC_LOADING_CONFIRMATION_TITLE 12055
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_NEW_PROFILE_BUTTON_LABEL 12056
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_NEW_PROFILE_BUTTON_LABEL_V2 12057
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CANCEL_BUTTON_LABEL 12058
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CANCEL_SWITCH_BUTTON_LABEL 12059
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CONFIRM_SWITCH_BUTTON_LABEL 12060
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CONFIRM_SWITCH_BUTTON_LABEL_V2 12061
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_BUBBLE_CHROME_SIGNIN_ACCEPT_TEXT 12062
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_ENTERPRISE_BUBBLE_DESC 12063
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_ENTERPRISE_BUBBLE_DESC_MANAGED_BY_TOKEN 12064
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_SWITCH_BUBBLE_DESC_V2 12065
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_CREATE_BUBBLE_TITLE_V2 12066
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_MANAGED_DISCLAIMER 12067
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_MANAGED_BY_DISCLAIMER 12068
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_AVATAR_BUTTON_SEPARATE_BROWSING_TEXT 12069
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_AVATAR_BUTTON_SWITCH_PROFILE_TEXT 12070
+#define IDS_SIGNIN_DICE_WEB_INTERCEPT_ENTERPRISE_PROFILE_NAME 12071
+#define IDS_SIGNIN_ERROR_TITLE 12072
+#define IDS_SIGNIN_ERROR_EMAIL_TITLE 12073
+#define IDS_SIGNIN_ERROR_DICE_EMAIL_TITLE 12074
+#define IDS_SIGNIN_ERROR_CLOSE_BUTTON_LABEL 12075
+#define IDS_SIGNIN_ERROR_OK_BUTTON_LABEL 12076
+#define IDS_SIGNIN_ERROR_SWITCH_BUTTON_LABEL 12077
+#define IDS_SIGNIN_ACCESSIBLE_CLOSE_BUTTON 12078
+#define IDS_SIGNIN_ACCESSIBLE_BACK_BUTTON 12079
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_CREATE_PROFILE_RADIO_BUTTON_TITLE 12080
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_CREATE_PROFILE_RADIO_BUTTON_SUBTITLE 12081
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_START_SYNC_RADIO_BUTTON_TITLE 12082
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_START_SYNC_RADIO_BUTTON_SUBTITLE 12083
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_CLOSE_BUTTON_LABEL 12084
+#define IDS_SIGNIN_EMAIL_CONFIRMATION_CONFIRM_BUTTON_LABEL 12085
+#define IDS_ACCOUNT_PASSWORDS_REAUTH_TITLE 12086
+#define IDS_ACCOUNT_PASSWORDS_WITH_PASSKEYS_REAUTH_TITLE 12087
+#define IDS_ACCOUNT_PASSWORDS_REAUTH_DESC 12088
+#define IDS_ACCOUNT_PASSWORDS_WITH_PASSKEYS_REAUTH_DESC 12089
+#define IDS_ACCOUNT_PASSWORDS_REAUTH_DESC_ALREADY_SAVED_LOCALLY 12090
+#define IDS_ACCOUNT_PASSWORDS_WITH_PASSKEYS_REAUTH_DESC_ALREADY_SAVED_LOCALLY 12091
+#define IDS_ACCOUNT_PASSWORDS_REAUTH_CONFIRM_BUTTON_LABEL 12092
+#define IDS_ACCOUNT_PASSWORDS_REAUTH_CLOSE_BUTTON_LABEL 12093
+#define IDS_ACCOUNT_PASSWORDS_REAUTH_CLOSE_BUTTON_LABEL_ALREADY_SAVED_LOCALLY 12094
+#define IDS_PLUGIN_CRASHED_PROMPT 12095
+#define IDS_PLUGIN_DISCONNECTED_PROMPT 12096
+#define IDS_RELOAD_PAGE_WITH_PLUGIN 12097
+#define IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT 12098
+#define IDS_EXTERNAL_PROTOCOL_TITLE 12099
+#define IDS_EXTERNAL_PROTOCOL_MESSAGE_WITH_INITIATING_ORIGIN 12100
+#define IDS_EXTERNAL_PROTOCOL_MESSAGE 12101
+#define IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT 12102
+#define IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT 12103
+#define IDS_EXTERNAL_PROTOCOL_CHECKBOX_PER_ORIGIN_TEXT 12104
+#define IDS_DIRECTORY_LISTING_HEADER 12106
+#define IDS_DIRECTORY_LISTING_PARENT 12107
+#define IDS_DIRECTORY_LISTING_NAME 12108
+#define IDS_DIRECTORY_LISTING_SIZE 12109
+#define IDS_DIRECTORY_LISTING_DATE_MODIFIED 12110
+#define IDS_SAVE_PAGE_DESC_HTML_ONLY 12111
+#define IDS_SAVE_PAGE_DESC_SINGLE_FILE 12112
+#define IDS_SAVE_PAGE_DESC_COMPLETE 12113
+#define IDS_PROFILE_ERROR_DIALOG_TITLE 12114
+#define IDS_COULDNT_OPEN_PROFILE_ERROR 12115
+#define IDS_OPEN_PROFILE_DATA_LOSS 12116
+#define IDS_PROFILE_ERROR_DIALOG_CHECKBOX 12117
+#define IDS_PROFILE_ERROR_FEEDBACK_DESCRIPTION 12118
+#define IDS_COULDNT_STARTUP_PROFILE_ERROR 12119
+#define IDS_REFUSE_TO_RUN_AS_ROOT 12120
+#define IDS_REFUSE_TO_RUN_AS_ROOT_2 12121
+#define IDS_PROFILE_ON_NETWORK_WARNING 12122
+#define IDS_CANT_WRITE_USER_DIRECTORY_TITLE 12123
+#define IDS_RECENT_TABS_MENU 12124
+#define IDS_RECENTLY_CLOSED_WINDOW 12125
+#define IDS_RECENTLY_CLOSED_GROUP 12126
+#define IDS_RECENTLY_CLOSED_GROUP_UNNAMED 12127
+#define IDS_RECENT_TABS_NO_DEVICE_TABS 12128
+#define IDS_RECENT_TABS_LOGIN_FOR_DEVICE_TABS 12129
+#define IDS_HISTORY_MENU 12130
+#define IDS_DEFAULT_DOWNLOAD_FILENAME 12131
+#define IDS_DEFAULT_BROWSER_INFOBAR_OK_BUTTON_LABEL 12133
+#define IDS_USED_EXISTING_BROWSER 12139
+#define IDS_DECLINE_RECOVERY 12140
+#define IDS_SYNC_ACCOUNT_SYNCING 12141
+#define IDS_SYNC_ACCOUNT_SYNCING_CUSTOM_DATA_TYPES 12142
+#define IDS_SIGNIN_ERROR_DISPLAY_SOURCE 12143
+#define IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE 12144
+#define IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE 12145
+#define IDS_SYNC_ERROR_PASSWORDS_BUBBLE_VIEW_TITLE 12146
+#define IDS_SYNC_ERROR_USER_MENU_TITLE 12147
+#define IDS_SYNC_ERROR_PASSWORDS_USER_MENU_TITLE 12148
+#define IDS_SYNC_ERROR_PASSWORDS_USER_MENU_TITLE_SIGNED_IN_ONLY 12149
+#define IDS_SYNC_ERROR_RECOVERABILITY_DEGRADED_FOR_EVERYTHING_USER_MENU_TITLE 12150
+#define IDS_SYNC_ERROR_RECOVERABILITY_DEGRADED_FOR_PASSWORDS_USER_MENU_TITLE 12151
+#define IDS_SYNC_ERROR_USER_MENU_SIGNIN_BUTTON 12152
+#define IDS_SYNC_NEEDS_VERIFICATION_BUBBLE_VIEW_TITLE 12153
+#define IDS_SYNC_ERROR_USER_MENU_PASSPHRASE_BUTTON 12154
+#define IDS_SYNC_ERROR_USER_MENU_RECOVERABILITY_BUTTON 12155
+#define IDS_SYNC_ERROR_USER_MENU_RETRIEVE_KEYS_BUTTON 12156
+#define IDS_SYNC_ERROR_USER_MENU_SIGNOUT_BUTTON 12157
+#define IDS_SYNC_ERROR_USER_MENU_CONFIRM_SYNC_SETTINGS_BUTTON 12158
+#define IDS_SYNC_OVERVIEW 12164
+#define IDS_SYNC_START_SYNC_BUTTON_LABEL 12165
+#define IDS_SIGNED_IN_WITH_SYNC_DISABLED_BY_POLICY 12166
+#define IDS_SYNC_SETTINGS_NOT_CONFIRMED 12168
+#define IDS_SYNC_SETUP_IN_PROGRESS 12169
+#define IDS_SYNC_STATUS_UNRECOVERABLE_ERROR 12170
+#define IDS_SYNC_STATUS_UNRECOVERABLE_ERROR_NEEDS_SIGNOUT 12171
+#define IDS_SYNC_STATUS_NEEDS_PASSWORD 12172
+#define IDS_SYNC_STATUS_NEEDS_PASSWORD_BUTTON 12173
+#define IDS_SYNC_STATUS_NEEDS_KEYS_BUTTON 12174
+#define IDS_SYNC_RELOGIN_ERROR 12175
+#define IDS_SYNC_RELOGIN_BUTTON 12176
+#define IDS_SYNC_ADVANCED_OPTIONS 12181
+#define IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM 12183
+#define IDS_SYNC_FULL_ENCRYPTION_BODY_CUSTOM_WITH_DATE 12184
+#define IDS_PARTIAL_TRANSLATE_BUBBLE_WAITING_TITLE 12185
+#define IDS_TRANSLATE_BUBBLE_BEFORE_TRANSLATE_TITLE 12186
+#define IDS_TRANSLATE_BUBBLE_TRANSLATED_TITLE 12187
+#define IDS_PARTIAL_TRANSLATE_BUBBLE_COULD_NOT_TRANSLATE_TITLE 12188
+#define IDS_TRANSLATE_BUBBLE_COULD_NOT_TRANSLATE_TITLE 12189
+#define IDS_TRANSLATE_BUBBLE_SOURCE_LANG_COMBOBOX_ACCNAME 12190
+#define IDS_TRANSLATE_BUBBLE_TARGET_LANG_COMBOBOX_ACCNAME 12191
+#define IDS_TRANSLATE_BUBBLE_TRANSLATION_COMPLETE_ANNOUNCEMENT 12192
+#define IDS_TRANSLATE_BUBBLE_ADVANCED_BUTTON 12193
+#define IDS_TRANSLATE_BUBBLE_ADVANCED_MENU_BUTTON 12194
+#define IDS_TRANSLATE_BUBBLE_CHANGE_TARGET_LANGUAGE 12195
+#define IDS_TRANSLATE_BUBBLE_CHANGE_SOURCE_LANGUAGE 12196
+#define IDS_PARTIAL_TRANSLATE_BUBBLE_CHANGE_SOURCE_LANGUAGE 12197
+#define IDS_TRANSLATE_BUBBLE_ACCEPT 12198
+#define IDS_TRANSLATE_BUBBLE_DENY 12199
+#define IDS_TRANSLATE_BUBBLE_ALWAYS_TRANSLATE_LANG 12200
+#define IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_LANG 12201
+#define IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_SITE 12202
+#define IDS_TRANSLATE_BUBBLE_TRANSLATING 12203
+#define IDS_TRANSLATE_BUBBLE_REVERT 12204
+#define IDS_TRANSLATE_BUBBLE_TRY_AGAIN 12205
+#define IDS_TRANSLATE_BUBBLE_ALWAYS 12206
+#define IDS_TRANSLATE_BUBBLE_OPTIONS_MENU_BUTTON 12207
+#define IDS_TRANSLATE_BUBBLE_PAGE_LANGUAGE 12208
+#define IDS_TRANSLATE_BUBBLE_TRANSLATION_LANGUAGE 12209
+#define IDS_TRANSLATE_BUBBLE_ADVANCED_TARGET 12210
+#define IDS_TRANSLATE_BUBBLE_ADVANCED_SOURCE 12211
+#define IDS_PARTIAL_TRANSLATE_BUBBLE_ADVANCED_SOURCE 12212
+#define IDS_PARTIAL_TRANSLATE_BUBBLE_TRANSLATE_FULL_PAGE 12213
+#define IDS_TRANSLATE_BUBBLE_RESET 12214
+#define IDS_NOTIFICATION_BUTTON_SETTINGS 12215
+#define IDS_NOTIFICATION_BUTTON_CLOSE 12216
+#define IDS_NOTIFICATION_BUTTON_MORE 12217
+#define IDS_NOTIFICATION_REPLY_PLACEHOLDER 12218
+#define IDS_NOTIFICATION_MUTED_MESSAGE 12219
+#define IDS_NOTIFICATION_MUTED_TITLE 12220
+#define IDS_NOTIFICATION_MUTED_ACTION_SHOW 12221
+#define IDS_NOTIFICATION_MUTED_ACTION_SNOOZE 12222
+#define IDS_ALLOWED_GEOLOCATION_TITLE 12361
+#define IDS_BLOCKED_GEOLOCATION_TITLE 12362
+#define IDS_ALLOWED_GEOLOCATION_MESSAGE 12363
+#define IDS_ALLOWED_GEOLOCATION_BLOCK 12364
+#define IDS_ALLOWED_GEOLOCATION_NO_ACTION 12365
+#define IDS_BLOCKED_GEOLOCATION_MESSAGE 12366
+#define IDS_BLOCKED_GEOLOCATION_UNBLOCK 12367
+#define IDS_BLOCKED_GEOLOCATION_NO_ACTION 12368
+#define IDS_GEOLOCATION 12369
+#define IDS_GEOLOCATION_WILL_ASK_AGAIN 12370
+#define IDS_GEOLOCATION_TURNED_OFF 12374
+#define IDS_ALLOWED_MIDI_SYSEX_TITLE 12375
+#define IDS_BLOCKED_MIDI_SYSEX_TITLE 12376
+#define IDS_ALLOWED_MIDI_SYSEX_MESSAGE 12377
+#define IDS_ALLOWED_MIDI_SYSEX_BLOCK 12378
+#define IDS_ALLOWED_MIDI_SYSEX_NO_ACTION 12379
+#define IDS_BLOCKED_MIDI_SYSEX_MESSAGE 12380
+#define IDS_BLOCKED_MIDI_SYSEX_UNBLOCK 12381
+#define IDS_BLOCKED_MIDI_SYSEX_NO_ACTION 12382
+#define IDS_MICROPHONE_CAMERA_ALLOWED 12383
+#define IDS_MICROPHONE_CAMERA_BLOCKED 12384
+#define IDS_MICROPHONE_ACCESSED 12385
+#define IDS_CAMERA_ACCESSED 12386
+#define IDS_MICROPHONE_BLOCKED 12387
+#define IDS_CAMERA_BLOCKED 12388
+#define IDS_MICROPHONE_CAMERA_ALLOWED_TITLE 12389
+#define IDS_MICROPHONE_CAMERA_BLOCKED_TITLE 12390
+#define IDS_MICROPHONE_ACCESSED_TITLE 12391
+#define IDS_CAMERA_ACCESSED_TITLE 12392
+#define IDS_MICROPHONE_BLOCKED_TITLE 12393
+#define IDS_CAMERA_BLOCKED_TITLE 12394
+#define IDS_MEDIASTREAM_SETTING_CHANGED_MESSAGE 12395
+#define IDS_A11Y_OMNIBOX_CHIP_HINT 443
+#define IDS_MICROPHONE_CAMERA_IN_USE 12405
+#define IDS_MICROPHONE_CAMERA_NOT_ALLOWED 12406
+#define IDS_MICROPHONE_IN_USE 12407
+#define IDS_CAMERA_IN_USE 12408
+#define IDS_MICROPHONE_NOT_ALLOWED 12409
+#define IDS_CAMERA_NOT_ALLOWED 12410
+#define IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT 12411
+#define IDS_PASSWORDS_WEB_LINK 12412
+#define IDS_MANAGE_PASSWORDS_LINK 12414
+#define IDS_MANAGE_PASSWORDS_TITLE 12415
+#define IDS_MANAGE_PASSWORDS_NO_PASSWORDS_TITLE 12416
+#define IDS_MANAGE_PASSWORDS_DIFFERENT_DOMAIN_TITLE 12417
+#define IDS_MANAGE_PASSWORDS_DIFFERENT_DOMAIN_NO_PASSWORDS_TITLE 12418
+#define IDS_MANAGE_PASSWORDS_SHOW_PASSWORD 12419
+#define IDS_MANAGE_PASSWORDS_HIDE_PASSWORD 12420
+#define IDS_MANAGE_PASSWORDS_EMPTY_NOTE 12421
+#define IDS_MANAGE_PASSWORDS_EDIT_USERNAME_TOOLTIP 12422
+#define IDS_MANAGE_PASSWORDS_EDIT_NOTE_TOOLTIP 12423
+#define IDS_MANAGE_PASSWORDS_NOTE_ACCESSIBLE_NAME 12424
+#define IDS_MANAGE_PASSWORDS_NOTE_TEXTFIELD 12425
+#define IDS_MANAGE_PASSWORDS_UPDATE 12426
+#define IDS_MANAGE_PASSWORDS_USERNAME_ACCESSIBLE_NAME 12427
+#define IDS_MANAGE_PASSWORDS_USERNAME_TEXTFIELD 12428
+#define IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE_MD 12429
+#define IDS_AUTO_SIGNIN_FIRST_RUN_TITLE_MANY_DEVICES 12430
+#define IDS_AUTO_SIGNIN_FIRST_RUN_TITLE_LOCAL_DEVICE 12431
+#define IDS_AUTO_SIGNIN_FIRST_RUN_TEXT 12432
+#define IDS_AUTO_SIGNIN_FIRST_RUN_OK 12433
+#define IDS_FILE_SELECTION_DIALOG_INFOBAR 12442
+#define IDS_IMAGE_FILES 12445
+#define IDS_AUDIO_FILES 12446
+#define IDS_VIDEO_FILES 12447
+#define IDS_CUSTOM_FILES 12448
+#define IDS_FULLSCREEN_USER_ENTERED_FULLSCREEN 12449
+#define IDS_FULLSCREEN_EXTENSION_TRIGGERED_FULLSCREEN 12450
+#define IDS_FULLSCREEN_UNKNOWN_EXTENSION_TRIGGERED_FULLSCREEN 12451
+#define IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN 12452
+#define IDS_FULLSCREEN_ENTERED_FULLSCREEN 12453
+#define IDS_FULLSCREEN_SITE_ENTERED_FULLSCREEN_MOUSELOCK 12454
+#define IDS_FULLSCREEN_ENTERED_FULLSCREEN_MOUSELOCK 12455
+#define IDS_FULLSCREEN_SITE_ENTERED_MOUSELOCK 12456
+#define IDS_FULLSCREEN_ENTERED_MOUSELOCK 12457
+#define IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_MOUSELOCK 12458
+#define IDS_SENSORS_ALLOWED_TOOLTIP 12459
+#define IDS_MOTION_SENSORS_ALLOWED_TOOLTIP 12460
+#define IDS_SENSORS_BLOCKED_TOOLTIP 12461
+#define IDS_MOTION_SENSORS_BLOCKED_TOOLTIP 12462
+#define IDS_BLOCKED_SENSORS_UNBLOCK 12463
+#define IDS_BLOCKED_SENSORS_NO_ACTION 12464
+#define IDS_ALLOWED_SENSORS_TITLE 12465
+#define IDS_BLOCKED_SENSORS_TITLE 12466
+#define IDS_ALLOWED_SENSORS_MESSAGE 12467
+#define IDS_ALLOWED_MOTION_SENSORS_MESSAGE 12468
+#define IDS_BLOCKED_SENSORS_MESSAGE 12469
+#define IDS_BLOCKED_MOTION_SENSORS_MESSAGE 12470
+#define IDS_ALLOWED_SENSORS_NO_ACTION 12471
+#define IDS_ALLOWED_SENSORS_BLOCK 12472
+#define IDS_LIVE_CAPTION_PROMO 12479
+#define IDS_LIVE_CAPTION_PROMO_SCREENREADER 12480
+#define IDS_ENABLE_CARET_BROWSING_INFO 12481
+#define IDS_CARET_BROWSING_DO_NOT_ASK 12482
+#define IDS_ENABLE_CARET_BROWSING_TITLE 12483
+#define IDS_ENABLE_CARET_BROWSING_TURN_ON 12484
+#define IDS_MEDIA_GALLERIES_DIALOG_HEADER 12485
+#define IDS_MEDIA_GALLERIES_DIALOG_SUBTEXT_READ_WRITE 12486
+#define IDS_MEDIA_GALLERIES_DIALOG_SUBTEXT_READ_DELETE 12487
+#define IDS_MEDIA_GALLERIES_DIALOG_SUBTEXT_READ_ONLY 12488
+#define IDS_MEDIA_GALLERIES_PERMISSION_SUGGESTIONS 12489
+#define IDS_MEDIA_GALLERIES_LAST_ATTACHED 12490
+#define IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY 12491
+#define IDS_MEDIA_GALLERIES_DIALOG_CONFIRM 12492
+#define IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY_TITLE 12493
+#define IDS_MEDIA_GALLERIES_DIALOG_DEVICE_ATTACHED 12494
+#define IDS_MEDIA_GALLERIES_DIALOG_DEVICE_NOT_ATTACHED 12495
+#define IDS_MEDIA_GALLERIES_DIALOG_DELETE 12496
+#define IDS_CHROME_SHORTCUT_DESCRIPTION 12518
+#define IDS_WEBSTORE_NAME_STORE 378
+#define IDS_DESKTOP_MEDIA_PICKER_TITLE 12519
+#define IDS_DISPLAY_MEDIA_PICKER_TITLE 12520
+#define IDS_DESKTOP_MEDIA_PICKER_TITLE_SCREEN_ONLY 12521
+#define IDS_DESKTOP_MEDIA_PICKER_TITLE_WINDOW_ONLY 12522
+#define IDS_DESKTOP_MEDIA_PICKER_TEXT 12523
+#define IDS_DISPLAY_MEDIA_PICKER_TEXT 12524
+#define IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED 12525
+#define IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_SCREEN 12526
+#define IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_WINDOW 12527
+#define IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TAB 12528
+#define IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_SCREEN_WITH_MUTE_WARNING 12529
+#define IDS_DESKTOP_MEDIA_PICKER_ALSO_SHARE_SYSTEM_AUDIO 12530
+#define IDS_DESKTOP_MEDIA_PICKER_ALSO_SHARE_TAB_AUDIO 12531
+#define IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_HINT_TAB 12532
+#define IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_HINT_TAB_OR_SCREEN 12533
+#define IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_SCREEN 12534
+#define IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_WINDOW 12535
+#define IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME 12536
+#define IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME 12537
+#define IDS_DESKTOP_MEDIA_PICKER_MANAGED 12538
+#define IDS_DESKTOP_MEDIA_PICKER_RESELECT_SCREEN 12539
+#define IDS_DESKTOP_MEDIA_PICKER_RESELECT_WINDOW 12540
+#define IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_THIS_TAB 12541
+#define IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_OTHER_TAB 12542
+#define IDS_DESKTOP_MEDIA_PICKER_EMPTY_PREVIEW 12543
+#define IDS_DESKTOP_MEDIA_PICKER_PREVIEW_ACCESSIBLE_NAME 12544
+#define IDS_DESKTOP_MEDIA_SOURCE_EMPTY_ACCESSIBLE_NAME 12545
+#define IDS_SHARE_THIS_TAB_DIALOG_TITLE 12546
+#define IDS_SHARE_THIS_TAB_DIALOG_TEXT 12547
+#define IDS_SHARE_THIS_TAB_DIALOG_ALLOW 12548
+#define IDS_SHARE_THIS_TAB_AUDIO_SHARE 12549
+#define IDS_TAB_CAPTURE_TERMINATED_BY_POLICY_TITLE 12550
+#define IDS_TAB_CAPTURE_TERMINATED_BY_POLICY_TEXT 12551
+#define IDS_TOOLTIP_TAB_ALERT_STATE_MEDIA_RECORDING 12552
+#define IDS_TOOLTIP_TAB_ALERT_STATE_AUDIO_RECORDING 12553
+#define IDS_TOOLTIP_TAB_ALERT_STATE_VIDEO_RECORDING 12554
+#define IDS_TOOLTIP_TAB_ALERT_STATE_TAB_CAPTURING 12555
+#define IDS_TOOLTIP_TAB_ALERT_STATE_AUDIO_PLAYING 12556
+#define IDS_TOOLTIP_TAB_ALERT_STATE_AUDIO_MUTING 12557
+#define IDS_TOOLTIP_TAB_ALERT_STATE_BLUETOOTH_CONNECTED 12558
+#define IDS_TOOLTIP_TAB_ALERT_STATE_BLUETOOTH_SCAN_ACTIVE 12559
+#define IDS_TOOLTIP_TAB_ALERT_STATE_USB_CONNECTED 12560
+#define IDS_TOOLTIP_TAB_ALERT_STATE_HID_CONNECTED 12561
+#define IDS_TOOLTIP_TAB_ALERT_STATE_SERIAL_CONNECTED 12562
+#define IDS_TOOLTIP_TAB_ALERT_STATE_PIP_PLAYING 12563
+#define IDS_TOOLTIP_TAB_ALERT_STATE_DESKTOP_CAPTURING 12564
+#define IDS_TOOLTIP_TAB_ALERT_STATE_VR_PRESENTING 12565
+#define IDS_TAB_AX_LABEL_MEDIA_RECORDING_FORMAT 12566
+#define IDS_TAB_AX_LABEL_AUDIO_RECORDING_FORMAT 12567
+#define IDS_TAB_AX_LABEL_VIDEO_RECORDING_FORMAT 12568
+#define IDS_TAB_AX_LABEL_TAB_CAPTURING_FORMAT 12569
+#define IDS_TAB_AX_LABEL_PIP_PLAYING_FORMAT 12570
+#define IDS_TAB_AX_LABEL_AUDIO_PLAYING_FORMAT 12571
+#define IDS_TAB_AX_LABEL_AUDIO_MUTING_FORMAT 12572
+#define IDS_TAB_AX_LABEL_BLUETOOTH_CONNECTED_FORMAT 12573
+#define IDS_TAB_AX_LABEL_BLUETOOTH_SCAN_ACTIVE_FORMAT 12574
+#define IDS_TAB_AX_LABEL_USB_CONNECTED_FORMAT 12575
+#define IDS_TAB_AX_LABEL_HID_CONNECTED_FORMAT 12576
+#define IDS_TAB_AX_LABEL_SERIAL_CONNECTED_FORMAT 12577
+#define IDS_TAB_AX_LABEL_NETWORK_ERROR_FORMAT 12578
+#define IDS_TAB_AX_LABEL_CRASHED_FORMAT 12579
+#define IDS_TAB_AX_LABEL_DESKTOP_CAPTURING_FORMAT 12580
+#define IDS_TAB_AX_LABEL_VR_PRESENTING 12581
+#define IDS_TAB_AX_LABEL_UNNAMED_GROUP_FORMAT 12582
+#define IDS_TAB_AX_LABEL_NAMED_GROUP_FORMAT 12583
+#define IDS_TAB_AX_LABEL_PINNED_FORMAT 12584
+#define IDS_TAB_AX_LABEL_PERMISSION_REQUESTED_FORMAT 12585
+#define IDS_GROUP_AX_LABEL_UNNAMED_GROUP_FORMAT 12586
+#define IDS_GROUP_AX_LABEL_NAMED_GROUP_FORMAT 12587
+#define IDS_GROUP_AX_LABEL_COLLAPSED 12588
+#define IDS_GROUP_AX_LABEL_EXPANDED 12589
+#define IDS_GROUP_AX_LABEL_UNNAMED_SAVED_GROUP_FORMAT 12590
+#define IDS_GROUP_AX_LABEL_NAMED_SAVED_GROUP_FORMAT 12591
+#define IDS_SAVED_GROUP_AX_LABEL_OPENED 12592
+#define IDS_SAVED_GROUP_AX_LABEL_CLOSED 12593
+#define IDS_TAB_AX_ANNOUNCE_MOVED_RIGHT 12594
+#define IDS_TAB_AX_ANNOUNCE_MOVED_LEFT 12595
+#define IDS_TAB_AX_ANNOUNCE_MOVED_FIRST 12596
+#define IDS_TAB_AX_ANNOUNCE_MOVED_LAST 12597
+#define IDS_TAB_AX_ANNOUNCE_TAB_ADDED_TO_UNNAMED_GROUP 12598
+#define IDS_TAB_AX_ANNOUNCE_TAB_ADDED_TO_NAMED_GROUP 12599
+#define IDS_TAB_AX_ANNOUNCE_TAB_REMOVED_FROM_UNNAMED_GROUP 12600
+#define IDS_TAB_AX_ANNOUNCE_TAB_REMOVED_FROM_NAMED_GROUP 12601
+#define IDS_PAGE_LOADING_AX_TITLE_FORMAT 12602
+#define IDS_TAB_AX_INACTIVE_TAB 12603
+#define IDS_TAB_AX_MEMORY_SAVINGS 12604
+#define IDS_TAB_AX_MEMORY_USAGE 12605
+#define IDS_TAB_AX_HIGH_MEMORY_USAGE 12606
+#define IDS_PROFILE_IN_USE_LINUX_QUIT 12607
+#define IDS_PROFILE_IN_USE_LINUX_RELAUNCH 12608
+#define IDS_DESKTOP_MEDIA_PICKER_SHARE 12621
+#define IDS_PUSH_MESSAGING_GENERIC_NOTIFICATION_BODY 12622
+#define IDS_DEVICE_PERMISSIONS_DIALOG_SELECT 12623
+#define IDS_DEVICE_PERMISSIONS_DIALOG_LOADING_LABEL 12624
+#define IDS_DEVICE_PERMISSIONS_DIALOG_LOADING_LABEL_TOOLTIP 12625
+#define IDS_DEVICE_LOG_TITLE 12626
+#define IDS_DEVICE_AUTO_REFRESH 12627
+#define IDS_DEVICE_LOG_REFRESH 12628
+#define IDS_DEVICE_LOG_CLEAR 12629
+#define IDS_DEVICE_LOG_CLEAR_TYPES 12630
+#define IDS_DEVICE_LOG_NO_ENTRIES 12631
+#define IDS_DEVICE_LOG_LEVEL_LABEL 12632
+#define IDS_DEVICE_LOG_LEVEL_ERROR 12633
+#define IDS_DEVICE_LOG_LEVEL_USER 12634
+#define IDS_DEVICE_LOG_LEVEL_EVENT 12635
+#define IDS_DEVICE_LOG_LEVEL_DEBUG 12636
+#define IDS_DEVICE_LOG_TYPE_LOGIN 12637
+#define IDS_DEVICE_LOG_TYPE_NETWORK 12638
+#define IDS_DEVICE_LOG_TYPE_POWER 12639
+#define IDS_DEVICE_LOG_TYPE_BLUETOOTH 12640
+#define IDS_DEVICE_LOG_TYPE_USB 12641
+#define IDS_DEVICE_LOG_TYPE_HID 12642
+#define IDS_DEVICE_LOG_TYPE_PRINTER 12643
+#define IDS_DEVICE_LOG_TYPE_FIDO 12644
+#define IDS_DEVICE_LOG_TYPE_SERIAL 12645
+#define IDS_DEVICE_LOG_TYPE_CAMERA 12646
+#define IDS_DEVICE_LOG_TYPE_GEOLOCATION 12647
+#define IDS_DEVICE_LOG_TYPE_EXTENSIONS 12648
+#define IDS_DEVICE_LOG_TYPE_DISPLAY 12649
+#define IDS_DEVICE_LOG_TYPE_FIRMWARE 12650
+#define IDS_DEVICE_LOG_FILEINFO 12651
+#define IDS_DEVICE_LOG_TIME_DETAIL 12652
+#define IDS_DEVICE_LOG_ENTRY 12653
+#define IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION 12655
+#define IDS_WEBUSB_DEVICE_DETECTED_NOTIFICATION_TITLE 12656
+#define IDS_WEBHID_SYSTEM_TRAY_ICON_HID_SETTINGS 12657
+#define IDS_WEBHID_SYSTEM_TRAY_ICON_ABOUT_HID_DEVICE 12658
+#define IDS_WEBUSB_SYSTEM_TRAY_ICON_USB_SETTINGS 12659
+#define IDS_WEBUSB_SYSTEM_TRAY_ICON_ABOUT_USB_DEVICE 12660
+#define IDS_DEVICE_CONNECTED_BY_EXTENSION 12663
+#define IDS_DEFAULT_AUDIO_DEVICE_NAME 12672
+#define IDS_COMMUNICATIONS_AUDIO_DEVICE_NAME 12673
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF 12674
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ON_BLUETOOTH_LINK_TEXT 12675
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_AUTHORIZE_BLUETOOTH_LINK_TEXT 12676
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN 12677
+#define IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN_TOOLTIP 12678
+#define IDS_DEVICE_CHOOSER_GET_HELP_LINK_WITH_SCANNING_STATUS 12679
+#define IDS_DEVICE_CHOOSER_GET_HELP_LINK_WITH_RE_SCAN_LINK 12680
+#define IDS_DEVICE_CHOOSER_PAIRED_STATUS_TEXT 12681
+#define IDS_DEVICE_CHOOSER_DEVICE_NAME_AND_PAIRED_STATUS_TEXT 12682
+#define IDS_DEVICE_CHOOSER_ACCNAME_COMPATIBLE_DEVICES_LIST 12683
+#define IDS_DEVICE_CHOOSER_DEVICE_NAME_UNKNOWN_DEVICE_WITH_VENDOR_NAME 12684
+#define IDS_DEVICE_CHOOSER_DEVICE_NAME_UNKNOWN_DEVICE_WITH_VENDOR_ID_AND_PRODUCT_ID 12685
+#define IDS_USB_POLICY_DEVICE_DESCRIPTION_FOR_PRODUCT_ID_AND_VENDOR_NAME 12686
+#define IDS_USB_POLICY_DEVICE_DESCRIPTION_FOR_PRODUCT_ID_AND_VENDOR_ID 12687
+#define IDS_USB_POLICY_DEVICE_DESCRIPTION_FOR_VENDOR_ID 12688
+#define IDS_USB_POLICY_DEVICE_DESCRIPTION_FOR_VENDOR_NAME 12689
+#define IDS_USB_POLICY_DEVICE_DESCRIPTION_FOR_ANY_VENDOR 12690
+#define IDS_SERIAL_PORT_CHOOSER_PROMPT 12691
+#define IDS_SERIAL_PORT_CHOOSER_NAME_WITH_PATH 12692
+#define IDS_SERIAL_PORT_CHOOSER_CONNECT_BUTTON_TEXT 12693
+#define IDS_SERIAL_PORT_CHOOSER_LOADING_LABEL 12694
+#define IDS_SERIAL_PORT_CHOOSER_LOADING_LABEL_TOOLTIP 12695
+#define IDS_SERIAL_POLICY_DESCRIPTION_FOR_USB_PRODUCT_ID_AND_VENDOR_NAME 12696
+#define IDS_SERIAL_POLICY_DESCRIPTION_FOR_USB_PRODUCT_ID_AND_VENDOR_ID 12697
+#define IDS_SERIAL_POLICY_DESCRIPTION_FOR_USB_VENDOR_ID 12698
+#define IDS_SERIAL_POLICY_DESCRIPTION_FOR_USB_VENDOR_NAME 12699
+#define IDS_SERIAL_POLICY_DESCRIPTION_FOR_ANY_PORT 12700
+#define IDS_HID_CHOOSER_PROMPT 12701
+#define IDS_HID_CHOOSER_ITEM_WITHOUT_NAME 12702
+#define IDS_HID_CHOOSER_LOADING_LABEL 12703
+#define IDS_HID_CHOOSER_LOADING_LABEL_TOOLTIP 12704
+#define IDS_HID_POLICY_DESCRIPTION_FOR_VENDOR_ID_AND_PRODUCT_ID 12705
+#define IDS_HID_POLICY_DESCRIPTION_FOR_VENDOR_ID 12706
+#define IDS_HID_POLICY_DESCRIPTION_FOR_USAGE_AND_USAGE_PAGE 12707
+#define IDS_HID_POLICY_DESCRIPTION_FOR_USAGE_PAGE 12708
+#define IDS_HID_POLICY_DESCRIPTION_FOR_ANY_DEVICE 12709
+#define IDS_WEB_APP_FILE_HANDLING_LIST_SEPARATOR 12710
+#define IDS_WEB_APP_FILE_HANDLING_DIALOG_QUESTION 12711
+#define IDS_WEB_APP_FILE_HANDLING_DIALOG_QUESTION_MULTIPLE 12712
+#define IDS_WEB_APP_FILE_HANDLING_DIALOG_STICKY_CHOICE 12713
+#define IDS_WEB_APP_FILE_HANDLING_POSITIVE_BUTTON 12714
+#define IDS_WEB_APP_FILE_HANDLING_NEGATIVE_BUTTON 12715
+#define IDS_WEB_APP_PERMISSION_NEGATIVE_BUTTON 12716
+#define IDS_PROTOCOL_HANDLER_INTENT_PICKER_QUESTION 12717
+#define IDS_FONT_ACCESS_CHOOSER_PROMPT_ORIGIN 12718
+#define IDS_FONT_ACCESS_CHOOSER_NO_FONTS_FOUND_PROMPT 12719
+#define IDS_FONT_ACCESS_CHOOSER_IMPORT_BUTTON_TEXT 12720
+#define IDS_FONT_ACCESS_CHOOSER_CANCEL_BUTTON_TEXT 12721
+#define IDS_FONT_ACCESS_CHOOSER_SELECT_ALL_CHECKBOX_TEXT 12722
+#define IDS_FONT_ACCESS_CHOOSER_LOADING_LABEL 12723
+#define IDS_FONT_ACCESS_CHOOSER_LOADING_LABEL_TOOLTIP 12724
+#define IDS_IME_API_ACTIVATED_WARNING 12725
+#define IDS_IME_API_NEVER_SHOW 12726
+#define IDS_BLOCKED_ADS_PROMPT_TOOLTIP 12727
+#define IDS_UTILITY_PROCESS_UTILITY_WIN_NAME 12728
+#define IDS_UTILITY_PROCESS_QUARANTINE_SERVICE_NAME 12729
+#define IDS_REDIRECT_BLOCKED_MESSAGE 12730
+#define IDS_REDIRECT_BLOCKED_TITLE 12731
+#define IDS_REDIRECT_BLOCKED_TOOLTIP 12732
+#define IDS_ALWAYS_ALLOW_REDIRECTS 12733
+#define IDS_OPEN_REDIRECT 12734
+#define IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME 12735
+#define IDS_CONTROLLED_BY_AUTOMATION 12738
+#define IDS_CHROME_FOR_TESTING_DISCLAIMER 12739
+#define IDS_DOWNLOAD_CHROME 12740
+#define IDS_DOWNLOAD_OPEN_CONFIRMATION_DIALOG_TITLE 12742
+#define IDS_DOWNLOAD_OPEN_CONFIRMATION_DIALOG_MESSAGE 12743
+#define IDS_CONFIRM_FILE_UPLOAD_TITLE 12744
+#define IDS_CONFIRM_FILE_UPLOAD_TEXT 12745
+#define IDS_CONFIRM_FILE_UPLOAD_OK_BUTTON 12746
+#define IDS_FILE_SYSTEM_ACCESS_WRITE_PERMISSION_TITLE 12747
+#define IDS_FILE_SYSTEM_ACCESS_WRITE_PERMISSION_ALLOW_TEXT 12748
+#define IDS_FILE_SYSTEM_ACCESS_ORIGIN_SCOPED_WRITE_PERMISSION_FILE_TEXT 12749
+#define IDS_FILE_SYSTEM_ACCESS_ORIGIN_SCOPED_WRITE_PERMISSION_DIRECTORY_TEXT 12750
+#define IDS_FILE_SYSTEM_ACCESS_ORIGIN_SCOPED_READ_PERMISSION_FILE_TEXT 12751
+#define IDS_FILE_SYSTEM_ACCESS_ORIGIN_SCOPED_READ_PERMISSION_DIRECTORY_TEXT 12752
+#define IDS_FILE_SYSTEM_ACCESS_WRITE_PERMISSION_FILE_TEXT 12753
+#define IDS_FILE_SYSTEM_ACCESS_WRITE_PERMISSION_DIRECTORY_TEXT 12754
+#define IDS_FILE_SYSTEM_ACCESS_READ_PERMISSION_FILE_TEXT 12755
+#define IDS_FILE_SYSTEM_ACCESS_READ_PERMISSION_DIRECTORY_TEXT 12756
+#define IDS_FILE_SYSTEM_ACCESS_EDIT_FILE_PERMISSION_TITLE 12757
+#define IDS_FILE_SYSTEM_ACCESS_EDIT_DIRECTORY_PERMISSION_TITLE 12758
+#define IDS_FILE_SYSTEM_ACCESS_READ_FILE_PERMISSION_TITLE 12759
+#define IDS_FILE_SYSTEM_ACCESS_READ_DIRECTORY_PERMISSION_TITLE 12760
+#define IDS_FILE_SYSTEM_ACCESS_EDIT_FILE_PERMISSION_ALLOW_TEXT 12761
+#define IDS_FILE_SYSTEM_ACCESS_EDIT_DIRECTORY_PERMISSION_ALLOW_TEXT 12762
+#define IDS_FILE_SYSTEM_ACCESS_VIEW_FILE_PERMISSION_ALLOW_TEXT 12763
+#define IDS_FILE_SYSTEM_ACCESS_VIEW_DIRECTORY_PERMISSION_ALLOW_TEXT 12764
+#define IDS_FILE_SYSTEM_ACCESS_RESTORE_PERMISSION_DESCRIPTION 12765
+#define IDS_FILE_SYSTEM_ACCESS_WRITE_USAGE_TOOLTIP 12766
+#define IDS_FILE_SYSTEM_ACCESS_DIRECTORY_USAGE_TOOLTIP 457
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_SINGLE_WRITABLE_FILE_TEXT 12767
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_WRITABLE_FILES_TEXT 12768
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_SINGLE_WRITABLE_DIRECTORY_TEXT 12769
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_WRITABLE_DIRECTORIES_TEXT 12770
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_WRITABLE_FILES_AND_DIRECTORIES_TEXT 12771
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_SINGLE_READABLE_FILE_TEXT 12772
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_READABLE_FILES_TEXT 12773
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_SINGLE_READABLE_DIRECTORY_TEXT 12774
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_READABLE_DIRECTORIES_TEXT 12775
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_READABLE_FILES_AND_DIRECTORIES_TEXT 12776
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_READ_AND_WRITE 12777
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_SAVE_CHANGES 12778
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_VIEW_CHANGES 12779
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_BUBBLE_FILES_TEXT 12780
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_EXPAND 12781
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_COLLAPSE 12782
+#define IDS_FILE_SYSTEM_ACCESS_USAGE_REMOVE_ACCESS 12783
+#define IDS_FILE_SYSTEM_ACCESS_CHOOSER_OPEN_READABLE_DIRECTORY_TITLE 12784
+#define IDS_FILE_SYSTEM_ACCESS_CHOOSER_OPEN_WRITABLE_DIRECTORY_TITLE 12785
+#define IDS_FILE_SYSTEM_ACCESS_CHOOSER_OPEN_SAVE_FILE_TITLE 12786
+#define IDS_FILE_SYSTEM_ACCESS_RESTRICTED_DIRECTORY_TITLE 12787
+#define IDS_FILE_SYSTEM_ACCESS_RESTRICTED_DIRECTORY_TEXT 12788
+#define IDS_FILE_SYSTEM_ACCESS_RESTRICTED_DIRECTORY_BUTTON 12789
+#define IDS_FILE_SYSTEM_ACCESS_RESTRICTED_FILE_TITLE 12790
+#define IDS_FILE_SYSTEM_ACCESS_RESTRICTED_FILE_TEXT 12791
+#define IDS_FILE_SYSTEM_ACCESS_RESTRICTED_FILE_BUTTON 12792
+#define IDS_FILE_SYSTEM_ACCESS_DANGEROUS_FILE_TITLE 12793
+#define IDS_FILE_SYSTEM_ACCESS_DANGEROUS_FILE_TEXT 12794
+#define IDS_FILE_SYSTEM_ACCESS_DANGEROUS_FILE_DONT_SAVE 12795
+#define IDS_FILE_SYSTEM_ACCESS_DANGEROUS_FILE_SAVE 12796
+#define IDS_RELAUNCH_ACCEPT_BUTTON 12797
+#define IDS_RELAUNCH_REQUIRED_CANCEL_BUTTON 12798
+#define IDS_IDLE_TIMEOUT_INCOGNITO 12799
+#define IDS_IDLE_TIMEOUT_CLOSE_COUNTDOWN 12800
+#define IDS_IDLE_TIMEOUT_CLEAR_COUNTDOWN 12801
+#define IDS_WEBAUTHN_GENERIC_TITLE 12802
+#define IDS_WEBAUTHN_CONTINUE 12803
+#define IDS_WEBAUTHN_TRANSPORT_USB 12804
+#define IDS_WEBAUTHN_TRANSPORT_INTERNAL 12806
+#define IDS_WEBAUTHN_TRANSPORT_CABLE 12807
+#define IDS_WEBAUTHN_TRANSPORT_AOA 12808
+#define IDS_WEBAUTHN_TRANSPORT_WINDOWS_HELLO_OR_SECURITY_KEY 12809
+#define IDS_WEBAUTHN_TRANSPORT_WINDOWS_HELLO 12810
+#define IDS_WEBAUTHN_TRANSPORT_ICLOUD_KEYCHAIN 12811
+#define IDS_WEBAUTHN_TRANSPORT_EXTERNAL_SECURITY_KEY 12812
+#define IDS_WEBAUTHN_USB_ACTIVATE_DESCRIPTION 12813
+#define IDS_WEBAUTHN_ERROR_GENERIC_TITLE 12814
+#define IDS_WEBAUTHN_ERROR_WRONG_KEY_TITLE 12815
+#define IDS_WEBAUTHN_ERROR_WRONG_DEVICE_TITLE 12816
+#define IDS_WEBAUTHN_ERROR_WRONG_DEVICE_REGISTER_DESCRIPTION 12817
+#define IDS_WEBAUTHN_ERROR_WRONG_KEY_SIGN_DESCRIPTION 12818
+#define IDS_WEBAUTHN_ERROR_TIMEOUT_DESCRIPTION 12819
+#define IDS_WEBAUTHN_ERROR_INTERNAL_UNRECOGNIZED_TITLE 12820
+#define IDS_WEBAUTHN_ERROR_INTERNAL_UNRECOGNIZED_DESCRIPTION 12821
+#define IDS_WEBAUTHN_WINDOWS_HELLO_NOT_ENABLED_TITLE 12822
+#define IDS_WEBAUTHN_WINDOWS_HELLO_NOT_ENABLED_DESCRIPTION 12823
+#define IDS_WEBAUTHN_ERROR_NO_PASSKEYS_TITLE 12824
+#define IDS_WEBAUTHN_ERROR_NO_PASSKEYS_DESCRIPTION 12825
+#define IDS_WEBAUTHN_BLUETOOTH_POWER_ON_AUTO_TITLE 12826
+#define IDS_WEBAUTHN_BLUETOOTH_POWER_ON_AUTO_DESCRIPTION 12827
+#define IDS_WEBAUTHN_BLUETOOTH_POWER_ON_AUTO_NEXT 12828
+#define IDS_WEBAUTHN_BLUETOOTH_POWER_ON_MANUAL_TITLE 12829
+#define IDS_WEBAUTHN_BLUETOOTH_POWER_ON_MANUAL_DESCRIPTION 12830
+#define IDS_WEBAUTHN_BLUETOOTH_POWER_ON_MANUAL_NEXT 12831
+#define IDS_WEBAUTHN_TRANSPORT_POPUP_USB 12833
+#define IDS_WEBAUTHN_TRANSPORT_POPUP_PAIR_PHONE 12834
+#define IDS_WEBAUTHN_TRANSPORT_POPUP_INTERNAL 12835
+#define IDS_WEBAUTHN_TRANSPORT_POPUP_CABLE 12836
+#define IDS_WEBAUTHN_TRANSPORT_POPUP_AOA 12837
+#define IDS_WEBAUTHN_CABLE_ACTIVATE_TITLE 12838
+#define IDS_WEBAUTHN_CABLE_ACTIVATE_TITLE_DEVICE 12839
+#define IDS_WEBAUTHN_CABLE_ACTIVATE_DESCRIPTION 12840
+#define IDS_WEBAUTHN_CABLE_ACTIVATE_DEVICE_NAME_DESCRIPTION 12841
+#define IDS_WEBAUTHN_CABLEV2_CONNECTING_TITLE 12842
+#define IDS_WEBAUTHN_CABLEV2_CONNECTED_DESCRIPTION 12843
+#define IDS_WEBAUTHN_CABLEV2_ERROR_DESCRIPTION 12844
+#define IDS_WEBAUTHN_CABLEV2_ERROR_CLOSE 12845
+#define IDS_WEBAUTHN_CABLEV2_SERVERLINK_TROUBLE 12846
+#define IDS_WEBAUTHN_CABLEV2_AOA_TITLE 12847
+#define IDS_WEBAUTHN_CABLEV2_AOA_DESCRIPTION 12848
+#define IDS_WEBAUTHN_CABLEV2_AOA_REQUEST_DESCRIPTION 12849
+#define IDS_WEBAUTHN_PASSKEY_PHONE_OR_TABLET_LABEL 12850
+#define IDS_WEBAUTHN_PASSKEY_PHONE_TABLET_OR_SECURITY_KEY_LABEL 12851
+#define IDS_WEBAUTHN_PASSKEY_DIFFERENT_PHONE_OR_TABLET_LABEL 12852
+#define IDS_WEBAUTHN_PASSKEY_DIFFERENT_PHONE_TABLET_OR_SECURITY_KEY_LABEL 12853
+#define IDS_WEBAUTHN_PHONE_CONFIRMATION_TITLE 12854
+#define IDS_WEBAUTHN_CABLE_ACTIVATE_DESCRIPTION_SHORT 12855
+#define IDS_WEBAUTHN_PIN_ENTRY_TITLE 12856
+#define IDS_WEBAUTHN_PIN_ENTRY_DESCRIPTION 12857
+#define IDS_WEBAUTHN_PIN_ENTRY_PIN_LABEL 12858
+#define IDS_WEBAUTHN_PIN_ENTRY_NEXT 12859
+#define IDS_WEBAUTHN_PIN_SETUP_DESCRIPTION 12860
+#define IDS_WEBAUTHN_PIN_SETUP_CONFIRMATION_LABEL 12861
+#define IDS_WEBAUTHN_PIN_ENTRY_ERROR_INVALID_CHARACTERS 12862
+#define IDS_WEBAUTHN_PIN_ENTRY_ERROR_TOO_SHORT 12863
+#define IDS_WEBAUTHN_PIN_ENTRY_ERROR_FAILED_RETRIES 12864
+#define IDS_WEBAUTHN_PIN_ENTRY_ERROR_FAILED 12865
+#define IDS_WEBAUTHN_PIN_SETUP_ERROR_FAILED 12866
+#define IDS_WEBAUTHN_PIN_TAP_AGAIN_DESCRIPTION 12867
+#define IDS_WEBAUTHN_PIN_ENTRY_ERROR_MISMATCH 12868
+#define IDS_WEBAUTHN_CLIENT_PIN_SOFT_BLOCK_DESCRIPTION 12869
+#define IDS_WEBAUTHN_CLIENT_PIN_HARD_BLOCK_DESCRIPTION 12870
+#define IDS_WEBAUTHN_CLIENT_PIN_AUTHENTICATOR_REMOVED_DESCRIPTION 12871
+#define IDS_WEBAUTHN_PIN_ENTRY_ERROR_SAME_AS_CURRENT 12872
+#define IDS_WEBAUTHN_INLINE_ENROLLMENT_CANCEL_LABEL 12873
+#define IDS_WEBAUTHN_UV_RETRY_TITLE 12874
+#define IDS_WEBAUTHN_UV_RETRY_DESCRIPTION 12875
+#define IDS_WEBAUTHN_UV_RETRY_ERROR_FAILED_RETRIES 12876
+#define IDS_WEBAUTHN_UV_ERROR_LOCKED 12877
+#define IDS_WEBAUTHN_FORCE_PIN_CHANGE 12878
+#define IDS_WEBAUTHN_UNKNOWN_ACCOUNT 12879
+#define IDS_WEBAUTHN_RESIDENT_KEY_PRIVACY 12880
+#define IDS_WEBAUTHN_RESIDENT_KEY_PREFERRED_PRIVACY 12881
+#define IDS_WEBAUTHN_ERROR_MISSING_CAPABILITY_TITLE 12882
+#define IDS_WEBAUTHN_ERROR_MISSING_CAPABILITY_DESC 12883
+#define IDS_WEBAUTHN_STORAGE_FULL_DESC 12884
+#define IDS_WEBAUTHN_REQUEST_ATTESTATION_PERMISSION_TITLE 12885
+#define IDS_WEBAUTHN_REQUEST_ATTESTATION_PERMISSION_DESC 12886
+#define IDS_WEBAUTHN_REQUEST_ENTERPRISE_ATTESTATION_PERMISSION_TITLE 12887
+#define IDS_WEBAUTHN_REQUEST_ENTERPRISE_ATTESTATION_PERMISSION_DESC 12888
+#define IDS_WEBAUTHN_ALLOW_ATTESTATION 12889
+#define IDS_WEBAUTHN_DENY_ATTESTATION 12890
+#define IDS_WEBAUTHN_RETRY 12891
+#define IDS_WEBAUTHN_PLATFORM_AUTHENTICATOR_OFF_THE_RECORD_INTERSTITIAL_TITLE 12892
+#define IDS_WEBAUTHN_PLATFORM_AUTHENTICATOR_OFF_THE_RECORD_INTERSTITIAL_DESCRIPTION 12893
+#define IDS_WEBAUTHN_PLATFORM_AUTHENTICATOR_OFF_THE_RECORD_INTERSTITIAL_DENY 12894
+#define IDS_WEBAUTHN_MANAGE_DEVICES 12895
+#define IDS_WEBAUTHN_CREATE_PASSKEY_TITLE 12896
+#define IDS_WEBAUTHN_CREATE_PASSKEY_EXTRA 12897
+#define IDS_WEBAUTHN_CREATE_PASSKEY_EXTRA_INCOGNITO 12898
+#define IDS_WEBAUTHN_CREATE_PASSKEY_EXTRA_WIN 12899
+#define IDS_WEBAUTHN_CREATE_PASSKEY_EXTRA_WIN_INCOGNITO 12900
+#define IDS_WEBAUTHN_CREATE_PASSKEY_CHOOSE_DEVICE_TITLE 12901
+#define IDS_WEBAUTHN_CREATE_PASSKEY_CHOOSE_DEVICE_BODY 12902
+#define IDS_WEBAUTHN_USE_PASSKEY_CHOOSE_DEVICE_TITLE 12903
+#define IDS_WEBAUTHN_USE_PASSKEY_CHOOSE_DEVICE_BODY 12904
+#define IDS_WEBAUTHN_USE_PASSKEY_TITLE 12905
+#define IDS_WEBAUTHN_CHOOSE_PASSKEY_TITLE 12906
+#define IDS_WEBAUTHN_CHOOSE_PASSKEY_BODY 12907
+#define IDS_WEBAUTHN_CREATE_PASSKEY_QR_TITLE 12908
+#define IDS_WEBAUTHN_CREATE_PASSKEY_QR_BODY 12909
+#define IDS_WEBAUTHN_USE_PASSKEY_QR_TITLE 12910
+#define IDS_WEBAUTHN_USE_PASSKEY_QR_BODY 12911
+#define IDS_WEBAUTHN_QR_CODE_ALT_TEXT 12912
+#define IDS_WEBAUTHN_USE_A_DIFFERENT_DEVICE 12913
+#define IDS_WEBAUTHN_USE_A_DIFFERENT_PASSKEY 12914
+#define IDS_WEBAUTHN_QR_CREATE_PASSKEY_ON_SECURITY_KEY_LABEL 12915
+#define IDS_WEBAUTHN_QR_USE_PASSKEY_ON_SECURITY_KEY_LABEL 12916
+#define IDS_WEBAUTHN_BACK 12917
+#define IDS_WEBAUTHN_CHOOSE_PASSKEY_FOR_RP_TITLE 12918
+#define IDS_WEBAUTHN_THIS_DEVICE_LABEL 12919
+#define IDS_WEBAUTHN_FROM_PHONE_LABEL 12920
+#define IDS_WEBAUTHN_OTHER_DEVICES_LABEL 12921
+#define IDS_WEBAUTHN_SOURCE_CHROME_PROFILE 12922
+#define IDS_WEBAUTHN_SOURCE_ICLOUD_KEYCHAIN 12923
+#define IDS_WEBAUTHN_SOURCE_CUSTOM_VENDOR 12924
+#define IDS_WEBAUTHN_SOURCE_WINDOWS_HELLO 12925
+#define IDS_WEBAUTHN_SOURCE_PHONE 12926
+#define IDS_ACCNAME_SIDE_SEARCH_TOOL 12927
+#define IDS_ACCNAME_SIDE_SEARCH_TOOLBAR_BUTTON_ACTIVATED 12928
+#define IDS_ACCNAME_SIDE_SEARCH_TOOLBAR_BUTTON_NOT_ACTIVATED 12929
+#define IDS_ACCNAME_SIDE_SEARCH_CLOSE_BUTTON 12930
+#define IDS_ACCNAME_SIDE_SEARCH_FEEDBACK_BUTTON 12931
+#define IDS_SIDE_SEARCH_PROMO 12932
+#define IDS_SIDE_SEARCH_TUTORIAL_OPEN_SIDE_PANEL 12933
+#define IDS_SIDE_SEARCH_TUTORIAL_OPEN_A_LINK_TO_TAB 12934
+#define IDS_SIDE_SEARCH_TUTORIAL_CLOSE_SIDE_PANEL 12935
+#define IDS_SIDE_SEARCH_ENTRYPOINT_LABEL 445
+#define IDS_TOOLTIP_SIDE_SEARCH_TOOLBAR_BUTTON_ACTIVATED 12936
+#define IDS_TOOLTIP_SIDE_SEARCH_TOOLBAR_BUTTON_NOT_ACTIVATED 446
+#define IDS_TOOLTIP_SIDE_SEARCH_CLOSE_BUTTON 12937
+#define IDS_TOOLTIP_SIDE_SEARCH_FEEDBACK_BUTTON 12938
+#define IDS_CABLEV2_MAKE_CREDENTIAL_NOTIFICATION_TITLE 12939
+#define IDS_CABLEV2_GET_ASSERTION_NOTIFICATION_TITLE 12940
+#define IDS_INCOGNITO_PROFILE_MENU_TITLE 12941
+#define IDS_INCOGNITO_WINDOW_COUNT_MESSAGE 12942
+#define IDS_INCOGNITO_PROFILE_MENU_CLOSE_BUTTON 12943
+#define IDS_INCOGNITO_PROFILE_MENU_CLOSE_BUTTON_NEW 12944
+#define IDS_INCOGNITO_CLEAR_BROWSING_DATA_DIALOG_PRIMARY_TEXT 12945
+#define IDS_INCOGNITO_CLEAR_BROWSING_DATA_DIALOG_SECONDARY_TEXT 12946
+#define IDS_INCOGNITO_CLEAR_BROWSING_DATA_DIALOG_CLOSE_WINDOWS_BUTTON 12947
+#define IDS_INCOGNITO_HISTORY_BUBBLE_PRIMARY_TEXT 12948
+#define IDS_INCOGNITO_HISTORY_BUBBLE_SECONDARY_TEXT 12949
+#define IDS_INCOGNITO_HISTORY_BUBBLE_CLOSE_INCOGNITO_BUTTON_TEXT 12950
+#define IDS_INCOGNITO_HISTORY_BUBBLE_CANCEL_BUTTON_TEXT 12951
+#define IDS_GUEST_WINDOW_COUNT_MESSAGE 12952
+#define IDS_GUEST_PROFILE_MENU_CLOSE_BUTTON 12953
+#define IDS_NOTIFICATION_DEFAULT_HELPFUL_BUTTON_TEXT 12954
+#define IDS_NOTIFICATION_DEFAULT_UNHELPFUL_BUTTON_TEXT 12955
+#define IDS_DEEP_SCANNING_DIALOG_TITLE 12956
+#define IDS_DEEP_SCANNING_DIALOG_UPLOAD_PENDING_MESSAGE 12957
+#define IDS_DEEP_SCANNING_DIALOG_PRINT_PENDING_MESSAGE 12958
+#define IDS_DEEP_SCANNING_DIALOG_SUCCESS_MESSAGE 12959
+#define IDS_DEEP_SCANNING_DIALOG_PRINT_SUCCESS_MESSAGE 12960
+#define IDS_DEEP_SCANNING_DIALOG_UPLOAD_FAILURE_MESSAGE 12961
+#define IDS_DEEP_SCANNING_DIALOG_UPLOAD_FAIL_CLOSED_MESSAGE 12962
+#define IDS_DEEP_SCANNING_DIALOG_UPLOAD_WARNING_MESSAGE 12963
+#define IDS_DEEP_SCANNING_DIALOG_PRINT_WARNING_MESSAGE 12964
+#define IDS_DEEP_SCANNING_DIALOG_TIMEOUT_MESSAGE 12965
+#define IDS_DEEP_SCANNING_DIALOG_PROCEED_BUTTON 12966
+#define IDS_DEEP_SCANNING_DIALOG_CANCEL_WARNING_BUTTON 12967
+#define IDS_DEEP_SCANNING_DIALOG_CANCEL_UPLOAD_BUTTON 12968
+#define IDS_DEEP_SCANNING_DIALOG_LARGE_FILE_FAILURE_MESSAGE 12969
+#define IDS_DEEP_SCANNING_DIALOG_LARGE_PRINT_FAILURE_MESSAGE 12970
+#define IDS_DEEP_SCANNING_DIALOG_ENCRYPTED_FILE_FAILURE_MESSAGE 12971
+#define IDS_DEEP_SCANNING_DIALOG_CUSTOM_MESSAGE 12972
+#define IDS_DEEP_SCANNING_DIALOG_DOWNLOADS_CUSTOM_MESSAGE 12973
+#define IDS_DEEP_SCANNING_DIALOG_CUSTOM_MESSAGE_LEARN_MORE_LINK 12974
+#define IDS_DEEP_SCANNING_DIALOG_DOWNLOADS_DISCARD_FILE_BUTTON 12975
+#define IDS_DEEP_SCANNING_DIALOG_UPLOAD_BYPASS_JUSTIFICATION_LABEL 12976
+#define IDS_DEEP_SCANNING_DIALOG_PASTE_BYPASS_JUSTIFICATION_LABEL 12977
+#define IDS_DEEP_SCANNING_DIALOG_PRINT_BYPASS_JUSTIFICATION_LABEL 12978
+#define IDS_DEEP_SCANNING_DIALOG_DOWNLOAD_BYPASS_JUSTIFICATION_LABEL 12979
+#define IDS_DEEP_SCANNING_DIALOG_BYPASS_JUSTIFICATION_TEXT_LIMIT_LABEL 12980
+#define IDS_DATA_CONTROLS_CLIPBOARD_PASTE_BLOCK_TITLE 12981
+#define IDS_DATA_CONTROLS_CLIPBOARD_COPY_BLOCK_TITLE 12982
+#define IDS_DATA_CONTROLS_BLOCKED_LABEL 12983
+#define IDS_DEEP_SCANNING_DIALOG_OPEN_NOW_TITLE 12984
+#define IDS_DEEP_SCANNING_DIALOG_OPEN_NOW_MESSAGE 12985
+#define IDS_DEEP_SCANNING_DIALOG_OPEN_NOW_ACCEPT_BUTTON 12986
+#define IDS_DEEP_SCANNING_INFO_DIALOG_TITLE 12987
+#define IDS_APP_DEEP_SCANNING_INFO_DIALOG_MESSAGE 12988
+#define IDS_DEEP_SCANNING_INFO_DIALOG_MESSAGE 12989
+#define IDS_DEEP_SCANNING_INFO_DIALOG_ACCEPT_BUTTON 12990
+#define IDS_DEEP_SCANNING_INFO_DIALOG_CANCEL_BUTTON 12991
+#define IDS_DEEP_SCANNING_INFO_DIALOG_OPEN_NOW_BUTTON 12992
+#define IDS_DEEP_SCANNING_TIMED_OUT_DIALOG_TITLE 12993
+#define IDS_DEEP_SCANNING_TIMED_OUT_DIALOG_MESSAGE 12994
+#define IDS_DEEP_SCANNING_TIMED_OUT_DIALOG_ACCEPT_BUTTON 12995
+#define IDS_DEEP_SCANNING_TIMED_OUT_DIALOG_CANCEL_BUTTON 12996
+#define IDS_DEEP_SCANNING_TIMED_OUT_DIALOG_OPEN_NOW_BUTTON 12997
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_IPH_BUBBLE_TEXT 12998
+#define IDS_SETTINGS_SAFEBROWSING_ENHANCED_IPH_BUBBLE_CLOSE_BUTTON_ARIA_LABEL_TEXT 12999
+#define IDS_TAILORED_SECURITY_ENABLED_DIALOG_TITLE 13000
+#define IDS_TAILORED_SECURITY_DISABLED_DIALOG_TITLE 13001
+#define IDS_TAILORED_SECURITY_ENABLED_DIALOG_MAIN_TEXT 13002
+#define IDS_TAILORED_SECURITY_DISABLED_DIALOG_MAIN_TEXT 13003
+#define IDS_TAILORED_SECURITY_DISABLED_DIALOG_ACCEPT_BUTTON 13004
+#define IDS_TAILORED_SECURITY_DIALOG_SETTINGS_BUTTON 13005
+#define IDS_TAILORED_SECURITY_UNCONSENTED_MODAL_TITLE 13006
+#define IDS_TAILORED_SECURITY_UNCONSENTED_MODAL_BODY 13007
+#define IDS_TAILORED_SECURITY_UNCONSENTED_ACCEPT_BUTTON 13008
+#define IDS_TAILORED_SECURITY_UNCONSENTED_CANCEL_BUTTON 13009
+#define IDS_TAILORED_SECURITY_CONSENTED_ENABLE_MESSAGE_TITLE 13010
+#define IDS_TAILORED_SECURITY_CONSENTED_ENABLE_MESSAGE_DESCRIPTION 13011
+#define IDS_TAILORED_SECURITY_CONSENTED_ENABLE_MESSAGE_DESCRIPTION_UPDATED 13012
+#define IDS_TAILORED_SECURITY_CONSENTED_DISABLE_MESSAGE_TITLE 13013
+#define IDS_TAILORED_SECURITY_CONSENTED_DISABLE_MESSAGE_DESCRIPTION 13014
+#define IDS_TAILORED_SECURITY_CONSENTED_DISABLE_MESSAGE_DESCRIPTION_UPDATED 13015
+#define IDS_TAILORED_SECURITY_CONSENTED_MESSAGE_OK_BUTTON 13016
+#define IDS_PROMPT_APP_UNINSTALL_TITLE 13017
+#define IDS_APP_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX_FOR_NON_GOOGLE 13018
+#define IDS_APP_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX_FOR_GOOGLE 13019
+#define IDS_APP_UNINSTALL_PROMPT_LEARN_MORE 13020
+#define IDS_APP_UNINSTALL_PROMPT_ADDITIONAL_UNINSTALLS_MESSAGE 13021
+#define IDS_SUB_APPS_UNINSTALL_NOTIFICATION_TITLE 13022
+#define IDS_SUB_APPS_UNINSTALL_NOTIFICATION_DESCRIPTION 13023
+#define IDS_UTILITY_PROCESS_SPEECH_RECOGNITION_SERVICE_NAME 13024
+#define IDS_APP_PAUSE_PROMPT_TITLE 13025
+#define IDS_APP_PAUSE_HEADING 13026
+#define IDS_APP_PAUSE_HEADING_FOR_WEB_APPS 13027
+#define IDS_APP_BLOCK_PROMPT_TITLE 13028
+#define IDS_APP_BLOCK_HEADING_FOR_CHILD 13029
+#define IDS_APP_BLOCK_HEADING 13030
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_APPROVED_TITLE 13031
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_REJECTED_TITLE 13032
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_FORCE_INSTALLED_TITLE 13033
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_CLICK_TO_INSTALL 13034
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_CLICK_TO_VIEW 13035
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_JUSTIFICATION 13036
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_JUSTIFICATION_PLACEHOLDER 13037
+#define IDS_ENTERPRISE_EXTENSION_REQUEST_JUSTIFICATION_LENGTH_LIMIT 13038
+#define IDS_NAME_WINDOW_PROMPT_TITLE 13039
+#define IDS_NAME_WINDOW_PROMPT_FIELD_LABEL 13040
+#define IDS_CHROMELABS_RELAUNCH_BUTTON_LABEL 13041
+#define IDS_WINDOW_TITLE_EXPERIMENTS 13042
+#define IDS_CHROMELABS_SEND_FEEDBACK 13043
+#define IDS_CHROMELABS_SEND_FEEDBACK_DESCRIPTION_PLACEHOLDER 13044
+#define IDS_CHROMELABS_DEFAULT 13045
+#define IDS_CHROMELABS_ENABLED 13046
+#define IDS_CHROMELABS_DISABLED 13047
+#define IDS_CHROMELABS_ENABLED_WITH_VARIATION_NAME 13048
+#define IDS_TAB_GROUPS_SAVE_EXPERIMENT_NAME 13049
+#define IDS_TAB_GROUPS_SAVE_DESCRIPTION 13050
+#define IDS_CUSTOMIZE_CHROME_SIDE_PANEL_EXPERIMENT_NAME 13051
+#define IDS_CUSTOMIZE_CHROME_SIDE_PANEL_DESCRIPTION 13052
+#define IDS_CHROMEREFRESH2023_EXPERIMENT_NAME 13053
+#define IDS_CHROMEREFRESH2023_DESCRIPTION 13054
+#define IDS_CHROMEREFRESH2023_WITHOUT_OMNIBOX 13055
+#define IDS_CHROMEWEBUIREFRESH2023_EXPERIMENT_NAME 13056
+#define IDS_CHROMEWEBUIREFRESH2023_DESCRIPTION 13057
+#define IDS_TAB_SCROLLING_EXPERIMENT_NAME 13058
+#define IDS_TAB_SCROLLING_EXPERIMENT_DESCRIPTION 13059
+#define IDS_TABS_SHRINK_TO_PINNED_TAB_WIDTH 13060
+#define IDS_TABS_SHRINK_TO_MEDIUM_WIDTH 13061
+#define IDS_TABS_SHRINK_TO_LARGE_WIDTH 13062
+#define IDS_TABS_DO_NOT_SHRINK 13063
+#define IDS_LENS_REGION_SEARCH_BUBBLE_TEXT 13064
+#define IDS_THUMBNAIL_TAB_STRIP_EXPERIMENT_NAME 13065
+#define IDS_THUMBNAIL_TAB_STRIP_EXPERIMENT_DESCRIPTION 13066
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_NOTIFICATION_DESCRIPTION 13069
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_NOTIFICATION_DESCRIPTION_UPDATED 13070
+#define IDS_TAILORED_SECURITY_UNCONSENTED_PROMOTION_NOTIFICATION_ACCEPT 13071
+#define IDS_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT_SIGN_IN 13072
+#define IDS_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT_SIGN_UP 13073
+#define IDS_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT_USE 13074
+#define IDS_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT_CONTINUE 13075
+#define IDS_ACCOUNT_SELECTION_SHEET_SUBTITLE 13076
+#define IDS_ACCOUNT_SELECTION_CONTINUE 13077
+#define IDS_ACCOUNT_SELECTION_CHOOSE_AN_ACCOUNT 13078
+#define IDS_ACCOUNT_SELECTION_CANCEL 13079
+#define IDS_ACCOUNT_SELECTION_DATA_SHARING_CONSENT_NO_PP_OR_TOS 13080
+#define IDS_ACCOUNT_SELECTION_DATA_SHARING_CONSENT_NO_PP 13081
+#define IDS_ACCOUNT_SELECTION_DATA_SHARING_CONSENT_NO_TOS 13082
+#define IDS_ACCOUNT_SELECTION_DATA_SHARING_CONSENT 13083
+#define IDS_ACCOUNT_SELECTION_USE_OTHER_ACCOUNT 13084
+#define IDS_IDP_SIGNIN_STATUS_MISMATCH_DIALOG_CONTINUE 13085
+#define IDS_IDP_SIGNIN_STATUS_MISMATCH_DIALOG_BODY 13086
+#define IDS_IDP_SIGNIN_STATUS_MISMATCH_BUTTON_TEXT 13087
+#define IDS_SIGNIN_GENERIC_ERROR_DIALOG_SUMMARY 13088
+#define IDS_SIGNIN_GENERIC_ERROR_DIALOG_DESCRIPTION 13089
+#define IDS_SIGNIN_UNAUTHORIZED_CLIENT_ERROR_DIALOG_SUMMARY 13090
+#define IDS_SIGNIN_UNAUTHORIZED_CLIENT_ERROR_DIALOG_DESCRIPTION 13091
+#define IDS_SIGNIN_INVALID_REQUEST_ERROR_DIALOG_SUMMARY 13092
+#define IDS_SIGNIN_INVALID_REQUEST_ERROR_DIALOG_DESCRIPTION 13093
+#define IDS_SIGNIN_ACCESS_DENIED_ERROR_DIALOG_SUMMARY 13094
+#define IDS_SIGNIN_ACCESS_DENIED_ERROR_DIALOG_DESCRIPTION 13095
+#define IDS_SIGNIN_SERVER_ERROR_DIALOG_SUMMARY 13096
+#define IDS_SIGNIN_SERVER_ERROR_DIALOG_DESCRIPTION 13097
+#define IDS_SIGNIN_TEMPORARILY_UNAVAILABLE_ERROR_DIALOG_SUMMARY 13098
+#define IDS_SIGNIN_TEMPORARILY_UNAVAILABLE_ERROR_DIALOG_DESCRIPTION 13099
+#define IDS_SIGNIN_ERROR_DIALOG_GOT_IT_BUTTON 13100
+#define IDS_SIGNIN_ERROR_DIALOG_MORE_DETAILS_BUTTON 13101
+#define IDS_SIGNIN_ERROR_DIALOG_MORE_DETAILS_PROMPT 13102
+#define IDS_SIGNIN_ERROR_DIALOG_TRY_OTHER_WAYS_PROMPT 13103
+#define IDS_SIGNIN_ERROR_DIALOG_MORE_DETAILS_RETRY_PROMPT 13104
+#define IDS_SIGNIN_ERROR_DIALOG_TRY_OTHER_WAYS_RETRY_PROMPT 13105
+#define IDS_MULTI_IDP_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT 13106
+#define IDS_VERIFY_SHEET_TITLE 13107
+#define IDS_VERIFY_SHEET_TITLE_AUTO_REAUTHN 13108
+#define IDS_AUTO_REAUTHN_OPTOUT_CHECKBOX 13109
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_TITLE 13141
+#define IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_TITLE 13142
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_HEADER_1 13143
+#define IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION 13144
+#define IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_SETTINGS_LINK 13145
+#define IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION_ESTIMATES_INTERESTS_LINK 13146
+#define IDS_PRIVACY_SANDBOX_BUBBLE_NOTICE_DESCRIPTION_ESTIMATES_INTERESTS_LINK_A11Y_NAME 13147
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_DESCRIPTION_1 13148
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_BODY_HEADER_2 13149
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_2_HEADER 13150
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_LEARN_MORE_SECTION_2_BULLET_POINT_3 13151
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_ACCEPT_BUTTON 13152
+#define IDS_PRIVACY_SANDBOX_DIALOG_CONSENT_DECLINE_BUTTON 13153
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_BODY_HEADER_1 13154
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_BODY_DESCRIPTION_1 13155
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_BODY_HEADER_2 13156
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_ACKNOWLEDGE_BUTTON 13157
+#define IDS_PRIVACY_SANDBOX_DIALOG_NOTICE_OPEN_SETTINGS_BUTTON 13158
+#define IDS_BATTERY_SAVER_BUTTON_TOOLTIP 435
+#define IDS_BATTERY_SAVER_BUTTON_ACCNAME 434
+#define IDS_BATTERY_SAVER_BUBBLE_TITLE 13159
+#define IDS_BATTERY_SAVER_BUBBLE_DESCRIPTION 13160
+#define IDS_BATTERY_SAVER_SESSION_TURN_OFF 13161
+#define IDS_MEMORY_SAVER_CHIP_LABEL 13162
+#define IDS_MEMORY_SAVER_CHIP_ACCNAME 460
+#define IDS_MEMORY_SAVER_CHIP_WITH_SAVINGS_ACCNAME 13163
+#define IDS_MEMORY_SAVER_CHIP_SAVINGS_LABEL 13164
+#define IDS_MEMORY_SAVER_DIALOG_TITLE 13165
+#define IDS_MEMORY_SAVER_DIALOG_SETTINGS_BUTTON 13166
+#define IDS_MEMORY_SAVER_DIALOG_SAVINGS_ACCNAME 13167
+#define IDS_MEMORY_SAVER_DIALOG_BUTTON_ADD_TO_EXCLUSION_LIST 13168
+#define IDS_MEMORY_SAVER_DIALOG_SAVINGS_LABEL 13169
+#define IDS_MEMORY_SAVER_DIALOG_SMALL_SAVINGS_LABEL 13170
+#define IDS_MEMORY_SAVER_DIALOG_MEDIUM_SAVINGS_LABEL 13171
+#define IDS_MEMORY_SAVER_DIALOG_LARGE_SAVINGS_LABEL 13172
+#define IDS_MEMORY_SAVER_DIALOG_VERY_LARGE_SAVINGS_LABEL 13173
+#define IDS_HOVERCARD_TAB_MEMORY_USAGE 13174
+#define IDS_HOVERCARD_TAB_HIGH_MEMORY_USAGE 13175
+#define IDS_HOVERCARD_INACTIVE_TAB_MEMORY_SAVINGS 13176
+#define IDS_HOVERCARD_INACTIVE_TAB 13177
+#define IDS_ACCNAME_SIDEBAR_WEBVIEW_LOCATION_BAR 13178
+#define IDS_SIDEBAR_WEBVIEW_TITLE 13179
+#define IDS_PROTECTED_AUDIENCE_DEBUGGING_DISCLAIMER 13183
+#define IDS_TEST_THIRD_PARTY_COOKIE_BLOCKING_PHASEOUT_INFO 13184
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_PROFILE 13185
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_DOWNLOADS 13186
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_EXTENSIONS 13187
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_FORWARD 13188
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_HOME 13189
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_LABS 13190
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_MEDIA_CONTROLS 13191
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_NEW_TAB 13192
+#define IDS_OVERFLOW_MENU_ITEM_TEXT_SIDE_PANEL 13193
+#define IDS_PROMISE_STATUS_WAITING 13194
+#define IDS_PROMISE_STATUS_INSTALLING 13195
+#define IDS_PROMISE_APP_ACCESSIBLE_LABEL_WAITING 13196
+#define IDS_PROMISE_APP_ACCESSIBLE_LABEL_INSTALLING 13197
+#define IDS_PROMISE_APP_PLACEHOLDER_ACCESSIBLE_LABEL_WAITING 13198
+#define IDS_PROMISE_APP_PLACEHOLDER_ACCESSIBLE_LABEL_INSTALLING 13199
+#define IDS_IWA_INSTALLER_DISABLED_TITLE 13200
+#define IDS_IWA_INSTALLER_DISABLED_CHANGE_PREFERENCE 13201
+#define IDS_IWA_INSTALLER_DISABLED_SUBTITLE 13202
+#define IDS_IWA_INSTALLER_ALREADY_INSTALLED_TITLE 13203
+#define IDS_IWA_INSTALLER_ALREADY_INSTALLED_SUBTITLE 13204
+#define IDS_IWA_INSTALLER_INSTALL_SUBTITLE 13205
+#define IDS_IWA_INSTALLER_INSTALL_PROGRESS 13206
+#define IDS_IWA_INSTALLER_SHOW_METADATA_SUBTITLE 13207
+#define IDS_IWA_INSTALLER_SHOW_METADATA_APP_NAME_LABEL 13208
+#define IDS_IWA_INSTALLER_SHOW_METADATA_APP_VERSION_LABEL 13209
+#define IDS_IWA_INSTALLER_CONFIRM_TITLE 13210
+#define IDS_IWA_INSTALLER_CONFIRM_SUBTITLE 13211
+#define IDS_IWA_INSTALLER_CONFIRM_LEARN_MORE 13212
+#define IDS_IWA_INSTALLER_CONFIRM_CONTINUE 13213
+#define IDS_IWA_INSTALLER_INSTALL_FAILED_TITLE 13214
+#define IDS_IWA_INSTALLER_INSTALL_FAILED_SUBTITLE 13215
+#define IDS_IWA_INSTALLER_INSTALL_FAILED_RETRY 13216
+#define IDS_IWA_INSTALLER_SUCCESS_SUBTITLE 13217
+#define IDS_IWA_INSTALLER_SUCCESS_FINISH 13218
+#define IDS_IWA_INSTALLER_SUCCESS_LAUNCH_APPLICATION 13219
+#define IDS_IWA_INSTALLER_VERIFICATION_TITLE 13220
+#define IDS_IWA_INSTALLER_VERIFICATION_SUBTITLE 13221
+#define IDS_IWA_INSTALLER_VERIFICATION_STATUS 13222
+#define IDS_IWA_INSTALLER_VERIFICATION_ERROR_TITLE 13223
+#define IDS_IWA_INSTALLER_VERIFICATION_ERROR_SUBTITLE 13224
+#define IDS_THUMBS_DOWN 13226
+#define IDS_THUMBS_UP 13227
+#define IDS_EXPERIMENTAL_FEATURE_DISCLAIMER 13228
+
+// ---------------------------------------------------------------------------
+// From locale_settings.h:
+
+#define IDS_SPELLCHECK_DICTIONARY 145
+#define IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS 16000
+#define IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES 16001
+#define IDS_THEMES_GALLERY_URL 16002
+#define IDS_WEBSTORE_URL 479
+#define IDS_MEDIA_GALLERIES_DIALOG_CONTENT_WIDTH_CHARS 16003
+#define IDS_SETTINGS_CLEAR_DATA_MYACTIVITY_URL_IN_DIALOG 16006
+#define IDS_SETTINGS_CLEAR_DATA_MYACTIVITY_URL_IN_HISTORY 16007
+
+// ---------------------------------------------------------------------------
+// From omnibox_pedal_synonyms.h:
+
+#define IDS_OMNIBOX_PEDALS_IGNORE_GROUP 287
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_REQUIRED_CLEAR_BROWSER_CACHE 40210
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_OPTIONAL_GOOGLE_CHROME 373
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_REQUIRED_DELETE 374
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLEAR_BROWSING_DATA_ONE_REQUIRED_INFORMATION 375
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_REQUIRED_MANAGE_CHROME_PASSWORDS 40211
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_OPTIONAL_GOOGLE_CHROME 367
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_OPTIONAL_MANAGER 368
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_PASSWORDS_ONE_REQUIRED_PASSWORDS 369
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_REQUIRED_MANAGE_PAYMENT_METHODS 40212
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_OPTIONAL_GOOGLE_CHROME 364
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_REQUIRED_CHANGE 365
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CREDIT_CARD_ONE_REQUIRED_CREDIT_CARD_INFORMATION 366
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_REQUIRED_ENTER_INCOGNITO_MODE 40213
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_OPTIONAL_GOOGLE_CHROME 361
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_OPTIONAL_CREATE 362
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_LAUNCH_INCOGNITO_ONE_REQUIRED_INCOGNITO_WINDOW 363
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_REQUIRED_TRANSLATE_THIS_PAGE 40214
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_OPTIONAL_GOOGLE_CHROME 357
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_REQUIRED_CHANGE_LANGUAGE 358
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_TRANSLATE_ONE_REQUIRED_THIS_PAGE 359
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CHROME_ONE_REQUIRED_UPDATE_CHROME 40215
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CHROME_ONE_REQUIRED_GOOGLE_CHROME 355
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_UPDATE_CHROME_ONE_REQUIRED_INSTALL 356
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_REQUIRED_RUN_CHROME_SAFETY_CHECK 40216
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_OPTIONAL_ACTIVATE 351
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_OPTIONAL_GOOGLE_CHROME 352
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_REQUIRED_CHECKUP 353
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_RUN_CHROME_SAFETY_CHECK_ONE_REQUIRED_PASSWORDS 354
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ONE_REQUIRED_MANAGE_SECURITY_SETTINGS 40217
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ANY_OPTIONAL_GOOGLE_CHROME 348
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ONE_REQUIRED_ENHANCED_PROTECTION 349
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SECURITY_SETTINGS_ONE_OPTIONAL_ALTER 350
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ONE_REQUIRED_CHROME_COOKIE_SETTINGS 40218
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ONE_REQUIRED_COOKIE_SETTINGS 345
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ANY_REQUIRED_GOOGLE_CHROME 346
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_COOKIES_ANY_OPTIONAL_THIRD_PARTY 347
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_REQUIRED_ADD_ADDRESS 40219
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_REQUIRED_CONTROL 342
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_REQUIRED_SHIPPING_ADDRESSES 343
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_ADDRESSES_ONE_OPTIONAL_GOOGLE_CHROME 344
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SYNC_ONE_REQUIRED_CHANGE_CHROME_BROWSER_SYNC_SETTINGS 40220
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SYNC_ONE_REQUIRED_SYNC_SETTINGS 340
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SYNC_ANY_REQUIRED_GOOGLE_CHROME 341
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SITE_SETTINGS_ONE_REQUIRED_ADJUST_SITE_PERMISSIONS 40221
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SITE_SETTINGS_ONE_REQUIRED_SITE_PERMISSIONS 338
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_SITE_SETTINGS_ANY_REQUIRED_GOOGLE_CHROME 339
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_CREATE_GOOGLE_DOC 40222
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_GOOGLE_WORKSPACE 332
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ANY_REQUIRED_CREATE 333
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_DOC_ONE_REQUIRED_DOCUMENT 334
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_CREATE_GOOGLE_SHEET 40223
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ANY_REQUIRED_CREATE 329
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_GOOGLE_WORKSPACE 330
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SHEET_ONE_REQUIRED_SPREADSHEET 331
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE_GOOGLE_SLIDE 40224
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_CREATE 326
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ONE_REQUIRED_PRESENTATION 327
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SLIDE_ANY_REQUIRED_WORKSPACE 328
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_CREATE_GOOGLE_CAL_INVITE 40225
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_SCHEDULE 323
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ANY_REQUIRED_WORKSPACE 324
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_CALENDAR_EVENT_ONE_REQUIRED_MEETING 325
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_CREATE_GOOGLE_SITE 40226
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_CREATE 320
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ANY_REQUIRED_WORKSPACE 321
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_SITE_ONE_REQUIRED_WEBSITE 322
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_CREATE_GOOGLE_KEEP_NOTE 40227
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_CREATE 317
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ANY_REQUIRED_WORKSPACE 318
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_KEEP_NOTE_ONE_REQUIRED_NOTES 319
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_CREATE_GOOGLE_FORM 40228
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_CREATE 314
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ANY_REQUIRED_WORKSPACE 315
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CREATE_GOOGLE_FORM_ONE_REQUIRED_SURVEY 316
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_CHROME_FEATURES 40229
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_OPTIONAL_MAKE_THE_MOST_OF 335
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ANY_OPTIONAL_BROWSER 336
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SEE_CHROME_TIPS_ONE_REQUIRED_NEW_CHROME_FEATURES 337
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL_MY_GOOGLE_ACCOUNT 40230
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_GOOGLE_ACCOUNT 311
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ANY_OPTIONAL_BROWSER 312
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_ACCOUNT_ONE_REQUIRED_CONTROL 313
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE_GMAIL_PASSWORD 40231
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_GOOGLE_ACCOUNT_PASSWORD 370
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ANY_OPTIONAL_BROWSER 371
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CHANGE_GOOGLE_PASSWORD_ONE_REQUIRED_CHANGE 372
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLOSE_INCOGNITO_WINDOWS_ONE_REQUIRED_CLOSE_INCOGNITO_WINDOW 40232
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLOSE_INCOGNITO_WINDOWS_ONE_REQUIRED_DELETE 40233
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CLOSE_INCOGNITO_WINDOWS_ONE_REQUIRED_INCOGNITO_WINDOW 40234
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_PLAY_CHROME_DINO_GAME_ONE_REQUIRED_CHROME_DINO 40235
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_PLAY_CHROME_DINO_GAME_ONE_REQUIRED_PLAY_CHROME_DINO_GAME 360
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_FIND_LOST_PHONE 40236
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_HELP_ME_LOCATE 309
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_FIND_MY_PHONE_ONE_REQUIRED_LOST_DEVICE 310
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_PRIVACY_ONE_REQUIRED_CHANGE_GOOGLE_PRIVACY_SETTINGS 40237
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_GOOGLE_PRIVACY_ONE_REQUIRED_MANAGE_GOOGLE_PRIVACY_SETTINGS 308
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_SETTINGS_ONE_REQUIRED_CHANGE_CHROME_SETTINGS 40238
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_SETTINGS_ONE_OPTIONAL_CONTROL 306
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_SETTINGS_ONE_REQUIRED_CHROME_BROWSER_SETTINGS 307
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_DOWNLOADS_ONE_REQUIRED_MANAGE_CHROME_DOWNLOADS 40239
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_DOWNLOADS_ONE_REQUIRED_CONTROL 304
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_DOWNLOADS_ONE_REQUIRED_CHROME_BROWSER_DOWNLOADS 305
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_VIEW_CHROME_HISTORY_ONE_REQUIRED_SEE_CHROME_HISTORY 40240
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_VIEW_CHROME_HISTORY_ONE_REQUIRED_REVISIT 302
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_VIEW_CHROME_HISTORY_ONE_REQUIRED_GOOGLE_CHROME_BROWSING_HISTORY 303
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SHARE_THIS_PAGE_ONE_REQUIRED_SHARE_THIS_PAGE 40241
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SHARE_THIS_PAGE_ONE_REQUIRED_SHARE_LINK_WITH_QR_CODE 301
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_ACCESSIBILITY_ONE_REQUIRED_CUSTOMIZE_CHROME_ACCESSIBILITY 40242
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_ACCESSIBILITY_ONE_OPTIONAL_CUSTOMIZE 299
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_ACCESSIBILITY_ONE_REQUIRED_ACCESSIBILITY_SETTINGS 300
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_REQUIRED_CHANGE_BROWSER_FONT 40243
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_OPTIONAL_CUSTOMIZE 296
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_REQUIRED_GOOGLE_CHROME 297
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_CHROME_FONTS_ONE_REQUIRED_FONT_SIZING 298
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_THEMES_ONE_REQUIRED_CUSTOMIZE_CHROME_APPEARANCE 40244
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_THEMES_ONE_OPTIONAL_CUSTOMIZE 294
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROME_THEMES_ONE_REQUIRED_CHROME_BACKGROUNDS 295
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_REQUIRED_ADD_CUSTOM_SEARCH 40245
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_OPTIONAL_CUSTOMIZE 291
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_REQUIRED_CUSTOM_SEARCH_ENGINES 292
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_CUSTOMIZE_SEARCH_ENGINES_ONE_OPTIONAL_GOOGLE_CHROME 293
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROMEOS_ACCESSIBILITY_ONE_REQUIRED_CUSTOMIZE_CHROMEOS_ACCESSIBILITY 40246
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROMEOS_ACCESSIBILITY_ONE_OPTIONAL_CUSTOMIZE 40247
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_MANAGE_CHROMEOS_ACCESSIBILITY_ONE_REQUIRED_ACCESSIBILITY_SETTINGS 40248
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_REQUIRED_ALWAYS_OPEN_LINKS_IN_CHROME 40249
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_REQUIRED_HOW_TO_MAKE_CHROME_MY_DEFAULT_BROWSER 288
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_OPTIONAL_SELECT 289
+#define IDS_OMNIBOX_PEDAL_SYNONYMS_SET_CHROME_AS_DEFAULT_BROWSER_ONE_OPTIONAL_DEFAULT_BROWSER 290
+
+// ---------------------------------------------------------------------------
+// From platform_locale_settings.h:
+
+#define IDS_STANDARD_FONT_FAMILY 106
+#define IDS_FIXED_FONT_FAMILY 107
+#define IDS_FIXED_FONT_FAMILY_ALT_WIN 108
+#define IDS_SERIF_FONT_FAMILY 109
+#define IDS_SANS_SERIF_FONT_FAMILY 110
+#define IDS_NTP_FONT_FAMILY 16100
+#define IDS_CURSIVE_FONT_FAMILY 111
+#define IDS_FANTASY_FONT_FAMILY 112
+#define IDS_MATH_FONT_FAMILY 113
+#define IDS_STANDARD_FONT_FAMILY_CYRILLIC 131
+#define IDS_FIXED_FONT_FAMILY_ARABIC 129
+#define IDS_FIXED_FONT_FAMILY_CYRILLIC 132
+#define IDS_SANS_SERIF_FONT_FAMILY_ARABIC 130
+#define IDS_SERIF_FONT_FAMILY_CYRILLIC 133
+#define IDS_SANS_SERIF_FONT_FAMILY_CYRILLIC 134
+#define IDS_STANDARD_FONT_FAMILY_GREEK 135
+#define IDS_FIXED_FONT_FAMILY_GREEK 136
+#define IDS_SERIF_FONT_FAMILY_GREEK 137
+#define IDS_SANS_SERIF_FONT_FAMILY_GREEK 138
+#define IDS_STANDARD_FONT_FAMILY_JAPANESE 114
+#define IDS_FIXED_FONT_FAMILY_JAPANESE 115
+#define IDS_SERIF_FONT_FAMILY_JAPANESE 116
+#define IDS_SANS_SERIF_FONT_FAMILY_JAPANESE 117
+#define IDS_STANDARD_FONT_FAMILY_KOREAN 118
+#define IDS_FIXED_FONT_FAMILY_KOREAN 139
+#define IDS_SERIF_FONT_FAMILY_KOREAN 119
+#define IDS_SANS_SERIF_FONT_FAMILY_KOREAN 120
+#define IDS_CURSIVE_FONT_FAMILY_KOREAN 140
+#define IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN 121
+#define IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN 141
+#define IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 122
+#define IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN 123
+#define IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN 127
+#define IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN 124
+#define IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN 142
+#define IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 125
+#define IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN 126
+#define IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN 128
+#define IDS_MINIMUM_FONT_SIZE 143
+#define IDS_MINIMUM_LOGICAL_FONT_SIZE 144
+
+// ---------------------------------------------------------------------------
+// From services_strings.h:
+
+#define IDS_PROXY_RESOLVER_DISPLAY_NAME 45220
+#define IDS_WINDOWS_SYSTEM_PROXY_RESOLVER_DISPLAY_NAME 45221
+
+// ---------------------------------------------------------------------------
+// From ui_strings.h:
+
+#define IDS_TIME_SECS 49800
+#define IDS_TIME_LONG_SECS 49801
+#define IDS_TIME_LONG_SECS_2ND 49802
+#define IDS_TIME_MINS 49803
+#define IDS_TIME_LONG_MINS 49804
+#define IDS_TIME_LONG_MINS_1ST 49805
+#define IDS_TIME_LONG_MINS_2ND 49806
+#define IDS_TIME_HOURS 49807
+#define IDS_TIME_HOURS_1ST 49808
+#define IDS_TIME_HOURS_2ND 49809
+#define IDS_TIME_DAYS 49810
+#define IDS_TIME_DAYS_1ST 49811
+#define IDS_TIME_MONTHS 49812
+#define IDS_TIME_YEARS 49813
+#define IDS_TIME_REMAINING_SECS 49814
+#define IDS_TIME_REMAINING_LONG_SECS 49815
+#define IDS_TIME_REMAINING_MINS 49816
+#define IDS_TIME_REMAINING_LONG_MINS 49817
+#define IDS_TIME_REMAINING_HOURS 49818
+#define IDS_TIME_REMAINING_DAYS 49819
+#define IDS_TIME_REMAINING_MONTHS 49820
+#define IDS_TIME_REMAINING_YEARS 49821
+#define IDS_TIME_ELAPSED_SECS 49822
+#define IDS_TIME_ELAPSED_LONG_SECS 49823
+#define IDS_TIME_ELAPSED_MINS 49824
+#define IDS_TIME_ELAPSED_LONG_MINS 49825
+#define IDS_TIME_ELAPSED_HOURS 49826
+#define IDS_TIME_ELAPSED_DAYS 49827
+#define IDS_TIME_ELAPSED_MONTHS 49828
+#define IDS_TIME_ELAPSED_YEARS 49829
+#define IDS_TIME_TITLE_CASE_ELAPSED_LONG_SECS 49830
+#define IDS_TIME_TITLE_CASE_ELAPSED_LONG_MINS 49831
+#define IDS_TIME_TITLE_CASE_ELAPSED_HOURS 49832
+#define IDS_TIME_TITLE_CASE_ELAPSED_DAYS 49833
+#define IDS_TIME_TITLE_CASE_ELAPSED_MONTHS 49834
+#define IDS_TIME_TITLE_CASE_ELAPSED_YEARS 49835
+#define IDS_PAST_TIME_TODAY 49836
+#define IDS_PAST_TIME_YESTERDAY 49837
+#define IDS_APP_MENU_EMPTY_SUBMENU 49838
+#define IDS_CLIPBOARD_MENU_HTML 49839
+#define IDS_CLIPBOARD_MENU_IMAGE 49840
+#define IDS_CLIPBOARD_MENU_RTF_CONTENT 49841
+#define IDS_CLIPBOARD_MENU_WEB_SMART_PASTE 49842
+#define IDS_CLIPBOARD_MENU_CLIPBOARD 49843
+#define IDS_CLIPBOARD_MENU_DELETE_ALL 49844
+#define IDS_EXTENSION_PINNED 49845
+#define IDS_EXTENSION_UNPINNED 49846
+#define IDS_NEW_BADGE 49847
+#define IDS_NEW_BADGE_UPPERCASE 49848
+#define IDS_NEW_BADGE_SCREEN_READER_MESSAGE 49849
+#define IDS_SENTENCE_END 49850
+#define IDS_CONCAT_TWO_STRINGS_WITH_COMMA 49851
+#define IDS_CONCAT_THREE_STRINGS_WITH_COMMA 49852
+#define IDS_CONCAT_TWO_STRINGS_WITH_PERIODS 49853
+#define IDS_APP_UNTITLED_SHORTCUT_FILE_NAME 49854
+#define IDS_APP_SAVEAS_ALL_FILES 49855
+#define IDS_APP_SAVEAS_EXTENSION_FORMAT 49856
+#define IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE 49857
+#define IDS_CONTENT_CONTEXT_WRITING_DIRECTION_MENU 49865
+#define IDS_CONTENT_CONTEXT_WRITING_DIRECTION_DEFAULT 49866
+#define IDS_CONTENT_CONTEXT_WRITING_DIRECTION_LTR 49867
+#define IDS_CONTENT_CONTEXT_WRITING_DIRECTION_RTL 49868
+#define IDS_SELECT_FOLDER_DIALOG_TITLE 49869
+#define IDS_SAVE_AS_DIALOG_TITLE 49870
+#define IDS_OPEN_FILE_DIALOG_TITLE 49871
+#define IDS_OPEN_FILES_DIALOG_TITLE 49872
+#define IDS_SAVEAS_ALL_FILES 49873
+#define IDS_SELECT_UPLOAD_FOLDER_DIALOG_UPLOAD_BUTTON 49874
+#define IDS_APP_ACCNAME_BACK 49875
+#define IDS_APP_ACCNAME_CENTER 49876
+#define IDS_APP_ACCNAME_CLOSE 404
+#define IDS_APP_ACCNAME_MINIMIZE 401
+#define IDS_APP_ACCNAME_MAXIMIZE 402
+#define IDS_APP_ACCNAME_RESTORE 403
+#define IDS_APP_ACCNAME_MENU 49877
+#define IDS_APP_ACCNAME_COLOR_CHOOSER_HEX_INPUT 49878
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE 49879
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFTEDGE 49880
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHTEDGE 49881
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLHOME 49882
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLEND 49883
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEUP 49884
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLPAGEDOWN 49885
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLLEFT 49886
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLRIGHT 49887
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLUP 49888
+#define IDS_APP_SCROLLBAR_CXMENU_SCROLLDOWN 49889
+#define IDS_APP_TABLE_COLUMN_NOT_SORTED_ACCNAME 49890
+#define IDS_APP_TABLE_COLUMN_SORTED_ASC_ACCNAME 49891
+#define IDS_APP_TABLE_COLUMN_SORTED_DESC_ACCNAME 49892
+#define IDS_APP_UNDO 49893
+#define IDS_APP_CUT 49894
+#define IDS_APP_COPY 407
+#define IDS_APP_PASTE 49895
+#define IDS_APP_DELETE 49896
+#define IDS_APP_SELECT_ALL 408
+#define IDS_APP_SELECT 49897
+#define IDS_CONTENT_CONTEXT_EMOJI 49898
+#define IDS_APP_OK 49901
+#define IDS_APP_CANCEL 49902
+#define IDS_APP_CLOSE 49903
+#define IDS_APP_ESC_KEY 49904
+#define IDS_APP_TAB_KEY 49905
+#define IDS_APP_INSERT_KEY 49906
+#define IDS_APP_HOME_KEY 49907
+#define IDS_APP_DELETE_KEY 49908
+#define IDS_APP_END_KEY 49909
+#define IDS_APP_PAGEUP_KEY 49910
+#define IDS_APP_PAGEDOWN_KEY 49911
+#define IDS_APP_LEFT_ARROW_KEY 49912
+#define IDS_APP_RIGHT_ARROW_KEY 49913
+#define IDS_APP_UP_ARROW_KEY 49914
+#define IDS_APP_DOWN_ARROW_KEY 49915
+#define IDS_APP_ENTER_KEY 49916
+#define IDS_APP_SPACE_KEY 49917
+#define IDS_APP_F1_KEY 49918
+#define IDS_APP_F5_KEY 49919
+#define IDS_APP_F6_KEY 49920
+#define IDS_APP_F11_KEY 49921
+#define IDS_APP_BACKSPACE_KEY 49922
+#define IDS_APP_COMMA_KEY 49923
+#define IDS_APP_PERIOD_KEY 49924
+#define IDS_APP_MEDIA_NEXT_TRACK_KEY 49925
+#define IDS_APP_MEDIA_PLAY_PAUSE_KEY 49926
+#define IDS_APP_MEDIA_PREV_TRACK_KEY 49927
+#define IDS_APP_MEDIA_STOP_KEY 49928
+#define IDS_APP_ALT_KEY 49929
+#define IDS_APP_COMMAND_KEY 49930
+#define IDS_APP_CTRL_KEY 480
+#define IDS_APP_SEARCH_KEY 49931
+#define IDS_APP_SHIFT_KEY 49932
+#define IDS_APP_WINDOWS_KEY 49933
+#define IDS_APP_ACCELERATOR_WITH_MODIFIER 481
+#define IDS_APP_BYTES 49937
+#define IDS_APP_KIBIBYTES 49938
+#define IDS_APP_MEBIBYTES 49939
+#define IDS_APP_GIBIBYTES 49940
+#define IDS_APP_TEBIBYTES 49941
+#define IDS_APP_PEBIBYTES 49942
+#define IDS_APP_BYTES_PER_SECOND 49943
+#define IDS_APP_KIBIBYTES_PER_SECOND 49944
+#define IDS_APP_MEBIBYTES_PER_SECOND 49945
+#define IDS_APP_GIBIBYTES_PER_SECOND 49946
+#define IDS_APP_TEBIBYTES_PER_SECOND 49947
+#define IDS_APP_PEBIBYTES_PER_SECOND 49948
+#define IDS_MESSAGE_CENTER_ACCESSIBLE_NAME 49949
+#define IDS_MESSAGE_CENTER_NOTIFICATION_ACCESSIBLE_NAME 49950
+#define IDS_MESSAGE_CENTER_NOTIFICATION_ACCESSIBLE_NAME_PLURAL 49951
+#define IDS_MESSAGE_CENTER_EXPAND_NOTIFICATION 49952
+#define IDS_MESSAGE_CENTER_COLLAPSE_NOTIFICATION 49953
+#define IDS_MESSAGE_CENTER_LIST_NOTIFICATION_MESSAGE_WITH_DIVIDER 49954
+#define IDS_MESSAGE_CENTER_LIST_NOTIFICATION_HEADER_OVERFLOW_INDICATOR 49955
+#define IDS_MESSAGE_CENTER_NOTIFICATION_PROGRESS_PERCENTAGE 49956
+#define IDS_MESSAGE_CENTER_NOTIFICATION_CHROMEOS_SYSTEM 49957
+#define IDS_MESSAGE_CENTER_NOTIFICATION_INLINE_REPLY_PLACEHOLDER 49958
+#define IDS_MESSAGE_CENTER_NOTIFICATION_INLINE_REPLY_ACCESSIBLE_NAME 49959
+#define IDS_MESSAGE_NOTIFICATION_NOW_STRING_SHORTEST 49960
+#define IDS_MESSAGE_NOTIFICATION_DURATION_MINUTES_SHORTEST 49961
+#define IDS_MESSAGE_NOTIFICATION_DURATION_HOURS_SHORTEST 49962
+#define IDS_MESSAGE_NOTIFICATION_DURATION_DAYS_SHORTEST 49963
+#define IDS_MESSAGE_NOTIFICATION_DURATION_YEARS_SHORTEST 49964
+#define IDS_MESSAGE_NOTIFICATION_DURATION_MINUTES_SHORTEST_FUTURE 49965
+#define IDS_MESSAGE_NOTIFICATION_DURATION_HOURS_SHORTEST_FUTURE 49966
+#define IDS_MESSAGE_NOTIFICATION_DURATION_DAYS_SHORTEST_FUTURE 49967
+#define IDS_MESSAGE_NOTIFICATION_DURATION_YEARS_SHORTEST_FUTURE 49968
+#define IDS_MESSAGE_CENTER_BLOCK_ALL_NOTIFICATIONS_SITE 49969
+#define IDS_MESSAGE_CENTER_BLOCK_ALL_NOTIFICATIONS_APP 49970
+#define IDS_MESSAGE_CENTER_BLOCK_ALL_NOTIFICATIONS 49971
+#define IDS_MESSAGE_CENTER_DONT_BLOCK_NOTIFICATIONS 49972
+#define IDS_MESSAGE_CENTER_SETTINGS_DONE 49973
+#define IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_ACCESSIBLE_NAME 49974
+#define IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_TOOLTIP 49975
+#define IDS_MESSAGE_CENTER_NOTIFICATION_SNOOZE_BUTTON_TOOLTIP 49976
+#define IDS_MESSAGE_NOTIFICATION_SETTINGS_BUTTON_ACCESSIBLE_NAME 49977
+#define IDS_MESSAGE_NOTIFICATION_ACCESSIBLE_NAME 49978
+#define IDS_MESSAGE_NOTIFICATION_SEND_TAB_TO_SELF_DEVICE_INFO 49979
+#define IDS_MESSAGE_NOTIFICATION_SEND_TAB_TO_SELF_CONFIRMATION_SUCCESS 49980
+#define IDS_MESSAGE_NOTIFICATION_SEND_TAB_TO_SELF_CONFIRMATION_FAILURE_TITLE 49981
+#define IDS_MESSAGE_NOTIFICATION_SEND_TAB_TO_SELF_CONFIRMATION_FAILURE_MESSAGE 49982
+#define IDS_CLIPBOARD_HISTORY_MENU_PNG_IMAGE 49984
+#define IDS_CLIPBOARD_HISTORY_MENU_HTML_IMAGE 49985
+#define IDS_CLIPBOARD_HISTORY_MENU_TITLE 49986
+#define IDS_CLIPBOARD_HISTORY_DELETE_ITEM_TEXT 49987
+#define IDS_CLIPBOARD_HISTORY_DELETE_BUTTON_HOVER_TEXT 49988
+#define IDS_CLIPBOARD_HISTORY_ITEM_DELETION 49989
+#define IDS_DISPLAY_TOUCH_CALIBRATION_EXIT_LABEL 49990
+#define IDS_DISPLAY_TOUCH_CALIBRATION_HINT_LABEL_TEXT 49991
+#define IDS_DISPLAY_TOUCH_CALIBRATION_HINT_SUBLABEL_TEXT 49992
+#define IDS_DISPLAY_TOUCH_CALIBRATION_TAP_HERE_LABEL 49993
+#define IDS_DISPLAY_TOUCH_CALIBRATION_FINISH_LABEL 49994
+#define IDS_DISPLAY_NAME_UNKNOWN 49995
+#define IDS_DISPLAY_NAME_INTERNAL 49996
+#define IDS_CROSTINI_USE_LOW_DENSITY 49997
+#define IDS_CROSTINI_USE_HIGH_DENSITY 49998
+#define IDS_CROSTINI_APP_RESTART_BODY 49999
+#define IDS_SATURATED_BADGE_CONTENT 50000
+#define IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED 50001
+#define IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED 50002
+#define IDS_BADGE_UNREAD_NOTIFICATIONS 50003
+#define IDS_BROWSER_SHARING_CLICK_TO_CALL_DIALOG_TITLE_LABEL 687
+#define IDS_BROWSER_SHARING_CLICK_TO_CALL_DIALOG_TITLE_NO_DEVICES 50004
+#define IDS_BROWSER_SHARING_CLICK_TO_CALL_DIALOG_CALL_BUTTON_LABEL 50005
+#define IDS_BROWSER_SHARING_OMNIBOX_SENDING_LABEL 467
+#define IDS_BROWSER_SHARING_DIALOG_DEVICE_SUBTITLE_LAST_ACTIVE_DAYS 50006
+#define IDS_BROWSER_SHARING_CLICK_TO_CALL_DIALOG_INITIATING_ORIGIN 50007
+#define IDS_BROWSER_SHARING_CONTENT_TYPE_TEXT 50008
+#define IDS_BROWSER_SHARING_CONTENT_TYPE_NUMBER 50009
+#define IDS_BROWSER_SHARING_ERROR_DIALOG_TITLE_GENERIC_ERROR 50010
+#define IDS_BROWSER_SHARING_ERROR_DIALOG_TITLE_INTERNAL_ERROR 50011
+#define IDS_BROWSER_SHARING_ERROR_DIALOG_TEXT_NETWORK_ERROR 50012
+#define IDS_BROWSER_SHARING_ERROR_DIALOG_TEXT_DEVICE_ACK_TIMEOUT 50013
+#define IDS_BROWSER_SHARING_ERROR_DIALOG_TEXT_INTERNAL_ERROR 50014
+#define IDS_BROWSER_SHARING_SHARED_CLIPBOARD_ERROR_DIALOG_TITLE_PAYLOAD_TOO_LARGE 50015
+#define IDS_BROWSER_SHARING_SHARED_CLIPBOARD_ERROR_DIALOG_TEXT_PAYLOAD_TOO_LARGE 50016
+#define IDS_SETTINGS_PASSWORD_SHOW 50020
+#define IDS_SETTINGS_PASSWORD_HIDE 50021
+#define IDS_TABLE_VIEW_AX_ANNOUNCE_ROW_SELECTED 50022
+#define IDS_LINK_COPIED 50023
+
+#endif  // CEF_INCLUDE_CEF_PACK_STRINGS_H_
diff --git a/src/include/cef_parser.h b/src/include/cef_parser.h
index ebe75103e..7482c7fea 100644
--- a/src/include/cef_parser.h
+++ b/src/include/cef_parser.h
@@ -44,81 +44,90 @@
 #include "include/cef_values.h"
 
 ///
-// Parse the specified |url| into its component parts.
-// Returns false if the URL is empty or invalid.
+/// Combines specified |base_url| and |relative_url| into |resolved_url|.
+/// Returns false if one of the URLs is empty or invalid.
+///
+/*--cef()--*/
+bool CefResolveURL(const CefString& base_url,
+                   const CefString& relative_url,
+                   CefString& resolved_url);
+
+///
+/// Parse the specified |url| into its component parts.
+/// Returns false if the URL is empty or invalid.
 ///
 /*--cef()--*/
 bool CefParseURL(const CefString& url, CefURLParts& parts);
 
 ///
-// Creates a URL from the specified |parts|, which must contain a non-empty
-// spec or a non-empty host and path (at a minimum), but not both.
-// Returns false if |parts| isn't initialized as described.
+/// Creates a URL from the specified |parts|, which must contain a non-empty
+/// spec or a non-empty host and path (at a minimum), but not both.
+/// Returns false if |parts| isn't initialized as described.
 ///
 /*--cef()--*/
 bool CefCreateURL(const CefURLParts& parts, CefString& url);
 
 ///
-// This is a convenience function for formatting a URL in a concise and human-
-// friendly way to help users make security-related decisions (or in other
-// circumstances when people need to distinguish sites, origins, or otherwise-
-// simplified URLs from each other). Internationalized domain names (IDN) may be
-// presented in Unicode if the conversion is considered safe. The returned value
-// will (a) omit the path for standard schemes, excepting file and filesystem,
-// and (b) omit the port if it is the default for the scheme. Do not use this
-// for URLs which will be parsed or sent to other applications.
+/// This is a convenience function for formatting a URL in a concise and human-
+/// friendly way to help users make security-related decisions (or in other
+/// circumstances when people need to distinguish sites, origins, or otherwise-
+/// simplified URLs from each other). Internationalized domain names (IDN) may
+/// be presented in Unicode if the conversion is considered safe. The returned
+/// value will (a) omit the path for standard schemes, excepting file and
+/// filesystem, and (b) omit the port if it is the default for the scheme. Do
+/// not use this for URLs which will be parsed or sent to other applications.
 ///
 /*--cef(optional_param=languages)--*/
 CefString CefFormatUrlForSecurityDisplay(const CefString& origin_url);
 
 ///
-// Returns the mime type for the specified file extension or an empty string if
-// unknown.
+/// Returns the mime type for the specified file extension or an empty string if
+/// unknown.
 ///
 /*--cef()--*/
 CefString CefGetMimeType(const CefString& extension);
 
 ///
-// Get the extensions associated with the given mime type. This should be passed
-// in lower case. There could be multiple extensions for a given mime type, like
-// "html,htm" for "text/html", or "txt,text,html,..." for "text/*". Any existing
-// elements in the provided vector will not be erased.
+/// Get the extensions associated with the given mime type. This should be
+/// passed in lower case. There could be multiple extensions for a given mime
+/// type, like "html,htm" for "text/html", or "txt,text,html,..." for "text/*".
+/// Any existing elements in the provided vector will not be erased.
 ///
 /*--cef()--*/
 void CefGetExtensionsForMimeType(const CefString& mime_type,
                                  std::vector<CefString>& extensions);
 
 ///
-// Encodes |data| as a base64 string.
+/// Encodes |data| as a base64 string.
 ///
 /*--cef()--*/
 CefString CefBase64Encode(const void* data, size_t data_size);
 
 ///
-// Decodes the base64 encoded string |data|. The returned value will be NULL if
-// the decoding fails.
+/// Decodes the base64 encoded string |data|. The returned value will be NULL if
+/// the decoding fails.
 ///
 /*--cef()--*/
 CefRefPtr<CefBinaryValue> CefBase64Decode(const CefString& data);
 
 ///
-// Escapes characters in |text| which are unsuitable for use as a query
-// parameter value. Everything except alphanumerics and -_.!~*'() will be
-// converted to "%XX". If |use_plus| is true spaces will change to "+". The
-// result is basically the same as encodeURIComponent in Javacript.
+/// Escapes characters in |text| which are unsuitable for use as a query
+/// parameter value. Everything except alphanumerics and -_.!~*'() will be
+/// converted to "%XX". If |use_plus| is true spaces will change to "+". The
+/// result is basically the same as encodeURIComponent in Javacript.
 ///
 /*--cef()--*/
 CefString CefURIEncode(const CefString& text, bool use_plus);
 
 ///
-// Unescapes |text| and returns the result. Unescaping consists of looking for
-// the exact pattern "%XX" where each X is a hex digit and converting to the
-// character with the numerical value of those digits (e.g. "i%20=%203%3b"
-// unescapes to "i = 3;"). If |convert_to_utf8| is true this function will
-// attempt to interpret the initial decoded result as UTF-8. If the result is
-// convertable into UTF-8 it will be returned as converted. Otherwise the
-// initial decoded result will be returned.  The |unescape_rule| parameter
-// supports further customization the decoding process.
+/// Unescapes |text| and returns the result. Unescaping consists of looking for
+/// the exact pattern "%XX" where each X is a hex digit and converting to the
+/// character with the numerical value of those digits (e.g. "i%20=%203%3b"
+/// unescapes to "i = 3;"). If |convert_to_utf8| is true this function will
+/// attempt to interpret the initial decoded result as UTF-8. If the result is
+/// convertable into UTF-8 it will be returned as converted. Otherwise the
+/// initial decoded result will be returned.  The |unescape_rule| parameter
+/// supports further customization the decoding process.
 ///
 /*--cef()--*/
 CefString CefURIDecode(const CefString& text,
@@ -126,30 +135,38 @@ CefString CefURIDecode(const CefString& text,
                        cef_uri_unescape_rule_t unescape_rule);
 
 ///
-// Parses the specified |json_string| and returns a dictionary or list
-// representation. If JSON parsing fails this method returns NULL.
+/// Parses the specified |json_string| and returns a dictionary or list
+/// representation. If JSON parsing fails this method returns NULL.
 ///
 /*--cef()--*/
 CefRefPtr<CefValue> CefParseJSON(const CefString& json_string,
                                  cef_json_parser_options_t options);
 
 ///
-// Parses the specified |json_string| and returns a dictionary or list
-// representation. If JSON parsing fails this method returns NULL and populates
-// |error_code_out| and |error_msg_out| with an error code and a formatted error
-// message respectively.
+/// Parses the specified UTF8-encoded |json| buffer of size |json_size| and
+/// returns a dictionary or list representation. If JSON parsing fails this
+/// method returns NULL.
+///
+/*--cef(capi_name=cef_parse_json_buffer)--*/
+CefRefPtr<CefValue> CefParseJSON(const void* json,
+                                 size_t json_size,
+                                 cef_json_parser_options_t options);
+
+///
+/// Parses the specified |json_string| and returns a dictionary or list
+/// representation. If JSON parsing fails this method returns NULL and populates
+/// |error_msg_out| with a formatted error message.
 ///
 /*--cef()--*/
 CefRefPtr<CefValue> CefParseJSONAndReturnError(
     const CefString& json_string,
     cef_json_parser_options_t options,
-    cef_json_parser_error_t& error_code_out,
     CefString& error_msg_out);
 
 ///
-// Generates a JSON string from the specified root |node| which should be a
-// dictionary or list value. Returns an empty string on failure. This method
-// requires exclusive access to |node| including any underlying data.
+/// Generates a JSON string from the specified root |node| which should be a
+/// dictionary or list value. Returns an empty string on failure. This method
+/// requires exclusive access to |node| including any underlying data.
 ///
 /*--cef()--*/
 CefString CefWriteJSON(CefRefPtr<CefValue> node,
diff --git a/src/include/cef_path_util.h b/src/include/cef_path_util.h
index 95af66efa..d30dc6ce8 100644
--- a/src/include/cef_path_util.h
+++ b/src/include/cef_path_util.h
@@ -43,21 +43,10 @@
 typedef cef_path_key_t PathKey;
 
 ///
-// Retrieve the path associated with the specified |key|. Returns true on
-// success. Can be called on any thread in the browser process.
+/// Retrieve the path associated with the specified |key|. Returns true on
+/// success. Can be called on any thread in the browser process.
 ///
 /*--cef()--*/
 bool CefGetPath(PathKey key, CefString& path);
 
-///
-// Override the path associated with the specified |key|. This cannot
-// be used to change the value of PK_DIR_CURRENT, but that should be obvious.
-// Also, if the path specifies a directory that does not exist, the directory
-// will be created by this method.  This method returns true if successful.
-// WARNING: Consumers of CefGetPath may expect paths to be constant
-// over the lifetime of the app, so this method should be used with caution.
-///
-/*--cef()--*/
-bool CefOverridePath(PathKey key, const CefString& path);
-
 #endif  // CEF_INCLUDE_CEF_PATH_UTIL_H_
diff --git a/src/include/cef_permission_handler.h b/src/include/cef_permission_handler.h
new file mode 100644
index 000000000..e28c6a60a
--- /dev/null
+++ b/src/include/cef_permission_handler.h
@@ -0,0 +1,149 @@
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_PERMISSION_HANDLER_H_
+#define CEF_INCLUDE_CEF_PERMISSION_HANDLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+
+///
+/// Callback interface used for asynchronous continuation of media access
+/// permission requests.
+///
+/*--cef(source=library)--*/
+class CefMediaAccessCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Call to allow or deny media access. If this callback was initiated in
+  /// response to a getUserMedia (indicated by
+  /// CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE and/or
+  /// CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE being set) then
+  /// |allowed_permissions| must match |required_permissions| passed to
+  /// OnRequestMediaAccessPermission.
+  ///
+  /*--cef(capi_name=cont)--*/
+  virtual void Continue(uint32_t allowed_permissions) = 0;
+
+  ///
+  /// Cancel the media access request.
+  ///
+  /*--cef()--*/
+  virtual void Cancel() = 0;
+};
+
+///
+/// Callback interface used for asynchronous continuation of permission prompts.
+///
+/*--cef(source=library)--*/
+class CefPermissionPromptCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Complete the permissions request with the specified |result|.
+  ///
+  /*--cef(capi_name=cont)--*/
+  virtual void Continue(cef_permission_request_result_t result) = 0;
+};
+
+///
+/// Implement this interface to handle events related to permission requests.
+/// The methods of this class will be called on the browser process UI thread.
+///
+/*--cef(source=client)--*/
+class CefPermissionHandler : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Called when a page requests permission to access media.
+  /// |requesting_origin| is the URL origin requesting permission.
+  /// |requested_permissions| is a combination of values from
+  /// cef_media_access_permission_types_t that represent the requested
+  /// permissions. Return true and call CefMediaAccessCallback methods either in
+  /// this method or at a later time to continue or cancel the request. Return
+  /// false to proceed with default handling. With the Chrome runtime, default
+  /// handling will display the permission request UI. With the Alloy runtime,
+  /// default handling will deny the request. This method will not be called if
+  /// the "--enable-media-stream" command-line switch is used to grant all
+  /// permissions.
+  ///
+  /*--cef()--*/
+  virtual bool OnRequestMediaAccessPermission(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
+      const CefString& requesting_origin,
+      uint32_t requested_permissions,
+      CefRefPtr<CefMediaAccessCallback> callback) {
+    return false;
+  }
+
+  ///
+  /// Called when a page should show a permission prompt. |prompt_id| uniquely
+  /// identifies the prompt. |requesting_origin| is the URL origin requesting
+  /// permission. |requested_permissions| is a combination of values from
+  /// cef_permission_request_types_t that represent the requested permissions.
+  /// Return true and call CefPermissionPromptCallback::Continue either in this
+  /// method or at a later time to continue or cancel the request. Return false
+  /// to proceed with default handling. With the Chrome runtime, default
+  /// handling will display the permission prompt UI. With the Alloy runtime,
+  /// default handling is CEF_PERMISSION_RESULT_IGNORE.
+  ///
+  /*--cef()--*/
+  virtual bool OnShowPermissionPrompt(
+      CefRefPtr<CefBrowser> browser,
+      uint64_t prompt_id,
+      const CefString& requesting_origin,
+      uint32_t requested_permissions,
+      CefRefPtr<CefPermissionPromptCallback> callback) {
+    return false;
+  }
+
+  ///
+  /// Called when a permission prompt handled via OnShowPermissionPrompt is
+  /// dismissed. |prompt_id| will match the value that was passed to
+  /// OnShowPermissionPrompt. |result| will be the value passed to
+  /// CefPermissionPromptCallback::Continue or CEF_PERMISSION_RESULT_IGNORE if
+  /// the dialog was dismissed for other reasons such as navigation, browser
+  /// closure, etc. This method will not be called if OnShowPermissionPrompt
+  /// returned false for |prompt_id|.
+  ///
+  /*--cef()--*/
+  virtual void OnDismissPermissionPrompt(
+      CefRefPtr<CefBrowser> browser,
+      uint64_t prompt_id,
+      cef_permission_request_result_t result) {}
+};
+
+#endif  // CEF_INCLUDE_CEF_PERMISSION_HANDLER_H_
diff --git a/src/include/cef_preference.h b/src/include/cef_preference.h
new file mode 100644
index 000000000..8f3d61afd
--- /dev/null
+++ b/src/include/cef_preference.h
@@ -0,0 +1,134 @@
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_PREFERENCE_H_
+#define CEF_INCLUDE_CEF_PREFERENCE_H_
+#pragma once
+
+#include <vector>
+
+#include "include/cef_base.h"
+#include "include/cef_values.h"
+
+///
+/// Class that manages custom preference registrations.
+///
+/*--cef(source=library)--*/
+class CefPreferenceRegistrar : public CefBaseScoped {
+ public:
+  ///
+  /// Register a preference with the specified |name| and |default_value|. To
+  /// avoid conflicts with built-in preferences the |name| value should contain
+  /// an application-specific prefix followed by a period (e.g. "myapp.value").
+  /// The contents of |default_value| will be copied. The data type for the
+  /// preference will be inferred from |default_value|'s type and cannot be
+  /// changed after registration. Returns true on success. Returns false if
+  /// |name| is already registered or if |default_value| has an invalid type.
+  /// This method must be called from within the scope of the
+  /// CefBrowserProcessHandler::OnRegisterCustomPreferences callback.
+  ///
+  /*--cef()--*/
+  virtual bool AddPreference(const CefString& name,
+                             CefRefPtr<CefValue> default_value) = 0;
+};
+
+///
+/// Manage access to preferences. Many built-in preferences are registered by
+/// Chromium. Custom preferences can be registered in
+/// CefBrowserProcessHandler::OnRegisterCustomPreferences.
+///
+/*--cef(source=library,no_debugct_check)--*/
+class CefPreferenceManager : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Returns the global preference manager object.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefPreferenceManager> GetGlobalPreferenceManager();
+
+  ///
+  /// Returns true if a preference with the specified |name| exists. This method
+  /// must be called on the browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool HasPreference(const CefString& name) = 0;
+
+  ///
+  /// Returns the value for the preference with the specified |name|. Returns
+  /// NULL if the preference does not exist. The returned object contains a copy
+  /// of the underlying preference value and modifications to the returned
+  /// object will not modify the underlying preference value. This method must
+  /// be called on the browser process UI thread.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefValue> GetPreference(const CefString& name) = 0;
+
+  ///
+  /// Returns all preferences as a dictionary. If |include_defaults| is true
+  /// then preferences currently at their default value will be included. The
+  /// returned object contains a copy of the underlying preference values and
+  /// modifications to the returned object will not modify the underlying
+  /// preference values. This method must be called on the browser process UI
+  /// thread.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefDictionaryValue> GetAllPreferences(
+      bool include_defaults) = 0;
+
+  ///
+  /// Returns true if the preference with the specified |name| can be modified
+  /// using SetPreference. As one example preferences set via the command-line
+  /// usually cannot be modified. This method must be called on the browser
+  /// process UI thread.
+  ///
+  /*--cef()--*/
+  virtual bool CanSetPreference(const CefString& name) = 0;
+
+  ///
+  /// Set the |value| associated with preference |name|. Returns true if the
+  /// value is set successfully and false otherwise. If |value| is NULL the
+  /// preference will be restored to its default value. If setting the
+  /// preference fails then |error| will be populated with a detailed
+  /// description of the problem. This method must be called on the browser
+  /// process UI thread.
+  ///
+  /*--cef(optional_param=value)--*/
+  virtual bool SetPreference(const CefString& name,
+                             CefRefPtr<CefValue> value,
+                             CefString& error) = 0;
+};
+
+#endif  // CEF_INCLUDE_CEF_PREFERENCE_H_
diff --git a/src/include/cef_print_handler.h b/src/include/cef_print_handler.h
index c668bd4cf..8e4bcc64a 100644
--- a/src/include/cef_print_handler.h
+++ b/src/include/cef_print_handler.h
@@ -43,58 +43,58 @@
 #include "include/cef_print_settings.h"
 
 ///
-// Callback interface for asynchronous continuation of print dialog requests.
+/// Callback interface for asynchronous continuation of print dialog requests.
 ///
 /*--cef(source=library)--*/
 class CefPrintDialogCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Continue printing with the specified |settings|.
+  /// Continue printing with the specified |settings|.
   ///
   /*--cef(capi_name=cont)--*/
   virtual void Continue(CefRefPtr<CefPrintSettings> settings) = 0;
 
   ///
-  // Cancel the printing.
+  /// Cancel the printing.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 };
 
 ///
-// Callback interface for asynchronous continuation of print job requests.
+/// Callback interface for asynchronous continuation of print job requests.
 ///
 /*--cef(source=library)--*/
 class CefPrintJobCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Indicate completion of the print job.
+  /// Indicate completion of the print job.
   ///
   /*--cef(capi_name=cont)--*/
   virtual void Continue() = 0;
 };
 
 ///
-// Implement this interface to handle printing on Linux. Each browser will have
-// only one print job in progress at a time. The methods of this class will be
-// called on the browser process UI thread.
+/// Implement this interface to handle printing on Linux. Each browser will have
+/// only one print job in progress at a time. The methods of this class will be
+/// called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefPrintHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called when printing has started for the specified |browser|. This method
-  // will be called before the other OnPrint*() methods and irrespective of how
-  // printing was initiated (e.g. CefBrowserHost::Print(), JavaScript
-  // window.print() or PDF extension print button).
+  /// Called when printing has started for the specified |browser|. This method
+  /// will be called before the other OnPrint*() methods and irrespective of how
+  /// printing was initiated (e.g. CefBrowserHost::Print(), JavaScript
+  /// window.print() or PDF extension print button).
   ///
   /*--cef()--*/
   virtual void OnPrintStart(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
-  // Synchronize |settings| with client state. If |get_defaults| is true then
-  // populate |settings| with the default print settings. Do not keep a
-  // reference to |settings| outside of this callback.
+  /// Synchronize |settings| with client state. If |get_defaults| is true then
+  /// populate |settings| with the default print settings. Do not keep a
+  /// reference to |settings| outside of this callback.
   ///
   /*--cef()--*/
   virtual void OnPrintSettings(CefRefPtr<CefBrowser> browser,
@@ -102,9 +102,9 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
                                bool get_defaults) = 0;
 
   ///
-  // Show the print dialog. Execute |callback| once the dialog is dismissed.
-  // Return true if the dialog will be displayed or false to cancel the
-  // printing immediately.
+  /// Show the print dialog. Execute |callback| once the dialog is dismissed.
+  /// Return true if the dialog will be displayed or false to cancel the
+  /// printing immediately.
   ///
   /*--cef()--*/
   virtual bool OnPrintDialog(CefRefPtr<CefBrowser> browser,
@@ -112,9 +112,9 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
                              CefRefPtr<CefPrintDialogCallback> callback) = 0;
 
   ///
-  // Send the print job to the printer. Execute |callback| once the job is
-  // completed. Return true if the job will proceed or false to cancel the job
-  // immediately.
+  /// Send the print job to the printer. Execute |callback| once the job is
+  /// completed. Return true if the job will proceed or false to cancel the job
+  /// immediately.
   ///
   /*--cef()--*/
   virtual bool OnPrintJob(CefRefPtr<CefBrowser> browser,
@@ -123,17 +123,18 @@ class CefPrintHandler : public virtual CefBaseRefCounted {
                           CefRefPtr<CefPrintJobCallback> callback) = 0;
 
   ///
-  // Reset client state related to printing.
+  /// Reset client state related to printing.
   ///
   /*--cef()--*/
   virtual void OnPrintReset(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
-  // Return the PDF paper size in device units. Used in combination with
-  // CefBrowserHost::PrintToPDF().
+  /// Return the PDF paper size in device units. Used in combination with
+  /// CefBrowserHost::PrintToPDF().
   ///
   /*--cef()--*/
-  virtual CefSize GetPdfPaperSize(int device_units_per_inch) {
+  virtual CefSize GetPdfPaperSize(CefRefPtr<CefBrowser> browser,
+                                  int device_units_per_inch) {
     return CefSize();
   }
 };
diff --git a/src/include/cef_print_settings.h b/src/include/cef_print_settings.h
index 576ac4e52..df61a29fc 100644
--- a/src/include/cef_print_settings.h
+++ b/src/include/cef_print_settings.h
@@ -43,7 +43,7 @@
 #include "include/cef_base.h"
 
 ///
-// Class representing print settings.
+/// Class representing print settings.
 ///
 /*--cef(source=library)--*/
 class CefPrintSettings : public virtual CefBaseRefCounted {
@@ -53,47 +53,41 @@ class CefPrintSettings : public virtual CefBaseRefCounted {
   typedef std::vector<CefRange> PageRangeList;
 
   ///
-  // Create a new CefPrintSettings object.
+  /// Create a new CefPrintSettings object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefPrintSettings> Create();
 
   ///
-  // Returns true if this object is valid. Do not call any other methods if this
-  // function returns false.
+  /// Returns true if this object is valid. Do not call any other methods if
+  /// this function returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
+  /// Returns true if the values of this object are read-only. Some APIs may
+  /// expose read-only objects.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns a writable copy of this object.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefPrintSettings> Copy() = 0;
-
-  ///
-  // Set the page orientation.
+  /// Set the page orientation.
   ///
   /*--cef()--*/
   virtual void SetOrientation(bool landscape) = 0;
 
   ///
-  // Returns true if the orientation is landscape.
+  /// Returns true if the orientation is landscape.
   ///
   /*--cef()--*/
   virtual bool IsLandscape() = 0;
 
   ///
-  // Set the printer printable area in device units.
-  // Some platforms already provide flipped area. Set |landscape_needs_flip|
-  // to false on those platforms to avoid double flipping.
+  /// Set the printer printable area in device units.
+  /// Some platforms already provide flipped area. Set |landscape_needs_flip|
+  /// to false on those platforms to avoid double flipping.
   ///
   /*--cef()--*/
   virtual void SetPrinterPrintableArea(
@@ -102,103 +96,103 @@ class CefPrintSettings : public virtual CefBaseRefCounted {
       bool landscape_needs_flip) = 0;
 
   ///
-  // Set the device name.
+  /// Set the device name.
   ///
   /*--cef(optional_param=name)--*/
   virtual void SetDeviceName(const CefString& name) = 0;
 
   ///
-  // Get the device name.
+  /// Get the device name.
   ///
   /*--cef()--*/
   virtual CefString GetDeviceName() = 0;
 
   ///
-  // Set the DPI (dots per inch).
+  /// Set the DPI (dots per inch).
   ///
   /*--cef()--*/
   virtual void SetDPI(int dpi) = 0;
 
   ///
-  // Get the DPI (dots per inch).
+  /// Get the DPI (dots per inch).
   ///
   /*--cef()--*/
   virtual int GetDPI() = 0;
 
   ///
-  // Set the page ranges.
+  /// Set the page ranges.
   ///
   /*--cef()--*/
   virtual void SetPageRanges(const PageRangeList& ranges) = 0;
 
   ///
-  // Returns the number of page ranges that currently exist.
+  /// Returns the number of page ranges that currently exist.
   ///
   /*--cef()--*/
   virtual size_t GetPageRangesCount() = 0;
 
   ///
-  // Retrieve the page ranges.
+  /// Retrieve the page ranges.
   ///
   /*--cef(count_func=ranges:GetPageRangesCount)--*/
   virtual void GetPageRanges(PageRangeList& ranges) = 0;
 
   ///
-  // Set whether only the selection will be printed.
+  /// Set whether only the selection will be printed.
   ///
   /*--cef()--*/
   virtual void SetSelectionOnly(bool selection_only) = 0;
 
   ///
-  // Returns true if only the selection will be printed.
+  /// Returns true if only the selection will be printed.
   ///
   /*--cef()--*/
   virtual bool IsSelectionOnly() = 0;
 
   ///
-  // Set whether pages will be collated.
+  /// Set whether pages will be collated.
   ///
   /*--cef()--*/
   virtual void SetCollate(bool collate) = 0;
 
   ///
-  // Returns true if pages will be collated.
+  /// Returns true if pages will be collated.
   ///
   /*--cef()--*/
   virtual bool WillCollate() = 0;
 
   ///
-  // Set the color model.
+  /// Set the color model.
   ///
   /*--cef()--*/
   virtual void SetColorModel(ColorModel model) = 0;
 
   ///
-  // Get the color model.
+  /// Get the color model.
   ///
   /*--cef(default_retval=COLOR_MODEL_UNKNOWN)--*/
   virtual ColorModel GetColorModel() = 0;
 
   ///
-  // Set the number of copies.
+  /// Set the number of copies.
   ///
   /*--cef()--*/
   virtual void SetCopies(int copies) = 0;
 
   ///
-  // Get the number of copies.
+  /// Get the number of copies.
   ///
   /*--cef()--*/
   virtual int GetCopies() = 0;
 
   ///
-  // Set the duplex mode.
+  /// Set the duplex mode.
   ///
   /*--cef()--*/
   virtual void SetDuplexMode(DuplexMode mode) = 0;
 
   ///
-  // Get the duplex mode.
+  /// Get the duplex mode.
   ///
   /*--cef(default_retval=DUPLEX_MODE_UNKNOWN)--*/
   virtual DuplexMode GetDuplexMode() = 0;
diff --git a/src/include/cef_process_message.h b/src/include/cef_process_message.h
index c4daeb822..74f648100 100644
--- a/src/include/cef_process_message.h
+++ b/src/include/cef_process_message.h
@@ -39,53 +39,63 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_shared_memory_region.h"
 #include "include/cef_values.h"
 
 typedef cef_process_id_t CefProcessId;
 
 ///
-// Class representing a message. Can be used on any process and thread.
+/// Class representing a message. Can be used on any process and thread.
 ///
 /*--cef(source=library)--*/
 class CefProcessMessage : public virtual CefBaseRefCounted {
  public:
   ///
-  // Create a new CefProcessMessage object with the specified name.
+  /// Create a new CefProcessMessage object with the specified name.
   ///
   /*--cef()--*/
   static CefRefPtr<CefProcessMessage> Create(const CefString& name);
 
   ///
-  // Returns true if this object is valid. Do not call any other methods if this
-  // function returns false.
+  /// Returns true if this object is valid. Do not call any other methods if
+  /// this function returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
+  /// Returns true if the values of this object are read-only. Some APIs may
+  /// expose read-only objects.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns a writable copy of this object.
+  /// Returns a writable copy of this object.
+  /// Returns nullptr when message contains a shared memory region.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefProcessMessage> Copy() = 0;
 
   ///
-  // Returns the message name.
+  /// Returns the message name.
   ///
   /*--cef()--*/
   virtual CefString GetName() = 0;
 
   ///
-  // Returns the list of arguments.
+  /// Returns the list of arguments.
+  /// Returns nullptr when message contains a shared memory region.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefListValue> GetArgumentList() = 0;
+
+  ///
+  /// Returns the shared memory region.
+  /// Returns nullptr when message contains an argument list.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefSharedMemoryRegion> GetSharedMemoryRegion() = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_MESSAGE_H_
diff --git a/src/include/cef_process_util.h b/src/include/cef_process_util.h
index 4fce778e7..c3e673123 100644
--- a/src/include/cef_process_util.h
+++ b/src/include/cef_process_util.h
@@ -42,14 +42,14 @@
 #include "include/cef_command_line.h"
 
 ///
-// Launches the process specified via |command_line|. Returns true upon
-// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread.
-//
-// Unix-specific notes:
-// - All file descriptors open in the parent process will be closed in the
-//   child process except for stdin, stdout, and stderr.
-// - If the first argument on the command line does not contain a slash,
-//   PATH will be searched. (See man execvp.)
+/// Launches the process specified via |command_line|. Returns true upon
+/// success. Must be called on the browser process TID_PROCESS_LAUNCHER thread.
+///
+/// Unix-specific notes:
+/// - All file descriptors open in the parent process will be closed in the
+///   child process except for stdin, stdout, and stderr.
+/// - If the first argument on the command line does not contain a slash,
+///   PATH will be searched. (See man execvp.)
 ///
 /*--cef()--*/
 bool CefLaunchProcess(CefRefPtr<CefCommandLine> command_line);
diff --git a/src/include/cef_registration.h b/src/include/cef_registration.h
new file mode 100644
index 000000000..87c9eee11
--- /dev/null
+++ b/src/include/cef_registration.h
@@ -0,0 +1,49 @@
+// Copyright (c) 2020 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_REGISTRATION_H_
+#define CEF_INCLUDE_CEF_REGISTRATION_H_
+#pragma once
+
+#include "include/cef_base.h"
+
+///
+/// Generic callback interface used for managing the lifespan of a registration.
+///
+/*--cef(source=library)--*/
+class CefRegistration : public virtual CefBaseRefCounted {};
+
+#endif  // CEF_INCLUDE_CEF_REGISTRATION_H_
diff --git a/src/include/cef_render_handler.h b/src/include/cef_render_handler.h
index 38cb74a1b..b27403f9a 100644
--- a/src/include/cef_render_handler.h
+++ b/src/include/cef_render_handler.h
@@ -46,30 +46,31 @@
 #include "include/cef_drag_data.h"
 
 ///
-// Implement this interface to handle events when window rendering is disabled.
-// The methods of this class will be called on the UI thread.
+/// Implement this interface to handle events when window rendering is disabled.
+/// The methods of this class will be called on the UI thread.
 ///
 /*--cef(source=client)--*/
 class CefRenderHandler : public virtual CefBaseRefCounted {
  public:
-  typedef cef_cursor_type_t CursorType;
   typedef cef_drag_operations_mask_t DragOperation;
   typedef cef_drag_operations_mask_t DragOperationsMask;
   typedef cef_paint_element_type_t PaintElementType;
   typedef std::vector<CefRect> RectList;
+  typedef cef_text_input_mode_t TextInputMode;
 
   ///
-  // Return the handler for accessibility notifications. If no handler is
-  // provided the default implementation will be used.
+  /// Return the handler for accessibility notifications. If no handler is
+  /// provided the default implementation will be used.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefAccessibilityHandler> GetAccessibilityHandler() {
-    return NULL;
+    return nullptr;
   }
 
   ///
-  // Called to retrieve the root window rectangle in screen coordinates. Return
-  // true if the rectangle was provided.
+  /// Called to retrieve the root window rectangle in screen DIP coordinates.
+  /// Return true if the rectangle was provided. If this method returns false
+  /// the rectangle from GetViewRect will be used.
   ///
   /*--cef()--*/
   virtual bool GetRootScreenRect(CefRefPtr<CefBrowser> browser, CefRect& rect) {
@@ -77,15 +78,17 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called to retrieve the view rectangle which is relative to screen
-  // coordinates. Return true if the rectangle was provided.
+  /// Called to retrieve the view rectangle in screen DIP coordinates. This
+  /// method must always provide a non-empty rectangle.
   ///
   /*--cef()--*/
-  virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) = 0;
+  virtual void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) = 0;
 
   ///
-  // Called to retrieve the translation from view coordinates to actual screen
-  // coordinates. Return true if the screen coordinates were provided.
+  /// Called to retrieve the translation from view DIP coordinates to screen
+  /// coordinates. Windows/Linux should provide screen device (pixel)
+  /// coordinates and MacOS should provide screen DIP coordinates. Return true
+  /// if the requested coordinates were provided.
   ///
   /*--cef()--*/
   virtual bool GetScreenPoint(CefRefPtr<CefBrowser> browser,
@@ -97,13 +100,13 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called to allow the client to fill in the CefScreenInfo object with
-  // appropriate values. Return true if the |screen_info| structure has been
-  // modified.
-  //
-  // If the screen info rectangle is left empty the rectangle from GetViewRect
-  // will be used. If the rectangle is still empty or invalid popups may not be
-  // drawn correctly.
+  /// Called to allow the client to fill in the CefScreenInfo object with
+  /// appropriate values. Return true if the |screen_info| structure has been
+  /// modified.
+  ///
+  /// If the screen info rectangle is left empty the rectangle from GetViewRect
+  /// will be used. If the rectangle is still empty or invalid popups may not be
+  /// drawn correctly.
   ///
   /*--cef()--*/
   virtual bool GetScreenInfo(CefRefPtr<CefBrowser> browser,
@@ -112,29 +115,30 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the browser wants to show or hide the popup widget. The popup
-  // should be shown if |show| is true and hidden if |show| is false.
+  /// Called when the browser wants to show or hide the popup widget. The popup
+  /// should be shown if |show| is true and hidden if |show| is false.
   ///
   /*--cef()--*/
   virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) {}
 
   ///
-  // Called when the browser wants to move or resize the popup widget. |rect|
-  // contains the new location and size in view coordinates.
+  /// Called when the browser wants to move or resize the popup widget. |rect|
+  /// contains the new location and size in view coordinates.
   ///
   /*--cef()--*/
   virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, const CefRect& rect) {
   }
 
   ///
-  // Called when an element should be painted. Pixel values passed to this
-  // method are scaled relative to view coordinates based on the value of
-  // CefScreenInfo.device_scale_factor returned from GetScreenInfo. |type|
-  // indicates whether the element is the view or the popup widget. |buffer|
-  // contains the pixel data for the whole image. |dirtyRects| contains the set
-  // of rectangles in pixel coordinates that need to be repainted. |buffer| will
-  // be |width|*|height|*4 bytes in size and represents a BGRA image with an
-  // upper-left origin.
+  /// Called when an element should be painted. Pixel values passed to this
+  /// method are scaled relative to view coordinates based on the value of
+  /// CefScreenInfo.device_scale_factor returned from GetScreenInfo. |type|
+  /// indicates whether the element is the view or the popup widget. |buffer|
+  /// contains the pixel data for the whole image. |dirtyRects| contains the set
+  /// of rectangles in pixel coordinates that need to be repainted. |buffer|
+  /// will be |width|*|height|*4 bytes in size and represents a BGRA image with
+  /// an upper-left origin. This method is only called when
+  /// CefWindowInfo::shared_texture_enabled is set to false.
   ///
   /*--cef()--*/
   virtual void OnPaint(CefRefPtr<CefBrowser> browser,
@@ -145,29 +149,51 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                        int height) = 0;
 
   ///
-  // Called when the browser's cursor has changed. If |type| is CT_CUSTOM then
-  // |custom_cursor_info| will be populated with the custom cursor information.
+  /// Called when an element has been rendered to the shared texture handle.
+  /// |type| indicates whether the element is the view or the popup widget.
+  /// |dirtyRects| contains the set of rectangles in pixel coordinates that need
+  /// to be repainted. |shared_handle| is the handle for a D3D11 Texture2D that
+  /// can be accessed via ID3D11Device using the OpenSharedResource method. This
+  /// method is only called when CefWindowInfo::shared_texture_enabled is set to
+  /// true, and is currently only supported on Windows.
+  ///
+  /*--cef()--*/
+  virtual void OnAcceleratedPaint(CefRefPtr<CefBrowser> browser,
+                                  PaintElementType type,
+                                  const RectList& dirtyRects,
+                                  void* shared_handle) {}
+
+  ///
+  /// Called to retrieve the size of the touch handle for the specified
+  /// |orientation|.
   ///
   /*--cef()--*/
-  virtual void OnCursorChange(CefRefPtr<CefBrowser> browser,
-                              CefCursorHandle cursor,
-                              CursorType type,
-                              const CefCursorInfo& custom_cursor_info) {}
+  virtual void GetTouchHandleSize(CefRefPtr<CefBrowser> browser,
+                                  cef_horizontal_alignment_t orientation,
+                                  CefSize& size) {}
 
   ///
-  // Called when the user starts dragging content in the web view. Contextual
-  // information about the dragged content is supplied by |drag_data|.
-  // (|x|, |y|) is the drag start location in screen coordinates.
-  // OS APIs that run a system message loop may be used within the
-  // StartDragging call.
-  //
-  // Return false to abort the drag operation. Don't call any of
-  // CefBrowserHost::DragSource*Ended* methods after returning false.
-  //
-  // Return true to handle the drag operation. Call
-  // CefBrowserHost::DragSourceEndedAt and DragSourceSystemDragEnded either
-  // synchronously or asynchronously to inform the web view that the drag
-  // operation has ended.
+  /// Called when touch handle state is updated. The client is responsible for
+  /// rendering the touch handles.
+  ///
+  /*--cef()--*/
+  virtual void OnTouchHandleStateChanged(CefRefPtr<CefBrowser> browser,
+                                         const CefTouchHandleState& state) {}
+
+  ///
+  /// Called when the user starts dragging content in the web view. Contextual
+  /// information about the dragged content is supplied by |drag_data|.
+  /// (|x|, |y|) is the drag start location in screen coordinates.
+  /// OS APIs that run a system message loop may be used within the
+  /// StartDragging call.
+  ///
+  /// Return false to abort the drag operation. Don't call any of
+  /// CefBrowserHost::DragSource*Ended* methods after returning false.
+  ///
+  /// Return true to handle the drag operation. Call
+  /// CefBrowserHost::DragSourceEndedAt and DragSourceSystemDragEnded either
+  /// synchronously or asynchronously to inform the web view that the drag
+  /// operation has ended.
   ///
   /*--cef()--*/
   virtual bool StartDragging(CefRefPtr<CefBrowser> browser,
@@ -179,16 +205,16 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the web view wants to update the mouse cursor during a
-  // drag & drop operation. |operation| describes the allowed operation
-  // (none, move, copy, link).
+  /// Called when the web view wants to update the mouse cursor during a
+  /// drag & drop operation. |operation| describes the allowed operation
+  /// (none, move, copy, link).
   ///
   /*--cef()--*/
   virtual void UpdateDragCursor(CefRefPtr<CefBrowser> browser,
                                 DragOperation operation) {}
 
   ///
-  // Called when the scroll offset has changed.
+  /// Called when the scroll offset has changed.
   ///
   /*--cef()--*/
   virtual void OnScrollOffsetChanged(CefRefPtr<CefBrowser> browser,
@@ -196,9 +222,9 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                                      double y) {}
 
   ///
-  // Called when the IME composition range has changed. |selected_range| is the
-  // range of characters that have been selected. |character_bounds| is the
-  // bounds of each character in view coordinates.
+  /// Called when the IME composition range has changed. |selected_range| is the
+  /// range of characters that have been selected. |character_bounds| is the
+  /// bounds of each character in view coordinates.
   ///
   /*--cef()--*/
   virtual void OnImeCompositionRangeChanged(CefRefPtr<CefBrowser> browser,
@@ -206,14 +232,24 @@ class CefRenderHandler : public virtual CefBaseRefCounted {
                                             const RectList& character_bounds) {}
 
   ///
-  // Called when text selection has changed for the specified |browser|.
-  // |selected_text| is the currently selected text and |selected_range| is
-  // the character range.
+  /// Called when text selection has changed for the specified |browser|.
+  /// |selected_text| is the currently selected text and |selected_range| is
+  /// the character range.
   ///
   /*--cef(optional_param=selected_text,optional_param=selected_range)--*/
   virtual void OnTextSelectionChanged(CefRefPtr<CefBrowser> browser,
                                       const CefString& selected_text,
                                       const CefRange& selected_range) {}
+
+  ///
+  /// Called when an on-screen keyboard should be shown or hidden for the
+  /// specified |browser|. |input_mode| specifies what kind of keyboard
+  /// should be opened. If |input_mode| is CEF_TEXT_INPUT_MODE_NONE, any
+  /// existing keyboard for this browser should be hidden.
+  ///
+  /*--cef()--*/
+  virtual void OnVirtualKeyboardRequested(CefRefPtr<CefBrowser> browser,
+                                          TextInputMode input_mode) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_RENDER_HANDLER_H_
diff --git a/src/include/cef_render_process_handler.h b/src/include/cef_render_process_handler.h
index 52709b59d..a9049ba2e 100644
--- a/src/include/cef_render_process_handler.h
+++ b/src/include/cef_render_process_handler.h
@@ -48,56 +48,51 @@
 #include "include/cef_values.h"
 
 ///
-// Class used to implement render process callbacks. The methods of this class
-// will be called on the render process main thread (TID_RENDERER) unless
-// otherwise indicated.
+/// Class used to implement render process callbacks. The methods of this class
+/// will be called on the render process main thread (TID_RENDERER) unless
+/// otherwise indicated.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefRenderProcessHandler : public virtual CefBaseRefCounted {
  public:
   typedef cef_navigation_type_t NavigationType;
 
   ///
-  // Called after the render process main thread has been created. |extra_info|
-  // is a read-only value originating from
-  // CefBrowserProcessHandler::OnRenderProcessThreadCreated(). Do not keep a
-  // reference to |extra_info| outside of this method.
-  ///
-  /*--cef()--*/
-  virtual void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) {}
-
-  ///
-  // Called after WebKit has been initialized.
+  /// Called after WebKit has been initialized.
   ///
   /*--cef()--*/
   virtual void OnWebKitInitialized() {}
 
   ///
-  // Called after a browser has been created. When browsing cross-origin a new
-  // browser will be created before the old browser with the same identifier is
-  // destroyed.
+  /// Called after a browser has been created. When browsing cross-origin a new
+  /// browser will be created before the old browser with the same identifier is
+  /// destroyed. |extra_info| is an optional read-only value originating from
+  /// CefBrowserHost::CreateBrowser(), CefBrowserHost::CreateBrowserSync(),
+  /// CefLifeSpanHandler::OnBeforePopup() or
+  /// CefBrowserView::CreateBrowserView().
   ///
-  /*--cef()--*/
-  virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser) {}
+  /*--cef(optional_param=extra_info)--*/
+  virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser,
+                                CefRefPtr<CefDictionaryValue> extra_info) {}
 
   ///
-  // Called before a browser is destroyed.
+  /// Called before a browser is destroyed.
   ///
   /*--cef()--*/
   virtual void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) {}
 
   ///
-  // Return the handler for browser load status events.
+  /// Return the handler for browser load status events.
   ///
   /*--cef()--*/
-  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return NULL; }
+  virtual CefRefPtr<CefLoadHandler> GetLoadHandler() { return nullptr; }
 
   ///
-  // Called immediately after the V8 context for a frame has been created. To
-  // retrieve the JavaScript 'window' object use the CefV8Context::GetGlobal()
-  // method. V8 handles can only be accessed from the thread on which they are
-  // created. A task runner for posting tasks on the associated thread can be
-  // retrieved via the CefV8Context::GetTaskRunner() method.
+  /// Called immediately after the V8 context for a frame has been created. To
+  /// retrieve the JavaScript 'window' object use the CefV8Context::GetGlobal()
+  /// method. V8 handles can only be accessed from the thread on which they are
+  /// created. A task runner for posting tasks on the associated thread can be
+  /// retrieved via the CefV8Context::GetTaskRunner() method.
   ///
   /*--cef()--*/
   virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
@@ -105,8 +100,8 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
                                 CefRefPtr<CefV8Context> context) {}
 
   ///
-  // Called immediately before the V8 context for a frame is released. No
-  // references to the context should be kept after this method is called.
+  /// Called immediately before the V8 context for a frame is released. No
+  /// references to the context should be kept after this method is called.
   ///
   /*--cef()--*/
   virtual void OnContextReleased(CefRefPtr<CefBrowser> browser,
@@ -114,9 +109,9 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
                                  CefRefPtr<CefV8Context> context) {}
 
   ///
-  // Called for global uncaught exceptions in a frame. Execution of this
-  // callback is disabled by default. To enable set
-  // CefSettings.uncaught_exception_stack_size > 0.
+  /// Called for global uncaught exceptions in a frame. Execution of this
+  /// callback is disabled by default. To enable set
+  /// cef_settings_t.uncaught_exception_stack_size > 0.
   ///
   /*--cef()--*/
   virtual void OnUncaughtException(CefRefPtr<CefBrowser> browser,
@@ -126,12 +121,12 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
                                    CefRefPtr<CefV8StackTrace> stackTrace) {}
 
   ///
-  // Called when a new node in the the browser gets focus. The |node| value may
-  // be empty if no specific node has gained focus. The node object passed to
-  // this method represents a snapshot of the DOM at the time this method is
-  // executed. DOM objects are only valid for the scope of this method. Do not
-  // keep references to or attempt to access any DOM objects outside the scope
-  // of this method.
+  /// Called when a new node in the the browser gets focus. The |node| value may
+  /// be empty if no specific node has gained focus. The node object passed to
+  /// this method represents a snapshot of the DOM at the time this method is
+  /// executed. DOM objects are only valid for the scope of this method. Do not
+  /// keep references to or attempt to access any DOM objects outside the scope
+  /// of this method.
   ///
   /*--cef(optional_param=frame,optional_param=node)--*/
   virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
@@ -139,12 +134,13 @@ class CefRenderProcessHandler : public virtual CefBaseRefCounted {
                                     CefRefPtr<CefDOMNode> node) {}
 
   ///
-  // Called when a new message is received from a different process. Return true
-  // if the message was handled or false otherwise. Do not keep a reference to
-  // or attempt to access the message outside of this callback.
+  /// Called when a new message is received from a different process. Return
+  /// true if the message was handled or false otherwise. It is safe to keep a
+  /// reference to |message| outside of this callback.
   ///
   /*--cef()--*/
   virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+                                        CefRefPtr<CefFrame> frame,
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message) {
     return false;
diff --git a/src/include/cef_request.h b/src/include/cef_request.h
index ec88ea47e..5f5a440ff 100644
--- a/src/include/cef_request.h
+++ b/src/include/cef_request.h
@@ -46,8 +46,8 @@ class CefPostData;
 class CefPostDataElement;
 
 ///
-// Class used to represent a web request. The methods of this class may be
-// called on any thread.
+/// Class used to represent a web request. The methods of this class may be
+/// called on any thread.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefRequest : public virtual CefBaseRefCounted {
@@ -58,90 +58,109 @@ class CefRequest : public virtual CefBaseRefCounted {
   typedef cef_transition_type_t TransitionType;
 
   ///
-  // Create a new CefRequest object.
+  /// Create a new CefRequest object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefRequest> Create();
 
   ///
-  // Returns true if this object is read-only.
+  /// Returns true if this object is read-only.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Get the fully qualified URL.
+  /// Get the fully qualified URL.
   ///
   /*--cef()--*/
   virtual CefString GetURL() = 0;
 
   ///
-  // Set the fully qualified URL.
+  /// Set the fully qualified URL.
   ///
   /*--cef()--*/
   virtual void SetURL(const CefString& url) = 0;
 
   ///
-  // Get the request method type. The value will default to POST if post data
-  // is provided and GET otherwise.
+  /// Get the request method type. The value will default to POST if post data
+  /// is provided and GET otherwise.
   ///
   /*--cef()--*/
   virtual CefString GetMethod() = 0;
 
   ///
-  // Set the request method type.
+  /// Set the request method type.
   ///
   /*--cef()--*/
   virtual void SetMethod(const CefString& method) = 0;
 
   ///
-  // Set the referrer URL and policy. If non-empty the referrer URL must be
-  // fully qualified with an HTTP or HTTPS scheme component. Any username,
-  // password or ref component will be removed.
+  /// Set the referrer URL and policy. If non-empty the referrer URL must be
+  /// fully qualified with an HTTP or HTTPS scheme component. Any username,
+  /// password or ref component will be removed.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=referrer_url)--*/
   virtual void SetReferrer(const CefString& referrer_url,
                            ReferrerPolicy policy) = 0;
 
   ///
-  // Get the referrer URL.
+  /// Get the referrer URL.
   ///
   /*--cef()--*/
   virtual CefString GetReferrerURL() = 0;
 
   ///
-  // Get the referrer policy.
+  /// Get the referrer policy.
   ///
   /*--cef(default_retval=REFERRER_POLICY_DEFAULT)--*/
   virtual ReferrerPolicy GetReferrerPolicy() = 0;
 
   ///
-  // Get the post data.
+  /// Get the post data.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefPostData> GetPostData() = 0;
 
   ///
-  // Set the post data.
+  /// Set the post data.
   ///
   /*--cef()--*/
   virtual void SetPostData(CefRefPtr<CefPostData> postData) = 0;
 
   ///
-  // Get the header values. Will not include the Referer value if any.
+  /// Get the header values. Will not include the Referer value if any.
   ///
   /*--cef()--*/
   virtual void GetHeaderMap(HeaderMap& headerMap) = 0;
 
   ///
-  // Set the header values. If a Referer value exists in the header map it will
-  // be removed and ignored.
+  /// Set the header values. If a Referer value exists in the header map it will
+  /// be removed and ignored.
   ///
   /*--cef()--*/
   virtual void SetHeaderMap(const HeaderMap& headerMap) = 0;
 
   ///
-  // Set all values at one time.
+  /// Returns the first header value for |name| or an empty string if not found.
+  /// Will not return the Referer value if any. Use GetHeaderMap instead if
+  /// |name| might have multiple values.
+  ///
+  /*--cef()--*/
+  virtual CefString GetHeaderByName(const CefString& name) = 0;
+
+  ///
+  /// Set the header |name| to |value|. If |overwrite| is true any existing
+  /// values will be replaced with the new value. If |overwrite| is false any
+  /// existing values will not be overwritten. The Referer value cannot be set
+  /// using this method.
+  ///
+  /*--cef(optional_param=value)--*/
+  virtual void SetHeaderByName(const CefString& name,
+                               const CefString& value,
+                               bool overwrite) = 0;
+
+  ///
+  /// Set all values at one time.
   ///
   /*--cef(optional_param=postData)--*/
   virtual void Set(const CefString& url,
@@ -150,60 +169,60 @@ class CefRequest : public virtual CefBaseRefCounted {
                    const HeaderMap& headerMap) = 0;
 
   ///
-  // Get the flags used in combination with CefURLRequest. See
-  // cef_urlrequest_flags_t for supported values.
+  /// Get the flags used in combination with CefURLRequest. See
+  /// cef_urlrequest_flags_t for supported values.
   ///
   /*--cef(default_retval=UR_FLAG_NONE)--*/
   virtual int GetFlags() = 0;
 
   ///
-  // Set the flags used in combination with CefURLRequest.  See
-  // cef_urlrequest_flags_t for supported values.
+  /// Set the flags used in combination with CefURLRequest.  See
+  /// cef_urlrequest_flags_t for supported values.
   ///
   /*--cef()--*/
   virtual void SetFlags(int flags) = 0;
 
   ///
-  // Get the URL to the first party for cookies used in combination with
-  // CefURLRequest.
+  /// Get the URL to the first party for cookies used in combination with
+  /// CefURLRequest.
   ///
   /*--cef()--*/
   virtual CefString GetFirstPartyForCookies() = 0;
 
   ///
-  // Set the URL to the first party for cookies used in combination with
-  // CefURLRequest.
+  /// Set the URL to the first party for cookies used in combination with
+  /// CefURLRequest.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=url)--*/
   virtual void SetFirstPartyForCookies(const CefString& url) = 0;
 
   ///
-  // Get the resource type for this request. Only available in the browser
-  // process.
+  /// Get the resource type for this request. Only available in the browser
+  /// process.
   ///
   /*--cef(default_retval=RT_SUB_RESOURCE)--*/
   virtual ResourceType GetResourceType() = 0;
 
   ///
-  // Get the transition type for this request. Only available in the browser
-  // process and only applies to requests that represent a main frame or
-  // sub-frame navigation.
+  /// Get the transition type for this request. Only available in the browser
+  /// process and only applies to requests that represent a main frame or
+  /// sub-frame navigation.
   ///
   /*--cef(default_retval=TT_EXPLICIT)--*/
   virtual TransitionType GetTransitionType() = 0;
 
   ///
-  // Returns the globally unique identifier for this request or 0 if not
-  // specified. Can be used by CefRequestHandler implementations in the browser
-  // process to track a single request across multiple callbacks.
+  /// Returns the globally unique identifier for this request or 0 if not
+  /// specified. Can be used by CefResourceRequestHandler implementations in the
+  /// browser process to track a single request across multiple callbacks.
   ///
   /*--cef()--*/
-  virtual uint64 GetIdentifier() = 0;
+  virtual uint64_t GetIdentifier() = 0;
 };
 
 ///
-// Class used to represent post data for a web request. The methods of this
-// class may be called on any thread.
+/// Class used to represent post data for a web request. The methods of this
+/// class may be called on any thread.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefPostData : public virtual CefBaseRefCounted {
@@ -211,122 +230,122 @@ class CefPostData : public virtual CefBaseRefCounted {
   typedef std::vector<CefRefPtr<CefPostDataElement>> ElementVector;
 
   ///
-  // Create a new CefPostData object.
+  /// Create a new CefPostData object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefPostData> Create();
 
   ///
-  // Returns true if this object is read-only.
+  /// Returns true if this object is read-only.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns true if the underlying POST data includes elements that are not
-  // represented by this CefPostData object (for example, multi-part file upload
-  // data). Modifying CefPostData objects with excluded elements may result in
-  // the request failing.
+  /// Returns true if the underlying POST data includes elements that are not
+  /// represented by this CefPostData object (for example, multi-part file
+  /// upload data). Modifying CefPostData objects with excluded elements may
+  /// result in the request failing.
   ///
   /*--cef()--*/
   virtual bool HasExcludedElements() = 0;
 
   ///
-  // Returns the number of existing post data elements.
+  /// Returns the number of existing post data elements.
   ///
   /*--cef()--*/
   virtual size_t GetElementCount() = 0;
 
   ///
-  // Retrieve the post data elements.
+  /// Retrieve the post data elements.
   ///
   /*--cef(count_func=elements:GetElementCount)--*/
   virtual void GetElements(ElementVector& elements) = 0;
 
   ///
-  // Remove the specified post data element.  Returns true if the removal
-  // succeeds.
+  /// Remove the specified post data element.  Returns true if the removal
+  /// succeeds.
   ///
   /*--cef()--*/
   virtual bool RemoveElement(CefRefPtr<CefPostDataElement> element) = 0;
 
   ///
-  // Add the specified post data element.  Returns true if the add succeeds.
+  /// Add the specified post data element.  Returns true if the add succeeds.
   ///
   /*--cef()--*/
   virtual bool AddElement(CefRefPtr<CefPostDataElement> element) = 0;
 
   ///
-  // Remove all existing post data elements.
+  /// Remove all existing post data elements.
   ///
   /*--cef()--*/
   virtual void RemoveElements() = 0;
 };
 
 ///
-// Class used to represent a single element in the request post data. The
-// methods of this class may be called on any thread.
+/// Class used to represent a single element in the request post data. The
+/// methods of this class may be called on any thread.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefPostDataElement : public virtual CefBaseRefCounted {
  public:
   ///
-  // Post data elements may represent either bytes or files.
+  /// Post data elements may represent either bytes or files.
   ///
   typedef cef_postdataelement_type_t Type;
 
   ///
-  // Create a new CefPostDataElement object.
+  /// Create a new CefPostDataElement object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefPostDataElement> Create();
 
   ///
-  // Returns true if this object is read-only.
+  /// Returns true if this object is read-only.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Remove all contents from the post data element.
+  /// Remove all contents from the post data element.
   ///
   /*--cef()--*/
   virtual void SetToEmpty() = 0;
 
   ///
-  // The post data element will represent a file.
+  /// The post data element will represent a file.
   ///
   /*--cef()--*/
   virtual void SetToFile(const CefString& fileName) = 0;
 
   ///
-  // The post data element will represent bytes.  The bytes passed
-  // in will be copied.
+  /// The post data element will represent bytes.  The bytes passed
+  /// in will be copied.
   ///
   /*--cef()--*/
   virtual void SetToBytes(size_t size, const void* bytes) = 0;
 
   ///
-  // Return the type of this post data element.
+  /// Return the type of this post data element.
   ///
   /*--cef(default_retval=PDE_TYPE_EMPTY)--*/
   virtual Type GetType() = 0;
 
   ///
-  // Return the file name.
+  /// Return the file name.
   ///
   /*--cef()--*/
   virtual CefString GetFile() = 0;
 
   ///
-  // Return the number of bytes.
+  /// Return the number of bytes.
   ///
   /*--cef()--*/
   virtual size_t GetBytesCount() = 0;
 
   ///
-  // Read up to |size| bytes into |bytes| and return the number of bytes
-  // actually read.
+  /// Read up to |size| bytes into |bytes| and return the number of bytes
+  /// actually read.
   ///
   /*--cef()--*/
   virtual size_t GetBytes(size_t size, void* bytes) = 0;
diff --git a/src/include/cef_request_context.h b/src/include/cef_request_context.h
index fdf4737d9..1ecaf44f9 100644
--- a/src/include/cef_request_context.h
+++ b/src/include/cef_request_context.h
@@ -44,21 +44,23 @@
 #include "include/cef_cookie.h"
 #include "include/cef_extension.h"
 #include "include/cef_extension_handler.h"
-#include "include/cef_request_context_handler.h"
+#include "include/cef_media_router.h"
+#include "include/cef_preference.h"
 #include "include/cef_values.h"
 
+class CefRequestContextHandler;
 class CefSchemeHandlerFactory;
 
 ///
-// Callback interface for CefRequestContext::ResolveHost.
+/// Callback interface for CefRequestContext::ResolveHost.
 ///
 /*--cef(source=client)--*/
 class CefResolveCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called on the UI thread after the ResolveHost request has completed.
-  // |result| will be the result code. |resolved_ips| will be the list of
-  // resolved IP addresses or empty if the resolution failed.
+  /// Called on the UI thread after the ResolveHost request has completed.
+  /// |result| will be the result code. |resolved_ips| will be the list of
+  /// resolved IP addresses or empty if the resolution failed.
   ///
   /*--cef(optional_param=resolved_ips)--*/
   virtual void OnResolveCompleted(
@@ -67,33 +69,33 @@ class CefResolveCallback : public virtual CefBaseRefCounted {
 };
 
 ///
-// A request context provides request handling for a set of related browser
-// or URL request objects. A request context can be specified when creating a
-// new browser via the CefBrowserHost static factory methods or when creating a
-// new URL request via the CefURLRequest static factory methods. Browser objects
-// with different request contexts will never be hosted in the same render
-// process. Browser objects with the same request context may or may not be
-// hosted in the same render process depending on the process model. Browser
-// objects created indirectly via the JavaScript window.open function or
-// targeted links will share the same render process and the same request
-// context as the source browser. When running in single-process mode there is
-// only a single render process (the main process) and so all browsers created
-// in single-process mode will share the same request context. This will be the
-// first request context passed into a CefBrowserHost static factory method and
-// all other request context objects will be ignored.
+/// A request context provides request handling for a set of related browser
+/// or URL request objects. A request context can be specified when creating a
+/// new browser via the CefBrowserHost static factory methods or when creating a
+/// new URL request via the CefURLRequest static factory methods. Browser
+/// objects with different request contexts will never be hosted in the same
+/// render process. Browser objects with the same request context may or may not
+/// be hosted in the same render process depending on the process model. Browser
+/// objects created indirectly via the JavaScript window.open function or
+/// targeted links will share the same render process and the same request
+/// context as the source browser. When running in single-process mode there is
+/// only a single render process (the main process) and so all browsers created
+/// in single-process mode will share the same request context. This will be the
+/// first request context passed into a CefBrowserHost static factory method and
+/// all other request context objects will be ignored.
 ///
 /*--cef(source=library,no_debugct_check)--*/
-class CefRequestContext : public virtual CefBaseRefCounted {
+class CefRequestContext : public CefPreferenceManager {
  public:
   ///
-  // Returns the global context object.
+  /// Returns the global context object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefRequestContext> GetGlobalContext();
 
   ///
-  // Creates a new context object with the specified |settings| and optional
-  // |handler|.
+  /// Creates a new context object with the specified |settings| and optional
+  /// |handler|.
   ///
   /*--cef(optional_param=handler)--*/
   static CefRefPtr<CefRequestContext> CreateContext(
@@ -101,8 +103,8 @@ class CefRequestContext : public virtual CefBaseRefCounted {
       CefRefPtr<CefRequestContextHandler> handler);
 
   ///
-  // Creates a new context object that shares storage with |other| and uses an
-  // optional |handler|.
+  /// Creates a new context object that shares storage with |other| and uses an
+  /// optional |handler|.
   ///
   /*--cef(capi_name=cef_create_context_shared,optional_param=handler)--*/
   static CefRefPtr<CefRequestContext> CreateContext(
@@ -110,63 +112,60 @@ class CefRequestContext : public virtual CefBaseRefCounted {
       CefRefPtr<CefRequestContextHandler> handler);
 
   ///
-  // Returns true if this object is pointing to the same context as |that|
-  // object.
+  /// Returns true if this object is pointing to the same context as |that|
+  /// object.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefRequestContext> other) = 0;
 
   ///
-  // Returns true if this object is sharing the same storage as |that| object.
+  /// Returns true if this object is sharing the same storage as |that| object.
   ///
   /*--cef()--*/
   virtual bool IsSharingWith(CefRefPtr<CefRequestContext> other) = 0;
 
   ///
-  // Returns true if this object is the global context. The global context is
-  // used by default when creating a browser or URL request with a NULL context
-  // argument.
+  /// Returns true if this object is the global context. The global context is
+  /// used by default when creating a browser or URL request with a NULL context
+  /// argument.
   ///
   /*--cef()--*/
   virtual bool IsGlobal() = 0;
 
   ///
-  // Returns the handler for this context if any.
+  /// Returns the handler for this context if any.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefRequestContextHandler> GetHandler() = 0;
 
   ///
-  // Returns the cache path for this object. If empty an "incognito mode"
-  // in-memory cache is being used.
+  /// Returns the cache path for this object. If empty an "incognito mode"
+  /// in-memory cache is being used.
   ///
   /*--cef()--*/
   virtual CefString GetCachePath() = 0;
 
   ///
-  // Returns the default cookie manager for this object. This will be the global
-  // cookie manager if this object is the global request context. Otherwise,
-  // this will be the default cookie manager used when this request context does
-  // not receive a value via CefRequestContextHandler::GetCookieManager(). If
-  // |callback| is non-NULL it will be executed asnychronously on the IO thread
-  // after the manager's storage has been initialized.
+  /// Returns the cookie manager for this object. If |callback| is non-NULL it
+  /// will be executed asnychronously on the UI thread after the manager's
+  /// storage has been initialized.
   ///
   /*--cef(optional_param=callback)--*/
-  virtual CefRefPtr<CefCookieManager> GetDefaultCookieManager(
+  virtual CefRefPtr<CefCookieManager> GetCookieManager(
       CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
-  // Register a scheme handler factory for the specified |scheme_name| and
-  // optional |domain_name|. An empty |domain_name| value for a standard scheme
-  // will cause the factory to match all domain names. The |domain_name| value
-  // will be ignored for non-standard schemes. If |scheme_name| is a built-in
-  // scheme and no handler is returned by |factory| then the built-in scheme
-  // handler factory will be called. If |scheme_name| is a custom scheme then
-  // you must also implement the CefApp::OnRegisterCustomSchemes() method in all
-  // processes. This function may be called multiple times to change or remove
-  // the factory that matches the specified |scheme_name| and optional
-  // |domain_name|. Returns false if an error occurs. This function may be
-  // called on any thread in the browser process.
+  /// Register a scheme handler factory for the specified |scheme_name| and
+  /// optional |domain_name|. An empty |domain_name| value for a standard scheme
+  /// will cause the factory to match all domain names. The |domain_name| value
+  /// will be ignored for non-standard schemes. If |scheme_name| is a built-in
+  /// scheme and no handler is returned by |factory| then the built-in scheme
+  /// handler factory will be called. If |scheme_name| is a custom scheme then
+  /// you must also implement the CefApp::OnRegisterCustomSchemes() method in
+  /// all processes. This function may be called multiple times to change or
+  /// remove the factory that matches the specified |scheme_name| and optional
+  /// |domain_name|. Returns false if an error occurs. This function may be
+  /// called on any thread in the browser process.
   ///
   /*--cef(optional_param=domain_name,optional_param=factory)--*/
   virtual bool RegisterSchemeHandlerFactory(
@@ -175,156 +174,97 @@ class CefRequestContext : public virtual CefBaseRefCounted {
       CefRefPtr<CefSchemeHandlerFactory> factory) = 0;
 
   ///
-  // Clear all registered scheme handler factories. Returns false on error. This
-  // function may be called on any thread in the browser process.
+  /// Clear all registered scheme handler factories. Returns false on error.
+  /// This function may be called on any thread in the browser process.
   ///
   /*--cef()--*/
   virtual bool ClearSchemeHandlerFactories() = 0;
 
   ///
-  // Tells all renderer processes associated with this context to throw away
-  // their plugin list cache. If |reload_pages| is true they will also reload
-  // all pages with plugins. CefRequestContextHandler::OnBeforePluginLoad may
-  // be called to rebuild the plugin list cache.
+  /// Clears all certificate exceptions that were added as part of handling
+  /// CefRequestHandler::OnCertificateError(). If you call this it is
+  /// recommended that you also call CloseAllConnections() or you risk not
+  /// being prompted again for server certificates if you reconnect quickly.
+  /// If |callback| is non-NULL it will be executed on the UI thread after
+  /// completion.
   ///
-  /*--cef()--*/
-  virtual void PurgePluginListCache(bool reload_pages) = 0;
-
-  ///
-  // Returns true if a preference with the specified |name| exists. This method
-  // must be called on the browser process UI thread.
-  ///
-  /*--cef()--*/
-  virtual bool HasPreference(const CefString& name) = 0;
-
-  ///
-  // Returns the value for the preference with the specified |name|. Returns
-  // NULL if the preference does not exist. The returned object contains a copy
-  // of the underlying preference value and modifications to the returned object
-  // will not modify the underlying preference value. This method must be called
-  // on the browser process UI thread.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefValue> GetPreference(const CefString& name) = 0;
-
-  ///
-  // Returns all preferences as a dictionary. If |include_defaults| is true then
-  // preferences currently at their default value will be included. The returned
-  // object contains a copy of the underlying preference values and
-  // modifications to the returned object will not modify the underlying
-  // preference values. This method must be called on the browser process UI
-  // thread.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefDictionaryValue> GetAllPreferences(
-      bool include_defaults) = 0;
-
-  ///
-  // Returns true if the preference with the specified |name| can be modified
-  // using SetPreference. As one example preferences set via the command-line
-  // usually cannot be modified. This method must be called on the browser
-  // process UI thread.
-  ///
-  /*--cef()--*/
-  virtual bool CanSetPreference(const CefString& name) = 0;
-
-  ///
-  // Set the |value| associated with preference |name|. Returns true if the
-  // value is set successfully and false otherwise. If |value| is NULL the
-  // preference will be restored to its default value. If setting the preference
-  // fails then |error| will be populated with a detailed description of the
-  // problem. This method must be called on the browser process UI thread.
-  ///
-  /*--cef(optional_param=value)--*/
-  virtual bool SetPreference(const CefString& name,
-                             CefRefPtr<CefValue> value,
-                             CefString& error) = 0;
+  /*--cef(optional_param=callback)--*/
+  virtual void ClearCertificateExceptions(
+      CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
-  // Clears all certificate exceptions that were added as part of handling
-  // CefRequestHandler::OnCertificateError(). If you call this it is
-  // recommended that you also call CloseAllConnections() or you risk not
-  // being prompted again for server certificates if you reconnect quickly.
-  // If |callback| is non-NULL it will be executed on the UI thread after
-  // completion.
+  /// Clears all HTTP authentication credentials that were added as part of
+  /// handling GetAuthCredentials. If |callback| is non-NULL it will be executed
+  /// on the UI thread after completion.
   ///
   /*--cef(optional_param=callback)--*/
-  virtual void ClearCertificateExceptions(
+  virtual void ClearHttpAuthCredentials(
       CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
-  // Clears all active and idle connections that Chromium currently has.
-  // This is only recommended if you have released all other CEF objects but
-  // don't yet want to call CefShutdown(). If |callback| is non-NULL it will be
-  // executed on the UI thread after completion.
+  /// Clears all active and idle connections that Chromium currently has.
+  /// This is only recommended if you have released all other CEF objects but
+  /// don't yet want to call CefShutdown(). If |callback| is non-NULL it will be
+  /// executed on the UI thread after completion.
   ///
   /*--cef(optional_param=callback)--*/
   virtual void CloseAllConnections(
       CefRefPtr<CefCompletionCallback> callback) = 0;
 
   ///
-  // Attempts to resolve |origin| to a list of associated IP addresses.
-  // |callback| will be executed on the UI thread after completion.
+  /// Attempts to resolve |origin| to a list of associated IP addresses.
+  /// |callback| will be executed on the UI thread after completion.
   ///
   /*--cef()--*/
   virtual void ResolveHost(const CefString& origin,
                            CefRefPtr<CefResolveCallback> callback) = 0;
 
   ///
-  // Attempts to resolve |origin| to a list of associated IP addresses using
-  // cached data. |resolved_ips| will be populated with the list of resolved IP
-  // addresses or empty if no cached data is available. Returns ERR_NONE on
-  // success. This method must be called on the browser process IO thread.
-  ///
-  /*--cef(default_retval=ERR_FAILED)--*/
-  virtual cef_errorcode_t ResolveHostCached(
-      const CefString& origin,
-      std::vector<CefString>& resolved_ips) = 0;
-
-  ///
-  // Load an extension.
-  //
-  // If extension resources will be read from disk using the default load
-  // implementation then |root_directory| should be the absolute path to the
-  // extension resources directory and |manifest| should be NULL. If extension
-  // resources will be provided by the client (e.g. via CefRequestHandler and/or
-  // CefExtensionHandler) then |root_directory| should be a path component
-  // unique to the extension (if not absolute this will be internally prefixed
-  // with the PK_DIR_RESOURCES path) and |manifest| should contain the contents
-  // that would otherwise be read from the "manifest.json" file on disk.
-  //
-  // The loaded extension will be accessible in all contexts sharing the same
-  // storage (HasExtension returns true). However, only the context on which
-  // this method was called is considered the loader (DidLoadExtension returns
-  // true) and only the loader will receive CefRequestContextHandler callbacks
-  // for the extension.
-  //
-  // CefExtensionHandler::OnExtensionLoaded will be called on load success or
-  // CefExtensionHandler::OnExtensionLoadFailed will be called on load failure.
-  //
-  // If the extension specifies a background script via the "background"
-  // manifest key then CefExtensionHandler::OnBeforeBackgroundBrowser will be
-  // called to create the background browser. See that method for additional
-  // information about background scripts.
-  //
-  // For visible extension views the client application should evaluate the
-  // manifest to determine the correct extension URL to load and then pass that
-  // URL to the CefBrowserHost::CreateBrowser* function after the extension has
-  // loaded. For example, the client can look for the "browser_action" manifest
-  // key as documented at https://developer.chrome.com/extensions/browserAction.
-  // Extension URLs take the form "chrome-extension://<extension_id>/<path>".
-  //
-  // Browsers that host extensions differ from normal browsers as follows:
-  //  - Can access chrome.* JavaScript APIs if allowed by the manifest. Visit
-  //    chrome://extensions-support for the list of extension APIs currently
-  //    supported by CEF.
-  //  - Main frame navigation to non-extension content is blocked.
-  //  - Pinch-zooming is disabled.
-  //  - CefBrowserHost::GetExtension returns the hosted extension.
-  //  - CefBrowserHost::IsBackgroundHost returns true for background hosts.
-  //
-  // See https://developer.chrome.com/extensions for extension implementation
-  // and usage documentation.
+  /// Load an extension.
+  ///
+  /// If extension resources will be read from disk using the default load
+  /// implementation then |root_directory| should be the absolute path to the
+  /// extension resources directory and |manifest| should be NULL. If extension
+  /// resources will be provided by the client (e.g. via CefRequestHandler
+  /// and/or CefExtensionHandler) then |root_directory| should be a path
+  /// component unique to the extension (if not absolute this will be internally
+  /// prefixed with the PK_DIR_RESOURCES path) and |manifest| should contain the
+  /// contents that would otherwise be read from the "manifest.json" file on
+  /// disk.
+  ///
+  /// The loaded extension will be accessible in all contexts sharing the same
+  /// storage (HasExtension returns true). However, only the context on which
+  /// this method was called is considered the loader (DidLoadExtension returns
+  /// true) and only the loader will receive CefRequestContextHandler callbacks
+  /// for the extension.
+  ///
+  /// CefExtensionHandler::OnExtensionLoaded will be called on load success or
+  /// CefExtensionHandler::OnExtensionLoadFailed will be called on load failure.
+  ///
+  /// If the extension specifies a background script via the "background"
+  /// manifest key then CefExtensionHandler::OnBeforeBackgroundBrowser will be
+  /// called to create the background browser. See that method for additional
+  /// information about background scripts.
+  ///
+  /// For visible extension views the client application should evaluate the
+  /// manifest to determine the correct extension URL to load and then pass that
+  /// URL to the CefBrowserHost::CreateBrowser* function after the extension has
+  /// loaded. For example, the client can look for the "browser_action" manifest
+  /// key as documented at
+  /// https://developer.chrome.com/extensions/browserAction. Extension URLs take
+  /// the form "chrome-extension://<extension_id>/<path>".
+  ///
+  /// Browsers that host extensions differ from normal browsers as follows:
+  ///  - Can access chrome.* JavaScript APIs if allowed by the manifest. Visit
+  ///    chrome://extensions-support for the list of extension APIs currently
+  ///    supported by CEF.
+  ///  - Main frame navigation to non-extension content is blocked.
+  ///  - Pinch-zooming is disabled.
+  ///  - CefBrowserHost::GetExtension returns the hosted extension.
+  ///  - CefBrowserHost::IsBackgroundHost returns true for background hosts.
+  ///
+  /// See https://developer.chrome.com/extensions for extension implementation
+  /// and usage documentation.
   ///
   /*--cef(optional_param=manifest,optional_param=handler)--*/
   virtual void LoadExtension(const CefString& root_directory,
@@ -332,40 +272,115 @@ class CefRequestContext : public virtual CefBaseRefCounted {
                              CefRefPtr<CefExtensionHandler> handler) = 0;
 
   ///
-  // Returns true if this context was used to load the extension identified by
-  // |extension_id|. Other contexts sharing the same storage will also have
-  // access to the extension (see HasExtension). This method must be called on
-  // the browser process UI thread.
+  /// Returns true if this context was used to load the extension identified by
+  /// |extension_id|. Other contexts sharing the same storage will also have
+  /// access to the extension (see HasExtension). This method must be called on
+  /// the browser process UI thread.
   ///
   /*--cef()--*/
   virtual bool DidLoadExtension(const CefString& extension_id) = 0;
 
   ///
-  // Returns true if this context has access to the extension identified by
-  // |extension_id|. This may not be the context that was used to load the
-  // extension (see DidLoadExtension). This method must be called on the browser
-  // process UI thread.
+  /// Returns true if this context has access to the extension identified by
+  /// |extension_id|. This may not be the context that was used to load the
+  /// extension (see DidLoadExtension). This method must be called on the
+  /// browser process UI thread.
   ///
   /*--cef()--*/
   virtual bool HasExtension(const CefString& extension_id) = 0;
 
   ///
-  // Retrieve the list of all extensions that this context has access to (see
-  // HasExtension). |extension_ids| will be populated with the list of extension
-  // ID values. Returns true on success. This method must be called on the
-  // browser process UI thread.
+  /// Retrieve the list of all extensions that this context has access to (see
+  /// HasExtension). |extension_ids| will be populated with the list of
+  /// extension ID values. Returns true on success. This method must be called
+  /// on the browser process UI thread.
   ///
   /*--cef()--*/
   virtual bool GetExtensions(std::vector<CefString>& extension_ids) = 0;
 
   ///
-  // Returns the extension matching |extension_id| or NULL if no matching
-  // extension is accessible in this context (see HasExtension). This method
-  // must be called on the browser process UI thread.
+  /// Returns the extension matching |extension_id| or NULL if no matching
+  /// extension is accessible in this context (see HasExtension). This method
+  /// must be called on the browser process UI thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefExtension> GetExtension(
       const CefString& extension_id) = 0;
+
+  ///
+  /// Returns the MediaRouter object associated with this context.  If
+  /// |callback| is non-NULL it will be executed asnychronously on the UI thread
+  /// after the manager's context has been initialized.
+  ///
+  /*--cef(optional_param=callback)--*/
+  virtual CefRefPtr<CefMediaRouter> GetMediaRouter(
+      CefRefPtr<CefCompletionCallback> callback) = 0;
+
+  ///
+  /// Returns the current value for |content_type| that applies for the
+  /// specified URLs. If both URLs are empty the default value will be returned.
+  /// Returns nullptr if no value is configured. Must be called on the browser
+  /// process UI thread.
+  ///
+  /*--cef(optional_param=requesting_url,optional_param=top_level_url)--*/
+  virtual CefRefPtr<CefValue> GetWebsiteSetting(
+      const CefString& requesting_url,
+      const CefString& top_level_url,
+      cef_content_setting_types_t content_type) = 0;
+
+  ///
+  /// Sets the current value for |content_type| for the specified URLs in the
+  /// default scope. If both URLs are empty, and the context is not incognito,
+  /// the default value will be set. Pass nullptr for |value| to remove the
+  /// default value for this content type.
+  ///
+  /// WARNING: Incorrect usage of this method may cause instability or security
+  /// issues in Chromium. Make sure that you first understand the potential
+  /// impact of any changes to |content_type| by reviewing the related source
+  /// code in Chromium. For example, if you plan to modify
+  /// CEF_CONTENT_SETTING_TYPE_POPUPS, first review and understand the usage of
+  /// ContentSettingsType::POPUPS in Chromium:
+  /// https://source.chromium.org/search?q=ContentSettingsType::POPUPS
+  ///
+  /*--cef(optional_param=requesting_url,optional_param=top_level_url,
+          optional_param=value)--*/
+  virtual void SetWebsiteSetting(const CefString& requesting_url,
+                                 const CefString& top_level_url,
+                                 cef_content_setting_types_t content_type,
+                                 CefRefPtr<CefValue> value) = 0;
+
+  ///
+  /// Returns the current value for |content_type| that applies for the
+  /// specified URLs. If both URLs are empty the default value will be returned.
+  /// Returns CEF_CONTENT_SETTING_VALUE_DEFAULT if no value is configured. Must
+  /// be called on the browser process UI thread.
+  ///
+  /*--cef(optional_param=requesting_url,optional_param=top_level_url,
+          default_retval=CEF_CONTENT_SETTING_VALUE_DEFAULT)--*/
+  virtual cef_content_setting_values_t GetContentSetting(
+      const CefString& requesting_url,
+      const CefString& top_level_url,
+      cef_content_setting_types_t content_type) = 0;
+
+  ///
+  /// Sets the current value for |content_type| for the specified URLs in the
+  /// default scope. If both URLs are empty, and the context is not incognito,
+  /// the default value will be set. Pass CEF_CONTENT_SETTING_VALUE_DEFAULT for
+  /// |value| to use the default value for this content type.
+  ///
+  /// WARNING: Incorrect usage of this method may cause instability or security
+  /// issues in Chromium. Make sure that you first understand the potential
+  /// impact of any changes to |content_type| by reviewing the related source
+  /// code in Chromium. For example, if you plan to modify
+  /// CEF_CONTENT_SETTING_TYPE_POPUPS, first review and understand the usage of
+  /// ContentSettingsType::POPUPS in Chromium:
+  /// https://source.chromium.org/search?q=ContentSettingsType::POPUPS
+  ///
+  /*--cef(optional_param=requesting_url,optional_param=top_level_url)--*/
+  virtual void SetContentSetting(const CefString& requesting_url,
+                                 const CefString& top_level_url,
+                                 cef_content_setting_types_t content_type,
+                                 cef_content_setting_values_t value) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_REQUEST_CONTEXT_H_
diff --git a/src/include/cef_request_context_handler.h b/src/include/cef_request_context_handler.h
index 20d91334d..ac8c77102 100644
--- a/src/include/cef_request_context_handler.h
+++ b/src/include/cef_request_context_handler.h
@@ -39,63 +39,57 @@
 #pragma once
 
 #include "include/cef_base.h"
-#include "include/cef_cookie.h"
-#include "include/cef_web_plugin.h"
-
-class CefRequestContext;
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_preference.h"
+#include "include/cef_request.h"
+#include "include/cef_resource_request_handler.h"
 
 ///
-// Implement this interface to provide handler implementations. The handler
-// instance will not be released until all objects related to the context have
-// been destroyed.
+/// Implement this interface to provide handler implementations. The handler
+/// instance will not be released until all objects related to the context have
+/// been destroyed.
 ///
 /*--cef(source=client,no_debugct_check)--*/
 class CefRequestContextHandler : public virtual CefBaseRefCounted {
  public:
-  typedef cef_plugin_policy_t PluginPolicy;
-
   ///
-  // Called on the browser process UI thread immediately after the request
-  // context has been initialized.
+  /// Called on the browser process UI thread immediately after the request
+  /// context has been initialized.
   ///
   /*--cef()--*/
   virtual void OnRequestContextInitialized(
       CefRefPtr<CefRequestContext> request_context) {}
 
   ///
-  // Called on the browser process IO thread to retrieve the cookie manager. If
-  // this method returns NULL the default cookie manager retrievable via
-  // CefRequestContext::GetDefaultCookieManager() will be used.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefCookieManager> GetCookieManager() { return NULL; }
-
-  ///
-  // Called on multiple browser process threads before a plugin instance is
-  // loaded. |mime_type| is the mime type of the plugin that will be loaded.
-  // |plugin_url| is the content URL that the plugin will load and may be empty.
-  // |is_main_frame| will be true if the plugin is being loaded in the main
-  // (top-level) frame, |top_origin_url| is the URL for the top-level frame that
-  // contains the plugin when loading a specific plugin instance or empty when
-  // building the initial list of enabled plugins for 'navigator.plugins'
-  // JavaScript state. |plugin_info| includes additional information about the
-  // plugin that will be loaded. |plugin_policy| is the recommended policy.
-  // Modify |plugin_policy| and return true to change the policy. Return false
-  // to use the recommended policy. The default plugin policy can be set at
-  // runtime using the `--plugin-policy=[allow|detect|block]` command-line flag.
-  // Decisions to mark a plugin as disabled by setting |plugin_policy| to
-  // PLUGIN_POLICY_DISABLED may be cached when |top_origin_url| is empty. To
-  // purge the plugin list cache and potentially trigger new calls to this
-  // method call CefRequestContext::PurgePluginListCache.
+  /// Called on the browser process IO thread before a resource request is
+  /// initiated. The |browser| and |frame| values represent the source of the
+  /// request, and may be NULL for requests originating from service workers or
+  /// CefURLRequest. |request| represents the request contents and cannot be
+  /// modified in this callback. |is_navigation| will be true if the resource
+  /// request is a navigation. |is_download| will be true if the resource
+  /// request is a download. |request_initiator| is the origin (scheme + domain)
+  /// of the page that initiated the request. Set |disable_default_handling| to
+  /// true to disable default handling of the request, in which case it will
+  /// need to be handled via CefResourceRequestHandler::GetResourceHandler or it
+  /// will be canceled. To allow the resource load to proceed with default
+  /// handling return NULL. To specify a handler for the resource return a
+  /// CefResourceRequestHandler object. This method will not be called if the
+  /// client associated with |browser| returns a non-NULL value from
+  /// CefRequestHandler::GetResourceRequestHandler for the same request
+  /// (identified by CefRequest::GetIdentifier).
   ///
-  /*--cef(optional_param=plugin_url,optional_param=top_origin_url)--*/
-  virtual bool OnBeforePluginLoad(const CefString& mime_type,
-                                  const CefString& plugin_url,
-                                  bool is_main_frame,
-                                  const CefString& top_origin_url,
-                                  CefRefPtr<CefWebPluginInfo> plugin_info,
-                                  PluginPolicy* plugin_policy) {
-    return false;
+  /*--cef(optional_param=browser,optional_param=frame,
+          optional_param=request_initiator)--*/
+  virtual CefRefPtr<CefResourceRequestHandler> GetResourceRequestHandler(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
+      CefRefPtr<CefRequest> request,
+      bool is_navigation,
+      bool is_download,
+      const CefString& request_initiator,
+      bool& disable_default_handling) {
+    return nullptr;
   }
 };
 
diff --git a/src/include/cef_request_handler.h b/src/include/cef_request_handler.h
index 7c535a55a..edeefbd1d 100644
--- a/src/include/cef_request_handler.h
+++ b/src/include/cef_request_handler.h
@@ -43,72 +43,49 @@
 #include "include/cef_auth_callback.h"
 #include "include/cef_base.h"
 #include "include/cef_browser.h"
+#include "include/cef_callback.h"
 #include "include/cef_frame.h"
 #include "include/cef_request.h"
-#include "include/cef_resource_handler.h"
-#include "include/cef_response.h"
-#include "include/cef_response_filter.h"
+#include "include/cef_resource_request_handler.h"
 #include "include/cef_ssl_info.h"
 #include "include/cef_x509_certificate.h"
 
 ///
-// Callback interface used for asynchronous continuation of url requests.
-///
-/*--cef(source=library)--*/
-class CefRequestCallback : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Continue the url request. If |allow| is true the request will be continued.
-  // Otherwise, the request will be canceled.
-  ///
-  /*--cef(capi_name=cont)--*/
-  virtual void Continue(bool allow) = 0;
-
-  ///
-  // Cancel the url request.
-  ///
-  /*--cef()--*/
-  virtual void Cancel() = 0;
-};
-
-///
-// Callback interface used to select a client certificate for authentication.
+/// Callback interface used to select a client certificate for authentication.
 ///
 /*--cef(source=library)--*/
 class CefSelectClientCertificateCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Chooses the specified certificate for client certificate authentication.
-  // NULL value means that no client certificate should be used.
+  /// Chooses the specified certificate for client certificate authentication.
+  /// NULL value means that no client certificate should be used.
   ///
   /*--cef(optional_param=cert)--*/
   virtual void Select(CefRefPtr<CefX509Certificate> cert) = 0;
 };
 
 ///
-// Implement this interface to handle events related to browser requests. The
-// methods of this class will be called on the thread indicated.
+/// Implement this interface to handle events related to browser requests. The
+/// methods of this class will be called on the thread indicated.
 ///
 /*--cef(source=client)--*/
 class CefRequestHandler : public virtual CefBaseRefCounted {
  public:
-  typedef cef_return_value_t ReturnValue;
   typedef cef_termination_status_t TerminationStatus;
-  typedef cef_urlrequest_status_t URLRequestStatus;
   typedef cef_window_open_disposition_t WindowOpenDisposition;
   typedef std::vector<CefRefPtr<CefX509Certificate>> X509CertificateList;
 
   ///
-  // Called on the UI thread before browser navigation. Return true to cancel
-  // the navigation or false to allow the navigation to proceed. The |request|
-  // object cannot be modified in this callback.
-  // CefLoadHandler::OnLoadingStateChange will be called twice in all cases.
-  // If the navigation is allowed CefLoadHandler::OnLoadStart and
-  // CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
-  // CefLoadHandler::OnLoadError will be called with an |errorCode| value of
-  // ERR_ABORTED. The |user_gesture| value will be true if the browser
-  // navigated via explicit user gesture (e.g. clicking a link) or false if it
-  // navigated automatically (e.g. via the DomContentLoaded event).
+  /// Called on the UI thread before browser navigation. Return true to cancel
+  /// the navigation or false to allow the navigation to proceed. The |request|
+  /// object cannot be modified in this callback.
+  /// CefLoadHandler::OnLoadingStateChange will be called twice in all cases.
+  /// If the navigation is allowed CefLoadHandler::OnLoadStart and
+  /// CefLoadHandler::OnLoadEnd will be called. If the navigation is canceled
+  /// CefLoadHandler::OnLoadError will be called with an |errorCode| value of
+  /// ERR_ABORTED. The |user_gesture| value will be true if the browser
+  /// navigated via explicit user gesture (e.g. clicking a link) or false if it
+  /// navigated automatically (e.g. via the DomContentLoaded event).
   ///
   /*--cef()--*/
   virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
@@ -120,20 +97,20 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called on the UI thread before OnBeforeBrowse in certain limited cases
-  // where navigating a new or different browser might be desirable. This
-  // includes user-initiated navigation that might open in a special way (e.g.
-  // links clicked via middle-click or ctrl + left-click) and certain types of
-  // cross-origin navigation initiated from the renderer process (e.g.
-  // navigating the top-level frame to/from a file URL). The |browser| and
-  // |frame| values represent the source of the navigation. The
-  // |target_disposition| value indicates where the user intended to navigate
-  // the browser based on standard Chromium behaviors (e.g. current tab,
-  // new tab, etc). The |user_gesture| value will be true if the browser
-  // navigated via explicit user gesture (e.g. clicking a link) or false if it
-  // navigated automatically (e.g. via the DomContentLoaded event). Return true
-  // to cancel the navigation or false to allow the navigation to proceed in the
-  // source browser's top-level frame.
+  /// Called on the UI thread before OnBeforeBrowse in certain limited cases
+  /// where navigating a new or different browser might be desirable. This
+  /// includes user-initiated navigation that might open in a special way (e.g.
+  /// links clicked via middle-click or ctrl + left-click) and certain types of
+  /// cross-origin navigation initiated from the renderer process (e.g.
+  /// navigating the top-level frame to/from a file URL). The |browser| and
+  /// |frame| values represent the source of the navigation. The
+  /// |target_disposition| value indicates where the user intended to navigate
+  /// the browser based on standard Chromium behaviors (e.g. current tab,
+  /// new tab, etc). The |user_gesture| value will be true if the browser
+  /// navigated via explicit user gesture (e.g. clicking a link) or false if it
+  /// navigated automatically (e.g. via the DomContentLoaded event). Return true
+  /// to cancel the navigation or false to allow the navigation to proceed in
+  /// the source browser's top-level frame.
   ///
   /*--cef()--*/
   virtual bool OnOpenURLFromTab(CefRefPtr<CefBrowser> browser,
@@ -145,107 +122,47 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called on the IO thread before a resource request is loaded. The |request|
-  // object may be modified. Return RV_CONTINUE to continue the request
-  // immediately. Return RV_CONTINUE_ASYNC and call CefRequestCallback::
-  // Continue() at a later time to continue or cancel the request
-  // asynchronously. Return RV_CANCEL to cancel the request immediately.
-  //
-  ///
-  /*--cef(default_retval=RV_CONTINUE)--*/
-  virtual ReturnValue OnBeforeResourceLoad(
-      CefRefPtr<CefBrowser> browser,
-      CefRefPtr<CefFrame> frame,
-      CefRefPtr<CefRequest> request,
-      CefRefPtr<CefRequestCallback> callback) {
-    return RV_CONTINUE;
-  }
-
-  ///
-  // Called on the IO thread before a resource is loaded. To allow the resource
-  // to load normally return NULL. To specify a handler for the resource return
-  // a CefResourceHandler object. The |request| object should not be modified in
-  // this callback.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefResourceHandler> GetResourceHandler(
-      CefRefPtr<CefBrowser> browser,
-      CefRefPtr<CefFrame> frame,
-      CefRefPtr<CefRequest> request) {
-    return NULL;
-  }
-
-  ///
-  // Called on the IO thread when a resource load is redirected. The |request|
-  // parameter will contain the old URL and other request-related information.
-  // The |response| parameter will contain the response that resulted in the
-  // redirect. The |new_url| parameter will contain the new URL and can be
-  // changed if desired. The |request| object cannot be modified in this
-  // callback.
-  ///
-  /*--cef()--*/
-  virtual void OnResourceRedirect(CefRefPtr<CefBrowser> browser,
-                                  CefRefPtr<CefFrame> frame,
-                                  CefRefPtr<CefRequest> request,
-                                  CefRefPtr<CefResponse> response,
-                                  CefString& new_url) {}
-
-  ///
-  // Called on the IO thread when a resource response is received. To allow the
-  // resource to load normally return false. To redirect or retry the resource
-  // modify |request| (url, headers or post body) and return true. The
-  // |response| object cannot be modified in this callback.
-  ///
-  /*--cef()--*/
-  virtual bool OnResourceResponse(CefRefPtr<CefBrowser> browser,
-                                  CefRefPtr<CefFrame> frame,
-                                  CefRefPtr<CefRequest> request,
-                                  CefRefPtr<CefResponse> response) {
-    return false;
-  }
-
-  ///
-  // Called on the IO thread to optionally filter resource response content.
-  // |request| and |response| represent the request and response respectively
-  // and cannot be modified in this callback.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefResponseFilter> GetResourceResponseFilter(
+  /// Called on the browser process IO thread before a resource request is
+  /// initiated. The |browser| and |frame| values represent the source of the
+  /// request. |request| represents the request contents and cannot be modified
+  /// in this callback. |is_navigation| will be true if the resource request is
+  /// a navigation. |is_download| will be true if the resource request is a
+  /// download. |request_initiator| is the origin (scheme + domain) of the page
+  /// that initiated the request. Set |disable_default_handling| to true to
+  /// disable default handling of the request, in which case it will need to be
+  /// handled via CefResourceRequestHandler::GetResourceHandler or it will be
+  /// canceled. To allow the resource load to proceed with default handling
+  /// return NULL. To specify a handler for the resource return a
+  /// CefResourceRequestHandler object. If this callback returns NULL the same
+  /// method will be called on the associated CefRequestContextHandler, if any.
+  ///
+  /*--cef(optional_param=request_initiator)--*/
+  virtual CefRefPtr<CefResourceRequestHandler> GetResourceRequestHandler(
       CefRefPtr<CefBrowser> browser,
       CefRefPtr<CefFrame> frame,
       CefRefPtr<CefRequest> request,
-      CefRefPtr<CefResponse> response) {
-    return NULL;
+      bool is_navigation,
+      bool is_download,
+      const CefString& request_initiator,
+      bool& disable_default_handling) {
+    return nullptr;
   }
 
   ///
-  // Called on the IO thread when a resource load has completed. |request| and
-  // |response| represent the request and response respectively and cannot be
-  // modified in this callback. |status| indicates the load completion status.
-  // |received_content_length| is the number of response bytes actually read.
-  ///
-  /*--cef()--*/
-  virtual void OnResourceLoadComplete(CefRefPtr<CefBrowser> browser,
-                                      CefRefPtr<CefFrame> frame,
-                                      CefRefPtr<CefRequest> request,
-                                      CefRefPtr<CefResponse> response,
-                                      URLRequestStatus status,
-                                      int64 received_content_length) {}
-
-  ///
-  // Called on the IO thread when the browser needs credentials from the user.
-  // |isProxy| indicates whether the host is a proxy server. |host| contains the
-  // hostname and |port| contains the port number. |realm| is the realm of the
-  // challenge and may be empty. |scheme| is the authentication scheme used,
-  // such as "basic" or "digest", and will be empty if the source of the request
-  // is an FTP server. Return true to continue the request and call
-  // CefAuthCallback::Continue() either in this method or at a later time when
-  // the authentication information is available. Return false to cancel the
-  // request immediately.
+  /// Called on the IO thread when the browser needs credentials from the user.
+  /// |origin_url| is the origin making this authentication request. |isProxy|
+  /// indicates whether the host is a proxy server. |host| contains the hostname
+  /// and |port| contains the port number. |realm| is the realm of the challenge
+  /// and may be empty. |scheme| is the authentication scheme used, such as
+  /// "basic" or "digest", and will be empty if the source of the request is an
+  /// FTP server. Return true to continue the request and call
+  /// CefAuthCallback::Continue() either in this method or at a later time when
+  /// the authentication information is available. Return false to cancel the
+  /// request immediately.
   ///
   /*--cef(optional_param=realm,optional_param=scheme)--*/
   virtual bool GetAuthCredentials(CefRefPtr<CefBrowser> browser,
-                                  CefRefPtr<CefFrame> frame,
+                                  const CefString& origin_url,
                                   bool isProxy,
                                   const CefString& host,
                                   int port,
@@ -256,88 +173,34 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called on the IO thread before sending a network request with a "Cookie"
-  // request header. Return true to allow cookies to be included in the network
-  // request or false to block cookies. The |request| object should not be
-  // modified in this callback.
-  ///
-  /*--cef()--*/
-  virtual bool CanGetCookies(CefRefPtr<CefBrowser> browser,
-                             CefRefPtr<CefFrame> frame,
-                             CefRefPtr<CefRequest> request) {
-    return true;
-  }
-
-  ///
-  // Called on the IO thread when receiving a network request with a
-  // "Set-Cookie" response header value represented by |cookie|. Return true to
-  // allow the cookie to be stored or false to block the cookie. The |request|
-  // object should not be modified in this callback.
-  ///
-  /*--cef()--*/
-  virtual bool CanSetCookie(CefRefPtr<CefBrowser> browser,
-                            CefRefPtr<CefFrame> frame,
-                            CefRefPtr<CefRequest> request,
-                            const CefCookie& cookie) {
-    return true;
-  }
-
-  ///
-  // Called on the IO thread when JavaScript requests a specific storage quota
-  // size via the webkitStorageInfo.requestQuota function. |origin_url| is the
-  // origin of the page making the request. |new_size| is the requested quota
-  // size in bytes. Return true to continue the request and call
-  // CefRequestCallback::Continue() either in this method or at a later time to
-  // grant or deny the request. Return false to cancel the request immediately.
-  ///
-  /*--cef()--*/
-  virtual bool OnQuotaRequest(CefRefPtr<CefBrowser> browser,
-                              const CefString& origin_url,
-                              int64 new_size,
-                              CefRefPtr<CefRequestCallback> callback) {
-    return false;
-  }
-
-  ///
-  // Called on the UI thread to handle requests for URLs with an unknown
-  // protocol component. Set |allow_os_execution| to true to attempt execution
-  // via the registered OS protocol handler, if any.
-  // SECURITY WARNING: YOU SHOULD USE THIS METHOD TO ENFORCE RESTRICTIONS BASED
-  // ON SCHEME, HOST OR OTHER URL ANALYSIS BEFORE ALLOWING OS EXECUTION.
-  ///
-  /*--cef()--*/
-  virtual void OnProtocolExecution(CefRefPtr<CefBrowser> browser,
-                                   const CefString& url,
-                                   bool& allow_os_execution) {}
-
-  ///
-  // Called on the UI thread to handle requests for URLs with an invalid
-  // SSL certificate. Return true and call CefRequestCallback::Continue() either
-  // in this method or at a later time to continue or cancel the request. Return
-  // false to cancel the request immediately. If
-  // CefSettings.ignore_certificate_errors is set all invalid certificates will
-  // be accepted without calling this method.
+  /// Called on the UI thread to handle requests for URLs with an invalid
+  /// SSL certificate. Return true and call CefCallback methods either in this
+  /// method or at a later time to continue or cancel the request. Return false
+  /// to cancel the request immediately. If
+  /// cef_settings_t.ignore_certificate_errors is set all invalid certificates
+  /// will be accepted without calling this method.
   ///
   /*--cef()--*/
   virtual bool OnCertificateError(CefRefPtr<CefBrowser> browser,
                                   cef_errorcode_t cert_error,
                                   const CefString& request_url,
                                   CefRefPtr<CefSSLInfo> ssl_info,
-                                  CefRefPtr<CefRequestCallback> callback) {
+                                  CefRefPtr<CefCallback> callback) {
     return false;
   }
 
   ///
-  // Called on the UI thread when a client certificate is being requested for
-  // authentication. Return false to use the default behavior and automatically
-  // select the first certificate available. Return true and call
-  // CefSelectClientCertificateCallback::Select either in this method or at a
-  // later time to select a certificate. Do not call Select or call it with NULL
-  // to continue without using any certificate. |isProxy| indicates whether the
-  // host is an HTTPS proxy or the origin server. |host| and |port| contains the
-  // hostname and port of the SSL server. |certificates| is the list of
-  // certificates to choose from; this list has already been pruned by Chromium
-  // so that it only contains certificates from issuers that the server trusts.
+  /// Called on the UI thread when a client certificate is being requested for
+  /// authentication. Return false to use the default behavior and automatically
+  /// select the first certificate available. Return true and call
+  /// CefSelectClientCertificateCallback::Select either in this method or at a
+  /// later time to select a certificate. Do not call Select or call it with
+  /// NULL to continue without using any certificate. |isProxy| indicates
+  /// whether the host is an HTTPS proxy or the origin server. |host| and |port|
+  /// contains the hostname and port of the SSL server. |certificates| is the
+  /// list of certificates to choose from; this list has already been pruned by
+  /// Chromium so that it only contains certificates from issuers that the
+  /// server trusts.
   ///
   /*--cef()--*/
   virtual bool OnSelectClientCertificate(
@@ -351,29 +214,28 @@ class CefRequestHandler : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called on the browser process UI thread when a plugin has crashed.
-  // |plugin_path| is the path of the plugin that crashed.
+  /// Called on the browser process UI thread when the render view associated
+  /// with |browser| is ready to receive/handle IPC messages in the render
+  /// process.
   ///
   /*--cef()--*/
-  virtual void OnPluginCrashed(CefRefPtr<CefBrowser> browser,
-                               const CefString& plugin_path) {}
+  virtual void OnRenderViewReady(CefRefPtr<CefBrowser> browser) {}
 
   ///
-  // Called on the browser process UI thread when the render view associated
-  // with |browser| is ready to receive/handle IPC messages in the render
-  // process.
+  /// Called on the browser process UI thread when the render process
+  /// terminates unexpectedly. |status| indicates how the process
+  /// terminated.
   ///
   /*--cef()--*/
-  virtual void OnRenderViewReady(CefRefPtr<CefBrowser> browser) {}
+  virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
+                                         TerminationStatus status) {}
 
   ///
-  // Called on the browser process UI thread when the render process
-  // terminates unexpectedly. |status| indicates how the process
-  // terminated.
+  /// Called on the browser process UI thread when the window.document object of
+  /// the main frame has been created.
   ///
   /*--cef()--*/
-  virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser,
-                                         TerminationStatus status) {}
+  virtual void OnDocumentAvailableInMainFrame(CefRefPtr<CefBrowser> browser) {}
 };
 
 #endif  // CEF_INCLUDE_CEF_REQUEST_HANDLER_H_
diff --git a/src/include/cef_resource_bundle.h b/src/include/cef_resource_bundle.h
index c08f5b089..d235e1c4a 100644
--- a/src/include/cef_resource_bundle.h
+++ b/src/include/cef_resource_bundle.h
@@ -39,13 +39,14 @@
 #pragma once
 
 #include "include/cef_base.h"
+#include "include/cef_values.h"
 
 ///
-// Class used for retrieving resources from the resource bundle (*.pak) files
-// loaded by CEF during startup or via the CefResourceBundleHandler returned
-// from CefApp::GetResourceBundleHandler. See CefSettings for additional options
-// related to resource bundle loading. The methods of this class may be called
-// on any thread unless otherwise indicated.
+/// Class used for retrieving resources from the resource bundle (*.pak) files
+/// loaded by CEF during startup or via the CefResourceBundleHandler returned
+/// from CefApp::GetResourceBundleHandler. See CefSettings for additional
+/// options related to resource bundle loading. The methods of this class may be
+/// called on any thread unless otherwise indicated.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefResourceBundle : public virtual CefBaseRefCounted {
@@ -53,47 +54,38 @@ class CefResourceBundle : public virtual CefBaseRefCounted {
   typedef cef_scale_factor_t ScaleFactor;
 
   ///
-  // Returns the global resource bundle instance.
+  /// Returns the global resource bundle instance.
   ///
   /*--cef()--*/
   static CefRefPtr<CefResourceBundle> GetGlobal();
 
   ///
-  // Returns the localized string for the specified |string_id| or an empty
-  // string if the value is not found. Include cef_pack_strings.h for a listing
-  // of valid string ID values.
+  /// Returns the localized string for the specified |string_id| or an empty
+  /// string if the value is not found. Include cef_pack_strings.h for a listing
+  /// of valid string ID values.
   ///
   /*--cef()--*/
   virtual CefString GetLocalizedString(int string_id) = 0;
 
   ///
-  // Retrieves the contents of the specified scale independent |resource_id|.
-  // If the value is found then |data| and |data_size| will be populated and
-  // this method will return true. If the value is not found then this method
-  // will return false. The returned |data| pointer will remain resident in
-  // memory and should not be freed. Include cef_pack_resources.h for a listing
-  // of valid resource ID values.
+  /// Returns a CefBinaryValue containing the decompressed contents of the
+  /// specified scale independent |resource_id| or NULL if not found. Include
+  /// cef_pack_resources.h for a listing of valid resource ID values.
   ///
   /*--cef()--*/
-  virtual bool GetDataResource(int resource_id,
-                               void*& data,
-                               size_t& data_size) = 0;
+  virtual CefRefPtr<CefBinaryValue> GetDataResource(int resource_id) = 0;
 
   ///
-  // Retrieves the contents of the specified |resource_id| nearest the scale
-  // factor |scale_factor|. Use a |scale_factor| value of SCALE_FACTOR_NONE for
-  // scale independent resources or call GetDataResource instead. If the value
-  // is found then |data| and |data_size| will be populated and this method will
-  // return true. If the value is not found then this method will return false.
-  // The returned |data| pointer will remain resident in memory and should not
-  // be freed. Include cef_pack_resources.h for a listing of valid resource ID
-  // values.
+  /// Returns a CefBinaryValue containing the decompressed contents of the
+  /// specified |resource_id| nearest the scale factor |scale_factor| or NULL if
+  /// not found. Use a |scale_factor| value of SCALE_FACTOR_NONE for scale
+  /// independent resources or call GetDataResource instead.Include
+  /// cef_pack_resources.h for a listing of valid resource ID values.
   ///
   /*--cef()--*/
-  virtual bool GetDataResourceForScale(int resource_id,
-                                       ScaleFactor scale_factor,
-                                       void*& data,
-                                       size_t& data_size) = 0;
+  virtual CefRefPtr<CefBinaryValue> GetDataResourceForScale(
+      int resource_id,
+      ScaleFactor scale_factor) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_RESOURCE_BUNDLE_H_
diff --git a/src/include/cef_resource_bundle_handler.h b/src/include/cef_resource_bundle_handler.h
index 6cd6c9afe..4743482c1 100644
--- a/src/include/cef_resource_bundle_handler.h
+++ b/src/include/cef_resource_bundle_handler.h
@@ -41,9 +41,9 @@
 #include "include/cef_base.h"
 
 ///
-// Class used to implement a custom resource bundle interface. See CefSettings
-// for additional options related to resource bundle loading. The methods of
-// this class may be called on multiple threads.
+/// Class used to implement a custom resource bundle interface. See CefSettings
+/// for additional options related to resource bundle loading. The methods of
+/// this class may be called on multiple threads.
 ///
 /*--cef(source=client)--*/
 class CefResourceBundleHandler : public virtual CefBaseRefCounted {
@@ -51,21 +51,21 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
   typedef cef_scale_factor_t ScaleFactor;
 
   ///
-  // Called to retrieve a localized translation for the specified |string_id|.
-  // To provide the translation set |string| to the translation string and
-  // return true. To use the default translation return false. Include
-  // cef_pack_strings.h for a listing of valid string ID values.
+  /// Called to retrieve a localized translation for the specified |string_id|.
+  /// To provide the translation set |string| to the translation string and
+  /// return true. To use the default translation return false. Include
+  /// cef_pack_strings.h for a listing of valid string ID values.
   ///
   /*--cef()--*/
   virtual bool GetLocalizedString(int string_id, CefString& string) = 0;
 
   ///
-  // Called to retrieve data for the specified scale independent |resource_id|.
-  // To provide the resource data set |data| and |data_size| to the data pointer
-  // and size respectively and return true. To use the default resource data
-  // return false. The resource data will not be copied and must remain resident
-  // in memory. Include cef_pack_resources.h for a listing of valid resource ID
-  // values.
+  /// Called to retrieve data for the specified scale independent |resource_id|.
+  /// To provide the resource data set |data| and |data_size| to the data
+  /// pointer and size respectively and return true. To use the default resource
+  /// data return false. The resource data will not be copied and must remain
+  /// resident in memory. Include cef_pack_resources.h for a listing of valid
+  /// resource ID values.
   ///
   /*--cef()--*/
   virtual bool GetDataResource(int resource_id,
@@ -73,12 +73,12 @@ class CefResourceBundleHandler : public virtual CefBaseRefCounted {
                                size_t& data_size) = 0;
 
   ///
-  // Called to retrieve data for the specified |resource_id| nearest the scale
-  // factor |scale_factor|. To provide the resource data set |data| and
-  // |data_size| to the data pointer and size respectively and return true. To
-  // use the default resource data return false. The resource data will not be
-  // copied and must remain resident in memory. Include cef_pack_resources.h for
-  // a listing of valid resource ID values.
+  /// Called to retrieve data for the specified |resource_id| nearest the scale
+  /// factor |scale_factor|. To provide the resource data set |data| and
+  /// |data_size| to the data pointer and size respectively and return true. To
+  /// use the default resource data return false. The resource data will not be
+  /// copied and must remain resident in memory. Include cef_pack_resources.h
+  /// for a listing of valid resource ID values.
   ///
   /*--cef()--*/
   virtual bool GetDataResourceForScale(int resource_id,
diff --git a/src/include/cef_resource_handler.h b/src/include/cef_resource_handler.h
index 02ccea91f..9c43ee7c9 100644
--- a/src/include/cef_resource_handler.h
+++ b/src/include/cef_resource_handler.h
@@ -46,69 +46,158 @@
 #include "include/cef_response.h"
 
 ///
-// Class used to implement a custom request handler interface. The methods of
-// this class will always be called on the IO thread.
+/// Callback for asynchronous continuation of CefResourceHandler::Skip().
+///
+/*--cef(source=library)--*/
+class CefResourceSkipCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Callback for asynchronous continuation of Skip(). If |bytes_skipped| > 0
+  /// then either Skip() will be called again until the requested number of
+  /// bytes have been skipped or the request will proceed. If |bytes_skipped|
+  /// <= 0 the request will fail with ERR_REQUEST_RANGE_NOT_SATISFIABLE.
+  ///
+  /*--cef(capi_name=cont)--*/
+  virtual void Continue(int64_t bytes_skipped) = 0;
+};
+
+///
+/// Callback for asynchronous continuation of CefResourceHandler::Read().
+///
+/*--cef(source=library)--*/
+class CefResourceReadCallback : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Callback for asynchronous continuation of Read(). If |bytes_read| == 0
+  /// the response will be considered complete. If |bytes_read| > 0 then Read()
+  /// will be called again until the request is complete (based on either the
+  /// result or the expected content length). If |bytes_read| < 0 then the
+  /// request will fail and the |bytes_read| value will be treated as the error
+  /// code.
+  ///
+  /*--cef(capi_name=cont)--*/
+  virtual void Continue(int bytes_read) = 0;
+};
+
+///
+/// Class used to implement a custom request handler interface. The methods of
+/// this class will be called on the IO thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
 class CefResourceHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Begin processing the request. To handle the request return true and call
-  // CefCallback::Continue() once the response header information is available
-  // (CefCallback::Continue() can also be called from inside this method if
-  // header information is available immediately). To cancel the request return
-  // false.
+  /// Open the response stream. To handle the request immediately set
+  /// |handle_request| to true and return true. To decide at a later time set
+  /// |handle_request| to false, return true, and execute |callback| to continue
+  /// or cancel the request. To cancel the request immediately set
+  /// |handle_request| to true and return false. This method will be called in
+  /// sequence but not from a dedicated thread. For backwards compatibility set
+  /// |handle_request| to false and return false and the ProcessRequest method
+  /// will be called.
+  ///
+  /*--cef()--*/
+  virtual bool Open(CefRefPtr<CefRequest> request,
+                    bool& handle_request,
+                    CefRefPtr<CefCallback> callback) {
+    handle_request = false;
+    return false;
+  }
+
+  ///
+  /// Begin processing the request. To handle the request return true and call
+  /// CefCallback::Continue() once the response header information is available
+  /// (CefCallback::Continue() can also be called from inside this method if
+  /// header information is available immediately). To cancel the request return
+  /// false.
+  ///
+  /// WARNING: This method is deprecated. Use Open instead.
   ///
   /*--cef()--*/
   virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
-                              CefRefPtr<CefCallback> callback) = 0;
+                              CefRefPtr<CefCallback> callback) {
+    return false;
+  }
 
   ///
-  // Retrieve response header information. If the response length is not known
-  // set |response_length| to -1 and ReadResponse() will be called until it
-  // returns false. If the response length is known set |response_length|
-  // to a positive value and ReadResponse() will be called until it returns
-  // false or the specified number of bytes have been read. Use the |response|
-  // object to set the mime type, http status code and other optional header
-  // values. To redirect the request to a new URL set |redirectUrl| to the new
-  // URL. If an error occured while setting up the request you can call
-  // SetError() on |response| to indicate the error condition.
+  /// Retrieve response header information. If the response length is not known
+  /// set |response_length| to -1 and ReadResponse() will be called until it
+  /// returns false. If the response length is known set |response_length|
+  /// to a positive value and ReadResponse() will be called until it returns
+  /// false or the specified number of bytes have been read. Use the |response|
+  /// object to set the mime type, http status code and other optional header
+  /// values. To redirect the request to a new URL set |redirectUrl| to the new
+  /// URL. |redirectUrl| can be either a relative or fully qualified URL.
+  /// It is also possible to set |response| to a redirect http status code
+  /// and pass the new URL via a Location header. Likewise with |redirectUrl| it
+  /// is valid to set a relative or fully qualified URL as the Location header
+  /// value. If an error occured while setting up the request you can call
+  /// SetError() on |response| to indicate the error condition.
   ///
   /*--cef()--*/
   virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
-                                  int64& response_length,
+                                  int64_t& response_length,
                                   CefString& redirectUrl) = 0;
 
   ///
-  // Read response data. If data is available immediately copy up to
-  // |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of
-  // bytes copied, and return true. To read the data at a later time set
-  // |bytes_read| to 0, return true and call CefCallback::Continue() when the
-  // data is available. To indicate response completion return false.
+  /// Skip response data when requested by a Range header. Skip over and discard
+  /// |bytes_to_skip| bytes of response data. If data is available immediately
+  /// set |bytes_skipped| to the number of bytes skipped and return true. To
+  /// read the data at a later time set |bytes_skipped| to 0, return true and
+  /// execute |callback| when the data is available. To indicate failure set
+  /// |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false. This
+  /// method will be called in sequence but not from a dedicated thread.
   ///
   /*--cef()--*/
-  virtual bool ReadResponse(void* data_out,
-                            int bytes_to_read,
-                            int& bytes_read,
-                            CefRefPtr<CefCallback> callback) = 0;
+  virtual bool Skip(int64_t bytes_to_skip,
+                    int64_t& bytes_skipped,
+                    CefRefPtr<CefResourceSkipCallback> callback) {
+    bytes_skipped = -2;
+    return false;
+  }
 
   ///
-  // Return true if the specified cookie can be sent with the request or false
-  // otherwise. If false is returned for any cookie then no cookies will be sent
-  // with the request.
+  /// Read response data. If data is available immediately copy up to
+  /// |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of
+  /// bytes copied, and return true. To read the data at a later time keep a
+  /// pointer to |data_out|, set |bytes_read| to 0, return true and execute
+  /// |callback| when the data is available (|data_out| will remain valid until
+  /// the callback is executed). To indicate response completion set
+  /// |bytes_read| to 0 and return false. To indicate failure set |bytes_read|
+  /// to < 0 (e.g. -2 for ERR_FAILED) and return false. This method will be
+  /// called in sequence but not from a dedicated thread. For backwards
+  /// compatibility set |bytes_read| to -1 and return false and the ReadResponse
+  /// method will be called.
   ///
   /*--cef()--*/
-  virtual bool CanGetCookie(const CefCookie& cookie) { return true; }
+  virtual bool Read(void* data_out,
+                    int bytes_to_read,
+                    int& bytes_read,
+                    CefRefPtr<CefResourceReadCallback> callback) {
+    bytes_read = -1;
+    return false;
+  }
 
   ///
-  // Return true if the specified cookie returned with the response can be set
-  // or false otherwise.
+  /// Read response data. If data is available immediately copy up to
+  /// |bytes_to_read| bytes into |data_out|, set |bytes_read| to the number of
+  /// bytes copied, and return true. To read the data at a later time set
+  /// |bytes_read| to 0, return true and call CefCallback::Continue() when the
+  /// data is available. To indicate response completion return false.
+  ///
+  /// WARNING: This method is deprecated. Use Skip and Read instead.
   ///
   /*--cef()--*/
-  virtual bool CanSetCookie(const CefCookie& cookie) { return true; }
+  virtual bool ReadResponse(void* data_out,
+                            int bytes_to_read,
+                            int& bytes_read,
+                            CefRefPtr<CefCallback> callback) {
+    bytes_read = -2;
+    return false;
+  }
 
   ///
-  // Request processing has been canceled.
+  /// Request processing has been canceled.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
diff --git a/src/include/cef_resource_request_handler.h b/src/include/cef_resource_request_handler.h
new file mode 100644
index 000000000..572065b77
--- /dev/null
+++ b/src/include/cef_resource_request_handler.h
@@ -0,0 +1,250 @@
+// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_RESOURCE_REQUEST_HANDLER_H_
+#define CEF_INCLUDE_CEF_RESOURCE_REQUEST_HANDLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_callback.h"
+#include "include/cef_frame.h"
+#include "include/cef_request.h"
+#include "include/cef_resource_handler.h"
+#include "include/cef_response.h"
+#include "include/cef_response_filter.h"
+
+class CefCookieAccessFilter;
+
+///
+/// Implement this interface to handle events related to browser requests. The
+/// methods of this class will be called on the IO thread unless otherwise
+/// indicated.
+///
+/*--cef(source=client,no_debugct_check)--*/
+class CefResourceRequestHandler : public virtual CefBaseRefCounted {
+ public:
+  typedef cef_return_value_t ReturnValue;
+  typedef cef_urlrequest_status_t URLRequestStatus;
+
+  ///
+  /// Called on the IO thread before a resource request is loaded. The |browser|
+  /// and |frame| values represent the source of the request, and may be NULL
+  /// for requests originating from service workers or CefURLRequest. To
+  /// optionally filter cookies for the request return a CefCookieAccessFilter
+  /// object. The |request| object cannot not be modified in this callback.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual CefRefPtr<CefCookieAccessFilter> GetCookieAccessFilter(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
+      CefRefPtr<CefRequest> request) {
+    return nullptr;
+  }
+
+  ///
+  /// Called on the IO thread before a resource request is loaded. The |browser|
+  /// and |frame| values represent the source of the request, and may be NULL
+  /// for requests originating from service workers or CefURLRequest. To
+  /// redirect or change the resource load optionally modify |request|.
+  /// Modification of the request URL will be treated as a redirect. Return
+  /// RV_CONTINUE to continue the request immediately. Return RV_CONTINUE_ASYNC
+  /// and call CefCallback methods at a later time to continue or cancel the
+  /// request asynchronously. Return RV_CANCEL to cancel the request
+  /// immediately.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame,
+          default_retval=RV_CONTINUE)--*/
+  virtual ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
+                                           CefRefPtr<CefFrame> frame,
+                                           CefRefPtr<CefRequest> request,
+                                           CefRefPtr<CefCallback> callback) {
+    return RV_CONTINUE;
+  }
+
+  ///
+  /// Called on the IO thread before a resource is loaded. The |browser| and
+  /// |frame| values represent the source of the request, and may be NULL for
+  /// requests originating from service workers or CefURLRequest. To allow the
+  /// resource to load using the default network loader return NULL. To specify
+  /// a handler for the resource return a CefResourceHandler object. The
+  /// |request| object cannot not be modified in this callback.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual CefRefPtr<CefResourceHandler> GetResourceHandler(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
+      CefRefPtr<CefRequest> request) {
+    return nullptr;
+  }
+
+  ///
+  /// Called on the IO thread when a resource load is redirected. The |browser|
+  /// and |frame| values represent the source of the request, and may be NULL
+  /// for requests originating from service workers or CefURLRequest. The
+  /// |request| parameter will contain the old URL and other request-related
+  /// information. The |response| parameter will contain the response that
+  /// resulted in the redirect. The |new_url| parameter will contain the new URL
+  /// and can be changed if desired. The |request| and |response| objects cannot
+  /// be modified in this callback.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual void OnResourceRedirect(CefRefPtr<CefBrowser> browser,
+                                  CefRefPtr<CefFrame> frame,
+                                  CefRefPtr<CefRequest> request,
+                                  CefRefPtr<CefResponse> response,
+                                  CefString& new_url) {}
+
+  ///
+  /// Called on the IO thread when a resource response is received. The
+  /// |browser| and |frame| values represent the source of the request, and may
+  /// be NULL for requests originating from service workers or CefURLRequest. To
+  /// allow the resource load to proceed without modification return false. To
+  /// redirect or retry the resource load optionally modify |request| and return
+  /// true. Modification of the request URL will be treated as a redirect.
+  /// Requests handled using the default network loader cannot be redirected in
+  /// this callback. The |response| object cannot be modified in this callback.
+  ///
+  /// WARNING: Redirecting using this method is deprecated. Use
+  /// OnBeforeResourceLoad or GetResourceHandler to perform redirects.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual bool OnResourceResponse(CefRefPtr<CefBrowser> browser,
+                                  CefRefPtr<CefFrame> frame,
+                                  CefRefPtr<CefRequest> request,
+                                  CefRefPtr<CefResponse> response) {
+    return false;
+  }
+
+  ///
+  /// Called on the IO thread to optionally filter resource response content.
+  /// The |browser| and |frame| values represent the source of the request, and
+  /// may be NULL for requests originating from service workers or
+  /// CefURLRequest. |request| and |response| represent the request and response
+  /// respectively and cannot be modified in this callback.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual CefRefPtr<CefResponseFilter> GetResourceResponseFilter(
+      CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
+      CefRefPtr<CefRequest> request,
+      CefRefPtr<CefResponse> response) {
+    return nullptr;
+  }
+
+  ///
+  /// Called on the IO thread when a resource load has completed. The |browser|
+  /// and |frame| values represent the source of the request, and may be NULL
+  /// for requests originating from service workers or CefURLRequest. |request|
+  /// and |response| represent the request and response respectively and cannot
+  /// be modified in this callback. |status| indicates the load completion
+  /// status. |received_content_length| is the number of response bytes actually
+  /// read. This method will be called for all requests, including requests that
+  /// are aborted due to CEF shutdown or destruction of the associated browser.
+  /// In cases where the associated browser is destroyed this callback may
+  /// arrive after the CefLifeSpanHandler::OnBeforeClose callback for that
+  /// browser. The CefFrame::IsValid method can be used to test for this
+  /// situation, and care should be taken not to call |browser| or |frame|
+  /// methods that modify state (like LoadURL, SendProcessMessage, etc.) if the
+  /// frame is invalid.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual void OnResourceLoadComplete(CefRefPtr<CefBrowser> browser,
+                                      CefRefPtr<CefFrame> frame,
+                                      CefRefPtr<CefRequest> request,
+                                      CefRefPtr<CefResponse> response,
+                                      URLRequestStatus status,
+                                      int64_t received_content_length) {}
+
+  ///
+  /// Called on the IO thread to handle requests for URLs with an unknown
+  /// protocol component. The |browser| and |frame| values represent the source
+  /// of the request, and may be NULL for requests originating from service
+  /// workers or CefURLRequest. |request| cannot be modified in this callback.
+  /// Set |allow_os_execution| to true to attempt execution via the registered
+  /// OS protocol handler, if any. SECURITY WARNING: YOU SHOULD USE THIS METHOD
+  /// TO ENFORCE RESTRICTIONS BASED ON SCHEME, HOST OR OTHER URL ANALYSIS BEFORE
+  /// ALLOWING OS EXECUTION.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual void OnProtocolExecution(CefRefPtr<CefBrowser> browser,
+                                   CefRefPtr<CefFrame> frame,
+                                   CefRefPtr<CefRequest> request,
+                                   bool& allow_os_execution) {}
+};
+
+///
+/// Implement this interface to filter cookies that may be sent or received from
+/// resource requests. The methods of this class will be called on the IO thread
+/// unless otherwise indicated.
+///
+/*--cef(source=client,no_debugct_check)--*/
+class CefCookieAccessFilter : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Called on the IO thread before a resource request is sent. The |browser|
+  /// and |frame| values represent the source of the request, and may be NULL
+  /// for requests originating from service workers or CefURLRequest. |request|
+  /// cannot be modified in this callback. Return true if the specified cookie
+  /// can be sent with the request or false otherwise.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual bool CanSendCookie(CefRefPtr<CefBrowser> browser,
+                             CefRefPtr<CefFrame> frame,
+                             CefRefPtr<CefRequest> request,
+                             const CefCookie& cookie) {
+    return true;
+  }
+
+  ///
+  /// Called on the IO thread after a resource response is received. The
+  /// |browser| and |frame| values represent the source of the request, and may
+  /// be NULL for requests originating from service workers or CefURLRequest.
+  /// |request| cannot be modified in this callback. Return true if the
+  /// specified cookie returned with the response can be saved or false
+  /// otherwise.
+  ///
+  /*--cef(optional_param=browser,optional_param=frame)--*/
+  virtual bool CanSaveCookie(CefRefPtr<CefBrowser> browser,
+                             CefRefPtr<CefFrame> frame,
+                             CefRefPtr<CefRequest> request,
+                             CefRefPtr<CefResponse> response,
+                             const CefCookie& cookie) {
+    return true;
+  }
+};
+
+#endif  // CEF_INCLUDE_CEF_RESOURCE_REQUEST_HANDLER_H_
diff --git a/src/include/cef_response.h b/src/include/cef_response.h
index 1862034aa..571998a46 100644
--- a/src/include/cef_response.h
+++ b/src/include/cef_response.h
@@ -42,8 +42,8 @@
 #include "include/cef_base.h"
 
 ///
-// Class used to represent a web response. The methods of this class may be
-// called on any thread.
+/// Class used to represent a web response. The methods of this class may be
+/// called on any thread.
 ///
 /*--cef(source=library,no_debugct_check)--*/
 class CefResponse : public virtual CefBaseRefCounted {
@@ -51,94 +51,116 @@ class CefResponse : public virtual CefBaseRefCounted {
   typedef std::multimap<CefString, CefString> HeaderMap;
 
   ///
-  // Create a new CefResponse object.
+  /// Create a new CefResponse object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefResponse> Create();
 
   ///
-  // Returns true if this object is read-only.
+  /// Returns true if this object is read-only.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Get the response error code. Returns ERR_NONE if there was no error.
+  /// Get the response error code. Returns ERR_NONE if there was no error.
   ///
   /*--cef(default_retval=ERR_NONE)--*/
   virtual cef_errorcode_t GetError() = 0;
 
   ///
-  // Set the response error code. This can be used by custom scheme handlers
-  // to return errors during initial request processing.
+  /// Set the response error code. This can be used by custom scheme handlers
+  /// to return errors during initial request processing.
   ///
   /*--cef()--*/
   virtual void SetError(cef_errorcode_t error) = 0;
 
   ///
-  // Get the response status code.
+  /// Get the response status code.
   ///
   /*--cef()--*/
   virtual int GetStatus() = 0;
 
   ///
-  // Set the response status code.
+  /// Set the response status code.
   ///
   /*--cef()--*/
   virtual void SetStatus(int status) = 0;
 
   ///
-  // Get the response status text.
+  /// Get the response status text.
   ///
   /*--cef()--*/
   virtual CefString GetStatusText() = 0;
 
   ///
-  // Set the response status text.
+  /// Set the response status text.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=statusText)--*/
   virtual void SetStatusText(const CefString& statusText) = 0;
 
   ///
-  // Get the response mime type.
+  /// Get the response mime type.
   ///
   /*--cef()--*/
   virtual CefString GetMimeType() = 0;
 
   ///
-  // Set the response mime type.
+  /// Set the response mime type.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=mimeType)--*/
   virtual void SetMimeType(const CefString& mimeType) = 0;
 
   ///
-  // Get the value for the specified response header field.
+  /// Get the response charset.
   ///
   /*--cef()--*/
-  virtual CefString GetHeader(const CefString& name) = 0;
+  virtual CefString GetCharset() = 0;
 
   ///
-  // Get all response header fields.
+  /// Set the response charset.
+  ///
+  /*--cef(optional_param=charset)--*/
+  virtual void SetCharset(const CefString& charset) = 0;
+
+  ///
+  /// Get the value for the specified response header field.
+  ///
+  /*--cef()--*/
+  virtual CefString GetHeaderByName(const CefString& name) = 0;
+
+  ///
+  /// Set the header |name| to |value|. If |overwrite| is true any existing
+  /// values will be replaced with the new value. If |overwrite| is false any
+  /// existing values will not be overwritten.
+  ///
+  /*--cef(optional_param=value)--*/
+  virtual void SetHeaderByName(const CefString& name,
+                               const CefString& value,
+                               bool overwrite) = 0;
+
+  ///
+  /// Get all response header fields.
   ///
   /*--cef()--*/
   virtual void GetHeaderMap(HeaderMap& headerMap) = 0;
 
   ///
-  // Set all response header fields.
+  /// Set all response header fields.
   ///
   /*--cef()--*/
   virtual void SetHeaderMap(const HeaderMap& headerMap) = 0;
 
   ///
-  // Get the resolved URL after redirects or changed as a result of HSTS.
+  /// Get the resolved URL after redirects or changed as a result of HSTS.
   ///
   /*--cef()--*/
   virtual CefString GetURL() = 0;
 
   ///
-  // Set the resolved URL after redirects or changed as a result of HSTS.
+  /// Set the resolved URL after redirects or changed as a result of HSTS.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=url)--*/
   virtual void SetURL(const CefString& url) = 0;
 };
 
diff --git a/src/include/cef_response_filter.h b/src/include/cef_response_filter.h
index 2eb446fa0..37d706493 100644
--- a/src/include/cef_response_filter.h
+++ b/src/include/cef_response_filter.h
@@ -41,8 +41,8 @@
 #include "include/cef_base.h"
 
 ///
-// Implement this interface to filter resource response content. The methods of
-// this class will be called on the browser process IO thread.
+/// Implement this interface to filter resource response content. The methods of
+/// this class will be called on the browser process IO thread.
 ///
 /*--cef(source=client)--*/
 class CefResponseFilter : public virtual CefBaseRefCounted {
@@ -50,41 +50,42 @@ class CefResponseFilter : public virtual CefBaseRefCounted {
   typedef cef_response_filter_status_t FilterStatus;
 
   ///
-  // Initialize the response filter. Will only be called a single time. The
-  // filter will not be installed if this method returns false.
+  /// Initialize the response filter. Will only be called a single time. The
+  /// filter will not be installed if this method returns false.
   ///
   /*--cef()--*/
   virtual bool InitFilter() = 0;
 
   ///
-  // Called to filter a chunk of data. Expected usage is as follows:
-  //
-  //  A. Read input data from |data_in| and set |data_in_read| to the number of
-  //     bytes that were read up to a maximum of |data_in_size|. |data_in| will
-  //     be NULL if |data_in_size| is zero.
-  //  B. Write filtered output data to |data_out| and set |data_out_written| to
-  //     the number of bytes that were written up to a maximum of
-  //     |data_out_size|. If no output data was written then all data must be
-  //     read from |data_in| (user must set |data_in_read| = |data_in_size|).
-  //  C. Return RESPONSE_FILTER_DONE if all output data was written or
-  //     RESPONSE_FILTER_NEED_MORE_DATA if output data is still pending.
-  //
-  // This method will be called repeatedly until the input buffer has been
-  // fully read (user sets |data_in_read| = |data_in_size|) and there is no
-  // more input data to filter (the resource response is complete). This method
-  // may then be called an additional time with an empty input buffer if the
-  // user filled the output buffer (set |data_out_written| = |data_out_size|)
-  // and returned RESPONSE_FILTER_NEED_MORE_DATA to indicate that output data is
-  // still pending.
-  //
-  // Calls to this method will stop when one of the following conditions is met:
-  //
-  //  A. There is no more input data to filter (the resource response is
-  //     complete) and the user sets |data_out_written| = 0 or returns
-  //     RESPONSE_FILTER_DONE to indicate that all data has been written, or;
-  //  B. The user returns RESPONSE_FILTER_ERROR to indicate an error.
-  //
-  // Do not keep a reference to the buffers passed to this method.
+  /// Called to filter a chunk of data. Expected usage is as follows:
+  ///
+  ///  1. Read input data from |data_in| and set |data_in_read| to the number of
+  ///     bytes that were read up to a maximum of |data_in_size|. |data_in| will
+  ///     be NULL if |data_in_size| is zero.
+  ///  2. Write filtered output data to |data_out| and set |data_out_written| to
+  ///     the number of bytes that were written up to a maximum of
+  ///     |data_out_size|. If no output data was written then all data must be
+  ///     read from |data_in| (user must set |data_in_read| = |data_in_size|).
+  ///  3. Return RESPONSE_FILTER_DONE if all output data was written or
+  ///     RESPONSE_FILTER_NEED_MORE_DATA if output data is still pending.
+  ///
+  /// This method will be called repeatedly until the input buffer has been
+  /// fully read (user sets |data_in_read| = |data_in_size|) and there is no
+  /// more input data to filter (the resource response is complete). This method
+  /// may then be called an additional time with an empty input buffer if the
+  /// user filled the output buffer (set |data_out_written| = |data_out_size|)
+  /// and returned RESPONSE_FILTER_NEED_MORE_DATA to indicate that output data
+  /// is still pending.
+  ///
+  /// Calls to this method will stop when one of the following conditions is
+  /// met:
+  ///
+  ///  1. There is no more input data to filter (the resource response is
+  ///     complete) and the user sets |data_out_written| = 0 or returns
+  ///     RESPONSE_FILTER_DONE to indicate that all data has been written, or;
+  ///  2. The user returns RESPONSE_FILTER_ERROR to indicate an error.
+  ///
+  /// Do not keep a reference to the buffers passed to this method.
   ///
   /*--cef(optional_param=data_in,default_retval=RESPONSE_FILTER_ERROR)--*/
   virtual FilterStatus Filter(void* data_in,
diff --git a/src/include/cef_sandbox_win.h b/src/include/cef_sandbox_win.h
index 3b7c4e0b6..a98d64c6c 100644
--- a/src/include/cef_sandbox_win.h
+++ b/src/include/cef_sandbox_win.h
@@ -39,29 +39,32 @@
 extern "C" {
 #endif
 
-// The sandbox is used to restrict sub-processes (renderer, plugin, GPU, etc)
-// from directly accessing system resources. This helps to protect the user
-// from untrusted and potentially malicious Web content.
-// See http://www.chromium.org/developers/design-documents/sandbox for
-// complete details.
-//
-// To enable the sandbox on Windows the following requirements must be met:
-// 1. Use the same executable for the browser process and all sub-processes.
-// 2. Link the executable with the cef_sandbox static library.
-// 3. Call the cef_sandbox_info_create() function from within the executable
-//    (not from a separate DLL) and pass the resulting pointer into both the
-//    CefExecutProcess() and CefInitialize() functions via the
-//    |windows_sandbox_info| parameter.
+///
+/// \file
+/// The sandbox is used to restrict sub-processes (renderer, GPU, etc) from
+/// directly accessing system resources. This helps to protect the user from
+/// untrusted and potentially malicious Web content. See
+/// http://www.chromium.org/developers/design-documents/sandbox for complete
+/// details.
+///
+/// To enable the sandbox on Windows the following requirements must be met:
+/// 1. Use the same executable for the browser process and all sub-processes.
+/// 2. Link the executable with the cef_sandbox static library.
+/// 3. Call the cef_sandbox_info_create() function from within the executable
+///    (not from a separate DLL) and pass the resulting pointer into both the
+///    CefExecuteProcess() and CefInitialize() functions via the
+///    |windows_sandbox_info| parameter.
+///
 
 ///
-// Create the sandbox information object for this process. It is safe to create
-// multiple of this object and to destroy the object immediately after passing
-// into the CefExecutProcess() and/or CefInitialize() functions.
+/// Create the sandbox information object for this process. It is safe to create
+/// multiple of this object and to destroy the object immediately after passing
+/// into the CefExecuteProcess() and/or CefInitialize() functions.
 ///
-void* cef_sandbox_info_create();
+void* cef_sandbox_info_create(void);
 
 ///
-// Destroy the specified sandbox information object.
+/// Destroy the specified sandbox information object.
 ///
 void cef_sandbox_info_destroy(void* sandbox_info);
 
@@ -69,7 +72,7 @@ void cef_sandbox_info_destroy(void* sandbox_info);
 }
 
 ///
-// Manages the life span of a sandbox information object.
+/// Manages the life span of a sandbox information object.
 ///
 class CefScopedSandboxInfo {
  public:
diff --git a/src/include/cef_scheme.h b/src/include/cef_scheme.h
index d1b960825..97f4c155b 100644
--- a/src/include/cef_scheme.h
+++ b/src/include/cef_scheme.h
@@ -48,18 +48,18 @@
 class CefSchemeHandlerFactory;
 
 ///
-// Register a scheme handler factory with the global request context. An empty
-// |domain_name| value for a standard scheme will cause the factory to match all
-// domain names. The |domain_name| value will be ignored for non-standard
-// schemes. If |scheme_name| is a built-in scheme and no handler is returned by
-// |factory| then the built-in scheme handler factory will be called. If
-// |scheme_name| is a custom scheme then you must also implement the
-// CefApp::OnRegisterCustomSchemes() method in all processes. This function may
-// be called multiple times to change or remove the factory that matches the
-// specified |scheme_name| and optional |domain_name|. Returns false if an error
-// occurs. This function may be called on any thread in the browser process.
-// Using this function is equivalent to calling
-// CefRequestContext::GetGlobalContext()->RegisterSchemeHandlerFactory().
+/// Register a scheme handler factory with the global request context. An empty
+/// |domain_name| value for a standard scheme will cause the factory to match
+/// all domain names. The |domain_name| value will be ignored for non-standard
+/// schemes. If |scheme_name| is a built-in scheme and no handler is returned by
+/// |factory| then the built-in scheme handler factory will be called. If
+/// |scheme_name| is a custom scheme then you must also implement the
+/// CefApp::OnRegisterCustomSchemes() method in all processes. This function may
+/// be called multiple times to change or remove the factory that matches the
+/// specified |scheme_name| and optional |domain_name|. Returns false if an
+/// error occurs. This function may be called on any thread in the browser
+/// process. Using this function is equivalent to calling
+/// CefRequestContext::GetGlobalContext()->RegisterSchemeHandlerFactory().
 ///
 /*--cef(optional_param=domain_name,optional_param=factory)--*/
 bool CefRegisterSchemeHandlerFactory(
@@ -68,103 +68,48 @@ bool CefRegisterSchemeHandlerFactory(
     CefRefPtr<CefSchemeHandlerFactory> factory);
 
 ///
-// Clear all scheme handler factories registered with the global request
-// context. Returns false on error. This function may be called on any thread in
-// the browser process. Using this function is equivalent to calling
-// CefRequestContext::GetGlobalContext()->ClearSchemeHandlerFactories().
+/// Clear all scheme handler factories registered with the global request
+/// context. Returns false on error. This function may be called on any thread
+/// in the browser process. Using this function is equivalent to calling
+/// CefRequestContext::GetGlobalContext()->ClearSchemeHandlerFactories().
 ///
 /*--cef()--*/
 bool CefClearSchemeHandlerFactories();
 
 ///
-// Class that manages custom scheme registrations.
+/// Class that manages custom scheme registrations.
 ///
 /*--cef(source=library)--*/
 class CefSchemeRegistrar : public CefBaseScoped {
  public:
   ///
-  // Register a custom scheme. This method should not be called for the built-in
-  // HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
-  //
-  // If |is_standard| is true the scheme will be treated as a standard scheme.
-  // Standard schemes are subject to URL canonicalization and parsing rules as
-  // defined in the Common Internet Scheme Syntax RFC 1738 Section 3.1 available
-  // at http://www.ietf.org/rfc/rfc1738.txt
-  //
-  // In particular, the syntax for standard scheme URLs must be of the form:
-  // <pre>
-  //  [scheme]://[username]:[password]@[host]:[port]/[url-path]
-  // </pre>
-  // Standard scheme URLs must have a host component that is a fully qualified
-  // domain name as defined in Section 3.5 of RFC 1034 [13] and Section 2.1 of
-  // RFC 1123. These URLs will be canonicalized to "scheme://host/path" in the
-  // simplest case and "scheme://username:password@host:port/path" in the most
-  // explicit case. For example, "scheme:host/path" and "scheme:///host/path"
-  // will both be canonicalized to "scheme://host/path". The origin of a
-  // standard scheme URL is the combination of scheme, host and port (i.e.,
-  // "scheme://host:port" in the most explicit case).
-  //
-  // For non-standard scheme URLs only the "scheme:" component is parsed and
-  // canonicalized. The remainder of the URL will be passed to the handler
-  // as-is. For example, "scheme:///some%20text" will remain the same.
-  // Non-standard scheme URLs cannot be used as a target for form submission.
-  //
-  // If |is_local| is true the scheme will be treated with the same security
-  // rules as those applied to "file" URLs. Normal pages cannot link to or
-  // access local URLs. Also, by default, local URLs can only perform
-  // XMLHttpRequest calls to the same URL (origin + path) that originated the
-  // request. To allow XMLHttpRequest calls from a local URL to other URLs with
-  // the same origin set the CefSettings.file_access_from_file_urls_allowed
-  // value to true. To allow XMLHttpRequest calls from a local URL to all
-  // origins set the CefSettings.universal_access_from_file_urls_allowed value
-  // to true.
-  //
-  // If |is_display_isolated| is true the scheme can only be displayed from
-  // other content hosted with the same scheme. For example, pages in other
-  // origins cannot create iframes or hyperlinks to URLs with the scheme. For
-  // schemes that must be accessible from other schemes set this value to false,
-  // set |is_cors_enabled| to true, and use CORS "Access-Control-Allow-Origin"
-  // headers to further restrict access.
-  //
-  // If |is_secure| is true the scheme will be treated with the same security
-  // rules as those applied to "https" URLs. For example, loading this scheme
-  // from other secure schemes will not trigger mixed content warnings.
-  //
-  // If |is_cors_enabled| is true the scheme can be sent CORS requests. This
-  // value should be true in most cases where |is_standard| is true.
-  //
-  // If |is_csp_bypassing| is true the scheme can bypass Content-Security-Policy
-  // (CSP) checks. This value should be false in most cases where |is_standard|
-  // is true.
-  //
-  // This function may be called on any thread. It should only be called once
-  // per unique |scheme_name| value. If |scheme_name| is already registered or
-  // if an error occurs this method will return false.
+  /// Register a custom scheme. This method should not be called for the
+  /// built-in HTTP, HTTPS, FILE, FTP, ABOUT and DATA schemes.
+  ///
+  /// See cef_scheme_options_t for possible values for |options|.
+  ///
+  /// This function may be called on any thread. It should only be called once
+  /// per unique |scheme_name| value. If |scheme_name| is already registered or
+  /// if an error occurs this method will return false.
   ///
   /*--cef()--*/
-  virtual bool AddCustomScheme(const CefString& scheme_name,
-                               bool is_standard,
-                               bool is_local,
-                               bool is_display_isolated,
-                               bool is_secure,
-                               bool is_cors_enabled,
-                               bool is_csp_bypassing) = 0;
+  virtual bool AddCustomScheme(const CefString& scheme_name, int options) = 0;
 };
 
 ///
-// Class that creates CefResourceHandler instances for handling scheme requests.
-// The methods of this class will always be called on the IO thread.
+/// Class that creates CefResourceHandler instances for handling scheme
+/// requests. The methods of this class will always be called on the IO thread.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefSchemeHandlerFactory : public virtual CefBaseRefCounted {
  public:
   ///
-  // Return a new resource handler instance to handle the request or an empty
-  // reference to allow default handling of the request. |browser| and |frame|
-  // will be the browser window and frame respectively that originated the
-  // request or NULL if the request did not originate from a browser window
-  // (for example, if the request came from CefURLRequest). The |request| object
-  // passed to this method will not contain cookie data.
+  /// Return a new resource handler instance to handle the request or an empty
+  /// reference to allow default handling of the request. |browser| and |frame|
+  /// will be the browser window and frame respectively that originated the
+  /// request or NULL if the request did not originate from a browser window
+  /// (for example, if the request came from CefURLRequest). The |request|
+  /// object passed to this method cannot be modified.
   ///
   /*--cef(optional_param=browser,optional_param=frame)--*/
   virtual CefRefPtr<CefResourceHandler> Create(
diff --git a/src/include/cef_server.h b/src/include/cef_server.h
index e22b8a6bf..b868581fa 100644
--- a/src/include/cef_server.h
+++ b/src/include/cef_server.h
@@ -47,11 +47,11 @@
 class CefServerHandler;
 
 ///
-// Class representing a server that supports HTTP and WebSocket requests. Server
-// capacity is limited and is intended to handle only a small number of
-// simultaneous connections (e.g. for communicating between applications on
-// localhost). The methods of this class are safe to call from any thread in the
-// brower process unless otherwise indicated.
+/// Class representing a server that supports HTTP and WebSocket requests.
+/// Server capacity is limited and is intended to handle only a small number of
+/// simultaneous connections (e.g. for communicating between applications on
+/// localhost). The methods of this class are safe to call from any thread in
+/// the brower process unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefServer : public CefBaseRefCounted {
@@ -59,74 +59,74 @@ class CefServer : public CefBaseRefCounted {
   typedef std::multimap<CefString, CefString> HeaderMap;
 
   ///
-  // Create a new server that binds to |address| and |port|. |address| must be a
-  // valid IPv4 or IPv6 address (e.g. 127.0.0.1 or ::1) and |port| must be a
-  // port number outside of the reserved range (e.g. between 1025 and 65535 on
-  // most platforms). |backlog| is the maximum number of pending connections.
-  // A new thread will be created for each CreateServer call (the "dedicated
-  // server thread"). It is therefore recommended to use a different
-  // CefServerHandler instance for each CreateServer call to avoid thread safety
-  // issues in the CefServerHandler implementation. The
-  // CefServerHandler::OnServerCreated method will be called on the dedicated
-  // server thread to report success or failure. See
-  // CefServerHandler::OnServerCreated documentation for a description of server
-  // lifespan.
+  /// Create a new server that binds to |address| and |port|. |address| must be
+  /// a valid IPv4 or IPv6 address (e.g. 127.0.0.1 or ::1) and |port| must be a
+  /// port number outside of the reserved range (e.g. between 1025 and 65535 on
+  /// most platforms). |backlog| is the maximum number of pending connections.
+  /// A new thread will be created for each CreateServer call (the "dedicated
+  /// server thread"). It is therefore recommended to use a different
+  /// CefServerHandler instance for each CreateServer call to avoid thread
+  /// safety issues in the CefServerHandler implementation. The
+  /// CefServerHandler::OnServerCreated method will be called on the dedicated
+  /// server thread to report success or failure. See
+  /// CefServerHandler::OnServerCreated documentation for a description of
+  /// server lifespan.
   ///
   /*--cef()--*/
   static void CreateServer(const CefString& address,
-                           uint16 port,
+                           uint16_t port,
                            int backlog,
                            CefRefPtr<CefServerHandler> handler);
 
   ///
-  // Returns the task runner for the dedicated server thread.
+  /// Returns the task runner for the dedicated server thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTaskRunner> GetTaskRunner() = 0;
 
   ///
-  // Stop the server and shut down the dedicated server thread. See
-  // CefServerHandler::OnServerCreated documentation for a description of
-  // server lifespan.
+  /// Stop the server and shut down the dedicated server thread. See
+  /// CefServerHandler::OnServerCreated documentation for a description of
+  /// server lifespan.
   ///
   /*--cef()--*/
   virtual void Shutdown() = 0;
 
   ///
-  // Returns true if the server is currently running and accepting incoming
-  // connections. See CefServerHandler::OnServerCreated documentation for a
-  // description of server lifespan. This method must be called on the dedicated
-  // server thread.
+  /// Returns true if the server is currently running and accepting incoming
+  /// connections. See CefServerHandler::OnServerCreated documentation for a
+  /// description of server lifespan. This method must be called on the
+  /// dedicated server thread.
   ///
   /*--cef()--*/
   virtual bool IsRunning() = 0;
 
   ///
-  // Returns the server address including the port number.
+  /// Returns the server address including the port number.
   ///
   /*--cef()--*/
   virtual CefString GetAddress() = 0;
 
   ///
-  // Returns true if the server currently has a connection. This method must be
-  // called on the dedicated server thread.
+  /// Returns true if the server currently has a connection. This method must be
+  /// called on the dedicated server thread.
   ///
   /*--cef()--*/
   virtual bool HasConnection() = 0;
 
   ///
-  // Returns true if |connection_id| represents a valid connection. This method
-  // must be called on the dedicated server thread.
+  /// Returns true if |connection_id| represents a valid connection. This method
+  /// must be called on the dedicated server thread.
   ///
   /*--cef()--*/
   virtual bool IsValidConnection(int connection_id) = 0;
 
   ///
-  // Send an HTTP 200 "OK" response to the connection identified by
-  // |connection_id|. |content_type| is the response content type (e.g.
-  // "text/html"), |data| is the response content, and |data_size| is the size
-  // of |data| in bytes. The contents of |data| will be copied. The connection
-  // will be closed automatically after the response is sent.
+  /// Send an HTTP 200 "OK" response to the connection identified by
+  /// |connection_id|. |content_type| is the response content type (e.g.
+  /// "text/html"), |data| is the response content, and |data_size| is the size
+  /// of |data| in bytes. The contents of |data| will be copied. The connection
+  /// will be closed automatically after the response is sent.
   ///
   /*--cef()--*/
   virtual void SendHttp200Response(int connection_id,
@@ -135,51 +135,51 @@ class CefServer : public CefBaseRefCounted {
                                    size_t data_size) = 0;
 
   ///
-  // Send an HTTP 404 "Not Found" response to the connection identified by
-  // |connection_id|. The connection will be closed automatically after the
-  // response is sent.
+  /// Send an HTTP 404 "Not Found" response to the connection identified by
+  /// |connection_id|. The connection will be closed automatically after the
+  /// response is sent.
   ///
   /*--cef()--*/
   virtual void SendHttp404Response(int connection_id) = 0;
 
   ///
-  // Send an HTTP 500 "Internal Server Error" response to the connection
-  // identified by |connection_id|. |error_message| is the associated error
-  // message. The connection will be closed automatically after the response is
-  // sent.
+  /// Send an HTTP 500 "Internal Server Error" response to the connection
+  /// identified by |connection_id|. |error_message| is the associated error
+  /// message. The connection will be closed automatically after the response is
+  /// sent.
   ///
   /*--cef()--*/
   virtual void SendHttp500Response(int connection_id,
                                    const CefString& error_message) = 0;
 
   ///
-  // Send a custom HTTP response to the connection identified by
-  // |connection_id|. |response_code| is the HTTP response code sent in the
-  // status line (e.g. 200), |content_type| is the response content type sent
-  // as the "Content-Type" header (e.g. "text/html"), |content_length| is the
-  // expected content length, and |extra_headers| is the map of extra response
-  // headers. If |content_length| is >= 0 then the "Content-Length" header will
-  // be sent. If |content_length| is 0 then no content is expected and the
-  // connection will be closed automatically after the response is sent. If
-  // |content_length| is < 0 then no "Content-Length" header will be sent and
-  // the client will continue reading until the connection is closed. Use the
-  // SendRawData method to send the content, if applicable, and call
-  // CloseConnection after all content has been sent.
+  /// Send a custom HTTP response to the connection identified by
+  /// |connection_id|. |response_code| is the HTTP response code sent in the
+  /// status line (e.g. 200), |content_type| is the response content type sent
+  /// as the "Content-Type" header (e.g. "text/html"), |content_length| is the
+  /// expected content length, and |extra_headers| is the map of extra response
+  /// headers. If |content_length| is >= 0 then the "Content-Length" header will
+  /// be sent. If |content_length| is 0 then no content is expected and the
+  /// connection will be closed automatically after the response is sent. If
+  /// |content_length| is < 0 then no "Content-Length" header will be sent and
+  /// the client will continue reading until the connection is closed. Use the
+  /// SendRawData method to send the content, if applicable, and call
+  /// CloseConnection after all content has been sent.
   ///
   /*--cef(optional_param=extra_headers)--*/
   virtual void SendHttpResponse(int connection_id,
                                 int response_code,
                                 const CefString& content_type,
-                                int64 content_length,
+                                int64_t content_length,
                                 const HeaderMap& extra_headers) = 0;
 
   ///
-  // Send raw data directly to the connection identified by |connection_id|.
-  // |data| is the raw data and |data_size| is the size of |data| in bytes.
-  // The contents of |data| will be copied. No validation of |data| is
-  // performed internally so the client should be careful to send the amount
-  // indicated by the "Content-Length" header, if specified. See
-  // SendHttpResponse documentation for intended usage.
+  /// Send raw data directly to the connection identified by |connection_id|.
+  /// |data| is the raw data and |data_size| is the size of |data| in bytes.
+  /// The contents of |data| will be copied. No validation of |data| is
+  /// performed internally so the client should be careful to send the amount
+  /// indicated by the "Content-Length" header, if specified. See
+  /// SendHttpResponse documentation for intended usage.
   ///
   /*--cef()--*/
   virtual void SendRawData(int connection_id,
@@ -187,17 +187,17 @@ class CefServer : public CefBaseRefCounted {
                            size_t data_size) = 0;
 
   ///
-  // Close the connection identified by |connection_id|. See SendHttpResponse
-  // documentation for intended usage.
+  /// Close the connection identified by |connection_id|. See SendHttpResponse
+  /// documentation for intended usage.
   ///
   /*--cef()--*/
   virtual void CloseConnection(int connection_id) = 0;
 
   ///
-  // Send a WebSocket message to the connection identified by |connection_id|.
-  // |data| is the response content and |data_size| is the size of |data| in
-  // bytes. The contents of |data| will be copied. See
-  // CefServerHandler::OnWebSocketRequest documentation for intended usage.
+  /// Send a WebSocket message to the connection identified by |connection_id|.
+  /// |data| is the response content and |data_size| is the size of |data| in
+  /// bytes. The contents of |data| will be copied. See
+  /// CefServerHandler::OnWebSocketRequest documentation for intended usage.
   ///
   /*--cef()--*/
   virtual void SendWebSocketMessage(int connection_id,
@@ -206,62 +206,62 @@ class CefServer : public CefBaseRefCounted {
 };
 
 ///
-// Implement this interface to handle HTTP server requests. A new thread will be
-// created for each CefServer::CreateServer call (the "dedicated server
-// thread"), and the methods of this class will be called on that thread. It is
-// therefore recommended to use a different CefServerHandler instance for each
-// CefServer::CreateServer call to avoid thread safety issues in the
-// CefServerHandler implementation.
+/// Implement this interface to handle HTTP server requests. A new thread will
+/// be created for each CefServer::CreateServer call (the "dedicated server
+/// thread"), and the methods of this class will be called on that thread. It is
+/// therefore recommended to use a different CefServerHandler instance for each
+/// CefServer::CreateServer call to avoid thread safety issues in the
+/// CefServerHandler implementation.
 ///
 /*--cef(source=client)--*/
 class CefServerHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called when |server| is created. If the server was started successfully
-  // then CefServer::IsRunning will return true. The server will continue
-  // running until CefServer::Shutdown is called, after which time
-  // OnServerDestroyed will be called. If the server failed to start then
-  // OnServerDestroyed will be called immediately after this method returns.
+  /// Called when |server| is created. If the server was started successfully
+  /// then CefServer::IsRunning will return true. The server will continue
+  /// running until CefServer::Shutdown is called, after which time
+  /// OnServerDestroyed will be called. If the server failed to start then
+  /// OnServerDestroyed will be called immediately after this method returns.
   ///
   /*--cef()--*/
   virtual void OnServerCreated(CefRefPtr<CefServer> server) = 0;
 
   ///
-  // Called when |server| is destroyed. The server thread will be stopped after
-  // this method returns. The client should release any references to |server|
-  // when this method is called. See OnServerCreated documentation for a
-  // description of server lifespan.
+  /// Called when |server| is destroyed. The server thread will be stopped after
+  /// this method returns. The client should release any references to |server|
+  /// when this method is called. See OnServerCreated documentation for a
+  /// description of server lifespan.
   ///
   /*--cef()--*/
   virtual void OnServerDestroyed(CefRefPtr<CefServer> server) = 0;
 
   ///
-  // Called when a client connects to |server|. |connection_id| uniquely
-  // identifies the connection. Each call to this method will have a matching
-  // call to OnClientDisconnected.
+  /// Called when a client connects to |server|. |connection_id| uniquely
+  /// identifies the connection. Each call to this method will have a matching
+  /// call to OnClientDisconnected.
   ///
   /*--cef()--*/
   virtual void OnClientConnected(CefRefPtr<CefServer> server,
                                  int connection_id) = 0;
 
   ///
-  // Called when a client disconnects from |server|. |connection_id| uniquely
-  // identifies the connection. The client should release any data associated
-  // with |connection_id| when this method is called and |connection_id| should
-  // no longer be passed to CefServer methods. Disconnects can originate from
-  // either the client or the server. For example, the server will disconnect
-  // automatically after a CefServer::SendHttpXXXResponse method is called.
+  /// Called when a client disconnects from |server|. |connection_id| uniquely
+  /// identifies the connection. The client should release any data associated
+  /// with |connection_id| when this method is called and |connection_id| should
+  /// no longer be passed to CefServer methods. Disconnects can originate from
+  /// either the client or the server. For example, the server will disconnect
+  /// automatically after a CefServer::SendHttpXXXResponse method is called.
   ///
   /*--cef()--*/
   virtual void OnClientDisconnected(CefRefPtr<CefServer> server,
                                     int connection_id) = 0;
 
   ///
-  // Called when |server| receives an HTTP request. |connection_id| uniquely
-  // identifies the connection, |client_address| is the requesting IPv4 or IPv6
-  // client address including port number, and |request| contains the request
-  // contents (URL, method, headers and optional POST data). Call CefServer
-  // methods either synchronously or asynchronusly to send a response.
+  /// Called when |server| receives an HTTP request. |connection_id| uniquely
+  /// identifies the connection, |client_address| is the requesting IPv4 or IPv6
+  /// client address including port number, and |request| contains the request
+  /// contents (URL, method, headers and optional POST data). Call CefServer
+  /// methods either synchronously or asynchronusly to send a response.
   ///
   /*--cef()--*/
   virtual void OnHttpRequest(CefRefPtr<CefServer> server,
@@ -270,17 +270,18 @@ class CefServerHandler : public virtual CefBaseRefCounted {
                              CefRefPtr<CefRequest> request) = 0;
 
   ///
-  // Called when |server| receives a WebSocket request. |connection_id| uniquely
-  // identifies the connection, |client_address| is the requesting IPv4 or
-  // IPv6 client address including port number, and |request| contains the
-  // request contents (URL, method, headers and optional POST data). Execute
-  // |callback| either synchronously or asynchronously to accept or decline the
-  // WebSocket connection. If the request is accepted then OnWebSocketConnected
-  // will be called after the WebSocket has connected and incoming messages will
-  // be delivered to the OnWebSocketMessage callback. If the request is declined
-  // then the client will be disconnected and OnClientDisconnected will be
-  // called. Call the CefServer::SendWebSocketMessage method after receiving the
-  // OnWebSocketConnected callback to respond with WebSocket messages.
+  /// Called when |server| receives a WebSocket request. |connection_id|
+  /// uniquely identifies the connection, |client_address| is the requesting
+  /// IPv4 or IPv6 client address including port number, and |request| contains
+  /// the request contents (URL, method, headers and optional POST data).
+  /// Execute |callback| either synchronously or asynchronously to accept or
+  /// decline the WebSocket connection. If the request is accepted then
+  /// OnWebSocketConnected will be called after the WebSocket has connected and
+  /// incoming messages will be delivered to the OnWebSocketMessage callback. If
+  /// the request is declined then the client will be disconnected and
+  /// OnClientDisconnected will be called. Call the
+  /// CefServer::SendWebSocketMessage method after receiving the
+  /// OnWebSocketConnected callback to respond with WebSocket messages.
   ///
   /*--cef()--*/
   virtual void OnWebSocketRequest(CefRefPtr<CefServer> server,
@@ -290,20 +291,20 @@ class CefServerHandler : public virtual CefBaseRefCounted {
                                   CefRefPtr<CefCallback> callback) = 0;
 
   ///
-  // Called after the client has accepted the WebSocket connection for |server|
-  // and |connection_id| via the OnWebSocketRequest callback. See
-  // OnWebSocketRequest documentation for intended usage.
+  /// Called after the client has accepted the WebSocket connection for |server|
+  /// and |connection_id| via the OnWebSocketRequest callback. See
+  /// OnWebSocketRequest documentation for intended usage.
   ///
   /*--cef()--*/
   virtual void OnWebSocketConnected(CefRefPtr<CefServer> server,
                                     int connection_id) = 0;
 
   ///
-  // Called when |server| receives an WebSocket message. |connection_id|
-  // uniquely identifies the connection, |data| is the message content and
-  // |data_size| is the size of |data| in bytes. Do not keep a reference to
-  // |data| outside of this method. See OnWebSocketRequest documentation for
-  // intended usage.
+  /// Called when |server| receives an WebSocket message. |connection_id|
+  /// uniquely identifies the connection, |data| is the message content and
+  /// |data_size| is the size of |data| in bytes. Do not keep a reference to
+  /// |data| outside of this method. See OnWebSocketRequest documentation for
+  /// intended usage.
   ///
   /*--cef()--*/
   virtual void OnWebSocketMessage(CefRefPtr<CefServer> server,
diff --git a/src/include/test/cef_test_helpers.h b/src/include/cef_shared_memory_region.h
similarity index 67%
rename from src/include/test/cef_test_helpers.h
rename to src/include/cef_shared_memory_region.h
index a4e45b8e4..126a9796c 100644
--- a/src/include/test/cef_test_helpers.h
+++ b/src/include/cef_shared_memory_region.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -33,29 +33,37 @@
 // support the CEF translator tool. See the translator.README.txt file in the
 // tools directory for more information.
 //
-// THIS FILE IS FOR TESTING PURPOSES ONLY.
-//
-// The APIs defined in this file are for testing purposes only. They should only
-// be included from unit test targets.
-//
 
-#ifndef CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_
-#define CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_
+#ifndef CEF_INCLUDE_CEF_SHARED_MEMORY_REGION_H_
+#define CEF_INCLUDE_CEF_SHARED_MEMORY_REGION_H_
 #pragma once
 
-#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \
-    !defined(UNIT_TEST)
-#error This file can be included for unit tests only
-#endif
-
-#include "include/cef_frame.h"
+#include "include/cef_base.h"
 
 ///
-// Execute JavaScript with a user gesture to trigger functionality like
-// onbeforeunload handlers that will otherwise be blocked.
+/// Class that wraps platform-dependent share memory region mapping.
 ///
-/*--cef(optional_param=javascript)--*/
-void CefExecuteJavaScriptWithUserGestureForTests(CefRefPtr<CefFrame> frame,
-                                                 const CefString& javascript);
+/*--cef(source=library)--*/
+class CefSharedMemoryRegion : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Returns true if the mapping is valid.
+  ///
+  /*--cef()--*/
+  virtual bool IsValid() = 0;
+
+  ///
+  /// Returns the size of the mapping in bytes. Returns 0 for invalid instances.
+  ///
+  /*--cef()--*/
+  virtual size_t Size() = 0;
+
+  ///
+  /// Returns the pointer to the memory. Returns nullptr for invalid instances.
+  /// The returned pointer is only valid for the life span of this object.
+  ///
+  /*--cef()--*/
+  virtual void* Memory() = 0;
+};
 
-#endif  // CEF_INCLUDE_TEST_CEF_TEST_HELPERS_H_
+#endif  // CEF_INCLUDE_CEF_SHARED_MEMORY_REGION_H_
diff --git a/src/include/cef_shared_process_message_builder.h b/src/include/cef_shared_process_message_builder.h
new file mode 100644
index 000000000..f67e58fda
--- /dev/null
+++ b/src/include/cef_shared_process_message_builder.h
@@ -0,0 +1,87 @@
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_CEF_SHARED_PROCESS_MESSAGE_BUILDER_H_
+#define CEF_INCLUDE_CEF_SHARED_PROCESS_MESSAGE_BUILDER_H_
+#pragma once
+
+#include "include/cef_process_message.h"
+
+///
+/// Class that builds a CefProcessMessage containing a shared memory region.
+/// This class is not thread-safe but may be used exclusively on a different
+/// thread from the one which constructed it.
+///
+/*--cef(source=library)--*/
+class CefSharedProcessMessageBuilder : public virtual CefBaseRefCounted {
+ public:
+  ///
+  /// Creates a new CefSharedProcessMessageBuilder with the specified |name| and
+  /// shared memory region of specified |byte_size|.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefSharedProcessMessageBuilder> Create(const CefString& name,
+                                                          size_t byte_size);
+  ///
+  /// Returns true if the builder is valid.
+  ///
+  /*--cef()--*/
+  virtual bool IsValid() = 0;
+
+  ///
+  /// Returns the size of the shared memory region in bytes. Returns 0 for
+  /// invalid instances.
+  ///
+  /*--cef()--*/
+  virtual size_t Size() = 0;
+
+  ///
+  /// Returns the pointer to the writable memory. Returns nullptr for invalid
+  /// instances. The returned pointer is only valid for the life span of this
+  /// object.
+  ///
+  /*--cef()--*/
+  virtual void* Memory() = 0;
+
+  ///
+  /// Creates a new CefProcessMessage from the data provided to the builder.
+  /// Returns nullptr for invalid instances. Invalidates the builder instance.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefProcessMessage> Build() = 0;
+};
+
+#endif  // CEF_INCLUDE_CEF_SHARED_PROCESS_MESSAGE_BUILDER_H_
diff --git a/src/include/cef_ssl_info.h b/src/include/cef_ssl_info.h
index 1ede59084..67b9cdfd9 100644
--- a/src/include/cef_ssl_info.h
+++ b/src/include/cef_ssl_info.h
@@ -44,36 +44,29 @@
 #include "include/cef_x509_certificate.h"
 
 ///
-// Class representing SSL information.
+/// Class representing SSL information.
 ///
 /*--cef(source=library)--*/
 class CefSSLInfo : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns a bitmask containing any and all problems verifying the server
-  // certificate.
+  /// Returns a bitmask containing any and all problems verifying the server
+  /// certificate.
   ///
   /*--cef(default_retval=CERT_STATUS_NONE)--*/
   virtual cef_cert_status_t GetCertStatus() = 0;
 
   ///
-  // Returns the X.509 certificate.
+  /// Returns the X.509 certificate.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefX509Certificate> GetX509Certificate() = 0;
 };
 
 ///
-// Returns true if the certificate status has any error, major or minor.
+/// Returns true if the certificate status represents an error.
 ///
 /*--cef()--*/
 bool CefIsCertStatusError(cef_cert_status_t status);
 
-///
-// Returns true if the certificate status represents only minor errors
-// (e.g. failure to verify certificate revocation).
-///
-/*--cef()--*/
-bool CefIsCertStatusMinorError(cef_cert_status_t status);
-
 #endif  // CEF_INCLUDE_CEF_SSL_INFO_H_
diff --git a/src/include/cef_ssl_status.h b/src/include/cef_ssl_status.h
index 002ac4912..fe108dffd 100644
--- a/src/include/cef_ssl_status.h
+++ b/src/include/cef_ssl_status.h
@@ -43,38 +43,38 @@
 #include "include/cef_x509_certificate.h"
 
 ///
-// Class representing the SSL information for a navigation entry.
+/// Class representing the SSL information for a navigation entry.
 ///
 /*--cef(source=library)--*/
 class CefSSLStatus : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns true if the status is related to a secure SSL/TLS connection.
+  /// Returns true if the status is related to a secure SSL/TLS connection.
   ///
   /*--cef()--*/
   virtual bool IsSecureConnection() = 0;
 
   ///
-  // Returns a bitmask containing any and all problems verifying the server
-  // certificate.
+  /// Returns a bitmask containing any and all problems verifying the server
+  /// certificate.
   ///
   /*--cef(default_retval=CERT_STATUS_NONE)--*/
   virtual cef_cert_status_t GetCertStatus() = 0;
 
   ///
-  // Returns the SSL version used for the SSL connection.
+  /// Returns the SSL version used for the SSL connection.
   ///
   /*--cef(default_retval=SSL_CONNECTION_VERSION_UNKNOWN)--*/
   virtual cef_ssl_version_t GetSSLVersion() = 0;
 
   ///
-  // Returns a bitmask containing the page security content status.
+  /// Returns a bitmask containing the page security content status.
   ///
   /*--cef(default_retval=SSL_CONTENT_NORMAL_CONTENT)--*/
   virtual cef_ssl_content_status_t GetContentStatus() = 0;
 
   ///
-  // Returns the X.509 certificate.
+  /// Returns the X.509 certificate.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefX509Certificate> GetX509Certificate() = 0;
diff --git a/src/include/cef_stream.h b/src/include/cef_stream.h
index c40392e02..22d4ef00e 100644
--- a/src/include/cef_stream.h
+++ b/src/include/cef_stream.h
@@ -40,197 +40,199 @@
 #include "include/cef_base.h"
 
 ///
-// Interface the client can implement to provide a custom stream reader. The
-// methods of this class may be called on any thread.
+/// Interface the client can implement to provide a custom stream reader. The
+/// methods of this class may be called on any thread.
 ///
 /*--cef(source=client)--*/
 class CefReadHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Read raw binary data.
+  /// Read raw binary data.
   ///
   /*--cef()--*/
   virtual size_t Read(void* ptr, size_t size, size_t n) = 0;
 
   ///
-  // Seek to the specified offset position. |whence| may be any one of
-  // SEEK_CUR, SEEK_END or SEEK_SET. Return zero on success and non-zero on
-  // failure.
+  /// Seek to the specified offset position. |whence| may be any one of
+  /// SEEK_CUR, SEEK_END or SEEK_SET. Return zero on success and non-zero on
+  /// failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) = 0;
+  virtual int Seek(int64_t offset, int whence) = 0;
 
   ///
-  // Return the current offset position.
+  /// Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() = 0;
+  virtual int64_t Tell() = 0;
 
   ///
-  // Return non-zero if at end of file.
+  /// Return non-zero if at end of file.
   ///
   /*--cef()--*/
   virtual int Eof() = 0;
 
   ///
-  // Return true if this handler performs work like accessing the file system
-  // which may block. Used as a hint for determining the thread to access the
-  // handler from.
+  /// Return true if this handler performs work like accessing the file system
+  /// which may block. Used as a hint for determining the thread to access the
+  /// handler from.
   ///
   /*--cef()--*/
   virtual bool MayBlock() = 0;
 };
 
 ///
-// Class used to read data from a stream. The methods of this class may be
-// called on any thread.
+/// Class used to read data from a stream. The methods of this class may be
+/// called on any thread.
 ///
 /*--cef(source=library)--*/
 class CefStreamReader : public virtual CefBaseRefCounted {
  public:
   ///
-  // Create a new CefStreamReader object from a file.
+  /// Create a new CefStreamReader object from a file.
   ///
   /*--cef()--*/
   static CefRefPtr<CefStreamReader> CreateForFile(const CefString& fileName);
+
   ///
-  // Create a new CefStreamReader object from data.
+  /// Create a new CefStreamReader object from data.
   ///
   /*--cef()--*/
   static CefRefPtr<CefStreamReader> CreateForData(void* data, size_t size);
+
   ///
-  // Create a new CefStreamReader object from a custom handler.
+  /// Create a new CefStreamReader object from a custom handler.
   ///
   /*--cef()--*/
   static CefRefPtr<CefStreamReader> CreateForHandler(
       CefRefPtr<CefReadHandler> handler);
 
   ///
-  // Read raw binary data.
+  /// Read raw binary data.
   ///
   /*--cef()--*/
   virtual size_t Read(void* ptr, size_t size, size_t n) = 0;
 
   ///
-  // Seek to the specified offset position. |whence| may be any one of
-  // SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on
-  // failure.
+  /// Seek to the specified offset position. |whence| may be any one of
+  /// SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on
+  /// failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) = 0;
+  virtual int Seek(int64_t offset, int whence) = 0;
 
   ///
-  // Return the current offset position.
+  /// Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() = 0;
+  virtual int64_t Tell() = 0;
 
   ///
-  // Return non-zero if at end of file.
+  /// Return non-zero if at end of file.
   ///
   /*--cef()--*/
   virtual int Eof() = 0;
 
   ///
-  // Returns true if this reader performs work like accessing the file system
-  // which may block. Used as a hint for determining the thread to access the
-  // reader from.
+  /// Returns true if this reader performs work like accessing the file system
+  /// which may block. Used as a hint for determining the thread to access the
+  /// reader from.
   ///
   /*--cef()--*/
   virtual bool MayBlock() = 0;
 };
 
 ///
-// Interface the client can implement to provide a custom stream writer. The
-// methods of this class may be called on any thread.
+/// Interface the client can implement to provide a custom stream writer. The
+/// methods of this class may be called on any thread.
 ///
 /*--cef(source=client)--*/
 class CefWriteHandler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Write raw binary data.
+  /// Write raw binary data.
   ///
   /*--cef()--*/
   virtual size_t Write(const void* ptr, size_t size, size_t n) = 0;
 
   ///
-  // Seek to the specified offset position. |whence| may be any one of
-  // SEEK_CUR, SEEK_END or SEEK_SET. Return zero on success and non-zero on
-  // failure.
+  /// Seek to the specified offset position. |whence| may be any one of
+  /// SEEK_CUR, SEEK_END or SEEK_SET. Return zero on success and non-zero on
+  /// failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) = 0;
+  virtual int Seek(int64_t offset, int whence) = 0;
 
   ///
-  // Return the current offset position.
+  /// Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() = 0;
+  virtual int64_t Tell() = 0;
 
   ///
-  // Flush the stream.
+  /// Flush the stream.
   ///
   /*--cef()--*/
   virtual int Flush() = 0;
 
   ///
-  // Return true if this handler performs work like accessing the file system
-  // which may block. Used as a hint for determining the thread to access the
-  // handler from.
+  /// Return true if this handler performs work like accessing the file system
+  /// which may block. Used as a hint for determining the thread to access the
+  /// handler from.
   ///
   /*--cef()--*/
   virtual bool MayBlock() = 0;
 };
 
 ///
-// Class used to write data to a stream. The methods of this class may be called
-// on any thread.
+/// Class used to write data to a stream. The methods of this class may be
+/// called on any thread.
 ///
 /*--cef(source=library)--*/
 class CefStreamWriter : public virtual CefBaseRefCounted {
  public:
   ///
-  // Create a new CefStreamWriter object for a file.
+  /// Create a new CefStreamWriter object for a file.
   ///
   /*--cef()--*/
   static CefRefPtr<CefStreamWriter> CreateForFile(const CefString& fileName);
   ///
-  // Create a new CefStreamWriter object for a custom handler.
+  /// Create a new CefStreamWriter object for a custom handler.
   ///
   /*--cef()--*/
   static CefRefPtr<CefStreamWriter> CreateForHandler(
       CefRefPtr<CefWriteHandler> handler);
 
   ///
-  // Write raw binary data.
+  /// Write raw binary data.
   ///
   /*--cef()--*/
   virtual size_t Write(const void* ptr, size_t size, size_t n) = 0;
 
   ///
-  // Seek to the specified offset position. |whence| may be any one of
-  // SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on
-  // failure.
+  /// Seek to the specified offset position. |whence| may be any one of
+  /// SEEK_CUR, SEEK_END or SEEK_SET. Returns zero on success and non-zero on
+  /// failure.
   ///
   /*--cef()--*/
-  virtual int Seek(int64 offset, int whence) = 0;
+  virtual int Seek(int64_t offset, int whence) = 0;
 
   ///
-  // Return the current offset position.
+  /// Return the current offset position.
   ///
   /*--cef()--*/
-  virtual int64 Tell() = 0;
+  virtual int64_t Tell() = 0;
 
   ///
-  // Flush the stream.
+  /// Flush the stream.
   ///
   /*--cef()--*/
   virtual int Flush() = 0;
 
   ///
-  // Returns true if this writer performs work like accessing the file system
-  // which may block. Used as a hint for determining the thread to access the
-  // writer from.
+  /// Returns true if this writer performs work like accessing the file system
+  /// which may block. Used as a hint for determining the thread to access the
+  /// writer from.
   ///
   /*--cef()--*/
   virtual bool MayBlock() = 0;
diff --git a/src/include/cef_string_visitor.h b/src/include/cef_string_visitor.h
index f23dfb6a0..c77e59c0a 100644
--- a/src/include/cef_string_visitor.h
+++ b/src/include/cef_string_visitor.h
@@ -40,13 +40,13 @@
 #include "include/cef_base.h"
 
 ///
-// Implement this interface to receive string values asynchronously.
+/// Implement this interface to receive string values asynchronously.
 ///
 /*--cef(source=client)--*/
 class CefStringVisitor : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be executed.
+  /// Method that will be executed.
   ///
   /*--cef(optional_param=string)--*/
   virtual void Visit(const CefString& string) = 0;
diff --git a/src/include/cef_task.h b/src/include/cef_task.h
index a892d3953..2e5085ef1 100644
--- a/src/include/cef_task.h
+++ b/src/include/cef_task.h
@@ -42,106 +42,107 @@
 typedef cef_thread_id_t CefThreadId;
 
 ///
-// Implement this interface for asynchronous task execution. If the task is
-// posted successfully and if the associated message loop is still running then
-// the Execute() method will be called on the target thread. If the task fails
-// to post then the task object may be destroyed on the source thread instead of
-// the target thread. For this reason be cautious when performing work in the
-// task object destructor.
+/// Implement this interface for asynchronous task execution. If the task is
+/// posted successfully and if the associated message loop is still running then
+/// the Execute() method will be called on the target thread. If the task fails
+/// to post then the task object may be destroyed on the source thread instead
+/// of the target thread. For this reason be cautious when performing work in
+/// the task object destructor.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefTask : public virtual CefBaseRefCounted {
  public:
   ///
-  // Method that will be executed on the target thread.
+  /// Method that will be executed on the target thread.
   ///
   /*--cef()--*/
   virtual void Execute() = 0;
 };
 
 ///
-// Class that asynchronously executes tasks on the associated thread. It is safe
-// to call the methods of this class on any thread.
-//
-// CEF maintains multiple internal threads that are used for handling different
-// types of tasks in different processes. The cef_thread_id_t definitions in
-// cef_types.h list the common CEF threads. Task runners are also available for
-// other CEF threads as appropriate (for example, V8 WebWorker threads).
+/// Class that asynchronously executes tasks on the associated thread. It is
+/// safe to call the methods of this class on any thread.
+///
+/// CEF maintains multiple internal threads that are used for handling different
+/// types of tasks in different processes. The cef_thread_id_t definitions in
+/// cef_types.h list the common CEF threads. Task runners are also available for
+/// other CEF threads as appropriate (for example, V8 WebWorker threads).
 ///
 /*--cef(source=library)--*/
 class CefTaskRunner : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns the task runner for the current thread. Only CEF threads will have
-  // task runners. An empty reference will be returned if this method is called
-  // on an invalid thread.
+  /// Returns the task runner for the current thread. Only CEF threads will have
+  /// task runners. An empty reference will be returned if this method is called
+  /// on an invalid thread.
   ///
   /*--cef()--*/
   static CefRefPtr<CefTaskRunner> GetForCurrentThread();
 
   ///
-  // Returns the task runner for the specified CEF thread.
+  /// Returns the task runner for the specified CEF thread.
   ///
   /*--cef()--*/
   static CefRefPtr<CefTaskRunner> GetForThread(CefThreadId threadId);
 
   ///
-  // Returns true if this object is pointing to the same task runner as |that|
-  // object.
+  /// Returns true if this object is pointing to the same task runner as |that|
+  /// object.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefTaskRunner> that) = 0;
 
   ///
-  // Returns true if this task runner belongs to the current thread.
+  /// Returns true if this task runner belongs to the current thread.
   ///
   /*--cef()--*/
   virtual bool BelongsToCurrentThread() = 0;
 
   ///
-  // Returns true if this task runner is for the specified CEF thread.
+  /// Returns true if this task runner is for the specified CEF thread.
   ///
   /*--cef()--*/
   virtual bool BelongsToThread(CefThreadId threadId) = 0;
 
   ///
-  // Post a task for execution on the thread associated with this task runner.
-  // Execution will occur asynchronously.
+  /// Post a task for execution on the thread associated with this task runner.
+  /// Execution will occur asynchronously.
   ///
   /*--cef()--*/
   virtual bool PostTask(CefRefPtr<CefTask> task) = 0;
 
   ///
-  // Post a task for delayed execution on the thread associated with this task
-  // runner. Execution will occur asynchronously. Delayed tasks are not
-  // supported on V8 WebWorker threads and will be executed without the
-  // specified delay.
+  /// Post a task for delayed execution on the thread associated with this task
+  /// runner. Execution will occur asynchronously. Delayed tasks are not
+  /// supported on V8 WebWorker threads and will be executed without the
+  /// specified delay.
   ///
   /*--cef()--*/
-  virtual bool PostDelayedTask(CefRefPtr<CefTask> task, int64 delay_ms) = 0;
+  virtual bool PostDelayedTask(CefRefPtr<CefTask> task, int64_t delay_ms) = 0;
 };
 
 ///
-// Returns true if called on the specified thread. Equivalent to using
-// CefTaskRunner::GetForThread(threadId)->BelongsToCurrentThread().
+/// Returns true if called on the specified thread. Equivalent to using
+/// CefTaskRunner::GetForThread(threadId)->BelongsToCurrentThread().
 ///
 /*--cef()--*/
 bool CefCurrentlyOn(CefThreadId threadId);
 
 ///
-// Post a task for execution on the specified thread. Equivalent to
-// using CefTaskRunner::GetForThread(threadId)->PostTask(task).
+/// Post a task for execution on the specified thread. Equivalent to
+/// using CefTaskRunner::GetForThread(threadId)->PostTask(task).
 ///
 /*--cef()--*/
 bool CefPostTask(CefThreadId threadId, CefRefPtr<CefTask> task);
 
 ///
-// Post a task for delayed execution on the specified thread. Equivalent to
-// using CefTaskRunner::GetForThread(threadId)->PostDelayedTask(task, delay_ms).
+/// Post a task for delayed execution on the specified thread. Equivalent to
+/// using CefTaskRunner::GetForThread(threadId)->PostDelayedTask(task,
+/// delay_ms).
 ///
 /*--cef()--*/
 bool CefPostDelayedTask(CefThreadId threadId,
                         CefRefPtr<CefTask> task,
-                        int64 delay_ms);
+                        int64_t delay_ms);
 
 #endif  // CEF_INCLUDE_CEF_TASK_H_
diff --git a/src/include/cef_thread.h b/src/include/cef_thread.h
index 1d0bd4cc8..da00c1e08 100644
--- a/src/include/cef_thread.h
+++ b/src/include/cef_thread.h
@@ -42,30 +42,30 @@
 #include "include/internal/cef_thread_internal.h"
 
 ///
-// A simple thread abstraction that establishes a message loop on a new thread.
-// The consumer uses CefTaskRunner to execute code on the thread's message loop.
-// The thread is terminated when the CefThread object is destroyed or Stop() is
-// called. All pending tasks queued on the thread's message loop will run to
-// completion before the thread is terminated. CreateThread() can be called on
-// any valid CEF thread in either the browser or render process. This class
-// should only be used for tasks that require a dedicated thread. In most cases
-// you can post tasks to an existing CEF thread instead of creating a new one;
-// see cef_task.h for details.
+/// A simple thread abstraction that establishes a message loop on a new thread.
+/// The consumer uses CefTaskRunner to execute code on the thread's message
+/// loop. The thread is terminated when the CefThread object is destroyed or
+/// Stop() is called. All pending tasks queued on the thread's message loop will
+/// run to completion before the thread is terminated. CreateThread() can be
+/// called on any valid CEF thread in either the browser or render process. This
+/// class should only be used for tasks that require a dedicated thread. In most
+/// cases you can post tasks to an existing CEF thread instead of creating a new
+/// one; see cef_task.h for details.
 ///
 /*--cef(source=library)--*/
 class CefThread : public CefBaseRefCounted {
  public:
   ///
-  // Create and start a new thread. This method does not block waiting for the
-  // thread to run initialization. |display_name| is the name that will be used
-  // to identify the thread. |priority| is the thread execution priority.
-  // |message_loop_type| indicates the set of asynchronous events that the
-  // thread can process. If |stoppable| is true the thread will stopped and
-  // joined on destruction or when Stop() is called; otherwise, the the thread
-  // cannot be stopped and will be leaked on shutdown. On Windows the
-  // |com_init_mode| value specifies how COM will be initialized for the thread.
-  // If |com_init_mode| is set to COM_INIT_MODE_STA then |message_loop_type|
-  // must be set to ML_TYPE_UI.
+  /// Create and start a new thread. This method does not block waiting for the
+  /// thread to run initialization. |display_name| is the name that will be used
+  /// to identify the thread. |priority| is the thread execution priority.
+  /// |message_loop_type| indicates the set of asynchronous events that the
+  /// thread can process. If |stoppable| is true the thread will stopped and
+  /// joined on destruction or when Stop() is called; otherwise, the thread
+  /// cannot be stopped and will be leaked on shutdown. On Windows the
+  /// |com_init_mode| value specifies how COM will be initialized for the
+  /// thread. If |com_init_mode| is set to COM_INIT_MODE_STA then
+  /// |message_loop_type| must be set to ML_TYPE_UI.
   ///
   /*--cef(optional_param=display_name)--*/
   static CefRefPtr<CefThread> CreateThread(
@@ -76,8 +76,8 @@ class CefThread : public CefBaseRefCounted {
       cef_com_init_mode_t com_init_mode);
 
   ///
-  // Create and start a new thread with default/recommended values.
-  // |display_name| is the name that will be used to identify the thread.
+  /// Create and start a new thread with default/recommended values.
+  /// |display_name| is the name that will be used to identify the thread.
   ///
   static CefRefPtr<CefThread> CreateThread(const CefString& display_name) {
     return CreateThread(display_name, TP_NORMAL, ML_TYPE_DEFAULT, true,
@@ -85,30 +85,30 @@ class CefThread : public CefBaseRefCounted {
   }
 
   ///
-  // Returns the CefTaskRunner that will execute code on this thread's message
-  // loop. This method is safe to call from any thread.
+  /// Returns the CefTaskRunner that will execute code on this thread's message
+  /// loop. This method is safe to call from any thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTaskRunner> GetTaskRunner() = 0;
 
   ///
-  // Returns the platform thread ID. It will return the same value after Stop()
-  // is called. This method is safe to call from any thread.
+  /// Returns the platform thread ID. It will return the same value after Stop()
+  /// is called. This method is safe to call from any thread.
   ///
   /*--cef(default_retval=kInvalidPlatformThreadId)--*/
   virtual cef_platform_thread_id_t GetPlatformThreadId() = 0;
 
   ///
-  // Stop and join the thread. This method must be called from the same thread
-  // that called CreateThread(). Do not call this method if CreateThread() was
-  // called with a |stoppable| value of false.
+  /// Stop and join the thread. This method must be called from the same thread
+  /// that called CreateThread(). Do not call this method if CreateThread() was
+  /// called with a |stoppable| value of false.
   ///
   /*--cef()--*/
   virtual void Stop() = 0;
 
   ///
-  // Returns true if the thread is currently running. This method must be called
-  // from the same thread that called CreateThread().
+  /// Returns true if the thread is currently running. This method must be
+  /// called from the same thread that called CreateThread().
   ///
   /*--cef()--*/
   virtual bool IsRunning() = 0;
diff --git a/src/include/cef_trace.h b/src/include/cef_trace.h
index bc92d3890..2fa71ee39 100644
--- a/src/include/cef_trace.h
+++ b/src/include/cef_trace.h
@@ -45,66 +45,67 @@
 #include "include/cef_callback.h"
 
 ///
-// Implement this interface to receive notification when tracing has completed.
-// The methods of this class will be called on the browser process UI thread.
+/// Implement this interface to receive notification when tracing has completed.
+/// The methods of this class will be called on the browser process UI thread.
 ///
 /*--cef(source=client)--*/
 class CefEndTracingCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called after all processes have sent their trace data. |tracing_file| is
-  // the path at which tracing data was written. The client is responsible for
-  // deleting |tracing_file|.
+  /// Called after all processes have sent their trace data. |tracing_file| is
+  /// the path at which tracing data was written. The client is responsible for
+  /// deleting |tracing_file|.
   ///
   /*--cef()--*/
   virtual void OnEndTracingComplete(const CefString& tracing_file) = 0;
 };
 
 ///
-// Start tracing events on all processes. Tracing is initialized asynchronously
-// and |callback| will be executed on the UI thread after initialization is
-// complete.
-//
-// If CefBeginTracing was called previously, or if a CefEndTracingAsync call is
-// pending, CefBeginTracing will fail and return false.
-//
-// |categories| is a comma-delimited list of category wildcards. A category can
-// have an optional '-' prefix to make it an excluded category. Having both
-// included and excluded categories in the same list is not supported.
-//
-// Example: "test_MyTest*"
-// Example: "test_MyTest*,test_OtherStuff"
-// Example: "-excluded_category1,-excluded_category2"
-//
-// This function must be called on the browser process UI thread.
+/// Start tracing events on all processes. Tracing is initialized asynchronously
+/// and |callback| will be executed on the UI thread after initialization is
+/// complete.
+///
+/// If CefBeginTracing was called previously, or if a CefEndTracingAsync call is
+/// pending, CefBeginTracing will fail and return false.
+///
+/// |categories| is a comma-delimited list of category wildcards. A category can
+/// have an optional '-' prefix to make it an excluded category. Having both
+/// included and excluded categories in the same list is not supported.
+///
+/// Examples:
+/// - "test_MyTest*"
+/// - "test_MyTest*,test_OtherStuff"
+/// - "-excluded_category1,-excluded_category2"
+///
+/// This function must be called on the browser process UI thread.
 ///
 /*--cef(optional_param=categories,optional_param=callback)--*/
 bool CefBeginTracing(const CefString& categories,
                      CefRefPtr<CefCompletionCallback> callback);
 
 ///
-// Stop tracing events on all processes.
-//
-// This function will fail and return false if a previous call to
-// CefEndTracingAsync is already pending or if CefBeginTracing was not called.
-//
-// |tracing_file| is the path at which tracing data will be written and
-// |callback| is the callback that will be executed once all processes have
-// sent their trace data. If |tracing_file| is empty a new temporary file path
-// will be used. If |callback| is empty no trace data will be written.
-//
-// This function must be called on the browser process UI thread.
+/// Stop tracing events on all processes.
+///
+/// This function will fail and return false if a previous call to
+/// CefEndTracingAsync is already pending or if CefBeginTracing was not called.
+///
+/// |tracing_file| is the path at which tracing data will be written and
+/// |callback| is the callback that will be executed once all processes have
+/// sent their trace data. If |tracing_file| is empty a new temporary file path
+/// will be used. If |callback| is empty no trace data will be written.
+///
+/// This function must be called on the browser process UI thread.
 ///
 /*--cef(optional_param=tracing_file,optional_param=callback)--*/
 bool CefEndTracing(const CefString& tracing_file,
                    CefRefPtr<CefEndTracingCallback> callback);
 
 ///
-// Returns the current system trace time or, if none is defined, the current
-// high-res time. Can be used by clients to synchronize with the time
-// information in trace events.
+/// Returns the current system trace time or, if none is defined, the current
+/// high-res time. Can be used by clients to synchronize with the time
+/// information in trace events.
 ///
 /*--cef()--*/
-int64 CefNowFromSystemTraceTime();
+int64_t CefNowFromSystemTraceTime();
 
 #endif  // CEF_INCLUDE_CEF_TRACE_H_
diff --git a/src/include/cef_urlrequest.h b/src/include/cef_urlrequest.h
index 889386ad1..77a82a6f7 100644
--- a/src/include/cef_urlrequest.h
+++ b/src/include/cef_urlrequest.h
@@ -47,11 +47,11 @@
 class CefURLRequestClient;
 
 ///
-// Class used to make a URL request. URL requests are not associated with a
-// browser instance so no CefClient callbacks will be executed. URL requests
-// can be created on any valid CEF thread in either the browser or render
-// process. Once created the methods of the URL request object must be accessed
-// on the same thread that created it.
+/// Class used to make a URL request. URL requests are not associated with a
+/// browser instance so no CefClient callbacks will be executed. URL requests
+/// can be created on any valid CEF thread in either the browser or render
+/// process. Once created the methods of the URL request object must be accessed
+/// on the same thread that created it.
 ///
 /*--cef(source=library)--*/
 class CefURLRequest : public virtual CefBaseRefCounted {
@@ -60,19 +60,19 @@ class CefURLRequest : public virtual CefBaseRefCounted {
   typedef cef_errorcode_t ErrorCode;
 
   ///
-  // Create a new URL request. Only GET, POST, HEAD, DELETE and PUT request
-  // methods are supported. Multiple post data elements are not supported and
-  // elements of type PDE_TYPE_FILE are only supported for requests originating
-  // from the browser process. Requests originating from the render process will
-  // receive the same handling as requests originating from Web content -- if
-  // the response contains Content-Disposition or Mime-Type header values that
-  // would not normally be rendered then the response may receive special
-  // handling inside the browser (for example, via the file download code path
-  // instead of the URL request code path). The |request| object will be marked
-  // as read-only after calling this method. In the browser process if
-  // |request_context| is empty the global request context will be used. In the
-  // render process |request_context| must be empty and the context associated
-  // with the current renderer process' browser will be used.
+  /// Create a new URL request that is not associated with a specific browser or
+  /// frame. Use CefFrame::CreateURLRequest instead if you want the request to
+  /// have this association, in which case it may be handled differently (see
+  /// documentation on that method). A request created with this method may only
+  /// originate from the browser process, and will behave as follows:
+  ///   - It may be intercepted by the client via CefResourceRequestHandler or
+  ///     CefSchemeHandlerFactory.
+  ///   - POST data may only contain only a single element of type PDE_TYPE_FILE
+  ///     or PDE_TYPE_BYTES.
+  ///   - If |request_context| is empty the global request context will be used.
+  ///
+  /// The |request| object will be marked as read-only after calling this
+  /// method.
   ///
   /*--cef(optional_param=request_context)--*/
   static CefRefPtr<CefURLRequest> Create(
@@ -81,94 +81,94 @@ class CefURLRequest : public virtual CefBaseRefCounted {
       CefRefPtr<CefRequestContext> request_context);
 
   ///
-  // Returns the request object used to create this URL request. The returned
-  // object is read-only and should not be modified.
+  /// Returns the request object used to create this URL request. The returned
+  /// object is read-only and should not be modified.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefRequest> GetRequest() = 0;
 
   ///
-  // Returns the client.
+  /// Returns the client.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefURLRequestClient> GetClient() = 0;
 
   ///
-  // Returns the request status.
+  /// Returns the request status.
   ///
   /*--cef(default_retval=UR_UNKNOWN)--*/
   virtual Status GetRequestStatus() = 0;
 
   ///
-  // Returns the request error if status is UR_CANCELED or UR_FAILED, or 0
-  // otherwise.
+  /// Returns the request error if status is UR_CANCELED or UR_FAILED, or 0
+  /// otherwise.
   ///
   /*--cef(default_retval=ERR_NONE)--*/
   virtual ErrorCode GetRequestError() = 0;
 
   ///
-  // Returns the response, or NULL if no response information is available.
-  // Response information will only be available after the upload has completed.
-  // The returned object is read-only and should not be modified.
+  /// Returns the response, or NULL if no response information is available.
+  /// Response information will only be available after the upload has
+  /// completed. The returned object is read-only and should not be modified.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefResponse> GetResponse() = 0;
 
   ///
-  // Returns true if the response body was served from the cache. This includes
-  // responses for which revalidation was required.
+  /// Returns true if the response body was served from the cache. This includes
+  /// responses for which revalidation was required.
   ///
   /*--cef()--*/
   virtual bool ResponseWasCached() = 0;
 
   ///
-  // Cancel the request.
+  /// Cancel the request.
   ///
   /*--cef()--*/
   virtual void Cancel() = 0;
 };
 
 ///
-// Interface that should be implemented by the CefURLRequest client. The
-// methods of this class will be called on the same thread that created the
-// request unless otherwise documented.
+/// Interface that should be implemented by the CefURLRequest client. The
+/// methods of this class will be called on the same thread that created the
+/// request unless otherwise documented.
 ///
 /*--cef(source=client)--*/
 class CefURLRequestClient : public virtual CefBaseRefCounted {
  public:
   ///
-  // Notifies the client that the request has completed. Use the
-  // CefURLRequest::GetRequestStatus method to determine if the request was
-  // successful or not.
+  /// Notifies the client that the request has completed. Use the
+  /// CefURLRequest::GetRequestStatus method to determine if the request was
+  /// successful or not.
   ///
   /*--cef()--*/
   virtual void OnRequestComplete(CefRefPtr<CefURLRequest> request) = 0;
 
   ///
-  // Notifies the client of upload progress. |current| denotes the number of
-  // bytes sent so far and |total| is the total size of uploading data (or -1 if
-  // chunked upload is enabled). This method will only be called if the
-  // UR_FLAG_REPORT_UPLOAD_PROGRESS flag is set on the request.
+  /// Notifies the client of upload progress. |current| denotes the number of
+  /// bytes sent so far and |total| is the total size of uploading data (or -1
+  /// if chunked upload is enabled). This method will only be called if the
+  /// UR_FLAG_REPORT_UPLOAD_PROGRESS flag is set on the request.
   ///
   /*--cef()--*/
   virtual void OnUploadProgress(CefRefPtr<CefURLRequest> request,
-                                int64 current,
-                                int64 total) = 0;
+                                int64_t current,
+                                int64_t total) = 0;
 
   ///
-  // Notifies the client of download progress. |current| denotes the number of
-  // bytes received up to the call and |total| is the expected total size of the
-  // response (or -1 if not determined).
+  /// Notifies the client of download progress. |current| denotes the number of
+  /// bytes received up to the call and |total| is the expected total size of
+  /// the response (or -1 if not determined).
   ///
   /*--cef()--*/
   virtual void OnDownloadProgress(CefRefPtr<CefURLRequest> request,
-                                  int64 current,
-                                  int64 total) = 0;
+                                  int64_t current,
+                                  int64_t total) = 0;
 
   ///
-  // Called when some part of the response is read. |data| contains the current
-  // bytes received since the last call. This method will not be called if the
-  // UR_FLAG_NO_DOWNLOAD_DATA flag is set on the request.
+  /// Called when some part of the response is read. |data| contains the current
+  /// bytes received since the last call. This method will not be called if the
+  /// UR_FLAG_NO_DOWNLOAD_DATA flag is set on the request.
   ///
   /*--cef()--*/
   virtual void OnDownloadData(CefRefPtr<CefURLRequest> request,
@@ -176,12 +176,15 @@ class CefURLRequestClient : public virtual CefBaseRefCounted {
                               size_t data_length) = 0;
 
   ///
-  // Called on the IO thread when the browser needs credentials from the user.
-  // |isProxy| indicates whether the host is a proxy server. |host| contains the
-  // hostname and |port| contains the port number. Return true to continue the
-  // request and call CefAuthCallback::Continue() when the authentication
-  // information is available. Return false to cancel the request. This method
-  // will only be called for requests initiated from the browser process.
+  /// Called on the IO thread when the browser needs credentials from the user.
+  /// |isProxy| indicates whether the host is a proxy server. |host| contains
+  /// the hostname and |port| contains the port number. Return true to continue
+  /// the request and call CefAuthCallback::Continue() when the authentication
+  /// information is available. If the request has an associated browser/frame
+  /// then returning false will result in a call to GetAuthCredentials on the
+  /// CefRequestHandler associated with that browser, if any. Otherwise,
+  /// returning false will cancel the request immediately. This method will only
+  /// be called for requests initiated from the browser process.
   ///
   /*--cef(optional_param=realm)--*/
   virtual bool GetAuthCredentials(bool isProxy,
diff --git a/src/include/cef_v8.h b/src/include/cef_v8.h
index 2886d35f4..f6a01c1e7 100644
--- a/src/include/cef_v8.h
+++ b/src/include/cef_v8.h
@@ -50,63 +50,64 @@ class CefV8StackFrame;
 class CefV8Value;
 
 ///
-// Register a new V8 extension with the specified JavaScript extension code and
-// handler. Functions implemented by the handler are prototyped using the
-// keyword 'native'. The calling of a native function is restricted to the scope
-// in which the prototype of the native function is defined. This function may
-// only be called on the render process main thread.
-//
-// Example JavaScript extension code:
-// <pre>
-//   // create the 'example' global object if it doesn't already exist.
-//   if (!example)
-//     example = {};
-//   // create the 'example.test' global object if it doesn't already exist.
-//   if (!example.test)
-//     example.test = {};
-//   (function() {
-//     // Define the function 'example.test.myfunction'.
-//     example.test.myfunction = function() {
-//       // Call CefV8Handler::Execute() with the function name 'MyFunction'
-//       // and no arguments.
-//       native function MyFunction();
-//       return MyFunction();
-//     };
-//     // Define the getter function for parameter 'example.test.myparam'.
-//     example.test.__defineGetter__('myparam', function() {
-//       // Call CefV8Handler::Execute() with the function name 'GetMyParam'
-//       // and no arguments.
-//       native function GetMyParam();
-//       return GetMyParam();
-//     });
-//     // Define the setter function for parameter 'example.test.myparam'.
-//     example.test.__defineSetter__('myparam', function(b) {
-//       // Call CefV8Handler::Execute() with the function name 'SetMyParam'
-//       // and a single argument.
-//       native function SetMyParam();
-//       if(b) SetMyParam(b);
-//     });
-//
-//     // Extension definitions can also contain normal JavaScript variables
-//     // and functions.
-//     var myint = 0;
-//     example.test.increment = function() {
-//       myint += 1;
-//       return myint;
-//     };
-//   })();
-// </pre>
-// Example usage in the page:
-// <pre>
-//   // Call the function.
-//   example.test.myfunction();
-//   // Set the parameter.
-//   example.test.myparam = value;
-//   // Get the parameter.
-//   value = example.test.myparam;
-//   // Call another function.
-//   example.test.increment();
-// </pre>
+/// Register a new V8 extension with the specified JavaScript extension code and
+/// handler. Functions implemented by the handler are prototyped using the
+/// keyword 'native'. The calling of a native function is restricted to the
+/// scope in which the prototype of the native function is defined. This
+/// function may only be called on the render process main thread.
+///
+/// Example JavaScript extension code:
+/// <pre>
+///   // create the 'example' global object if it doesn't already exist.
+///   if (!example)
+///     example = {};
+///   // create the 'example.test' global object if it doesn't already exist.
+///   if (!example.test)
+///     example.test = {};
+///   (function() {
+///     // Define the function 'example.test.myfunction'.
+///     example.test.myfunction = function() {
+///       // Call CefV8Handler::Execute() with the function name 'MyFunction'
+///       // and no arguments.
+///       native function MyFunction();
+///       return MyFunction();
+///     };
+///     // Define the getter function for parameter 'example.test.myparam'.
+///     example.test.__defineGetter__('myparam', function() {
+///       // Call CefV8Handler::Execute() with the function name 'GetMyParam'
+///       // and no arguments.
+///       native function GetMyParam();
+///       return GetMyParam();
+///     });
+///     // Define the setter function for parameter 'example.test.myparam'.
+///     example.test.__defineSetter__('myparam', function(b) {
+///       // Call CefV8Handler::Execute() with the function name 'SetMyParam'
+///       // and a single argument.
+///       native function SetMyParam();
+///       if(b) SetMyParam(b);
+///     });
+///
+///     // Extension definitions can also contain normal JavaScript variables
+///     // and functions.
+///     var myint = 0;
+///     example.test.increment = function() {
+///       myint += 1;
+///       return myint;
+///     };
+///   })();
+/// </pre>
+///
+/// Example usage in the page:
+/// <pre>
+///   // Call the function.
+///   example.test.myfunction();
+///   // Set the parameter.
+///   example.test.myparam = value;
+///   // Get the parameter.
+///   value = example.test.myparam;
+///   // Call another function.
+///   example.test.increment();
+/// </pre>
 ///
 /*--cef(optional_param=handler)--*/
 bool CefRegisterExtension(const CefString& extension_name,
@@ -114,101 +115,101 @@ bool CefRegisterExtension(const CefString& extension_name,
                           CefRefPtr<CefV8Handler> handler);
 
 ///
-// Class representing a V8 context handle. V8 handles can only be accessed from
-// the thread on which they are created. Valid threads for creating a V8 handle
-// include the render process main thread (TID_RENDERER) and WebWorker threads.
-// A task runner for posting tasks on the associated thread can be retrieved via
-// the CefV8Context::GetTaskRunner() method.
+/// Class representing a V8 context handle. V8 handles can only be accessed from
+/// the thread on which they are created. Valid threads for creating a V8 handle
+/// include the render process main thread (TID_RENDERER) and WebWorker threads.
+/// A task runner for posting tasks on the associated thread can be retrieved
+/// via the CefV8Context::GetTaskRunner() method.
 ///
-/*--cef(source=library)--*/
+/*--cef(source=library,no_debugct_check)--*/
 class CefV8Context : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns the current (top) context object in the V8 context stack.
+  /// Returns the current (top) context object in the V8 context stack.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Context> GetCurrentContext();
 
   ///
-  // Returns the entered (bottom) context object in the V8 context stack.
+  /// Returns the entered (bottom) context object in the V8 context stack.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Context> GetEnteredContext();
 
   ///
-  // Returns true if V8 is currently inside a context.
+  /// Returns true if V8 is currently inside a context.
   ///
   /*--cef()--*/
   static bool InContext();
 
   ///
-  // Returns the task runner associated with this context. V8 handles can only
-  // be accessed from the thread on which they are created. This method can be
-  // called on any render process thread.
+  /// Returns the task runner associated with this context. V8 handles can only
+  /// be accessed from the thread on which they are created. This method can be
+  /// called on any render process thread.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTaskRunner> GetTaskRunner() = 0;
 
   ///
-  // Returns true if the underlying handle is valid and it can be accessed on
-  // the current thread. Do not call any other methods if this method returns
-  // false.
+  /// Returns true if the underlying handle is valid and it can be accessed on
+  /// the current thread. Do not call any other methods if this method returns
+  /// false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns the browser for this context. This method will return an empty
-  // reference for WebWorker contexts.
+  /// Returns the browser for this context. This method will return an empty
+  /// reference for WebWorker contexts.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
-  // Returns the frame for this context. This method will return an empty
-  // reference for WebWorker contexts.
+  /// Returns the frame for this context. This method will return an empty
+  /// reference for WebWorker contexts.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefFrame> GetFrame() = 0;
 
   ///
-  // Returns the global object for this context. The context must be entered
-  // before calling this method.
+  /// Returns the global object for this context. The context must be entered
+  /// before calling this method.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefV8Value> GetGlobal() = 0;
 
   ///
-  // Enter this context. A context must be explicitly entered before creating a
-  // V8 Object, Array, Function or Date asynchronously. Exit() must be called
-  // the same number of times as Enter() before releasing this context. V8
-  // objects belong to the context in which they are created. Returns true if
-  // the scope was entered successfully.
+  /// Enter this context. A context must be explicitly entered before creating a
+  /// V8 Object, Array, Function or Date asynchronously. Exit() must be called
+  /// the same number of times as Enter() before releasing this context. V8
+  /// objects belong to the context in which they are created. Returns true if
+  /// the scope was entered successfully.
   ///
   /*--cef()--*/
   virtual bool Enter() = 0;
 
   ///
-  // Exit this context. Call this method only after calling Enter(). Returns
-  // true if the scope was exited successfully.
+  /// Exit this context. Call this method only after calling Enter(). Returns
+  /// true if the scope was exited successfully.
   ///
   /*--cef()--*/
   virtual bool Exit() = 0;
 
   ///
-  // Returns true if this object is pointing to the same handle as |that|
-  // object.
+  /// Returns true if this object is pointing to the same handle as |that|
+  /// object.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefV8Context> that) = 0;
 
   ///
-  // Execute a string of JavaScript code in this V8 context. The |script_url|
-  // parameter is the URL where the script in question can be found, if any.
-  // The |start_line| parameter is the base line number to use for error
-  // reporting. On success |retval| will be set to the return value, if any, and
-  // the function will return true. On failure |exception| will be set to the
-  // exception, if any, and the function will return false.
+  /// Execute a string of JavaScript code in this V8 context. The |script_url|
+  /// parameter is the URL where the script in question can be found, if any.
+  /// The |start_line| parameter is the base line number to use for error
+  /// reporting. On success |retval| will be set to the return value, if any,
+  /// and the function will return true. On failure |exception| will be set to
+  /// the exception, if any, and the function will return false.
   ///
   /*--cef(optional_param=script_url)--*/
   virtual bool Eval(const CefString& code,
@@ -221,18 +222,19 @@ class CefV8Context : public virtual CefBaseRefCounted {
 typedef std::vector<CefRefPtr<CefV8Value>> CefV8ValueList;
 
 ///
-// Interface that should be implemented to handle V8 function calls. The methods
-// of this class will be called on the thread associated with the V8 function.
+/// Interface that should be implemented to handle V8 function calls. The
+/// methods of this class will be called on the thread associated with the V8
+/// function.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefV8Handler : public virtual CefBaseRefCounted {
  public:
   ///
-  // Handle execution of the function identified by |name|. |object| is the
-  // receiver ('this' object) of the function. |arguments| is the list of
-  // arguments passed to the function. If execution succeeds set |retval| to the
-  // function return value. If execution fails set |exception| to the exception
-  // that will be thrown. Return true if execution was handled.
+  /// Handle execution of the function identified by |name|. |object| is the
+  /// receiver ('this' object) of the function. |arguments| is the list of
+  /// arguments passed to the function. If execution succeeds set |retval| to
+  /// the function return value. If execution fails set |exception| to the
+  /// exception that will be thrown. Return true if execution was handled.
   ///
   /*--cef()--*/
   virtual bool Execute(const CefString& name,
@@ -243,19 +245,19 @@ class CefV8Handler : public virtual CefBaseRefCounted {
 };
 
 ///
-// Interface that should be implemented to handle V8 accessor calls. Accessor
-// identifiers are registered by calling CefV8Value::SetValue(). The methods
-// of this class will be called on the thread associated with the V8 accessor.
+/// Interface that should be implemented to handle V8 accessor calls. Accessor
+/// identifiers are registered by calling CefV8Value::SetValue(). The methods
+/// of this class will be called on the thread associated with the V8 accessor.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefV8Accessor : public virtual CefBaseRefCounted {
  public:
   ///
-  // Handle retrieval the accessor value identified by |name|. |object| is the
-  // receiver ('this' object) of the accessor. If retrieval succeeds set
-  // |retval| to the return value. If retrieval fails set |exception| to the
-  // exception that will be thrown. Return true if accessor retrieval was
-  // handled.
+  /// Handle retrieval the accessor value identified by |name|. |object| is the
+  /// receiver ('this' object) of the accessor. If retrieval succeeds set
+  /// |retval| to the return value. If retrieval fails set |exception| to the
+  /// exception that will be thrown. Return true if accessor retrieval was
+  /// handled.
   ///
   /*--cef()--*/
   virtual bool Get(const CefString& name,
@@ -264,11 +266,11 @@ class CefV8Accessor : public virtual CefBaseRefCounted {
                    CefString& exception) = 0;
 
   ///
-  // Handle assignment of the accessor value identified by |name|. |object| is
-  // the receiver ('this' object) of the accessor. |value| is the new value
-  // being assigned to the accessor. If assignment fails set |exception| to the
-  // exception that will be thrown. Return true if accessor assignment was
-  // handled.
+  /// Handle assignment of the accessor value identified by |name|. |object| is
+  /// the receiver ('this' object) of the accessor. |value| is the new value
+  /// being assigned to the accessor. If assignment fails set |exception| to the
+  /// exception that will be thrown. Return true if accessor assignment was
+  /// handled.
   ///
   /*--cef()--*/
   virtual bool Set(const CefString& name,
@@ -278,24 +280,24 @@ class CefV8Accessor : public virtual CefBaseRefCounted {
 };
 
 ///
-// Interface that should be implemented to handle V8 interceptor calls. The
-// methods of this class will be called on the thread associated with the V8
-// interceptor. Interceptor's named property handlers (with first argument of
-// type CefString) are called when object is indexed by string. Indexed property
-// handlers (with first argument of type int) are called when object is indexed
-// by integer.
+/// Interface that should be implemented to handle V8 interceptor calls. The
+/// methods of this class will be called on the thread associated with the V8
+/// interceptor. Interceptor's named property handlers (with first argument of
+/// type CefString) are called when object is indexed by string. Indexed
+/// property handlers (with first argument of type int) are called when object
+/// is indexed by integer.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefV8Interceptor : public virtual CefBaseRefCounted {
  public:
   ///
-  // Handle retrieval of the interceptor value identified by |name|. |object| is
-  // the receiver ('this' object) of the interceptor. If retrieval succeeds, set
-  // |retval| to the return value. If the requested value does not exist, don't
-  // set either |retval| or |exception|. If retrieval fails, set |exception| to
-  // the exception that will be thrown. If the property has an associated
-  // accessor, it will be called only if you don't set |retval|.
-  // Return true if interceptor retrieval was handled, false otherwise.
+  /// Handle retrieval of the interceptor value identified by |name|. |object|
+  /// is the receiver ('this' object) of the interceptor. If retrieval succeeds,
+  /// set |retval| to the return value. If the requested value does not exist,
+  /// don't set either |retval| or |exception|. If retrieval fails, set
+  /// |exception| to the exception that will be thrown. If the property has an
+  /// associated accessor, it will be called only if you don't set |retval|.
+  /// Return true if interceptor retrieval was handled, false otherwise.
   ///
   /*--cef(capi_name=get_byname)--*/
   virtual bool Get(const CefString& name,
@@ -304,12 +306,12 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
                    CefString& exception) = 0;
 
   ///
-  // Handle retrieval of the interceptor value identified by |index|. |object|
-  // is the receiver ('this' object) of the interceptor. If retrieval succeeds,
-  // set |retval| to the return value. If the requested value does not exist,
-  // don't set either |retval| or |exception|. If retrieval fails, set
-  // |exception| to the exception that will be thrown.
-  // Return true if interceptor retrieval was handled, false otherwise.
+  /// Handle retrieval of the interceptor value identified by |index|. |object|
+  /// is the receiver ('this' object) of the interceptor. If retrieval succeeds,
+  /// set |retval| to the return value. If the requested value does not exist,
+  /// don't set either |retval| or |exception|. If retrieval fails, set
+  /// |exception| to the exception that will be thrown.
+  /// Return true if interceptor retrieval was handled, false otherwise.
   ///
   /*--cef(capi_name=get_byindex,index_param=index)--*/
   virtual bool Get(int index,
@@ -318,12 +320,12 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
                    CefString& exception) = 0;
 
   ///
-  // Handle assignment of the interceptor value identified by |name|. |object|
-  // is the receiver ('this' object) of the interceptor. |value| is the new
-  // value being assigned to the interceptor. If assignment fails, set
-  // |exception| to the exception that will be thrown. This setter will always
-  // be called, even when the property has an associated accessor.
-  // Return true if interceptor assignment was handled, false otherwise.
+  /// Handle assignment of the interceptor value identified by |name|. |object|
+  /// is the receiver ('this' object) of the interceptor. |value| is the new
+  /// value being assigned to the interceptor. If assignment fails, set
+  /// |exception| to the exception that will be thrown. This setter will always
+  /// be called, even when the property has an associated accessor.
+  /// Return true if interceptor assignment was handled, false otherwise.
   ///
   /*--cef(capi_name=set_byname)--*/
   virtual bool Set(const CefString& name,
@@ -332,11 +334,11 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
                    CefString& exception) = 0;
 
   ///
-  // Handle assignment of the interceptor value identified by |index|. |object|
-  // is the receiver ('this' object) of the interceptor. |value| is the new
-  // value being assigned to the interceptor. If assignment fails, set
-  // |exception| to the exception that will be thrown.
-  // Return true if interceptor assignment was handled, false otherwise.
+  /// Handle assignment of the interceptor value identified by |index|. |object|
+  /// is the receiver ('this' object) of the interceptor. |value| is the new
+  /// value being assigned to the interceptor. If assignment fails, set
+  /// |exception| to the exception that will be thrown.
+  /// Return true if interceptor assignment was handled, false otherwise.
   ///
   /*--cef(capi_name=set_byindex,index_param=index)--*/
   virtual bool Set(int index,
@@ -346,152 +348,152 @@ class CefV8Interceptor : public virtual CefBaseRefCounted {
 };
 
 ///
-// Class representing a V8 exception. The methods of this class may be called on
-// any render process thread.
+/// Class representing a V8 exception. The methods of this class may be called
+/// on any render process thread.
 ///
-/*--cef(source=library)--*/
+/*--cef(source=library,no_debugct_check)--*/
 class CefV8Exception : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns the exception message.
+  /// Returns the exception message.
   ///
   /*--cef()--*/
   virtual CefString GetMessage() = 0;
 
   ///
-  // Returns the line of source code that the exception occurred within.
+  /// Returns the line of source code that the exception occurred within.
   ///
   /*--cef()--*/
   virtual CefString GetSourceLine() = 0;
 
   ///
-  // Returns the resource name for the script from where the function causing
-  // the error originates.
+  /// Returns the resource name for the script from where the function causing
+  /// the error originates.
   ///
   /*--cef()--*/
   virtual CefString GetScriptResourceName() = 0;
 
   ///
-  // Returns the 1-based number of the line where the error occurred or 0 if the
-  // line number is unknown.
+  /// Returns the 1-based number of the line where the error occurred or 0 if
+  /// the line number is unknown.
   ///
   /*--cef()--*/
   virtual int GetLineNumber() = 0;
 
   ///
-  // Returns the index within the script of the first character where the error
-  // occurred.
+  /// Returns the index within the script of the first character where the error
+  /// occurred.
   ///
   /*--cef()--*/
   virtual int GetStartPosition() = 0;
 
   ///
-  // Returns the index within the script of the last character where the error
-  // occurred.
+  /// Returns the index within the script of the last character where the error
+  /// occurred.
   ///
   /*--cef()--*/
   virtual int GetEndPosition() = 0;
 
   ///
-  // Returns the index within the line of the first character where the error
-  // occurred.
+  /// Returns the index within the line of the first character where the error
+  /// occurred.
   ///
   /*--cef()--*/
   virtual int GetStartColumn() = 0;
 
   ///
-  // Returns the index within the line of the last character where the error
-  // occurred.
+  /// Returns the index within the line of the last character where the error
+  /// occurred.
   ///
   /*--cef()--*/
   virtual int GetEndColumn() = 0;
 };
 
 ///
-// Callback interface that is passed to CefV8Value::CreateArrayBuffer.
+/// Callback interface that is passed to CefV8Value::CreateArrayBuffer.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefV8ArrayBufferReleaseCallback : public virtual CefBaseRefCounted {
  public:
   ///
-  // Called to release |buffer| when the ArrayBuffer JS object is garbage
-  // collected. |buffer| is the value that was passed to CreateArrayBuffer along
-  // with this object.
+  /// Called to release |buffer| when the ArrayBuffer JS object is garbage
+  /// collected. |buffer| is the value that was passed to CreateArrayBuffer
+  /// along with this object.
   ///
   /*--cef()--*/
   virtual void ReleaseBuffer(void* buffer) = 0;
 };
 
 ///
-// Class representing a V8 value handle. V8 handles can only be accessed from
-// the thread on which they are created. Valid threads for creating a V8 handle
-// include the render process main thread (TID_RENDERER) and WebWorker threads.
-// A task runner for posting tasks on the associated thread can be retrieved via
-// the CefV8Context::GetTaskRunner() method.
+/// Class representing a V8 value handle. V8 handles can only be accessed from
+/// the thread on which they are created. Valid threads for creating a V8 handle
+/// include the render process main thread (TID_RENDERER) and WebWorker threads.
+/// A task runner for posting tasks on the associated thread can be retrieved
+/// via the CefV8Context::GetTaskRunner() method.
 ///
-/*--cef(source=library)--*/
+/*--cef(source=library,no_debugct_check)--*/
 class CefV8Value : public virtual CefBaseRefCounted {
  public:
   typedef cef_v8_accesscontrol_t AccessControl;
   typedef cef_v8_propertyattribute_t PropertyAttribute;
 
   ///
-  // Create a new CefV8Value object of type undefined.
+  /// Create a new CefV8Value object of type undefined.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateUndefined();
 
   ///
-  // Create a new CefV8Value object of type null.
+  /// Create a new CefV8Value object of type null.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateNull();
 
   ///
-  // Create a new CefV8Value object of type bool.
+  /// Create a new CefV8Value object of type bool.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateBool(bool value);
 
   ///
-  // Create a new CefV8Value object of type int.
+  /// Create a new CefV8Value object of type int.
   ///
   /*--cef()--*/
-  static CefRefPtr<CefV8Value> CreateInt(int32 value);
+  static CefRefPtr<CefV8Value> CreateInt(int32_t value);
 
   ///
-  // Create a new CefV8Value object of type unsigned int.
+  /// Create a new CefV8Value object of type unsigned int.
   ///
   /*--cef()--*/
-  static CefRefPtr<CefV8Value> CreateUInt(uint32 value);
+  static CefRefPtr<CefV8Value> CreateUInt(uint32_t value);
 
   ///
-  // Create a new CefV8Value object of type double.
+  /// Create a new CefV8Value object of type double.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateDouble(double value);
 
   ///
-  // Create a new CefV8Value object of type Date. This method should only be
-  // called from within the scope of a CefRenderProcessHandler, CefV8Handler or
-  // CefV8Accessor callback, or in combination with calling Enter() and Exit()
-  // on a stored CefV8Context reference.
+  /// Create a new CefV8Value object of type Date. This method should only be
+  /// called from within the scope of a CefRenderProcessHandler, CefV8Handler or
+  /// CefV8Accessor callback, or in combination with calling Enter() and Exit()
+  /// on a stored CefV8Context reference.
   ///
   /*--cef()--*/
-  static CefRefPtr<CefV8Value> CreateDate(const CefTime& date);
+  static CefRefPtr<CefV8Value> CreateDate(CefBaseTime date);
 
   ///
-  // Create a new CefV8Value object of type string.
+  /// Create a new CefV8Value object of type string.
   ///
   /*--cef(optional_param=value)--*/
   static CefRefPtr<CefV8Value> CreateString(const CefString& value);
 
   ///
-  // Create a new CefV8Value object of type object with optional accessor and/or
-  // interceptor. This method should only be called from within the scope of a
-  // CefRenderProcessHandler, CefV8Handler or CefV8Accessor callback, or in
-  // combination with calling Enter() and Exit() on a stored CefV8Context
-  // reference.
+  /// Create a new CefV8Value object of type object with optional accessor
+  /// and/or interceptor. This method should only be called from within the
+  /// scope of a CefRenderProcessHandler, CefV8Handler or CefV8Accessor
+  /// callback, or in combination with calling Enter() and Exit() on a stored
+  /// CefV8Context reference.
   ///
   /*--cef(optional_param=accessor, optional_param=interceptor)--*/
   static CefRefPtr<CefV8Value> CreateObject(
@@ -499,260 +501,275 @@ class CefV8Value : public virtual CefBaseRefCounted {
       CefRefPtr<CefV8Interceptor> interceptor);
 
   ///
-  // Create a new CefV8Value object of type array with the specified |length|.
-  // If |length| is negative the returned array will have length 0. This method
-  // should only be called from within the scope of a CefRenderProcessHandler,
-  // CefV8Handler or CefV8Accessor callback, or in combination with calling
-  // Enter() and Exit() on a stored CefV8Context reference.
+  /// Create a new CefV8Value object of type array with the specified |length|.
+  /// If |length| is negative the returned array will have length 0. This method
+  /// should only be called from within the scope of a CefRenderProcessHandler,
+  /// CefV8Handler or CefV8Accessor callback, or in combination with calling
+  /// Enter() and Exit() on a stored CefV8Context reference.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateArray(int length);
 
   ///
-  // Create a new CefV8Value object of type ArrayBuffer which wraps the provided
-  // |buffer| of size |length| bytes. The ArrayBuffer is externalized, meaning
-  // that it does not own |buffer|. The caller is responsible for freeing
-  // |buffer| when requested via a call to CefV8ArrayBufferReleaseCallback::
-  // ReleaseBuffer. This method should only be called from within the scope of a
-  // CefRenderProcessHandler, CefV8Handler or CefV8Accessor callback, or in
-  // combination with calling Enter() and Exit() on a stored CefV8Context
-  // reference.
+  /// Create a new CefV8Value object of type ArrayBuffer which wraps the
+  /// provided |buffer| of size |length| bytes. The ArrayBuffer is externalized,
+  /// meaning that it does not own |buffer|. The caller is responsible for
+  /// freeing |buffer| when requested via a call to
+  /// CefV8ArrayBufferReleaseCallback::ReleaseBuffer. This method should only
+  /// be called from within the scope of a CefRenderProcessHandler, CefV8Handler
+  /// or CefV8Accessor callback, or in combination with calling Enter() and
+  /// Exit() on a stored CefV8Context reference.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=buffer)--*/
   static CefRefPtr<CefV8Value> CreateArrayBuffer(
       void* buffer,
       size_t length,
       CefRefPtr<CefV8ArrayBufferReleaseCallback> release_callback);
 
   ///
-  // Create a new CefV8Value object of type function. This method should only be
-  // called from within the scope of a CefRenderProcessHandler, CefV8Handler or
-  // CefV8Accessor callback, or in combination with calling Enter() and Exit()
-  // on a stored CefV8Context reference.
+  /// Create a new CefV8Value object of type function. This method should only
+  /// be called from within the scope of a CefRenderProcessHandler, CefV8Handler
+  /// or CefV8Accessor callback, or in combination with calling Enter() and
+  /// Exit() on a stored CefV8Context reference.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8Value> CreateFunction(const CefString& name,
                                               CefRefPtr<CefV8Handler> handler);
 
   ///
-  // Returns true if the underlying handle is valid and it can be accessed on
-  // the current thread. Do not call any other methods if this method returns
-  // false.
+  /// Create a new CefV8Value object of type Promise. This method should only be
+  /// called from within the scope of a CefRenderProcessHandler, CefV8Handler or
+  /// CefV8Accessor callback, or in combination with calling Enter() and Exit()
+  /// on a stored CefV8Context reference.
+  ///
+  /*--cef()--*/
+  static CefRefPtr<CefV8Value> CreatePromise();
+
+  ///
+  /// Returns true if the underlying handle is valid and it can be accessed on
+  /// the current thread. Do not call any other methods if this method returns
+  /// false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // True if the value type is undefined.
+  /// True if the value type is undefined.
   ///
   /*--cef()--*/
   virtual bool IsUndefined() = 0;
 
   ///
-  // True if the value type is null.
+  /// True if the value type is null.
   ///
   /*--cef()--*/
   virtual bool IsNull() = 0;
 
   ///
-  // True if the value type is bool.
+  /// True if the value type is bool.
   ///
   /*--cef()--*/
   virtual bool IsBool() = 0;
 
   ///
-  // True if the value type is int.
+  /// True if the value type is int.
   ///
   /*--cef()--*/
   virtual bool IsInt() = 0;
 
   ///
-  // True if the value type is unsigned int.
+  /// True if the value type is unsigned int.
   ///
   /*--cef()--*/
   virtual bool IsUInt() = 0;
 
   ///
-  // True if the value type is double.
+  /// True if the value type is double.
   ///
   /*--cef()--*/
   virtual bool IsDouble() = 0;
 
   ///
-  // True if the value type is Date.
+  /// True if the value type is Date.
   ///
   /*--cef()--*/
   virtual bool IsDate() = 0;
 
   ///
-  // True if the value type is string.
+  /// True if the value type is string.
   ///
   /*--cef()--*/
   virtual bool IsString() = 0;
 
   ///
-  // True if the value type is object.
+  /// True if the value type is object.
   ///
   /*--cef()--*/
   virtual bool IsObject() = 0;
 
   ///
-  // True if the value type is array.
+  /// True if the value type is array.
   ///
   /*--cef()--*/
   virtual bool IsArray() = 0;
 
   ///
-  // True if the value type is an ArrayBuffer.
+  /// True if the value type is an ArrayBuffer.
   ///
   /*--cef()--*/
   virtual bool IsArrayBuffer() = 0;
 
   ///
-  // True if the value type is function.
+  /// True if the value type is function.
   ///
   /*--cef()--*/
   virtual bool IsFunction() = 0;
 
   ///
-  // Returns true if this object is pointing to the same handle as |that|
-  // object.
+  /// True if the value type is a Promise.
+  ///
+  /*--cef()--*/
+  virtual bool IsPromise() = 0;
+
+  ///
+  /// Returns true if this object is pointing to the same handle as |that|
+  /// object.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefV8Value> that) = 0;
 
   ///
-  // Return a bool value.
+  /// Return a bool value.
   ///
   /*--cef()--*/
   virtual bool GetBoolValue() = 0;
 
   ///
-  // Return an int value.
+  /// Return an int value.
   ///
   /*--cef()--*/
-  virtual int32 GetIntValue() = 0;
+  virtual int32_t GetIntValue() = 0;
 
   ///
-  // Return an unsigned int value.
+  /// Return an unsigned int value.
   ///
   /*--cef()--*/
-  virtual uint32 GetUIntValue() = 0;
+  virtual uint32_t GetUIntValue() = 0;
 
   ///
-  // Return a double value.
+  /// Return a double value.
   ///
   /*--cef()--*/
   virtual double GetDoubleValue() = 0;
 
   ///
-  // Return a Date value.
+  /// Return a Date value.
   ///
   /*--cef()--*/
-  virtual CefTime GetDateValue() = 0;
+  virtual CefBaseTime GetDateValue() = 0;
 
   ///
-  // Return a string value.
+  /// Return a string value.
   ///
   /*--cef()--*/
   virtual CefString GetStringValue() = 0;
 
-  // OBJECT METHODS - These methods are only available on objects. Arrays and
-  // functions are also objects. String- and integer-based keys can be used
-  // interchangably with the framework converting between them as necessary.
+  /// OBJECT METHODS - These methods are only available on objects. Arrays and
+  /// functions are also objects. String- and integer-based keys can be used
+  /// interchangably with the framework converting between them as necessary.
 
   ///
-  // Returns true if this is a user created object.
+  /// Returns true if this is a user created object.
   ///
   /*--cef()--*/
   virtual bool IsUserCreated() = 0;
 
   ///
-  // Returns true if the last method call resulted in an exception. This
-  // attribute exists only in the scope of the current CEF value object.
+  /// Returns true if the last method call resulted in an exception. This
+  /// attribute exists only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
   virtual bool HasException() = 0;
 
   ///
-  // Returns the exception resulting from the last method call. This attribute
-  // exists only in the scope of the current CEF value object.
+  /// Returns the exception resulting from the last method call. This attribute
+  /// exists only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefV8Exception> GetException() = 0;
 
   ///
-  // Clears the last exception and returns true on success.
+  /// Clears the last exception and returns true on success.
   ///
   /*--cef()--*/
   virtual bool ClearException() = 0;
 
   ///
-  // Returns true if this object will re-throw future exceptions. This attribute
-  // exists only in the scope of the current CEF value object.
+  /// Returns true if this object will re-throw future exceptions. This
+  /// attribute exists only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
   virtual bool WillRethrowExceptions() = 0;
 
   ///
-  // Set whether this object will re-throw future exceptions. By default
-  // exceptions are not re-thrown. If a exception is re-thrown the current
-  // context should not be accessed again until after the exception has been
-  // caught and not re-thrown. Returns true on success. This attribute exists
-  // only in the scope of the current CEF value object.
+  /// Set whether this object will re-throw future exceptions. By default
+  /// exceptions are not re-thrown. If a exception is re-thrown the current
+  /// context should not be accessed again until after the exception has been
+  /// caught and not re-thrown. Returns true on success. This attribute exists
+  /// only in the scope of the current CEF value object.
   ///
   /*--cef()--*/
   virtual bool SetRethrowExceptions(bool rethrow) = 0;
 
   ///
-  // Returns true if the object has a value with the specified identifier.
+  /// Returns true if the object has a value with the specified identifier.
   ///
   /*--cef(capi_name=has_value_bykey,optional_param=key)--*/
   virtual bool HasValue(const CefString& key) = 0;
 
   ///
-  // Returns true if the object has a value with the specified identifier.
+  /// Returns true if the object has a value with the specified identifier.
   ///
   /*--cef(capi_name=has_value_byindex,index_param=index)--*/
   virtual bool HasValue(int index) = 0;
 
   ///
-  // Deletes the value with the specified identifier and returns true on
-  // success. Returns false if this method is called incorrectly or an exception
-  // is thrown. For read-only and don't-delete values this method will return
-  // true even though deletion failed.
+  /// Deletes the value with the specified identifier and returns true on
+  /// success. Returns false if this method is called incorrectly or an
+  /// exception is thrown. For read-only and don't-delete values this method
+  /// will return true even though deletion failed.
   ///
   /*--cef(capi_name=delete_value_bykey,optional_param=key)--*/
   virtual bool DeleteValue(const CefString& key) = 0;
 
   ///
-  // Deletes the value with the specified identifier and returns true on
-  // success. Returns false if this method is called incorrectly, deletion fails
-  // or an exception is thrown. For read-only and don't-delete values this
-  // method will return true even though deletion failed.
+  /// Deletes the value with the specified identifier and returns true on
+  /// success. Returns false if this method is called incorrectly, deletion
+  /// fails or an exception is thrown. For read-only and don't-delete values
+  /// this method will return true even though deletion failed.
   ///
   /*--cef(capi_name=delete_value_byindex,index_param=index)--*/
   virtual bool DeleteValue(int index) = 0;
 
   ///
-  // Returns the value with the specified identifier on success. Returns NULL
-  // if this method is called incorrectly or an exception is thrown.
+  /// Returns the value with the specified identifier on success. Returns NULL
+  /// if this method is called incorrectly or an exception is thrown.
   ///
   /*--cef(capi_name=get_value_bykey,optional_param=key)--*/
   virtual CefRefPtr<CefV8Value> GetValue(const CefString& key) = 0;
 
   ///
-  // Returns the value with the specified identifier on success. Returns NULL
-  // if this method is called incorrectly or an exception is thrown.
+  /// Returns the value with the specified identifier on success. Returns NULL
+  /// if this method is called incorrectly or an exception is thrown.
   ///
   /*--cef(capi_name=get_value_byindex,index_param=index)--*/
   virtual CefRefPtr<CefV8Value> GetValue(int index) = 0;
 
   ///
-  // Associates a value with the specified identifier and returns true on
-  // success. Returns false if this method is called incorrectly or an exception
-  // is thrown. For read-only values this method will return true even though
-  // assignment failed.
+  /// Associates a value with the specified identifier and returns true on
+  /// success. Returns false if this method is called incorrectly or an
+  /// exception is thrown. For read-only values this method will return true
+  /// even though assignment failed.
   ///
   /*--cef(capi_name=set_value_bykey,optional_param=key)--*/
   virtual bool SetValue(const CefString& key,
@@ -760,20 +777,20 @@ class CefV8Value : public virtual CefBaseRefCounted {
                         PropertyAttribute attribute) = 0;
 
   ///
-  // Associates a value with the specified identifier and returns true on
-  // success. Returns false if this method is called incorrectly or an exception
-  // is thrown. For read-only values this method will return true even though
-  // assignment failed.
+  /// Associates a value with the specified identifier and returns true on
+  /// success. Returns false if this method is called incorrectly or an
+  /// exception is thrown. For read-only values this method will return true
+  /// even though assignment failed.
   ///
   /*--cef(capi_name=set_value_byindex,index_param=index)--*/
   virtual bool SetValue(int index, CefRefPtr<CefV8Value> value) = 0;
 
   ///
-  // Registers an identifier and returns true on success. Access to the
-  // identifier will be forwarded to the CefV8Accessor instance passed to
-  // CefV8Value::CreateObject(). Returns false if this method is called
-  // incorrectly or an exception is thrown. For read-only values this method
-  // will return true even though assignment failed.
+  /// Registers an identifier and returns true on success. Access to the
+  /// identifier will be forwarded to the CefV8Accessor instance passed to
+  /// CefV8Value::CreateObject(). Returns false if this method is called
+  /// incorrectly or an exception is thrown. For read-only values this method
+  /// will return true even though assignment failed.
   ///
   /*--cef(capi_name=set_value_byaccessor,optional_param=key)--*/
   virtual bool SetValue(const CefString& key,
@@ -781,43 +798,43 @@ class CefV8Value : public virtual CefBaseRefCounted {
                         PropertyAttribute attribute) = 0;
 
   ///
-  // Read the keys for the object's values into the specified vector. Integer-
-  // based keys will also be returned as strings.
+  /// Read the keys for the object's values into the specified vector. Integer-
+  /// based keys will also be returned as strings.
   ///
   /*--cef()--*/
   virtual bool GetKeys(std::vector<CefString>& keys) = 0;
 
   ///
-  // Sets the user data for this object and returns true on success. Returns
-  // false if this method is called incorrectly. This method can only be called
-  // on user created objects.
+  /// Sets the user data for this object and returns true on success. Returns
+  /// false if this method is called incorrectly. This method can only be called
+  /// on user created objects.
   ///
   /*--cef(optional_param=user_data)--*/
   virtual bool SetUserData(CefRefPtr<CefBaseRefCounted> user_data) = 0;
 
   ///
-  // Returns the user data, if any, assigned to this object.
+  /// Returns the user data, if any, assigned to this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBaseRefCounted> GetUserData() = 0;
 
   ///
-  // Returns the amount of externally allocated memory registered for the
-  // object.
+  /// Returns the amount of externally allocated memory registered for the
+  /// object.
   ///
   /*--cef()--*/
   virtual int GetExternallyAllocatedMemory() = 0;
 
   ///
-  // Adjusts the amount of registered external memory for the object. Used to
-  // give V8 an indication of the amount of externally allocated memory that is
-  // kept alive by JavaScript objects. V8 uses this information to decide when
-  // to perform global garbage collection. Each CefV8Value tracks the amount of
-  // external memory associated with it and automatically decreases the global
-  // total by the appropriate amount on its destruction. |change_in_bytes|
-  // specifies the number of bytes to adjust by. This method returns the number
-  // of bytes associated with the object after the adjustment. This method can
-  // only be called on user created objects.
+  /// Adjusts the amount of registered external memory for the object. Used to
+  /// give V8 an indication of the amount of externally allocated memory that is
+  /// kept alive by JavaScript objects. V8 uses this information to decide when
+  /// to perform global garbage collection. Each CefV8Value tracks the amount of
+  /// external memory associated with it and automatically decreases the global
+  /// total by the appropriate amount on its destruction. |change_in_bytes|
+  /// specifies the number of bytes to adjust by. This method returns the number
+  /// of bytes associated with the object after the adjustment. This method can
+  /// only be called on user created objects.
   ///
   /*--cef()--*/
   virtual int AdjustExternallyAllocatedMemory(int change_in_bytes) = 0;
@@ -825,7 +842,7 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // ARRAY METHODS - These methods are only available on arrays.
 
   ///
-  // Returns the number of elements in the array.
+  /// Returns the number of elements in the array.
   ///
   /*--cef()--*/
   virtual int GetArrayLength() = 0;
@@ -833,45 +850,59 @@ class CefV8Value : public virtual CefBaseRefCounted {
   // ARRAY BUFFER METHODS - These methods are only available on ArrayBuffers.
 
   ///
-  // Returns the ReleaseCallback object associated with the ArrayBuffer or NULL
-  // if the ArrayBuffer was not created with CreateArrayBuffer.
+  /// Returns the ReleaseCallback object associated with the ArrayBuffer or NULL
+  /// if the ArrayBuffer was not created with CreateArrayBuffer.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefV8ArrayBufferReleaseCallback>
   GetArrayBufferReleaseCallback() = 0;
 
   ///
-  // Prevent the ArrayBuffer from using it's memory block by setting the length
-  // to zero. This operation cannot be undone. If the ArrayBuffer was created
-  // with CreateArrayBuffer then CefV8ArrayBufferReleaseCallback::ReleaseBuffer
-  // will be called to release the underlying buffer.
+  /// Prevent the ArrayBuffer from using it's memory block by setting the length
+  /// to zero. This operation cannot be undone. If the ArrayBuffer was created
+  /// with CreateArrayBuffer then CefV8ArrayBufferReleaseCallback::ReleaseBuffer
+  /// will be called to release the underlying buffer.
   ///
   /*--cef()--*/
   virtual bool NeuterArrayBuffer() = 0;
 
+  ///
+  /// Returns the length (in bytes) of the ArrayBuffer.
+  ///
+  /*--cef()--*/
+  virtual size_t GetArrayBufferByteLength() = 0;
+
+  ///
+  /// Returns a pointer to the beginning of the memory block for this
+  /// ArrayBuffer backing store. The returned pointer is valid as long as the
+  /// CefV8Value is alive.
+  ///
+  /*--cef()--*/
+  virtual void* GetArrayBufferData() = 0;
+
   // FUNCTION METHODS - These methods are only available on functions.
 
   ///
-  // Returns the function name.
+  /// Returns the function name.
   ///
   /*--cef()--*/
   virtual CefString GetFunctionName() = 0;
 
   ///
-  // Returns the function handler or NULL if not a CEF-created function.
+  /// Returns the function handler or NULL if not a CEF-created function.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefV8Handler> GetFunctionHandler() = 0;
 
   ///
-  // Execute the function using the current V8 context. This method should only
-  // be called from within the scope of a CefV8Handler or CefV8Accessor
-  // callback, or in combination with calling Enter() and Exit() on a stored
-  // CefV8Context reference. |object| is the receiver ('this' object) of the
-  // function. If |object| is empty the current context's global object will be
-  // used. |arguments| is the list of arguments that will be passed to the
-  // function. Returns the function return value on success. Returns NULL if
-  // this method is called incorrectly or an exception is thrown.
+  /// Execute the function using the current V8 context. This method should only
+  /// be called from within the scope of a CefV8Handler or CefV8Accessor
+  /// callback, or in combination with calling Enter() and Exit() on a stored
+  /// CefV8Context reference. |object| is the receiver ('this' object) of the
+  /// function. If |object| is empty the current context's global object will be
+  /// used. |arguments| is the list of arguments that will be passed to the
+  /// function. Returns the function return value on success. Returns NULL if
+  /// this method is called incorrectly or an exception is thrown.
   ///
   /*--cef(optional_param=object)--*/
   virtual CefRefPtr<CefV8Value> ExecuteFunction(
@@ -879,117 +910,140 @@ class CefV8Value : public virtual CefBaseRefCounted {
       const CefV8ValueList& arguments) = 0;
 
   ///
-  // Execute the function using the specified V8 context. |object| is the
-  // receiver ('this' object) of the function. If |object| is empty the
-  // specified context's global object will be used. |arguments| is the list of
-  // arguments that will be passed to the function. Returns the function return
-  // value on success. Returns NULL if this method is called incorrectly or an
-  // exception is thrown.
+  /// Execute the function using the specified V8 context. |object| is the
+  /// receiver ('this' object) of the function. If |object| is empty the
+  /// specified context's global object will be used. |arguments| is the list of
+  /// arguments that will be passed to the function. Returns the function return
+  /// value on success. Returns NULL if this method is called incorrectly or an
+  /// exception is thrown.
   ///
   /*--cef(optional_param=object)--*/
   virtual CefRefPtr<CefV8Value> ExecuteFunctionWithContext(
       CefRefPtr<CefV8Context> context,
       CefRefPtr<CefV8Value> object,
       const CefV8ValueList& arguments) = 0;
+
+  // PROMISE METHODS - These methods are only available on Promises.
+
+  ///
+  /// Resolve the Promise using the current V8 context. This method should only
+  /// be called from within the scope of a CefV8Handler or CefV8Accessor
+  /// callback, or in combination with calling Enter() and Exit() on a stored
+  /// CefV8Context reference. |arg| is the argument passed to the resolved
+  /// promise. Returns true on success. Returns false if this method is called
+  /// incorrectly or an exception is thrown.
+  ///
+  /*--cef(optional_param=arg)--*/
+  virtual bool ResolvePromise(CefRefPtr<CefV8Value> arg) = 0;
+
+  ///
+  /// Reject the Promise using the current V8 context. This method should only
+  /// be called from within the scope of a CefV8Handler or CefV8Accessor
+  /// callback, or in combination with calling Enter() and Exit() on a stored
+  /// CefV8Context reference. Returns true on success. Returns false if this
+  /// method is called incorrectly or an exception is thrown.
+  ///
+  /*--cef()--*/
+  virtual bool RejectPromise(const CefString& errorMsg) = 0;
 };
 
 ///
-// Class representing a V8 stack trace handle. V8 handles can only be accessed
-// from the thread on which they are created. Valid threads for creating a V8
-// handle include the render process main thread (TID_RENDERER) and WebWorker
-// threads. A task runner for posting tasks on the associated thread can be
-// retrieved via the CefV8Context::GetTaskRunner() method.
+/// Class representing a V8 stack trace handle. V8 handles can only be accessed
+/// from the thread on which they are created. Valid threads for creating a V8
+/// handle include the render process main thread (TID_RENDERER) and WebWorker
+/// threads. A task runner for posting tasks on the associated thread can be
+/// retrieved via the CefV8Context::GetTaskRunner() method.
 ///
 /*--cef(source=library)--*/
 class CefV8StackTrace : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns the stack trace for the currently active context. |frame_limit| is
-  // the maximum number of frames that will be captured.
+  /// Returns the stack trace for the currently active context. |frame_limit| is
+  /// the maximum number of frames that will be captured.
   ///
   /*--cef()--*/
   static CefRefPtr<CefV8StackTrace> GetCurrent(int frame_limit);
 
   ///
-  // Returns true if the underlying handle is valid and it can be accessed on
-  // the current thread. Do not call any other methods if this method returns
-  // false.
+  /// Returns true if the underlying handle is valid and it can be accessed on
+  /// the current thread. Do not call any other methods if this method returns
+  /// false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns the number of stack frames.
+  /// Returns the number of stack frames.
   ///
   /*--cef()--*/
   virtual int GetFrameCount() = 0;
 
   ///
-  // Returns the stack frame at the specified 0-based index.
+  /// Returns the stack frame at the specified 0-based index.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefV8StackFrame> GetFrame(int index) = 0;
 };
 
 ///
-// Class representing a V8 stack frame handle. V8 handles can only be accessed
-// from the thread on which they are created. Valid threads for creating a V8
-// handle include the render process main thread (TID_RENDERER) and WebWorker
-// threads. A task runner for posting tasks on the associated thread can be
-// retrieved via the CefV8Context::GetTaskRunner() method.
+/// Class representing a V8 stack frame handle. V8 handles can only be accessed
+/// from the thread on which they are created. Valid threads for creating a V8
+/// handle include the render process main thread (TID_RENDERER) and WebWorker
+/// threads. A task runner for posting tasks on the associated thread can be
+/// retrieved via the CefV8Context::GetTaskRunner() method.
 ///
-/*--cef(source=library)--*/
+/*--cef(source=library,no_debugct_check)--*/
 class CefV8StackFrame : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns true if the underlying handle is valid and it can be accessed on
-  // the current thread. Do not call any other methods if this method returns
-  // false.
+  /// Returns true if the underlying handle is valid and it can be accessed on
+  /// the current thread. Do not call any other methods if this method returns
+  /// false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns the name of the resource script that contains the function.
+  /// Returns the name of the resource script that contains the function.
   ///
   /*--cef()--*/
   virtual CefString GetScriptName() = 0;
 
   ///
-  // Returns the name of the resource script that contains the function or the
-  // sourceURL value if the script name is undefined and its source ends with
-  // a "//@ sourceURL=..." string.
+  /// Returns the name of the resource script that contains the function or the
+  /// sourceURL value if the script name is undefined and its source ends with
+  /// a "//@ sourceURL=..." string.
   ///
   /*--cef()--*/
   virtual CefString GetScriptNameOrSourceURL() = 0;
 
   ///
-  // Returns the name of the function.
+  /// Returns the name of the function.
   ///
   /*--cef()--*/
   virtual CefString GetFunctionName() = 0;
 
   ///
-  // Returns the 1-based line number for the function call or 0 if unknown.
+  /// Returns the 1-based line number for the function call or 0 if unknown.
   ///
   /*--cef()--*/
   virtual int GetLineNumber() = 0;
 
   ///
-  // Returns the 1-based column offset on the line for the function call or 0 if
-  // unknown.
+  /// Returns the 1-based column offset on the line for the function call or 0
+  /// if unknown.
   ///
   /*--cef()--*/
   virtual int GetColumn() = 0;
 
   ///
-  // Returns true if the function was compiled using eval().
+  /// Returns true if the function was compiled using eval().
   ///
   /*--cef()--*/
   virtual bool IsEval() = 0;
 
   ///
-  // Returns true if the function was called as a constructor via "new".
+  /// Returns true if the function was called as a constructor via "new".
   ///
   /*--cef()--*/
   virtual bool IsConstructor() = 0;
diff --git a/src/include/cef_values.h b/src/include/cef_values.h
index be88794e8..f7bcb79c7 100644
--- a/src/include/cef_values.h
+++ b/src/include/cef_values.h
@@ -48,244 +48,252 @@ class CefListValue;
 typedef cef_value_type_t CefValueType;
 
 ///
-// Class that wraps other data value types. Complex types (binary, dictionary
-// and list) will be referenced but not owned by this object. Can be used on any
-// process and thread.
+/// Class that wraps other data value types. Complex types (binary, dictionary
+/// and list) will be referenced but not owned by this object. Can be used on
+/// any process and thread.
 ///
 /*--cef(source=library)--*/
 class CefValue : public virtual CefBaseRefCounted {
  public:
   ///
-  // Creates a new object.
+  /// Creates a new object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefValue> Create();
 
   ///
-  // Returns true if the underlying data is valid. This will always be true for
-  // simple types. For complex types (binary, dictionary and list) the
-  // underlying data may become invalid if owned by another object (e.g. list or
-  // dictionary) and that other object is then modified or destroyed. This value
-  // object can be re-used by calling Set*() even if the underlying data is
-  // invalid.
+  /// Returns true if the underlying data is valid. This will always be true for
+  /// simple types. For complex types (binary, dictionary and list) the
+  /// underlying data may become invalid if owned by another object (e.g. list
+  /// or dictionary) and that other object is then modified or destroyed. This
+  /// value object can be re-used by calling Set*() even if the underlying data
+  /// is invalid.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if the underlying data is owned by another object.
+  /// Returns true if the underlying data is owned by another object.
   ///
   /*--cef()--*/
   virtual bool IsOwned() = 0;
 
   ///
-  // Returns true if the underlying data is read-only. Some APIs may expose
-  // read-only objects.
+  /// Returns true if the underlying data is read-only. Some APIs may expose
+  /// read-only objects.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns true if this object and |that| object have the same underlying
-  // data. If true modifications to this object will also affect |that| object
-  // and vice-versa.
+  /// Returns true if this object and |that| object have the same underlying
+  /// data. If true modifications to this object will also affect |that| object
+  /// and vice-versa.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefValue> that) = 0;
 
   ///
-  // Returns true if this object and |that| object have an equivalent underlying
-  // value but are not necessarily the same object.
+  /// Returns true if this object and |that| object have an equivalent
+  /// underlying value but are not necessarily the same object.
   ///
   /*--cef()--*/
   virtual bool IsEqual(CefRefPtr<CefValue> that) = 0;
 
   ///
-  // Returns a copy of this object. The underlying data will also be copied.
+  /// Returns a copy of this object. The underlying data will also be copied.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefValue> Copy() = 0;
 
   ///
-  // Returns the underlying value type.
+  /// Returns the underlying value type.
   ///
   /*--cef(default_retval=VTYPE_INVALID)--*/
   virtual CefValueType GetType() = 0;
 
   ///
-  // Returns the underlying value as type bool.
+  /// Returns the underlying value as type bool.
   ///
   /*--cef()--*/
   virtual bool GetBool() = 0;
 
   ///
-  // Returns the underlying value as type int.
+  /// Returns the underlying value as type int.
   ///
   /*--cef()--*/
   virtual int GetInt() = 0;
 
   ///
-  // Returns the underlying value as type double.
+  /// Returns the underlying value as type double.
   ///
   /*--cef()--*/
   virtual double GetDouble() = 0;
 
   ///
-  // Returns the underlying value as type string.
+  /// Returns the underlying value as type string.
   ///
   /*--cef()--*/
   virtual CefString GetString() = 0;
 
   ///
-  // Returns the underlying value as type binary. The returned reference may
-  // become invalid if the value is owned by another object or if ownership is
-  // transferred to another object in the future. To maintain a reference to
-  // the value after assigning ownership to a dictionary or list pass this
-  // object to the SetValue() method instead of passing the returned reference
-  // to SetBinary().
+  /// Returns the underlying value as type binary. The returned reference may
+  /// become invalid if the value is owned by another object or if ownership is
+  /// transferred to another object in the future. To maintain a reference to
+  /// the value after assigning ownership to a dictionary or list pass this
+  /// object to the SetValue() method instead of passing the returned reference
+  /// to SetBinary().
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetBinary() = 0;
 
   ///
-  // Returns the underlying value as type dictionary. The returned reference may
-  // become invalid if the value is owned by another object or if ownership is
-  // transferred to another object in the future. To maintain a reference to
-  // the value after assigning ownership to a dictionary or list pass this
-  // object to the SetValue() method instead of passing the returned reference
-  // to SetDictionary().
+  /// Returns the underlying value as type dictionary. The returned reference
+  /// may become invalid if the value is owned by another object or if ownership
+  /// is transferred to another object in the future. To maintain a reference to
+  /// the value after assigning ownership to a dictionary or list pass this
+  /// object to the SetValue() method instead of passing the returned reference
+  /// to SetDictionary().
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDictionaryValue> GetDictionary() = 0;
 
   ///
-  // Returns the underlying value as type list. The returned reference may
-  // become invalid if the value is owned by another object or if ownership is
-  // transferred to another object in the future. To maintain a reference to
-  // the value after assigning ownership to a dictionary or list pass this
-  // object to the SetValue() method instead of passing the returned reference
-  // to SetList().
+  /// Returns the underlying value as type list. The returned reference may
+  /// become invalid if the value is owned by another object or if ownership is
+  /// transferred to another object in the future. To maintain a reference to
+  /// the value after assigning ownership to a dictionary or list pass this
+  /// object to the SetValue() method instead of passing the returned reference
+  /// to SetList().
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefListValue> GetList() = 0;
 
   ///
-  // Sets the underlying value as type null. Returns true if the value was set
-  // successfully.
+  /// Sets the underlying value as type null. Returns true if the value was set
+  /// successfully.
   ///
   /*--cef()--*/
   virtual bool SetNull() = 0;
 
   ///
-  // Sets the underlying value as type bool. Returns true if the value was set
-  // successfully.
+  /// Sets the underlying value as type bool. Returns true if the value was set
+  /// successfully.
   ///
   /*--cef()--*/
   virtual bool SetBool(bool value) = 0;
 
   ///
-  // Sets the underlying value as type int. Returns true if the value was set
-  // successfully.
+  /// Sets the underlying value as type int. Returns true if the value was set
+  /// successfully.
   ///
   /*--cef()--*/
   virtual bool SetInt(int value) = 0;
 
   ///
-  // Sets the underlying value as type double. Returns true if the value was set
-  // successfully.
+  /// Sets the underlying value as type double. Returns true if the value was
+  /// set successfully.
   ///
   /*--cef()--*/
   virtual bool SetDouble(double value) = 0;
 
   ///
-  // Sets the underlying value as type string. Returns true if the value was set
-  // successfully.
+  /// Sets the underlying value as type string. Returns true if the value was
+  /// set successfully.
   ///
   /*--cef(optional_param=value)--*/
   virtual bool SetString(const CefString& value) = 0;
 
   ///
-  // Sets the underlying value as type binary. Returns true if the value was set
-  // successfully. This object keeps a reference to |value| and ownership of the
-  // underlying data remains unchanged.
+  /// Sets the underlying value as type binary. Returns true if the value was
+  /// set successfully. This object keeps a reference to |value| and ownership
+  /// of the underlying data remains unchanged.
   ///
   /*--cef()--*/
   virtual bool SetBinary(CefRefPtr<CefBinaryValue> value) = 0;
 
   ///
-  // Sets the underlying value as type dict. Returns true if the value was set
-  // successfully. This object keeps a reference to |value| and ownership of the
-  // underlying data remains unchanged.
+  /// Sets the underlying value as type dict. Returns true if the value was set
+  /// successfully. This object keeps a reference to |value| and ownership of
+  /// the underlying data remains unchanged.
   ///
   /*--cef()--*/
   virtual bool SetDictionary(CefRefPtr<CefDictionaryValue> value) = 0;
 
   ///
-  // Sets the underlying value as type list. Returns true if the value was set
-  // successfully. This object keeps a reference to |value| and ownership of the
-  // underlying data remains unchanged.
+  /// Sets the underlying value as type list. Returns true if the value was set
+  /// successfully. This object keeps a reference to |value| and ownership of
+  /// the underlying data remains unchanged.
   ///
   /*--cef()--*/
   virtual bool SetList(CefRefPtr<CefListValue> value) = 0;
 };
 
 ///
-// Class representing a binary value. Can be used on any process and thread.
+/// Class representing a binary value. Can be used on any process and thread.
 ///
 /*--cef(source=library)--*/
 class CefBinaryValue : public virtual CefBaseRefCounted {
  public:
   ///
-  // Creates a new object that is not owned by any other object. The specified
-  // |data| will be copied.
+  /// Creates a new object that is not owned by any other object. The specified
+  /// |data| will be copied.
   ///
   /*--cef()--*/
   static CefRefPtr<CefBinaryValue> Create(const void* data, size_t data_size);
 
   ///
-  // Returns true if this object is valid. This object may become invalid if
-  // the underlying data is owned by another object (e.g. list or dictionary)
-  // and that other object is then modified or destroyed. Do not call any other
-  // methods if this method returns false.
+  /// Returns true if this object is valid. This object may become invalid if
+  /// the underlying data is owned by another object (e.g. list or dictionary)
+  /// and that other object is then modified or destroyed. Do not call any other
+  /// methods if this method returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if this object is currently owned by another object.
+  /// Returns true if this object is currently owned by another object.
   ///
   /*--cef()--*/
   virtual bool IsOwned() = 0;
 
   ///
-  // Returns true if this object and |that| object have the same underlying
-  // data.
+  /// Returns true if this object and |that| object have the same underlying
+  /// data.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefBinaryValue> that) = 0;
 
   ///
-  // Returns true if this object and |that| object have an equivalent underlying
-  // value but are not necessarily the same object.
+  /// Returns true if this object and |that| object have an equivalent
+  /// underlying value but are not necessarily the same object.
   ///
   /*--cef()--*/
   virtual bool IsEqual(CefRefPtr<CefBinaryValue> that) = 0;
 
   ///
-  // Returns a copy of this object. The data in this object will also be copied.
+  /// Returns a copy of this object. The data in this object will also be
+  /// copied.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> Copy() = 0;
 
   ///
-  // Returns the data size.
+  /// Returns a pointer to the beginning of the memory block.
+  /// The returned pointer is valid as long as the CefBinaryValue is alive.
+  ///
+  /*--cef()--*/
+  virtual const void* GetRawData() = 0;
+
+  ///
+  /// Returns the data size.
   ///
   /*--cef()--*/
   virtual size_t GetSize() = 0;
 
   ///
-  // Read up to |buffer_size| number of bytes into |buffer|. Reading begins at
-  // the specified byte |data_offset|. Returns the number of bytes read.
+  /// Read up to |buffer_size| number of bytes into |buffer|. Reading begins at
+  /// the specified byte |data_offset|. Returns the number of bytes read.
   ///
   /*--cef()--*/
   virtual size_t GetData(void* buffer,
@@ -294,7 +302,8 @@ class CefBinaryValue : public virtual CefBaseRefCounted {
 };
 
 ///
-// Class representing a dictionary value. Can be used on any process and thread.
+/// Class representing a dictionary value. Can be used on any process and
+/// thread.
 ///
 /*--cef(source=library)--*/
 class CefDictionaryValue : public virtual CefBaseRefCounted {
@@ -302,444 +311,444 @@ class CefDictionaryValue : public virtual CefBaseRefCounted {
   typedef std::vector<CefString> KeyList;
 
   ///
-  // Creates a new object that is not owned by any other object.
+  /// Creates a new object that is not owned by any other object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDictionaryValue> Create();
 
   ///
-  // Returns true if this object is valid. This object may become invalid if
-  // the underlying data is owned by another object (e.g. list or dictionary)
-  // and that other object is then modified or destroyed. Do not call any other
-  // methods if this method returns false.
+  /// Returns true if this object is valid. This object may become invalid if
+  /// the underlying data is owned by another object (e.g. list or dictionary)
+  /// and that other object is then modified or destroyed. Do not call any other
+  /// methods if this method returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if this object is currently owned by another object.
+  /// Returns true if this object is currently owned by another object.
   ///
   /*--cef()--*/
   virtual bool IsOwned() = 0;
 
   ///
-  // Returns true if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
+  /// Returns true if the values of this object are read-only. Some APIs may
+  /// expose read-only objects.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns true if this object and |that| object have the same underlying
-  // data. If true modifications to this object will also affect |that| object
-  // and vice-versa.
+  /// Returns true if this object and |that| object have the same underlying
+  /// data. If true modifications to this object will also affect |that| object
+  /// and vice-versa.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefDictionaryValue> that) = 0;
 
   ///
-  // Returns true if this object and |that| object have an equivalent underlying
-  // value but are not necessarily the same object.
+  /// Returns true if this object and |that| object have an equivalent
+  /// underlying value but are not necessarily the same object.
   ///
   /*--cef()--*/
   virtual bool IsEqual(CefRefPtr<CefDictionaryValue> that) = 0;
 
   ///
-  // Returns a writable copy of this object. If |exclude_empty_children| is true
-  // any empty dictionaries or lists will be excluded from the copy.
+  /// Returns a writable copy of this object. If |exclude_empty_children| is
+  /// true any empty dictionaries or lists will be excluded from the copy.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDictionaryValue> Copy(bool exclude_empty_children) = 0;
 
   ///
-  // Returns the number of values.
+  /// Returns the number of values.
   ///
   /*--cef()--*/
   virtual size_t GetSize() = 0;
 
   ///
-  // Removes all values. Returns true on success.
+  /// Removes all values. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool Clear() = 0;
 
   ///
-  // Returns true if the current dictionary has a value for the given key.
+  /// Returns true if the current dictionary has a value for the given key.
   ///
   /*--cef()--*/
   virtual bool HasKey(const CefString& key) = 0;
 
   ///
-  // Reads all keys for this dictionary into the specified vector.
+  /// Reads all keys for this dictionary into the specified vector.
   ///
   /*--cef()--*/
   virtual bool GetKeys(KeyList& keys) = 0;
 
   ///
-  // Removes the value at the specified key. Returns true is the value was
-  // removed successfully.
+  /// Removes the value at the specified key. Returns true is the value was
+  /// removed successfully.
   ///
   /*--cef()--*/
   virtual bool Remove(const CefString& key) = 0;
 
   ///
-  // Returns the value type for the specified key.
+  /// Returns the value type for the specified key.
   ///
   /*--cef(default_retval=VTYPE_INVALID)--*/
   virtual CefValueType GetType(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key. For simple types the returned
-  // value will copy existing data and modifications to the value will not
-  // modify this object. For complex types (binary, dictionary and list) the
-  // returned value will reference existing data and modifications to the value
-  // will modify this object.
+  /// Returns the value at the specified key. For simple types the returned
+  /// value will copy existing data and modifications to the value will not
+  /// modify this object. For complex types (binary, dictionary and list) the
+  /// returned value will reference existing data and modifications to the value
+  /// will modify this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefValue> GetValue(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type bool.
+  /// Returns the value at the specified key as type bool.
   ///
   /*--cef()--*/
   virtual bool GetBool(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type int.
+  /// Returns the value at the specified key as type int.
   ///
   /*--cef()--*/
   virtual int GetInt(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type double.
+  /// Returns the value at the specified key as type double.
   ///
   /*--cef()--*/
   virtual double GetDouble(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type string.
+  /// Returns the value at the specified key as type string.
   ///
   /*--cef()--*/
   virtual CefString GetString(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type binary. The returned
-  // value will reference existing data.
+  /// Returns the value at the specified key as type binary. The returned
+  /// value will reference existing data.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetBinary(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type dictionary. The returned
-  // value will reference existing data and modifications to the value will
-  // modify this object.
+  /// Returns the value at the specified key as type dictionary. The returned
+  /// value will reference existing data and modifications to the value will
+  /// modify this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDictionaryValue> GetDictionary(const CefString& key) = 0;
 
   ///
-  // Returns the value at the specified key as type list. The returned value
-  // will reference existing data and modifications to the value will modify
-  // this object.
+  /// Returns the value at the specified key as type list. The returned value
+  /// will reference existing data and modifications to the value will modify
+  /// this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefListValue> GetList(const CefString& key) = 0;
 
   ///
-  // Sets the value at the specified key. Returns true if the value was set
-  // successfully. If |value| represents simple data then the underlying data
-  // will be copied and modifications to |value| will not modify this object. If
-  // |value| represents complex data (binary, dictionary or list) then the
-  // underlying data will be referenced and modifications to |value| will modify
-  // this object.
+  /// Sets the value at the specified key. Returns true if the value was set
+  /// successfully. If |value| represents simple data then the underlying data
+  /// will be copied and modifications to |value| will not modify this object.
+  /// If |value| represents complex data (binary, dictionary or list) then the
+  /// underlying data will be referenced and modifications to |value| will
+  /// modify this object.
   ///
   /*--cef()--*/
   virtual bool SetValue(const CefString& key, CefRefPtr<CefValue> value) = 0;
 
   ///
-  // Sets the value at the specified key as type null. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified key as type null. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetNull(const CefString& key) = 0;
 
   ///
-  // Sets the value at the specified key as type bool. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified key as type bool. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetBool(const CefString& key, bool value) = 0;
 
   ///
-  // Sets the value at the specified key as type int. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified key as type int. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetInt(const CefString& key, int value) = 0;
 
   ///
-  // Sets the value at the specified key as type double. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified key as type double. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetDouble(const CefString& key, double value) = 0;
 
   ///
-  // Sets the value at the specified key as type string. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified key as type string. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef(optional_param=value)--*/
   virtual bool SetString(const CefString& key, const CefString& value) = 0;
 
   ///
-  // Sets the value at the specified key as type binary. Returns true if the
-  // value was set successfully. If |value| is currently owned by another object
-  // then the value will be copied and the |value| reference will not change.
-  // Otherwise, ownership will be transferred to this object and the |value|
-  // reference will be invalidated.
+  /// Sets the value at the specified key as type binary. Returns true if the
+  /// value was set successfully. If |value| is currently owned by another
+  /// object then the value will be copied and the |value| reference will not
+  /// change. Otherwise, ownership will be transferred to this object and the
+  /// |value| reference will be invalidated.
   ///
   /*--cef()--*/
   virtual bool SetBinary(const CefString& key,
                          CefRefPtr<CefBinaryValue> value) = 0;
 
   ///
-  // Sets the value at the specified key as type dict. Returns true if the
-  // value was set successfully. If |value| is currently owned by another object
-  // then the value will be copied and the |value| reference will not change.
-  // Otherwise, ownership will be transferred to this object and the |value|
-  // reference will be invalidated.
+  /// Sets the value at the specified key as type dict. Returns true if the
+  /// value was set successfully. If |value| is currently owned by another
+  /// object then the value will be copied and the |value| reference will not
+  /// change. Otherwise, ownership will be transferred to this object and the
+  /// |value| reference will be invalidated.
   ///
   /*--cef()--*/
   virtual bool SetDictionary(const CefString& key,
                              CefRefPtr<CefDictionaryValue> value) = 0;
 
   ///
-  // Sets the value at the specified key as type list. Returns true if the
-  // value was set successfully. If |value| is currently owned by another object
-  // then the value will be copied and the |value| reference will not change.
-  // Otherwise, ownership will be transferred to this object and the |value|
-  // reference will be invalidated.
+  /// Sets the value at the specified key as type list. Returns true if the
+  /// value was set successfully. If |value| is currently owned by another
+  /// object then the value will be copied and the |value| reference will not
+  /// change. Otherwise, ownership will be transferred to this object and the
+  /// |value| reference will be invalidated.
   ///
   /*--cef()--*/
   virtual bool SetList(const CefString& key, CefRefPtr<CefListValue> value) = 0;
 };
 
 ///
-// Class representing a list value. Can be used on any process and thread.
+/// Class representing a list value. Can be used on any process and thread.
 ///
 /*--cef(source=library)--*/
 class CefListValue : public virtual CefBaseRefCounted {
  public:
   ///
-  // Creates a new object that is not owned by any other object.
+  /// Creates a new object that is not owned by any other object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefListValue> Create();
 
   ///
-  // Returns true if this object is valid. This object may become invalid if
-  // the underlying data is owned by another object (e.g. list or dictionary)
-  // and that other object is then modified or destroyed. Do not call any other
-  // methods if this method returns false.
+  /// Returns true if this object is valid. This object may become invalid if
+  /// the underlying data is owned by another object (e.g. list or dictionary)
+  /// and that other object is then modified or destroyed. Do not call any other
+  /// methods if this method returns false.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if this object is currently owned by another object.
+  /// Returns true if this object is currently owned by another object.
   ///
   /*--cef()--*/
   virtual bool IsOwned() = 0;
 
   ///
-  // Returns true if the values of this object are read-only. Some APIs may
-  // expose read-only objects.
+  /// Returns true if the values of this object are read-only. Some APIs may
+  /// expose read-only objects.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns true if this object and |that| object have the same underlying
-  // data. If true modifications to this object will also affect |that| object
-  // and vice-versa.
+  /// Returns true if this object and |that| object have the same underlying
+  /// data. If true modifications to this object will also affect |that| object
+  /// and vice-versa.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefListValue> that) = 0;
 
   ///
-  // Returns true if this object and |that| object have an equivalent underlying
-  // value but are not necessarily the same object.
+  /// Returns true if this object and |that| object have an equivalent
+  /// underlying value but are not necessarily the same object.
   ///
   /*--cef()--*/
   virtual bool IsEqual(CefRefPtr<CefListValue> that) = 0;
 
   ///
-  // Returns a writable copy of this object.
+  /// Returns a writable copy of this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefListValue> Copy() = 0;
 
   ///
-  // Sets the number of values. If the number of values is expanded all
-  // new value slots will default to type null. Returns true on success.
+  /// Sets the number of values. If the number of values is expanded all
+  /// new value slots will default to type null. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool SetSize(size_t size) = 0;
 
   ///
-  // Returns the number of values.
+  /// Returns the number of values.
   ///
   /*--cef()--*/
   virtual size_t GetSize() = 0;
 
   ///
-  // Removes all values. Returns true on success.
+  /// Removes all values. Returns true on success.
   ///
   /*--cef()--*/
   virtual bool Clear() = 0;
 
   ///
-  // Removes the value at the specified index.
+  /// Removes the value at the specified index.
   ///
   /*--cef()--*/
   virtual bool Remove(size_t index) = 0;
 
   ///
-  // Returns the value type at the specified index.
+  /// Returns the value type at the specified index.
   ///
   /*--cef(default_retval=VTYPE_INVALID)--*/
   virtual CefValueType GetType(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index. For simple types the returned
-  // value will copy existing data and modifications to the value will not
-  // modify this object. For complex types (binary, dictionary and list) the
-  // returned value will reference existing data and modifications to the value
-  // will modify this object.
+  /// Returns the value at the specified index. For simple types the returned
+  /// value will copy existing data and modifications to the value will not
+  /// modify this object. For complex types (binary, dictionary and list) the
+  /// returned value will reference existing data and modifications to the value
+  /// will modify this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefValue> GetValue(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type bool.
+  /// Returns the value at the specified index as type bool.
   ///
   /*--cef()--*/
   virtual bool GetBool(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type int.
+  /// Returns the value at the specified index as type int.
   ///
   /*--cef()--*/
   virtual int GetInt(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type double.
+  /// Returns the value at the specified index as type double.
   ///
   /*--cef()--*/
   virtual double GetDouble(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type string.
+  /// Returns the value at the specified index as type string.
   ///
   /*--cef()--*/
   virtual CefString GetString(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type binary. The returned
-  // value will reference existing data.
+  /// Returns the value at the specified index as type binary. The returned
+  /// value will reference existing data.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetBinary(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type dictionary. The returned
-  // value will reference existing data and modifications to the value will
-  // modify this object.
+  /// Returns the value at the specified index as type dictionary. The returned
+  /// value will reference existing data and modifications to the value will
+  /// modify this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDictionaryValue> GetDictionary(size_t index) = 0;
 
   ///
-  // Returns the value at the specified index as type list. The returned
-  // value will reference existing data and modifications to the value will
-  // modify this object.
+  /// Returns the value at the specified index as type list. The returned
+  /// value will reference existing data and modifications to the value will
+  /// modify this object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefListValue> GetList(size_t index) = 0;
 
   ///
-  // Sets the value at the specified index. Returns true if the value was set
-  // successfully. If |value| represents simple data then the underlying data
-  // will be copied and modifications to |value| will not modify this object. If
-  // |value| represents complex data (binary, dictionary or list) then the
-  // underlying data will be referenced and modifications to |value| will modify
-  // this object.
+  /// Sets the value at the specified index. Returns true if the value was set
+  /// successfully. If |value| represents simple data then the underlying data
+  /// will be copied and modifications to |value| will not modify this object.
+  /// If |value| represents complex data (binary, dictionary or list) then the
+  /// underlying data will be referenced and modifications to |value| will
+  /// modify this object.
   ///
   /*--cef()--*/
   virtual bool SetValue(size_t index, CefRefPtr<CefValue> value) = 0;
 
   ///
-  // Sets the value at the specified index as type null. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified index as type null. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetNull(size_t index) = 0;
 
   ///
-  // Sets the value at the specified index as type bool. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified index as type bool. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetBool(size_t index, bool value) = 0;
 
   ///
-  // Sets the value at the specified index as type int. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified index as type int. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetInt(size_t index, int value) = 0;
 
   ///
-  // Sets the value at the specified index as type double. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified index as type double. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef()--*/
   virtual bool SetDouble(size_t index, double value) = 0;
 
   ///
-  // Sets the value at the specified index as type string. Returns true if the
-  // value was set successfully.
+  /// Sets the value at the specified index as type string. Returns true if the
+  /// value was set successfully.
   ///
   /*--cef(optional_param=value)--*/
   virtual bool SetString(size_t index, const CefString& value) = 0;
 
   ///
-  // Sets the value at the specified index as type binary. Returns true if the
-  // value was set successfully. If |value| is currently owned by another object
-  // then the value will be copied and the |value| reference will not change.
-  // Otherwise, ownership will be transferred to this object and the |value|
-  // reference will be invalidated.
+  /// Sets the value at the specified index as type binary. Returns true if the
+  /// value was set successfully. If |value| is currently owned by another
+  /// object then the value will be copied and the |value| reference will not
+  /// change. Otherwise, ownership will be transferred to this object and the
+  /// |value| reference will be invalidated.
   ///
   /*--cef()--*/
   virtual bool SetBinary(size_t index, CefRefPtr<CefBinaryValue> value) = 0;
 
   ///
-  // Sets the value at the specified index as type dict. Returns true if the
-  // value was set successfully. If |value| is currently owned by another object
-  // then the value will be copied and the |value| reference will not change.
-  // Otherwise, ownership will be transferred to this object and the |value|
-  // reference will be invalidated.
+  /// Sets the value at the specified index as type dict. Returns true if the
+  /// value was set successfully. If |value| is currently owned by another
+  /// object then the value will be copied and the |value| reference will not
+  /// change. Otherwise, ownership will be transferred to this object and the
+  /// |value| reference will be invalidated.
   ///
   /*--cef()--*/
   virtual bool SetDictionary(size_t index,
                              CefRefPtr<CefDictionaryValue> value) = 0;
 
   ///
-  // Sets the value at the specified index as type list. Returns true if the
-  // value was set successfully. If |value| is currently owned by another object
-  // then the value will be copied and the |value| reference will not change.
-  // Otherwise, ownership will be transferred to this object and the |value|
-  // reference will be invalidated.
+  /// Sets the value at the specified index as type list. Returns true if the
+  /// value was set successfully. If |value| is currently owned by another
+  /// object then the value will be copied and the |value| reference will not
+  /// change. Otherwise, ownership will be transferred to this object and the
+  /// |value| reference will be invalidated.
   ///
   /*--cef()--*/
   virtual bool SetList(size_t index, CefRefPtr<CefListValue> value) = 0;
diff --git a/src/include/cef_version.h b/src/include/cef_version.h
new file mode 100644
index 000000000..040c8ddb9
--- /dev/null
+++ b/src/include/cef_version.h
@@ -0,0 +1,81 @@
+// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the make_version_header.py tool.
+//
+
+#ifndef CEF_INCLUDE_CEF_VERSION_H_
+#define CEF_INCLUDE_CEF_VERSION_H_
+
+#define CEF_VERSION "123.0.7+g6a21509+chromium-123.0.6312.46"
+#define CEF_VERSION_MAJOR 123
+#define CEF_VERSION_MINOR 0
+#define CEF_VERSION_PATCH 7
+#define CEF_COMMIT_NUMBER 2926
+#define CEF_COMMIT_HASH "6a2150951b57eff2d64289bd3746b577b8b74e0b"
+#define COPYRIGHT_YEAR 2024
+
+#define CHROME_VERSION_MAJOR 123
+#define CHROME_VERSION_MINOR 0
+#define CHROME_VERSION_BUILD 6312
+#define CHROME_VERSION_PATCH 46
+
+#define DO_MAKE_STRING(p) #p
+#define MAKE_STRING(p) DO_MAKE_STRING(p)
+
+#ifndef APSTUDIO_HIDDEN_SYMBOLS
+
+#include "include/internal/cef_export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Returns CEF version information for the libcef library. The |entry|
+// parameter describes which version component will be returned:
+// 0 - CEF_VERSION_MAJOR
+// 1 - CEF_VERSION_MINOR
+// 2 - CEF_VERSION_PATCH
+// 3 - CEF_COMMIT_NUMBER
+// 4 - CHROME_VERSION_MAJOR
+// 5 - CHROME_VERSION_MINOR
+// 6 - CHROME_VERSION_BUILD
+// 7 - CHROME_VERSION_PATCH
+///
+CEF_EXPORT int cef_version_info(int entry);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // APSTUDIO_HIDDEN_SYMBOLS
+
+#endif  // CEF_INCLUDE_CEF_VERSION_H_
diff --git a/src/include/cef_waitable_event.h b/src/include/cef_waitable_event.h
index d89371eb9..fa9a9385d 100644
--- a/src/include/cef_waitable_event.h
+++ b/src/include/cef_waitable_event.h
@@ -41,25 +41,25 @@
 #include "include/cef_base.h"
 
 ///
-// WaitableEvent is a thread synchronization tool that allows one thread to wait
-// for another thread to finish some work. This is equivalent to using a
-// Lock+ConditionVariable to protect a simple boolean value. However, using
-// WaitableEvent in conjunction with a Lock to wait for a more complex state
-// change (e.g., for an item to be added to a queue) is not recommended. In that
-// case consider using a ConditionVariable instead of a WaitableEvent. It is
-// safe to create and/or signal a WaitableEvent from any thread. Blocking on a
-// WaitableEvent by calling the *Wait() methods is not allowed on the browser
-// process UI or IO threads.
+/// WaitableEvent is a thread synchronization tool that allows one thread to
+/// wait for another thread to finish some work. This is equivalent to using a
+/// Lock+ConditionVariable to protect a simple boolean value. However, using
+/// WaitableEvent in conjunction with a Lock to wait for a more complex state
+/// change (e.g., for an item to be added to a queue) is not recommended. In
+/// that case consider using a ConditionVariable instead of a WaitableEvent. It
+/// is safe to create and/or signal a WaitableEvent from any thread. Blocking on
+/// a WaitableEvent by calling the *Wait() methods is not allowed on the browser
+/// process UI or IO threads.
 ///
 /*--cef(source=library)--*/
 class CefWaitableEvent : public CefBaseRefCounted {
  public:
   ///
-  // Create a new waitable event. If |automatic_reset| is true then the event
-  // state is automatically reset to un-signaled after a single waiting thread
-  // has been released; otherwise, the state remains signaled until Reset() is
-  // called manually. If |initially_signaled| is true then the event will start
-  // in the signaled state.
+  /// Create a new waitable event. If |automatic_reset| is true then the event
+  /// state is automatically reset to un-signaled after a single waiting thread
+  /// has been released; otherwise, the state remains signaled until Reset() is
+  /// called manually. If |initially_signaled| is true then the event will start
+  /// in the signaled state.
   ///
   /*--cef()--*/
   static CefRefPtr<CefWaitableEvent> CreateWaitableEvent(
@@ -67,43 +67,43 @@ class CefWaitableEvent : public CefBaseRefCounted {
       bool initially_signaled);
 
   ///
-  // Put the event in the un-signaled state.
+  /// Put the event in the un-signaled state.
   ///
   /*--cef()--*/
   virtual void Reset() = 0;
 
   ///
-  // Put the event in the signaled state. This causes any thread blocked on Wait
-  // to be woken up.
+  /// Put the event in the signaled state. This causes any thread blocked on
+  /// Wait to be woken up.
   ///
   /*--cef()--*/
   virtual void Signal() = 0;
 
   ///
-  // Returns true if the event is in the signaled state, else false. If the
-  // event was created with |automatic_reset| set to true then calling this
-  // method will also cause a reset.
+  /// Returns true if the event is in the signaled state, else false. If the
+  /// event was created with |automatic_reset| set to true then calling this
+  /// method will also cause a reset.
   ///
   /*--cef()--*/
   virtual bool IsSignaled() = 0;
 
   ///
-  // Wait indefinitely for the event to be signaled. This method will not return
-  // until after the call to Signal() has completed. This method cannot be
-  // called on the browser process UI or IO threads.
+  /// Wait indefinitely for the event to be signaled. This method will not
+  /// return until after the call to Signal() has completed. This method cannot
+  /// be called on the browser process UI or IO threads.
   ///
   /*--cef()--*/
   virtual void Wait() = 0;
 
   ///
-  // Wait up to |max_ms| milliseconds for the event to be signaled. Returns true
-  // if the event was signaled. A return value of false does not necessarily
-  // mean that |max_ms| was exceeded. This method will not return until after
-  // the call to Signal() has completed. This method cannot be called on the
-  // browser process UI or IO threads.
+  /// Wait up to |max_ms| milliseconds for the event to be signaled. Returns
+  /// true if the event was signaled. A return value of false does not
+  /// necessarily mean that |max_ms| was exceeded. This method will not return
+  /// until after the call to Signal() has completed. This method cannot be
+  /// called on the browser process UI or IO threads.
   ///
   /*--cef()--*/
-  virtual bool TimedWait(int64 max_ms) = 0;
+  virtual bool TimedWait(int64_t max_ms) = 0;
 };
 
 #endif  // CEF_INCLUDE_CEF_WAITABLE_EVENT_H_
diff --git a/src/include/cef_web_plugin.h b/src/include/cef_web_plugin.h
deleted file mode 100644
index d5de16aba..000000000
--- a/src/include/cef_web_plugin.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
-
-#ifndef CEF_INCLUDE_CEF_WEB_PLUGIN_H_
-#define CEF_INCLUDE_CEF_WEB_PLUGIN_H_
-
-#include "include/cef_base.h"
-
-class CefBrowser;
-
-///
-// Information about a specific web plugin.
-///
-/*--cef(source=library)--*/
-class CefWebPluginInfo : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Returns the plugin name (i.e. Flash).
-  ///
-  /*--cef()--*/
-  virtual CefString GetName() = 0;
-
-  ///
-  // Returns the plugin file path (DLL/bundle/library).
-  ///
-  /*--cef()--*/
-  virtual CefString GetPath() = 0;
-
-  ///
-  // Returns the version of the plugin (may be OS-specific).
-  ///
-  /*--cef()--*/
-  virtual CefString GetVersion() = 0;
-
-  ///
-  // Returns a description of the plugin from the version information.
-  ///
-  /*--cef()--*/
-  virtual CefString GetDescription() = 0;
-};
-
-///
-// Interface to implement for visiting web plugin information. The methods of
-// this class will be called on the browser process UI thread.
-///
-/*--cef(source=client)--*/
-class CefWebPluginInfoVisitor : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Method that will be called once for each plugin. |count| is the 0-based
-  // index for the current plugin. |total| is the total number of plugins.
-  // Return false to stop visiting plugins. This method may never be called if
-  // no plugins are found.
-  ///
-  /*--cef()--*/
-  virtual bool Visit(CefRefPtr<CefWebPluginInfo> info,
-                     int count,
-                     int total) = 0;
-};
-
-///
-// Visit web plugin information. Can be called on any thread in the browser
-// process.
-///
-/*--cef()--*/
-void CefVisitWebPluginInfo(CefRefPtr<CefWebPluginInfoVisitor> visitor);
-
-///
-// Cause the plugin list to refresh the next time it is accessed regardless
-// of whether it has already been loaded. Can be called on any thread in the
-// browser process.
-///
-/*--cef()--*/
-void CefRefreshWebPlugins();
-
-///
-// Unregister an internal plugin. This may be undone the next time
-// CefRefreshWebPlugins() is called. Can be called on any thread in the browser
-// process.
-///
-/*--cef()--*/
-void CefUnregisterInternalWebPlugin(const CefString& path);
-
-///
-// Register a plugin crash. Can be called on any thread in the browser process
-// but will be executed on the IO thread.
-///
-/*--cef()--*/
-void CefRegisterWebPluginCrash(const CefString& path);
-
-///
-// Interface to implement for receiving unstable plugin information. The methods
-// of this class will be called on the browser process IO thread.
-///
-/*--cef(source=client)--*/
-class CefWebPluginUnstableCallback : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Method that will be called for the requested plugin. |unstable| will be
-  // true if the plugin has reached the crash count threshold of 3 times in 120
-  // seconds.
-  ///
-  /*--cef()--*/
-  virtual void IsUnstable(const CefString& path, bool unstable) = 0;
-};
-
-///
-// Query if a plugin is unstable. Can be called on any thread in the browser
-// process.
-///
-/*--cef()--*/
-void CefIsWebPluginUnstable(const CefString& path,
-                            CefRefPtr<CefWebPluginUnstableCallback> callback);
-
-///
-// Implement this interface to receive notification when CDM registration is
-// complete. The methods of this class will be called on the browser process
-// UI thread.
-///
-/*--cef(source=client)--*/
-class CefRegisterCdmCallback : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Method that will be called when CDM registration is complete. |result|
-  // will be CEF_CDM_REGISTRATION_ERROR_NONE if registration completed
-  // successfully. Otherwise, |result| and |error_message| will contain
-  // additional information about why registration failed.
-  ///
-  /*--cef(optional_param=error_message)--*/
-  virtual void OnCdmRegistrationComplete(cef_cdm_registration_error_t result,
-                                         const CefString& error_message) = 0;
-};
-
-///
-// Register the Widevine CDM plugin.
-//
-// The client application is responsible for downloading an appropriate
-// platform-specific CDM binary distribution from Google, extracting the
-// contents, and building the required directory structure on the local machine.
-// The CefBrowserHost::StartDownload method and CefZipArchive class can be used
-// to implement this functionality in CEF. Contact Google via
-// https://www.widevine.com/contact.html for details on CDM download.
-//
-// |path| is a directory that must contain the following files:
-//   1. manifest.json file from the CDM binary distribution (see below).
-//   2. widevinecdm file from the CDM binary distribution (e.g.
-//      widevinecdm.dll on on Windows, libwidevinecdm.dylib on OS X,
-//      libwidevinecdm.so on Linux).
-//   3. widevidecdmadapter file from the CEF binary distribution (e.g.
-//      widevinecdmadapter.dll on Windows, widevinecdmadapter.plugin on OS X,
-//      libwidevinecdmadapter.so on Linux).
-//
-// If any of these files are missing or if the manifest file has incorrect
-// contents the registration will fail and |callback| will receive a |result|
-// value of CEF_CDM_REGISTRATION_ERROR_INCORRECT_CONTENTS.
-//
-// The manifest.json file must contain the following keys:
-//   A. "os": Supported OS (e.g. "mac", "win" or "linux").
-//   B. "arch": Supported architecture (e.g. "ia32" or "x64").
-//   C. "x-cdm-module-versions": Module API version (e.g. "4").
-//   D. "x-cdm-interface-versions": Interface API version (e.g. "8").
-//   E. "x-cdm-host-versions": Host API version (e.g. "8").
-//   F. "version": CDM version (e.g. "1.4.8.903").
-//   G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp9.0,avc1").
-//
-// A through E are used to verify compatibility with the current Chromium
-// version. If the CDM is not compatible the registration will fail and
-// |callback| will receive a |result| value of
-// CEF_CDM_REGISTRATION_ERROR_INCOMPATIBLE.
-//
-// |callback| will be executed asynchronously once registration is complete.
-//
-// On Linux this function must be called before CefInitialize() and the
-// registration cannot be changed during runtime. If registration is not
-// supported at the time that CefRegisterWidevineCdm() is called then |callback|
-// will receive a |result| value of CEF_CDM_REGISTRATION_ERROR_NOT_SUPPORTED.
-///
-/*--cef(optional_param=callback)--*/
-void CefRegisterWidevineCdm(const CefString& path,
-                            CefRefPtr<CefRegisterCdmCallback> callback);
-
-#endif  // CEF_INCLUDE_CEF_WEB_PLUGIN_H_
diff --git a/src/include/cef_x509_certificate.h b/src/include/cef_x509_certificate.h
index b466a6adc..68ae752b4 100644
--- a/src/include/cef_x509_certificate.h
+++ b/src/include/cef_x509_certificate.h
@@ -44,70 +44,58 @@
 #include "include/cef_values.h"
 
 ///
-// Class representing the issuer or subject field of an X.509 certificate.
+/// Class representing the issuer or subject field of an X.509 certificate.
 ///
 /*--cef(source=library)--*/
 class CefX509CertPrincipal : public virtual CefBaseRefCounted {
  public:
   ///
-  // Returns a name that can be used to represent the issuer. It tries in this
-  // order: Common Name (CN), Organization Name (O) and Organizational Unit
-  // Name (OU) and returns the first non-empty one found.
+  /// Returns a name that can be used to represent the issuer. It tries in this
+  /// order: Common Name (CN), Organization Name (O) and Organizational Unit
+  /// Name (OU) and returns the first non-empty one found.
   ///
   /*--cef()--*/
   virtual CefString GetDisplayName() = 0;
 
   ///
-  // Returns the common name.
+  /// Returns the common name.
   ///
   /*--cef()--*/
   virtual CefString GetCommonName() = 0;
 
   ///
-  // Returns the locality name.
+  /// Returns the locality name.
   ///
   /*--cef()--*/
   virtual CefString GetLocalityName() = 0;
 
   ///
-  // Returns the state or province name.
+  /// Returns the state or province name.
   ///
   /*--cef()--*/
   virtual CefString GetStateOrProvinceName() = 0;
 
   ///
-  // Returns the country name.
+  /// Returns the country name.
   ///
   /*--cef()--*/
   virtual CefString GetCountryName() = 0;
 
   ///
-  // Retrieve the list of street addresses.
-  ///
-  /*--cef()--*/
-  virtual void GetStreetAddresses(std::vector<CefString>& addresses) = 0;
-
-  ///
-  // Retrieve the list of organization names.
+  /// Retrieve the list of organization names.
   ///
   /*--cef()--*/
   virtual void GetOrganizationNames(std::vector<CefString>& names) = 0;
 
   ///
-  // Retrieve the list of organization unit names.
+  /// Retrieve the list of organization unit names.
   ///
   /*--cef()--*/
   virtual void GetOrganizationUnitNames(std::vector<CefString>& names) = 0;
-
-  ///
-  // Retrieve the list of domain components.
-  ///
-  /*--cef()--*/
-  virtual void GetDomainComponents(std::vector<CefString>& components) = 0;
 };
 
 ///
-// Class representing a X.509 certificate.
+/// Class representing a X.509 certificate.
 ///
 /*--cef(source=library)--*/
 class CefX509Certificate : public virtual CefBaseRefCounted {
@@ -115,71 +103,71 @@ class CefX509Certificate : public virtual CefBaseRefCounted {
   typedef std::vector<CefRefPtr<CefBinaryValue>> IssuerChainBinaryList;
 
   ///
-  // Returns the subject of the X.509 certificate. For HTTPS server
-  // certificates this represents the web server.  The common name of the
-  // subject should match the host name of the web server.
+  /// Returns the subject of the X.509 certificate. For HTTPS server
+  /// certificates this represents the web server.  The common name of the
+  /// subject should match the host name of the web server.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefX509CertPrincipal> GetSubject() = 0;
 
   ///
-  // Returns the issuer of the X.509 certificate.
+  /// Returns the issuer of the X.509 certificate.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefX509CertPrincipal> GetIssuer() = 0;
 
   ///
-  // Returns the DER encoded serial number for the X.509 certificate. The value
-  // possibly includes a leading 00 byte.
+  /// Returns the DER encoded serial number for the X.509 certificate. The value
+  /// possibly includes a leading 00 byte.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetSerialNumber() = 0;
 
   ///
-  // Returns the date before which the X.509 certificate is invalid.
-  // CefTime.GetTimeT() will return 0 if no date was specified.
+  /// Returns the date before which the X.509 certificate is invalid.
+  /// CefBaseTime.GetTimeT() will return 0 if no date was specified.
   ///
   /*--cef()--*/
-  virtual CefTime GetValidStart() = 0;
+  virtual CefBaseTime GetValidStart() = 0;
 
   ///
-  // Returns the date after which the X.509 certificate is invalid.
-  // CefTime.GetTimeT() will return 0 if no date was specified.
+  /// Returns the date after which the X.509 certificate is invalid.
+  /// CefBaseTime.GetTimeT() will return 0 if no date was specified.
   ///
   /*--cef()--*/
-  virtual CefTime GetValidExpiry() = 0;
+  virtual CefBaseTime GetValidExpiry() = 0;
 
   ///
-  // Returns the DER encoded data for the X.509 certificate.
+  /// Returns the DER encoded data for the X.509 certificate.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetDEREncoded() = 0;
 
   ///
-  // Returns the PEM encoded data for the X.509 certificate.
+  /// Returns the PEM encoded data for the X.509 certificate.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBinaryValue> GetPEMEncoded() = 0;
 
   ///
-  // Returns the number of certificates in the issuer chain.
-  // If 0, the certificate is self-signed.
+  /// Returns the number of certificates in the issuer chain.
+  /// If 0, the certificate is self-signed.
   ///
   /*--cef()--*/
   virtual size_t GetIssuerChainSize() = 0;
 
   ///
-  // Returns the DER encoded data for the certificate issuer chain.
-  // If we failed to encode a certificate in the chain it is still
-  // present in the array but is an empty string.
+  /// Returns the DER encoded data for the certificate issuer chain.
+  /// If we failed to encode a certificate in the chain it is still
+  /// present in the array but is an empty string.
   ///
   /*--cef(count_func=chain:GetIssuerChainSize)--*/
   virtual void GetDEREncodedIssuerChain(IssuerChainBinaryList& chain) = 0;
 
   ///
-  // Returns the PEM encoded data for the certificate issuer chain.
-  // If we failed to encode a certificate in the chain it is still
-  // present in the array but is an empty string.
+  /// Returns the PEM encoded data for the certificate issuer chain.
+  /// If we failed to encode a certificate in the chain it is still
+  /// present in the array but is an empty string.
   ///
   /*--cef(count_func=chain:GetIssuerChainSize)--*/
   virtual void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) = 0;
diff --git a/src/include/cef_xml_reader.h b/src/include/cef_xml_reader.h
index 5269ef5ee..055d522d1 100644
--- a/src/include/cef_xml_reader.h
+++ b/src/include/cef_xml_reader.h
@@ -42,9 +42,9 @@
 #include "include/cef_stream.h"
 
 ///
-// Class that supports the reading of XML data via the libxml streaming API.
-// The methods of this class should only be called on the thread that creates
-// the object.
+/// Class that supports the reading of XML data via the libxml streaming API.
+/// The methods of this class should only be called on the thread that creates
+/// the object.
 ///
 /*--cef(source=library)--*/
 class CefXmlReader : public virtual CefBaseRefCounted {
@@ -53,8 +53,8 @@ class CefXmlReader : public virtual CefBaseRefCounted {
   typedef cef_xml_node_type_t NodeType;
 
   ///
-  // Create a new CefXmlReader object. The returned object's methods can only
-  // be called from the thread that created the object.
+  /// Create a new CefXmlReader object. The returned object's methods can only
+  /// be called from the thread that created the object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefXmlReader> Create(CefRefPtr<CefStreamReader> stream,
@@ -62,202 +62,202 @@ class CefXmlReader : public virtual CefBaseRefCounted {
                                         const CefString& URI);
 
   ///
-  // Moves the cursor to the next node in the document. This method must be
-  // called at least once to set the current cursor position. Returns true if
-  // the cursor position was set successfully.
+  /// Moves the cursor to the next node in the document. This method must be
+  /// called at least once to set the current cursor position. Returns true if
+  /// the cursor position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToNextNode() = 0;
 
   ///
-  // Close the document. This should be called directly to ensure that cleanup
-  // occurs on the correct thread.
+  /// Close the document. This should be called directly to ensure that cleanup
+  /// occurs on the correct thread.
   ///
   /*--cef()--*/
   virtual bool Close() = 0;
 
   ///
-  // Returns true if an error has been reported by the XML parser.
+  /// Returns true if an error has been reported by the XML parser.
   ///
   /*--cef()--*/
   virtual bool HasError() = 0;
 
   ///
-  // Returns the error string.
+  /// Returns the error string.
   ///
   /*--cef()--*/
   virtual CefString GetError() = 0;
 
-  // The below methods retrieve data for the node at the current cursor
-  // position.
+  /// The below methods retrieve data for the node at the current cursor
+  /// position.
 
   ///
-  // Returns the node type.
+  /// Returns the node type.
   ///
   /*--cef(default_retval=XML_NODE_UNSUPPORTED)--*/
   virtual NodeType GetType() = 0;
 
   ///
-  // Returns the node depth. Depth starts at 0 for the root node.
+  /// Returns the node depth. Depth starts at 0 for the root node.
   ///
   /*--cef()--*/
   virtual int GetDepth() = 0;
 
   ///
-  // Returns the local name. See
-  // http://www.w3.org/TR/REC-xml-names/#NT-LocalPart for additional details.
+  /// Returns the local name. See
+  /// http://www.w3.org/TR/REC-xml-names/#NT-LocalPart for additional details.
   ///
   /*--cef()--*/
   virtual CefString GetLocalName() = 0;
 
   ///
-  // Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for
-  // additional details.
+  /// Returns the namespace prefix. See http://www.w3.org/TR/REC-xml-names/ for
+  /// additional details.
   ///
   /*--cef()--*/
   virtual CefString GetPrefix() = 0;
 
   ///
-  // Returns the qualified name, equal to (Prefix:)LocalName. See
-  // http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details.
+  /// Returns the qualified name, equal to (Prefix:)LocalName. See
+  /// http://www.w3.org/TR/REC-xml-names/#ns-qualnames for additional details.
   ///
   /*--cef()--*/
   virtual CefString GetQualifiedName() = 0;
 
   ///
-  // Returns the URI defining the namespace associated with the node. See
-  // http://www.w3.org/TR/REC-xml-names/ for additional details.
+  /// Returns the URI defining the namespace associated with the node. See
+  /// http://www.w3.org/TR/REC-xml-names/ for additional details.
   ///
   /*--cef()--*/
   virtual CefString GetNamespaceURI() = 0;
 
   ///
-  // Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for
-  // additional details.
+  /// Returns the base URI of the node. See http://www.w3.org/TR/xmlbase/ for
+  /// additional details.
   ///
   /*--cef()--*/
   virtual CefString GetBaseURI() = 0;
 
   ///
-  // Returns the xml:lang scope within which the node resides. See
-  // http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details.
+  /// Returns the xml:lang scope within which the node resides. See
+  /// http://www.w3.org/TR/REC-xml/#sec-lang-tag for additional details.
   ///
   /*--cef()--*/
   virtual CefString GetXmlLang() = 0;
 
   ///
-  // Returns true if the node represents an empty element. <a/> is considered
-  // empty but <a></a> is not.
+  /// Returns true if the node represents an empty element. "<a/>" is considered
+  /// empty but "<a></a>" is not.
   ///
   /*--cef()--*/
   virtual bool IsEmptyElement() = 0;
 
   ///
-  // Returns true if the node has a text value.
+  /// Returns true if the node has a text value.
   ///
   /*--cef()--*/
   virtual bool HasValue() = 0;
 
   ///
-  // Returns the text value.
+  /// Returns the text value.
   ///
   /*--cef()--*/
   virtual CefString GetValue() = 0;
 
   ///
-  // Returns true if the node has attributes.
+  /// Returns true if the node has attributes.
   ///
   /*--cef()--*/
   virtual bool HasAttributes() = 0;
 
   ///
-  // Returns the number of attributes.
+  /// Returns the number of attributes.
   ///
   /*--cef()--*/
   virtual size_t GetAttributeCount() = 0;
 
   ///
-  // Returns the value of the attribute at the specified 0-based index.
+  /// Returns the value of the attribute at the specified 0-based index.
   ///
   /*--cef(capi_name=get_attribute_byindex,index_param=index)--*/
   virtual CefString GetAttribute(int index) = 0;
 
   ///
-  // Returns the value of the attribute with the specified qualified name.
+  /// Returns the value of the attribute with the specified qualified name.
   ///
   /*--cef(capi_name=get_attribute_byqname)--*/
   virtual CefString GetAttribute(const CefString& qualifiedName) = 0;
 
   ///
-  // Returns the value of the attribute with the specified local name and
-  // namespace URI.
+  /// Returns the value of the attribute with the specified local name and
+  /// namespace URI.
   ///
   /*--cef(capi_name=get_attribute_bylname)--*/
   virtual CefString GetAttribute(const CefString& localName,
                                  const CefString& namespaceURI) = 0;
 
   ///
-  // Returns an XML representation of the current node's children.
+  /// Returns an XML representation of the current node's children.
   ///
   /*--cef()--*/
   virtual CefString GetInnerXml() = 0;
 
   ///
-  // Returns an XML representation of the current node including its children.
+  /// Returns an XML representation of the current node including its children.
   ///
   /*--cef()--*/
   virtual CefString GetOuterXml() = 0;
 
   ///
-  // Returns the line number for the current node.
+  /// Returns the line number for the current node.
   ///
   /*--cef()--*/
   virtual int GetLineNumber() = 0;
 
-  // Attribute nodes are not traversed by default. The below methods can be
-  // used to move the cursor to an attribute node. MoveToCarryingElement() can
-  // be called afterwards to return the cursor to the carrying element. The
-  // depth of an attribute node will be 1 + the depth of the carrying element.
+  /// Attribute nodes are not traversed by default. The below methods can be
+  /// used to move the cursor to an attribute node. MoveToCarryingElement() can
+  /// be called afterwards to return the cursor to the carrying element. The
+  /// depth of an attribute node will be 1 + the depth of the carrying element.
 
   ///
-  // Moves the cursor to the attribute at the specified 0-based index. Returns
-  // true if the cursor position was set successfully.
+  /// Moves the cursor to the attribute at the specified 0-based index. Returns
+  /// true if the cursor position was set successfully.
   ///
   /*--cef(capi_name=move_to_attribute_byindex,index_param=index)--*/
   virtual bool MoveToAttribute(int index) = 0;
 
   ///
-  // Moves the cursor to the attribute with the specified qualified name.
-  // Returns true if the cursor position was set successfully.
+  /// Moves the cursor to the attribute with the specified qualified name.
+  /// Returns true if the cursor position was set successfully.
   ///
   /*--cef(capi_name=move_to_attribute_byqname)--*/
   virtual bool MoveToAttribute(const CefString& qualifiedName) = 0;
 
   ///
-  // Moves the cursor to the attribute with the specified local name and
-  // namespace URI. Returns true if the cursor position was set successfully.
+  /// Moves the cursor to the attribute with the specified local name and
+  /// namespace URI. Returns true if the cursor position was set successfully.
   ///
   /*--cef(capi_name=move_to_attribute_bylname)--*/
   virtual bool MoveToAttribute(const CefString& localName,
                                const CefString& namespaceURI) = 0;
 
   ///
-  // Moves the cursor to the first attribute in the current element. Returns
-  // true if the cursor position was set successfully.
+  /// Moves the cursor to the first attribute in the current element. Returns
+  /// true if the cursor position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToFirstAttribute() = 0;
 
   ///
-  // Moves the cursor to the next attribute in the current element. Returns
-  // true if the cursor position was set successfully.
+  /// Moves the cursor to the next attribute in the current element. Returns
+  /// true if the cursor position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToNextAttribute() = 0;
 
   ///
-  // Moves the cursor back to the carrying element. Returns true if the cursor
-  // position was set successfully.
+  /// Moves the cursor back to the carrying element. Returns true if the cursor
+  /// position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToCarryingElement() = 0;
diff --git a/src/include/cef_zip_reader.h b/src/include/cef_zip_reader.h
index 5dc2efd60..9aa5e9b0c 100644
--- a/src/include/cef_zip_reader.h
+++ b/src/include/cef_zip_reader.h
@@ -41,97 +41,97 @@
 #include "include/cef_stream.h"
 
 ///
-// Class that supports the reading of zip archives via the zlib unzip API.
-// The methods of this class should only be called on the thread that creates
-// the object.
+/// Class that supports the reading of zip archives via the zlib unzip API.
+/// The methods of this class should only be called on the thread that creates
+/// the object.
 ///
 /*--cef(source=library)--*/
 class CefZipReader : public virtual CefBaseRefCounted {
  public:
   ///
-  // Create a new CefZipReader object. The returned object's methods can only
-  // be called from the thread that created the object.
+  /// Create a new CefZipReader object. The returned object's methods can only
+  /// be called from the thread that created the object.
   ///
   /*--cef()--*/
   static CefRefPtr<CefZipReader> Create(CefRefPtr<CefStreamReader> stream);
 
   ///
-  // Moves the cursor to the first file in the archive. Returns true if the
-  // cursor position was set successfully.
+  /// Moves the cursor to the first file in the archive. Returns true if the
+  /// cursor position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToFirstFile() = 0;
 
   ///
-  // Moves the cursor to the next file in the archive. Returns true if the
-  // cursor position was set successfully.
+  /// Moves the cursor to the next file in the archive. Returns true if the
+  /// cursor position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToNextFile() = 0;
 
   ///
-  // Moves the cursor to the specified file in the archive. If |caseSensitive|
-  // is true then the search will be case sensitive. Returns true if the cursor
-  // position was set successfully.
+  /// Moves the cursor to the specified file in the archive. If |caseSensitive|
+  /// is true then the search will be case sensitive. Returns true if the cursor
+  /// position was set successfully.
   ///
   /*--cef()--*/
   virtual bool MoveToFile(const CefString& fileName, bool caseSensitive) = 0;
 
   ///
-  // Closes the archive. This should be called directly to ensure that cleanup
-  // occurs on the correct thread.
+  /// Closes the archive. This should be called directly to ensure that cleanup
+  /// occurs on the correct thread.
   ///
   /*--cef()--*/
   virtual bool Close() = 0;
 
-  // The below methods act on the file at the current cursor position.
+  /// The below methods act on the file at the current cursor position.
 
   ///
-  // Returns the name of the file.
+  /// Returns the name of the file.
   ///
   /*--cef()--*/
   virtual CefString GetFileName() = 0;
 
   ///
-  // Returns the uncompressed size of the file.
+  /// Returns the uncompressed size of the file.
   ///
   /*--cef()--*/
-  virtual int64 GetFileSize() = 0;
+  virtual int64_t GetFileSize() = 0;
 
   ///
-  // Returns the last modified timestamp for the file.
+  /// Returns the last modified timestamp for the file.
   ///
   /*--cef()--*/
-  virtual CefTime GetFileLastModified() = 0;
+  virtual CefBaseTime GetFileLastModified() = 0;
 
   ///
-  // Opens the file for reading of uncompressed data. A read password may
-  // optionally be specified.
+  /// Opens the file for reading of uncompressed data. A read password may
+  /// optionally be specified.
   ///
   /*--cef(optional_param=password)--*/
   virtual bool OpenFile(const CefString& password) = 0;
 
   ///
-  // Closes the file.
+  /// Closes the file.
   ///
   /*--cef()--*/
   virtual bool CloseFile() = 0;
 
   ///
-  // Read uncompressed file contents into the specified buffer. Returns < 0 if
-  // an error occurred, 0 if at the end of file, or the number of bytes read.
+  /// Read uncompressed file contents into the specified buffer. Returns < 0 if
+  /// an error occurred, 0 if at the end of file, or the number of bytes read.
   ///
   /*--cef()--*/
   virtual int ReadFile(void* buffer, size_t bufferSize) = 0;
 
   ///
-  // Returns the current offset in the uncompressed file contents.
+  /// Returns the current offset in the uncompressed file contents.
   ///
   /*--cef()--*/
-  virtual int64 Tell() = 0;
+  virtual int64_t Tell() = 0;
 
   ///
-  // Returns true if at end of the file contents.
+  /// Returns true if at end of the file contents.
   ///
   /*--cef()--*/
   virtual bool Eof() = 0;
diff --git a/src/include/internal/cef_app_win.h b/src/include/internal/cef_app_win.h
new file mode 100644
index 000000000..a28d90596
--- /dev/null
+++ b/src/include/internal/cef_app_win.h
@@ -0,0 +1,100 @@
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_INTERNAL_CEF_APP_WIN_H_
+#define CEF_INCLUDE_INTERNAL_CEF_APP_WIN_H_
+#pragma once
+
+#include "include/base/cef_build.h"
+
+#if defined(OS_WIN)
+
+#if defined(ARCH_CPU_32_BITS)
+#include <windows.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(ARCH_CPU_32_BITS)
+typedef int(APIENTRY* wWinMainPtr)(HINSTANCE hInstance,
+                                   HINSTANCE hPrevInstance,
+                                   LPWSTR lpCmdLine,
+                                   int nCmdShow);
+typedef int (*mainPtr)(int argc, char* argv[]);
+
+///
+/// Run the main thread on 32-bit Windows using a fiber with the preferred 4MiB
+/// stack size. This function must be called at the top of the executable entry
+/// point function (`main()` or `wWinMain()`). It is used in combination with
+/// the initial stack size of 0.5MiB configured via the `/STACK:0x80000` linker
+/// flag on executable targets. This saves significant memory on threads (like
+/// those in the Windows thread pool, and others) whose stack size can only be
+/// controlled via the linker flag.
+///
+/// CEF's main thread needs at least a 1.5 MiB stack size in order to avoid
+/// stack overflow crashes. However, if this is set in the PE file then other
+/// threads get this size as well, leading to address-space exhaustion in 32-bit
+/// CEF. This function uses fibers to switch the main thread to a 4 MiB stack
+/// (roughly the same effective size as the 64-bit build's 8 MiB stack) before
+/// running any other code.
+///
+/// Choose the function variant that matches the entry point function type used
+/// by the executable. Reusing the entry point minimizes confusion when
+/// examining call stacks in crash reports.
+///
+/// If this function is already running on the fiber it will return -1
+/// immediately, meaning that execution should proceed with the remainder of the
+/// entry point function. Otherwise, this function will block until the entry
+/// point function has completed execution on the fiber and then return a result
+/// >= 0, meaning that the entry point function should return the result
+/// immediately without proceeding with execution.
+///
+CEF_EXPORT int cef_run_winmain_with_preferred_stack_size(wWinMainPtr wWinMain,
+                                                         HINSTANCE hInstance,
+                                                         LPWSTR lpCmdLine,
+                                                         int nCmdShow);
+CEF_EXPORT int cef_run_main_with_preferred_stack_size(mainPtr main,
+                                                      int argc,
+                                                      char* argv[]);
+#endif  // defined(ARCH_CPU_32_BITS)
+
+///
+/// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a
+/// modal message loop. Set to false (0) after exiting the modal message loop.
+///
+CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // defined(OS_WIN)
+#endif  // CEF_INCLUDE_INTERNAL_CEF_APP_WIN_H_
diff --git a/src/include/internal/cef_linux.h b/src/include/internal/cef_linux.h
index ecf74e0f5..cebd7f6cd 100644
--- a/src/include/internal/cef_linux.h
+++ b/src/include/internal/cef_linux.h
@@ -39,54 +39,43 @@
 #define CefEventHandle cef_event_handle_t
 #define CefWindowHandle cef_window_handle_t
 
-struct CefMainArgsTraits {
-  typedef cef_main_args_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->argc = src->argc;
-    target->argv = src->argv;
-  }
-};
-
-// Class representing CefExecuteProcess arguments.
-class CefMainArgs : public CefStructBase<CefMainArgsTraits> {
+///
+/// Class representing CefExecuteProcess arguments.
+///
+class CefMainArgs : public cef_main_args_t {
  public:
-  typedef CefStructBase<CefMainArgsTraits> parent;
-
-  CefMainArgs() : parent() {}
-  explicit CefMainArgs(const cef_main_args_t& r) : parent(r) {}
-  explicit CefMainArgs(const CefMainArgs& r) : parent(r) {}
-  CefMainArgs(int argc_arg, char** argv_arg) : parent() {
-    argc = argc_arg;
-    argv = argv_arg;
-  }
+  CefMainArgs() : cef_main_args_t{} {}
+  CefMainArgs(const cef_main_args_t& r) : cef_main_args_t(r) {}
+  CefMainArgs(int argc_arg, char** argv_arg)
+      : cef_main_args_t{argc_arg, argv_arg} {}
 };
 
 struct CefWindowInfoTraits {
   typedef cef_window_info_t struct_type;
 
   static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
+
+  static inline void clear(struct_type* s) {
+    cef_string_clear(&s->window_name);
+  }
 
   static inline void set(const struct_type* src,
                          struct_type* target,
                          bool copy) {
-    target->x = src->x;
-    target->y = src->y;
-    target->width = src->width;
-    target->height = src->height;
+    cef_string_set(src->window_name.str, src->window_name.length,
+                   &target->window_name, copy);
+    target->bounds = src->bounds;
     target->parent_window = src->parent_window;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
+    target->shared_texture_enabled = src->shared_texture_enabled;
+    target->external_begin_frame_enabled = src->external_begin_frame_enabled;
     target->window = src->window;
   }
 };
 
-// Class representing window information.
+///
+/// Class representing window information.
+///
 class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
  public:
   typedef CefStructBase<CefWindowInfoTraits> parent;
@@ -95,28 +84,28 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {}
   explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {}
 
+  CefWindowInfo& operator=(const CefWindowInfo&) = default;
+  CefWindowInfo& operator=(CefWindowInfo&&) = default;
+
   ///
-  // Create the browser as a child window.
+  /// Create the browser as a child window.
   ///
-  void SetAsChild(CefWindowHandle parent, const CefRect& windowRect) {
+  void SetAsChild(CefWindowHandle parent, const CefRect& bounds) {
     parent_window = parent;
-    x = windowRect.x;
-    y = windowRect.y;
-    width = windowRect.width;
-    height = windowRect.height;
+    this->bounds = bounds;
   }
 
   ///
-  // Create the browser using windowless (off-screen) rendering. No window
-  // will be created for the browser and all rendering will occur via the
-  // CefRenderHandler interface. The |parent| value will be used to identify
-  // monitor info and to act as the parent window for dialogs, context menus,
-  // etc. If |parent| is not provided then the main screen monitor will be used
-  // and some functionality that requires a parent window may not function
-  // correctly. In order to create windowless browsers the
-  // CefSettings.windowless_rendering_enabled value must be set to true.
-  // Transparent painting is enabled by default but can be disabled by setting
-  // CefBrowserSettings.background_color to an opaque value.
+  /// Create the browser using windowless (off-screen) rendering. No window
+  /// will be created for the browser and all rendering will occur via the
+  /// CefRenderHandler interface. The |parent| value will be used to identify
+  /// monitor info and to act as the parent window for dialogs, context menus,
+  /// etc. If |parent| is not provided then the main screen monitor will be used
+  /// and some functionality that requires a parent window may not function
+  /// correctly. In order to create windowless browsers the
+  /// CefSettings.windowless_rendering_enabled value must be set to true.
+  /// Transparent painting is enabled by default but can be disabled by setting
+  /// CefBrowserSettings.background_color to an opaque value.
   ///
   void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = true;
diff --git a/src/include/internal/cef_logging_internal.h b/src/include/internal/cef_logging_internal.h
index 598263d16..d29cfc861 100644
--- a/src/include/internal/cef_logging_internal.h
+++ b/src/include/internal/cef_logging_internal.h
@@ -42,19 +42,19 @@ extern "C" {
 // See include/base/cef_logging.h for macros and intended usage.
 
 ///
-// Gets the current log level.
+/// Gets the current log level.
 ///
-CEF_EXPORT int cef_get_min_log_level();
+CEF_EXPORT int cef_get_min_log_level(void);
 
 ///
-// Gets the current vlog level for the given file (usually taken from
-// __FILE__). Note that |N| is the size *with* the null terminator.
+/// Gets the current vlog level for the given file (usually taken from
+/// __FILE__). Note that |N| is the size *with* the null terminator.
 ///
 CEF_EXPORT int cef_get_vlog_level(const char* file_start, size_t N);
 
 ///
-// Add a log message. See the LogSeverity defines for supported |severity|
-// values.
+/// Add a log message. See the LogSeverity defines for supported |severity|
+/// values.
 ///
 CEF_EXPORT void cef_log(const char* file,
                         int line,
diff --git a/src/include/internal/cef_mac.h b/src/include/internal/cef_mac.h
index 689d88cd8..983eda8cf 100644
--- a/src/include/internal/cef_mac.h
+++ b/src/include/internal/cef_mac.h
@@ -39,32 +39,15 @@
 #define CefEventHandle cef_event_handle_t
 #define CefWindowHandle cef_window_handle_t
 
-struct CefMainArgsTraits {
-  typedef cef_main_args_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->argc = src->argc;
-    target->argv = src->argv;
-  }
-};
-
-// Class representing CefExecuteProcess arguments.
-class CefMainArgs : public CefStructBase<CefMainArgsTraits> {
+///
+/// Class representing CefExecuteProcess arguments.
+///
+class CefMainArgs : public cef_main_args_t {
  public:
-  typedef CefStructBase<CefMainArgsTraits> parent;
-
-  CefMainArgs() : parent() {}
-  explicit CefMainArgs(const cef_main_args_t& r) : parent(r) {}
-  explicit CefMainArgs(const CefMainArgs& r) : parent(r) {}
-  CefMainArgs(int argc, char** argv) : parent() {
-    this->argc = argc;
-    this->argv = argv;
-  }
+  CefMainArgs() : cef_main_args_t{} {}
+  CefMainArgs(const cef_main_args_t& r) : cef_main_args_t(r) {}
+  CefMainArgs(int argc_arg, char** argv_arg)
+      : cef_main_args_t{argc_arg, argv_arg} {}
 };
 
 struct CefWindowInfoTraits {
@@ -81,18 +64,19 @@ struct CefWindowInfoTraits {
                          bool copy) {
     cef_string_set(src->window_name.str, src->window_name.length,
                    &target->window_name, copy);
-    target->x = src->x;
-    target->y = src->y;
-    target->width = src->width;
-    target->height = src->height;
+    target->bounds = src->bounds;
     target->hidden = src->hidden;
     target->parent_view = src->parent_view;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
+    target->shared_texture_enabled = src->shared_texture_enabled;
+    target->external_begin_frame_enabled = src->external_begin_frame_enabled;
     target->view = src->view;
   }
 };
 
-// Class representing window information.
+///
+/// Class representing window information.
+///
 class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
  public:
   typedef CefStructBase<CefWindowInfoTraits> parent;
@@ -101,29 +85,29 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {}
   explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {}
 
+  CefWindowInfo& operator=(const CefWindowInfo&) = default;
+  CefWindowInfo& operator=(CefWindowInfo&&) = default;
+
   ///
-  // Create the browser as a child view.
+  /// Create the browser as a child view.
   ///
-  void SetAsChild(CefWindowHandle parent, int x, int y, int width, int height) {
+  void SetAsChild(CefWindowHandle parent, const CefRect& bounds) {
     parent_view = parent;
-    this->x = x;
-    this->y = y;
-    this->width = width;
-    this->height = height;
+    this->bounds = bounds;
     hidden = false;
   }
 
   ///
-  // Create the browser using windowless (off-screen) rendering. No view
-  // will be created for the browser and all rendering will occur via the
-  // CefRenderHandler interface. The |parent| value will be used to identify
-  // monitor info and to act as the parent view for dialogs, context menus,
-  // etc. If |parent| is not provided then the main screen monitor will be used
-  // and some functionality that requires a parent view may not function
-  // correctly. In order to create windowless browsers the
-  // CefSettings.windowless_rendering_enabled value must be set to true.
-  // Transparent painting is enabled by default but can be disabled by setting
-  // CefBrowserSettings.background_color to an opaque value.
+  /// Create the browser using windowless (off-screen) rendering. No view
+  /// will be created for the browser and all rendering will occur via the
+  /// CefRenderHandler interface. The |parent| value will be used to identify
+  /// monitor info and to act as the parent view for dialogs, context menus,
+  /// etc. If |parent| is not provided then the main screen monitor will be used
+  /// and some functionality that requires a parent view may not function
+  /// correctly. In order to create windowless browsers the
+  /// CefSettings.windowless_rendering_enabled value must be set to true.
+  /// Transparent painting is enabled by default but can be disabled by setting
+  /// CefBrowserSettings.background_color to an opaque value.
   ///
   void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = true;
diff --git a/src/include/internal/cef_ptr.h b/src/include/internal/cef_ptr.h
index 044c73310..855ade531 100644
--- a/src/include/internal/cef_ptr.h
+++ b/src/include/internal/cef_ptr.h
@@ -31,200 +31,146 @@
 #define CEF_INCLUDE_INTERNAL_CEF_PTR_H_
 #pragma once
 
+#include <memory>
+
 #include "include/base/cef_build.h"
 #include "include/base/cef_ref_counted.h"
 
-#if defined(USING_CHROMIUM_INCLUDES)
-#include <memory>  // For std::unique_ptr.
-#else
-#include "include/base/cef_scoped_ptr.h"
-#endif
-
 ///
-// Smart pointer implementation that is an alias of scoped_refptr from
-// include/base/cef_ref_counted.h.
-// <p>
-// A smart pointer class for reference counted objects.  Use this class instead
-// of calling AddRef and Release manually on a reference counted object to
-// avoid common memory leaks caused by forgetting to Release an object
-// reference.  Sample usage:
-// <pre>
-//   class MyFoo : public CefBaseRefCounted {
-//    ...
-//   };
-//
-//   void some_function() {
-//     // The MyFoo object that |foo| represents starts with a single
-//     // reference.
-//     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
-//     foo-&gt;Method(param);
-//     // |foo| is released when this function returns
-//   }
-//
-//   void some_other_function() {
-//     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
-//     ...
-//     foo = NULL;  // explicitly releases |foo|
-//     ...
-//     if (foo)
-//       foo-&gt;Method(param);
-//   }
-// </pre>
-// The above examples show how CefRefPtr&lt;T&gt; acts like a pointer to T.
-// Given two CefRefPtr&lt;T&gt; classes, it is also possible to exchange
-// references between the two objects, like so:
-// <pre>
-//   {
-//     CefRefPtr&lt;MyFoo&gt; a = new MyFoo();
-//     CefRefPtr&lt;MyFoo&gt; b;
-//
-//     b.swap(a);
-//     // now, |b| references the MyFoo object, and |a| references NULL.
-//   }
-// </pre>
-// To make both |a| and |b| in the above example reference the same MyFoo
-// object, simply use the assignment operator:
-// <pre>
-//   {
-//     CefRefPtr&lt;MyFoo&gt; a = new MyFoo();
-//     CefRefPtr&lt;MyFoo&gt; b;
-//
-//     b = a;
-//     // now, |a| and |b| each own a reference to the same MyFoo object.
-//     // the reference count of the underlying MyFoo object will be 2.
-//   }
-// </pre>
-// Reference counted objects can also be passed as function parameters and
-// used as function return values:
-// <pre>
-//   void some_func_with_param(CefRefPtr&lt;MyFoo&gt; param) {
-//     // A reference is added to the MyFoo object that |param| represents
-//     // during the scope of some_func_with_param() and released when
-//     // some_func_with_param() goes out of scope.
-//   }
-//
-//   CefRefPtr&lt;MyFoo&gt; some_func_with_retval() {
-//     // The MyFoo object that |foox| represents starts with a single
-//     // reference.
-//     CefRefPtr&lt;MyFoo&gt; foox = new MyFoo();
-//
-//     // Creating the return value adds an additional reference.
-//     return foox;
-//
-//     // When some_func_with_retval() goes out of scope the original |foox|
-//     // reference is released.
-//   }
-//
-//   void and_another_function() {
-//     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
-//
-//     // pass |foo| as a parameter.
-//     some_function(foo);
-//
-//     CefRefPtr&lt;MyFoo&gt; foo2 = some_func_with_retval();
-//     // Now, since we kept a reference to the some_func_with_retval() return
-//     // value, |foo2| is the only class pointing to the MyFoo object created
-//     in some_func_with_retval(), and it has a reference count of 1.
-//
-//     some_func_with_retval();
-//     // Now, since we didn't keep a reference to the some_func_with_retval()
-//     // return value, the MyFoo object created in some_func_with_retval()
-//     // will automatically be released.
-//   }
-// </pre>
-// And in standard containers:
-// <pre>
-//   {
-//      // Create a vector that holds MyFoo objects.
-//      std::vector&lt;CefRefPtr&lt;MyFoo&gt; &gt; MyFooVec;
-//
-//     // The MyFoo object that |foo| represents starts with a single
-//     // reference.
-//     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
-//
-//     // When the MyFoo object is added to |MyFooVec| the reference count
-//     // is increased to 2.
-//     MyFooVec.push_back(foo);
-//   }
-// </pre>
-// </p>
-///
-#if defined(HAS_CPP11_TEMPLATE_ALIAS_SUPPORT)
+/// Smart pointer implementation that is an alias of scoped_refptr from
+/// include/base/cef_ref_counted.h.
+///
+/// A smart pointer class for reference counted objects.  Use this class instead
+/// of calling AddRef and Release manually on a reference counted object to
+/// avoid common memory leaks caused by forgetting to Release an object
+/// reference.  Sample usage:
+///
+/// <pre>
+///   class MyFoo : public CefBaseRefCounted {
+///     ...
+///   };
+///
+///   void some_function() {
+///     // The MyFoo object that |foo| represents starts with a single
+///     // reference.
+///     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
+///     foo-&gt;Method(param);
+///     // |foo| is released when this function returns
+///   }
+///
+///   void some_other_function() {
+///     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
+///     ...
+///     foo = NULL;  /// explicitly releases |foo|
+///     ...
+///     if (foo)
+///       foo-&gt;Method(param);
+///   }
+/// </pre>
+///
+/// The above examples show how CefRefPtr&lt;T&gt; acts like a pointer to T.
+/// Given two CefRefPtr&lt;T&gt; classes, it is also possible to exchange
+/// references between the two objects, like so:
+///
+/// <pre>
+///   {
+///     CefRefPtr&lt;MyFoo&gt; a = new MyFoo();
+///     CefRefPtr&lt;MyFoo&gt; b;
+///
+///     b.swap(a);
+///     // now, |b| references the MyFoo object, and |a| references NULL.
+///   }
+/// </pre>
+///
+/// To make both |a| and |b| in the above example reference the same MyFoo
+/// object, simply use the assignment operator:
+///
+/// <pre>
+///   {
+///     CefRefPtr&lt;MyFoo&gt; a = new MyFoo();
+///     CefRefPtr&lt;MyFoo&gt; b;
+///
+///     b = a;
+///     // now, |a| and |b| each own a reference to the same MyFoo object.
+///     // the reference count of the underlying MyFoo object will be 2.
+///   }
+/// </pre>
+///
+/// Reference counted objects can also be passed as function parameters and
+/// used as function return values:
+///
+/// <pre>
+///   void some_func_with_param(CefRefPtr&lt;MyFoo&gt; param) {
+///     // A reference is added to the MyFoo object that |param| represents
+///     // during the scope of some_func_with_param() and released when
+///     // some_func_with_param() goes out of scope.
+///   }
+///
+///   CefRefPtr&lt;MyFoo&gt; some_func_with_retval() {
+///     // The MyFoo object that |foox| represents starts with a single
+///     // reference.
+///     CefRefPtr&lt;MyFoo&gt; foox = new MyFoo();
+///
+///     // Creating the return value adds an additional reference.
+///     return foox;
+///
+///     // When some_func_with_retval() goes out of scope the original |foox|
+///     // reference is released.
+///   }
+///
+///   void and_another_function() {
+///     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
+///
+///     // pass |foo| as a parameter.
+///     some_function(foo);
+///
+///     CefRefPtr&lt;MyFoo&gt; foo2 = some_func_with_retval();
+///     // Now, since we kept a reference to the some_func_with_retval() return
+///     // value, |foo2| is the only class pointing to the MyFoo object created
+///     in some_func_with_retval(), and it has a reference count of 1.
+///
+///     some_func_with_retval();
+///     // Now, since we didn't keep a reference to the some_func_with_retval()
+///     // return value, the MyFoo object created in some_func_with_retval()
+///     // will automatically be released.
+///   }
+/// </pre>
+///
+/// And in standard containers:
+///
+/// <pre>
+///   {
+///     // Create a vector that holds MyFoo objects.
+///     std::vector&lt;CefRefPtr&lt;MyFoo&gt; &gt; MyFooVec;
+///
+///     // The MyFoo object that |foo| represents starts with a single
+///     // reference.
+///     CefRefPtr&lt;MyFoo&gt; foo = new MyFoo();
+///
+///     // When the MyFoo object is added to |MyFooVec| the reference count
+///     // is increased to 2.
+///     MyFooVec.push_back(foo);
+///   }
+/// </pre>
+///
 template <class T>
 using CefRefPtr = scoped_refptr<T>;
-#else
-// When template aliases are not supported use a define instead of subclassing
-// because it's otherwise hard to get the constructors to behave correctly.
-#define CefRefPtr scoped_refptr
-#endif
 
 ///
-// A CefOwnPtr<T> is like a T*, except that the destructor of CefOwnPtr<T>
-// automatically deletes the pointer it holds (if any). That is, CefOwnPtr<T>
-// owns the T object that it points to. Like a T*, a CefOwnPtr<T> may hold
-// either NULL or a pointer to a T object. Also like T*, CefOwnPtr<T> is
-// thread-compatible, and once you dereference it, you get the thread safety
-// guarantees of T.
+/// A CefOwnPtr<T> is like a T*, except that the destructor of CefOwnPtr<T>
+/// automatically deletes the pointer it holds (if any). That is, CefOwnPtr<T>
+/// owns the T object that it points to. Like a T*, a CefOwnPtr<T> may hold
+/// either NULL or a pointer to a T object. Also like T*, CefOwnPtr<T> is
+/// thread-compatible, and once you dereference it, you get the thread safety
+/// guarantees of T.
 ///
-#if defined(USING_CHROMIUM_INCLUDES)
-// Implementation-side code uses std::unique_ptr instead of scoped_ptr.
 template <class T, class D = std::default_delete<T>>
 using CefOwnPtr = std::unique_ptr<T, D>;
-#elif defined(HAS_CPP11_TEMPLATE_ALIAS_SUPPORT)
-template <class T, class D = base::DefaultDeleter<T>>
-using CefOwnPtr = scoped_ptr<T, D>;
-#else
-// When template aliases are not supported use a define instead of subclassing
-// because it's otherwise hard to get the constructors to behave correctly.
-#define CefOwnPtr scoped_ptr
-#endif
 
 ///
-// A CefRawPtr<T> is the same as T*
+/// A CefRawPtr<T> is the same as T*
 ///
-#if defined(HAS_CPP11_TEMPLATE_ALIAS_SUPPORT)
-#define CEF_RAW_PTR_GET(r) r
 template <class T>
 using CefRawPtr = T*;
-#else
-// Simple wrapper implementation that behaves as much like T* as possible.
-// CEF_RAW_PTR_GET is required for VS2008 compatibility (Issue #2155).
-#define CEF_RAW_PTR_GET(r) r.get()
-template <class T>
-class CefRawPtr {
- public:
-  CefRawPtr() : ptr_(nullptr) {}
-  CefRawPtr(T* p) : ptr_(p) {}
-  CefRawPtr(const CefRawPtr& r) : ptr_(r.ptr_) {}
-
-  template <typename U>
-  CefRawPtr(const CefRawPtr<U>& r) : ptr_(r.get()) {}
-
-  T* get() const { return ptr_; }
-
-  // Allow CefRawPtr to be used in boolean expression and comparison operations.
-  operator T*() const { return ptr_; }
-
-  T* operator->() const {
-    assert(ptr_ != NULL);
-    return ptr_;
-  }
-
-  CefRawPtr<T>& operator=(T* p) {
-    ptr_ = p;
-    return *this;
-  }
-
-  CefRawPtr<T>& operator=(const CefRawPtr<T>& r) { return *this = r.ptr_; }
-
-  template <typename U>
-  CefRawPtr<T>& operator=(const CefRawPtr<U>& r) {
-    return *this = r.get();
-  }
-
- private:
-  T* ptr_;
-};
-#endif
 
 #endif  // CEF_INCLUDE_INTERNAL_CEF_PTR_H_
diff --git a/src/include/internal/cef_string.h b/src/include/internal/cef_string.h
index 77c8ca3db..20df91a1f 100644
--- a/src/include/internal/cef_string.h
+++ b/src/include/internal/cef_string.h
@@ -74,7 +74,7 @@ typedef cef_string_userfree_utf8_t cef_string_userfree_t;
 #define cef_string_to_wide cef_string_utf8_to_wide
 #define cef_string_from_wide cef_string_wide_to_utf8
 #elif defined(CEF_STRING_TYPE_UTF16)
-typedef char16 cef_char_t;
+typedef char16_t cef_char_t;
 typedef cef_string_userfree_utf16_t cef_string_userfree_t;
 typedef cef_string_utf16_t cef_string_t;
 #define cef_string_set cef_string_utf16_set
diff --git a/src/include/internal/cef_string_list.h b/src/include/internal/cef_string_list.h
index b44bac719..e8339bdbc 100644
--- a/src/include/internal/cef_string_list.h
+++ b/src/include/internal/cef_string_list.h
@@ -39,46 +39,46 @@ extern "C" {
 #endif
 
 ///
-// CEF string maps are a set of key/value string pairs.
+/// CEF string maps are a set of key/value string pairs.
 ///
-typedef void* cef_string_list_t;
+typedef struct _cef_string_list_t* cef_string_list_t;
 
 ///
-// Allocate a new string map.
+/// Allocate a new string map.
 ///
-CEF_EXPORT cef_string_list_t cef_string_list_alloc();
+CEF_EXPORT cef_string_list_t cef_string_list_alloc(void);
 
 ///
-// Return the number of elements in the string list.
+/// Return the number of elements in the string list.
 ///
 CEF_EXPORT size_t cef_string_list_size(cef_string_list_t list);
 
 ///
-// Retrieve the value at the specified zero-based string list index. Returns
-// true (1) if the value was successfully retrieved.
+/// Retrieve the value at the specified zero-based string list index. Returns
+/// true (1) if the value was successfully retrieved.
 ///
 CEF_EXPORT int cef_string_list_value(cef_string_list_t list,
                                      size_t index,
                                      cef_string_t* value);
 
 ///
-// Append a new value at the end of the string list.
+/// Append a new value at the end of the string list.
 ///
 CEF_EXPORT void cef_string_list_append(cef_string_list_t list,
                                        const cef_string_t* value);
 
 ///
-// Clear the string list.
+/// Clear the string list.
 ///
 CEF_EXPORT void cef_string_list_clear(cef_string_list_t list);
 
 ///
-// Free the string list.
+/// Free the string list.
 ///
 CEF_EXPORT void cef_string_list_free(cef_string_list_t list);
 
 ///
-// Creates a copy of an existing string list.
+/// Creates a copy of an existing string list.
 ///
 CEF_EXPORT cef_string_list_t cef_string_list_copy(cef_string_list_t list);
 
diff --git a/src/include/internal/cef_string_map.h b/src/include/internal/cef_string_map.h
index 0f3342575..031a6bf10 100644
--- a/src/include/internal/cef_string_map.h
+++ b/src/include/internal/cef_string_map.h
@@ -39,55 +39,56 @@ extern "C" {
 #endif
 
 ///
-// CEF string maps are a set of key/value string pairs.
+/// CEF string maps are a set of key/value string pairs.
 ///
-typedef void* cef_string_map_t;
+typedef struct _cef_string_map_t* cef_string_map_t;
 
 ///
-// Allocate a new string map.
+/// Allocate a new string map.
 ///
-CEF_EXPORT cef_string_map_t cef_string_map_alloc();
+CEF_EXPORT cef_string_map_t cef_string_map_alloc(void);
 
 ///
-// Return the number of elements in the string map.
+/// Return the number of elements in the string map.
 ///
 CEF_EXPORT size_t cef_string_map_size(cef_string_map_t map);
 
 ///
-// Return the value assigned to the specified key.
+/// Return the value assigned to the specified key.
 ///
 CEF_EXPORT int cef_string_map_find(cef_string_map_t map,
                                    const cef_string_t* key,
                                    cef_string_t* value);
 
 ///
-// Return the key at the specified zero-based string map index.
+/// Return the key at the specified zero-based string map index.
 ///
 CEF_EXPORT int cef_string_map_key(cef_string_map_t map,
                                   size_t index,
                                   cef_string_t* key);
 
 ///
-// Return the value at the specified zero-based string map index.
+/// Return the value at the specified zero-based string map index.
 ///
 CEF_EXPORT int cef_string_map_value(cef_string_map_t map,
                                     size_t index,
                                     cef_string_t* value);
 
 ///
-// Append a new key/value pair at the end of the string map.
+/// Append a new key/value pair at the end of the string map. If the key exists,
+/// overwrite the existing value with a new value w/o changing the pair order.
 ///
 CEF_EXPORT int cef_string_map_append(cef_string_map_t map,
                                      const cef_string_t* key,
                                      const cef_string_t* value);
 
 ///
-// Clear the string map.
+/// Clear the string map.
 ///
 CEF_EXPORT void cef_string_map_clear(cef_string_map_t map);
 
 ///
-// Free the string map.
+/// Free the string map.
 ///
 CEF_EXPORT void cef_string_map_free(cef_string_map_t map);
 
diff --git a/src/include/internal/cef_string_multimap.h b/src/include/internal/cef_string_multimap.h
index cd077460b..9dde8053c 100644
--- a/src/include/internal/cef_string_multimap.h
+++ b/src/include/internal/cef_string_multimap.h
@@ -39,29 +39,29 @@ extern "C" {
 #endif
 
 ///
-// CEF string multimaps are a set of key/value string pairs.
-// More than one value can be assigned to a single key.
+/// CEF string multimaps are a set of key/value string pairs.
+/// More than one value can be assigned to a single key.
 ///
-typedef void* cef_string_multimap_t;
+typedef struct _cef_string_multimap_t* cef_string_multimap_t;
 
 ///
-// Allocate a new string multimap.
+/// Allocate a new string multimap.
 ///
-CEF_EXPORT cef_string_multimap_t cef_string_multimap_alloc();
+CEF_EXPORT cef_string_multimap_t cef_string_multimap_alloc(void);
 
 ///
-// Return the number of elements in the string multimap.
+/// Return the number of elements in the string multimap.
 ///
 CEF_EXPORT size_t cef_string_multimap_size(cef_string_multimap_t map);
 
 ///
-// Return the number of values with the specified key.
+/// Return the number of values with the specified key.
 ///
 CEF_EXPORT size_t cef_string_multimap_find_count(cef_string_multimap_t map,
                                                  const cef_string_t* key);
 
 ///
-// Return the value_index-th value with the specified key.
+/// Return the value_index-th value with the specified key.
 ///
 CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
                                              const cef_string_t* key,
@@ -69,33 +69,33 @@ CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
                                              cef_string_t* value);
 
 ///
-// Return the key at the specified zero-based string multimap index.
+/// Return the key at the specified zero-based string multimap index.
 ///
 CEF_EXPORT int cef_string_multimap_key(cef_string_multimap_t map,
                                        size_t index,
                                        cef_string_t* key);
 
 ///
-// Return the value at the specified zero-based string multimap index.
+/// Return the value at the specified zero-based string multimap index.
 ///
 CEF_EXPORT int cef_string_multimap_value(cef_string_multimap_t map,
                                          size_t index,
                                          cef_string_t* value);
 
 ///
-// Append a new key/value pair at the end of the string multimap.
+/// Append a new key/value pair at the end of the string multimap.
 ///
 CEF_EXPORT int cef_string_multimap_append(cef_string_multimap_t map,
                                           const cef_string_t* key,
                                           const cef_string_t* value);
 
 ///
-// Clear the string multimap.
+/// Clear the string multimap.
 ///
 CEF_EXPORT void cef_string_multimap_clear(cef_string_multimap_t map);
 
 ///
-// Free the string multimap.
+/// Free the string multimap.
 ///
 CEF_EXPORT void cef_string_multimap_free(cef_string_multimap_t map);
 
diff --git a/src/include/internal/cef_string_types.h b/src/include/internal/cef_string_types.h
index ea9196082..ee3308b5c 100644
--- a/src/include/internal/cef_string_types.h
+++ b/src/include/internal/cef_string_types.h
@@ -31,26 +31,42 @@
 #define CEF_INCLUDE_INTERNAL_CEF_STRING_TYPES_H_
 #pragma once
 
-// CEF provides functions for converting between UTF-8, -16 and -32 strings.
-// CEF string types are safe for reading from multiple threads but not for
-// modification. It is the user's responsibility to provide synchronization if
-// modifying CEF strings from multiple threads.
-
 #include <stddef.h>
 
-#include "include/base/cef_basictypes.h"
+#ifdef __clang__
+// On macOS, <uchar.h> is only available with Xcode 14.3+.
+#if __has_include(<uchar.h>)
+#include <uchar.h>
+#elif !defined(__cplusplus)
+#include <stdint.h>
+typedef uint_least16_t char16_t;
+#endif
+#else
+#include <uchar.h>
+#endif
+
 #include "include/internal/cef_export.h"
 
+///
+/// \file
+/// CEF provides functions for converting between UTF-8, -16 and -32 strings.
+/// CEF string types are safe for reading from multiple threads but not for
+/// modification. It is the user's responsibility to provide synchronization if
+/// modifying CEF strings from multiple threads.
+///
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// CEF string type definitions. Whomever allocates |str| is responsible for
-// providing an appropriate |dtor| implementation that will free the string in
-// the same memory space. When reusing an existing string structure make sure
-// to call |dtor| for the old value before assigning new |str| and |dtor|
-// values. Static strings will have a NULL |dtor| value. Using the below
-// functions if you want this managed for you.
+///
+/// CEF string type definitions. Whomever allocates |str| is responsible for
+/// providing an appropriate |dtor| implementation that will free the string in
+/// the same memory space. When reusing an existing string structure make sure
+/// to call |dtor| for the old value before assigning new |str| and |dtor|
+/// values. Static strings will have a NULL |dtor| value. Using the below
+/// functions if you want this managed for you.
+///
 
 typedef struct _cef_string_wide_t {
   wchar_t* str;
@@ -65,15 +81,15 @@ typedef struct _cef_string_utf8_t {
 } cef_string_utf8_t;
 
 typedef struct _cef_string_utf16_t {
-  char16* str;
+  char16_t* str;
   size_t length;
-  void (*dtor)(char16* str);
+  void (*dtor)(char16_t* str);
 } cef_string_utf16_t;
 
 ///
-// These functions set string values. If |copy| is true (1) the value will be
-// copied instead of referenced. It is up to the user to properly manage
-// the lifespan of references.
+/// These functions set string values. If |copy| is true (1) the value will be
+/// copied instead of referenced. It is up to the user to properly manage
+/// the lifespan of references.
 ///
 
 CEF_EXPORT int cef_string_wide_set(const wchar_t* src,
@@ -84,13 +100,13 @@ CEF_EXPORT int cef_string_utf8_set(const char* src,
                                    size_t src_len,
                                    cef_string_utf8_t* output,
                                    int copy);
-CEF_EXPORT int cef_string_utf16_set(const char16* src,
+CEF_EXPORT int cef_string_utf16_set(const char16_t* src,
                                     size_t src_len,
                                     cef_string_utf16_t* output,
                                     int copy);
 
 ///
-// Convenience macros for copying values.
+/// Convenience macros for copying values.
 ///
 
 #define cef_string_wide_copy(src, src_len, output) \
@@ -101,7 +117,7 @@ CEF_EXPORT int cef_string_utf16_set(const char16* src,
   cef_string_utf16_set(src, src_len, output, true)
 
 ///
-// These functions clear string values. The structure itself is not freed.
+/// These functions clear string values. The structure itself is not freed.
 ///
 
 CEF_EXPORT void cef_string_wide_clear(cef_string_wide_t* str);
@@ -109,7 +125,7 @@ CEF_EXPORT void cef_string_utf8_clear(cef_string_utf8_t* str);
 CEF_EXPORT void cef_string_utf16_clear(cef_string_utf16_t* str);
 
 ///
-// These functions compare two string values with the same results as strcmp().
+/// These functions compare two string values with the same results as strcmp().
 ///
 
 CEF_EXPORT int cef_string_wide_cmp(const cef_string_wide_t* str1,
@@ -120,10 +136,10 @@ CEF_EXPORT int cef_string_utf16_cmp(const cef_string_utf16_t* str1,
                                     const cef_string_utf16_t* str2);
 
 ///
-// These functions convert between UTF-8, -16, and -32 strings. They are
-// potentially slow so unnecessary conversions should be avoided. The best
-// possible result will always be written to |output| with the boolean return
-// value indicating whether the conversion is 100% valid.
+/// These functions convert between UTF-8, -16, and -32 strings. They are
+/// potentially slow so unnecessary conversions should be avoided. The best
+/// possible result will always be written to |output| with the boolean return
+/// value indicating whether the conversion is 100% valid.
 ///
 
 CEF_EXPORT int cef_string_wide_to_utf8(const wchar_t* src,
@@ -136,21 +152,21 @@ CEF_EXPORT int cef_string_utf8_to_wide(const char* src,
 CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src,
                                         size_t src_len,
                                         cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_wide(const char16* src,
+CEF_EXPORT int cef_string_utf16_to_wide(const char16_t* src,
                                         size_t src_len,
                                         cef_string_wide_t* output);
 
 CEF_EXPORT int cef_string_utf8_to_utf16(const char* src,
                                         size_t src_len,
                                         cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src,
+CEF_EXPORT int cef_string_utf16_to_utf8(const char16_t* src,
                                         size_t src_len,
                                         cef_string_utf8_t* output);
 
 ///
-// These functions convert an ASCII string, typically a hardcoded constant, to a
-// Wide/UTF16 string. Use instead of the UTF8 conversion routines if you know
-// the string is ASCII.
+/// These functions convert an ASCII string, typically a hardcoded constant, to
+/// a Wide/UTF16 string. Use instead of the UTF8 conversion routines if you know
+/// the string is ASCII.
 ///
 
 CEF_EXPORT int cef_string_ascii_to_wide(const char* src,
@@ -161,9 +177,9 @@ CEF_EXPORT int cef_string_ascii_to_utf16(const char* src,
                                          cef_string_utf16_t* output);
 
 ///
-// It is sometimes necessary for the system to allocate string structures with
-// the expectation that the user will free them. The userfree types act as a
-// hint that the user is responsible for freeing the structure.
+/// It is sometimes necessary for the system to allocate string structures with
+/// the expectation that the user will free them. The userfree types act as a
+/// hint that the user is responsible for freeing the structure.
 ///
 
 typedef cef_string_wide_t* cef_string_userfree_wide_t;
@@ -171,17 +187,17 @@ typedef cef_string_utf8_t* cef_string_userfree_utf8_t;
 typedef cef_string_utf16_t* cef_string_userfree_utf16_t;
 
 ///
-// These functions allocate a new string structure. They must be freed by
-// calling the associated free function.
+/// These functions allocate a new string structure. They must be freed by
+/// calling the associated free function.
 ///
 
-CEF_EXPORT cef_string_userfree_wide_t cef_string_userfree_wide_alloc();
-CEF_EXPORT cef_string_userfree_utf8_t cef_string_userfree_utf8_alloc();
-CEF_EXPORT cef_string_userfree_utf16_t cef_string_userfree_utf16_alloc();
+CEF_EXPORT cef_string_userfree_wide_t cef_string_userfree_wide_alloc(void);
+CEF_EXPORT cef_string_userfree_utf8_t cef_string_userfree_utf8_alloc(void);
+CEF_EXPORT cef_string_userfree_utf16_t cef_string_userfree_utf16_alloc(void);
 
 ///
-// These functions free the string structure allocated by the associated
-// alloc function. Any string contents will first be cleared.
+/// These functions free the string structure allocated by the associated
+/// alloc function. Any string contents will first be cleared.
 ///
 
 CEF_EXPORT void cef_string_userfree_wide_free(cef_string_userfree_wide_t str);
@@ -189,14 +205,14 @@ CEF_EXPORT void cef_string_userfree_utf8_free(cef_string_userfree_utf8_t str);
 CEF_EXPORT void cef_string_userfree_utf16_free(cef_string_userfree_utf16_t str);
 
 ///
-// These functions convert utf16 string case using the current ICU locale. This
-// may change the length of the string in some cases.
+/// These functions convert utf16 string case using the current ICU locale. This
+/// may change the length of the string in some cases.
 ///
 
-CEF_EXPORT int cef_string_utf16_to_lower(const char16* src,
+CEF_EXPORT int cef_string_utf16_to_lower(const char16_t* src,
                                          size_t src_len,
                                          cef_string_utf16_t* output);
-CEF_EXPORT int cef_string_utf16_to_upper(const char16* src,
+CEF_EXPORT int cef_string_utf16_to_upper(const char16_t* src,
                                          size_t src_len,
                                          cef_string_utf16_t* output);
 
diff --git a/src/include/internal/cef_string_wrappers.h b/src/include/internal/cef_string_wrappers.h
index f965e9c00..7d20eef29 100644
--- a/src/include/internal/cef_string_wrappers.h
+++ b/src/include/internal/cef_string_wrappers.h
@@ -31,10 +31,9 @@
 #define CEF_INCLUDE_INTERNAL_CEF_STRING_WRAPPERS_H_
 #pragma once
 
-#include <memory.h>
+#include <cstring>
 #include <string>
 
-#include "include/base/cef_string16.h"
 #include "include/internal/cef_string_types.h"
 
 #if defined(USING_CHROMIUM_INCLUDES)
@@ -42,7 +41,7 @@
 #endif
 
 ///
-// Traits implementation for wide character strings.
+/// Traits implementation for wide character strings.
 ///
 struct CefStringTraitsWide {
   typedef wchar_t char_type;
@@ -75,49 +74,73 @@ struct CefStringTraitsWide {
     memset(&cstr, 0, sizeof(cstr));
     cef_string_wide_to_utf8(s->str, s->length, &cstr);
     std::string str;
-    if (cstr.length > 0)
+    if (cstr.length > 0) {
       str = std::string(cstr.str, cstr.length);
+    }
     cef_string_utf8_clear(&cstr);
     return str;
   }
+  static inline bool from_string(const std::string::value_type* data,
+                                 size_t length,
+                                 struct_type* s) {
+    return cef_string_utf8_to_wide(data, length, s) ? true : false;
+  }
   static inline bool from_string(const std::string& str, struct_type* s) {
-    return cef_string_utf8_to_wide(str.c_str(), str.length(), s) ? true : false;
+    return from_string(str.data(), str.length(), s);
   }
   static inline std::wstring to_wstring(const struct_type* s) {
     return std::wstring(s->str, s->length);
   }
+  static inline bool from_wstring(const std::wstring::value_type* data,
+                                  size_t length,
+                                  struct_type* s) {
+    return cef_string_wide_set(data, length, s, true) ? true : false;
+  }
   static inline bool from_wstring(const std::wstring& str, struct_type* s) {
-    return cef_string_wide_set(str.c_str(), str.length(), s, true) ? true
-                                                                   : false;
+    return from_wstring(str.data(), str.length(), s);
   }
-#if defined(WCHAR_T_IS_UTF32)
-  static inline base::string16 to_string16(const struct_type* s) {
+#if defined(WCHAR_T_IS_32_BIT)
+  static inline std::u16string to_string16(const struct_type* s) {
     cef_string_utf16_t cstr;
     memset(&cstr, 0, sizeof(cstr));
     cef_string_wide_to_utf16(s->str, s->length, &cstr);
-    base::string16 str;
-    if (cstr.length > 0)
-      str = base::string16(cstr.str, cstr.length);
+    std::u16string str;
+    if (cstr.length > 0) {
+      str = std::u16string(
+          reinterpret_cast<std::u16string::value_type*>(cstr.str), cstr.length);
+    }
     cef_string_utf16_clear(&cstr);
     return str;
   }
-  static inline bool from_string16(const base::string16& str, struct_type* s) {
-    return cef_string_utf16_to_wide(str.c_str(), str.length(), s) ? true
-                                                                  : false;
-  }
-#else   // WCHAR_T_IS_UTF32
-  static inline base::string16 to_string16(const struct_type* s) {
-    return base::string16(s->str, s->length);
+  static inline bool from_string16(const std::u16string::value_type* data,
+                                   size_t length,
+                                   struct_type* s) {
+    return cef_string_utf16_to_wide(reinterpret_cast<const char16_t*>(data),
+                                    length, s)
+               ? true
+               : false;
+  }
+#elif defined(WCHAR_T_IS_16_BIT)
+  static inline std::u16string to_string16(const struct_type* s) {
+    return std::u16string(
+        reinterpret_cast<const std::u16string::value_type*>(s->str), s->length);
+  }
+  static inline bool from_string16(const std::u16string::value_type* data,
+                                   size_t length,
+                                   struct_type* s) {
+    return cef_string_wide_set(reinterpret_cast<const wchar_t*>(data), length,
+                               s, true)
+               ? true
+               : false;
+  }
+#endif  // WCHAR_T_IS_16_BIT
+  static inline bool from_string16(const std::u16string& str, struct_type* s) {
+    return from_string16(str.data(), str.length(), s);
   }
-  static inline bool from_string16(const base::string16& str, struct_type* s) {
-    return cef_string_wide_set(str.c_str(), str.length(), s, true) ? true
-                                                                   : false;
-  }
-#endif  // WCHAR_T_IS_UTF32
 };
 
 ///
-// Traits implementation for utf8 character strings.
+/// Traits implementation for utf8 character strings.
 ///
 struct CefStringTraitsUTF8 {
   typedef char char_type;
@@ -148,43 +171,63 @@ struct CefStringTraitsUTF8 {
   static inline std::string to_string(const struct_type* s) {
     return std::string(s->str, s->length);
   }
+  static inline bool from_string(const std::string::value_type* data,
+                                 size_t length,
+                                 struct_type* s) {
+    return cef_string_utf8_copy(data, length, s) ? true : false;
+  }
   static inline bool from_string(const std::string& str, struct_type* s) {
-    return cef_string_utf8_copy(str.c_str(), str.length(), s) ? true : false;
+    return from_string(str.c_str(), str.length(), s);
   }
   static inline std::wstring to_wstring(const struct_type* s) {
     cef_string_wide_t cstr;
     memset(&cstr, 0, sizeof(cstr));
     cef_string_utf8_to_wide(s->str, s->length, &cstr);
     std::wstring str;
-    if (cstr.length > 0)
+    if (cstr.length > 0) {
       str = std::wstring(cstr.str, cstr.length);
+    }
     cef_string_wide_clear(&cstr);
     return str;
   }
+  static inline bool from_wstring(const std::wstring::value_type* data,
+                                  size_t length,
+                                  struct_type* s) {
+    return cef_string_wide_to_utf8(data, length, s) ? true : false;
+  }
   static inline bool from_wstring(const std::wstring& str, struct_type* s) {
-    return cef_string_wide_to_utf8(str.c_str(), str.length(), s) ? true : false;
+    return from_wstring(str.data(), str.length(), s);
   }
-  static inline base::string16 to_string16(const struct_type* s) {
+  static inline std::u16string to_string16(const struct_type* s) {
     cef_string_utf16_t cstr;
     memset(&cstr, 0, sizeof(cstr));
     cef_string_utf8_to_utf16(s->str, s->length, &cstr);
-    base::string16 str;
-    if (cstr.length > 0)
-      str = base::string16(cstr.str, cstr.length);
+    std::u16string str;
+    if (cstr.length > 0) {
+      str = std::u16string(
+          reinterpret_cast<std::u16string::value_type*>(cstr.str), cstr.length);
+    }
     cef_string_utf16_clear(&cstr);
     return str;
   }
-  static inline bool from_string16(const base::string16& str, struct_type* s) {
-    return cef_string_utf16_to_utf8(str.c_str(), str.length(), s) ? true
-                                                                  : false;
+  static inline bool from_string16(const std::u16string::value_type* data,
+                                   size_t length,
+                                   struct_type* s) {
+    return cef_string_utf16_to_utf8(reinterpret_cast<const char16_t*>(data),
+                                    length, s)
+               ? true
+               : false;
+  }
+  static inline bool from_string16(const std::u16string& str, struct_type* s) {
+    return from_string16(str.data(), str.length(), s);
   }
 };
 
 ///
-// Traits implementation for utf16 character strings.
+/// Traits implementation for utf16 character strings.
 ///
 struct CefStringTraitsUTF16 {
-  typedef char16 char_type;
+  typedef char16_t char_type;
   typedef cef_string_utf16_t struct_type;
   typedef cef_string_userfree_utf16_t userfree_struct_type;
 
@@ -214,208 +257,243 @@ struct CefStringTraitsUTF16 {
     memset(&cstr, 0, sizeof(cstr));
     cef_string_utf16_to_utf8(s->str, s->length, &cstr);
     std::string str;
-    if (cstr.length > 0)
+    if (cstr.length > 0) {
       str = std::string(cstr.str, cstr.length);
+    }
     cef_string_utf8_clear(&cstr);
     return str;
   }
+  static inline bool from_string(const std::string::value_type* data,
+                                 size_t length,
+                                 struct_type* s) {
+    return cef_string_utf8_to_utf16(data, length, s) ? true : false;
+  }
   static inline bool from_string(const std::string& str, struct_type* s) {
-    return cef_string_utf8_to_utf16(str.c_str(), str.length(), s) ? true
-                                                                  : false;
+    return from_string(str.data(), str.length(), s);
   }
-#if defined(WCHAR_T_IS_UTF32)
+#if defined(WCHAR_T_IS_32_BIT)
   static inline std::wstring to_wstring(const struct_type* s) {
     cef_string_wide_t cstr;
     memset(&cstr, 0, sizeof(cstr));
     cef_string_utf16_to_wide(s->str, s->length, &cstr);
     std::wstring str;
-    if (cstr.length > 0)
+    if (cstr.length > 0) {
       str = std::wstring(cstr.str, cstr.length);
+    }
     cef_string_wide_clear(&cstr);
     return str;
   }
-  static inline bool from_wstring(const std::wstring& str, struct_type* s) {
-    return cef_string_wide_to_utf16(str.c_str(), str.length(), s) ? true
-                                                                  : false;
+  static inline bool from_wstring(const std::wstring::value_type* data,
+                                  size_t length,
+                                  struct_type* s) {
+    return cef_string_wide_to_utf16(data, length, s) ? true : false;
   }
-#else   // WCHAR_T_IS_UTF32
+#elif defined(WCHAR_T_IS_16_BIT)
   static inline std::wstring to_wstring(const struct_type* s) {
-    return std::wstring(s->str, s->length);
+    return std::wstring(reinterpret_cast<wchar_t*>(s->str), s->length);
+  }
+  static inline bool from_wstring(const std::wstring::value_type* data,
+                                  size_t length,
+                                  struct_type* s) {
+    return cef_string_utf16_set(reinterpret_cast<const char16_t*>(data), length,
+                                s, true)
+               ? true
+               : false;
   }
+#endif  // WCHAR_T_IS_16_BIT
   static inline bool from_wstring(const std::wstring& str, struct_type* s) {
-    return cef_string_utf16_set(str.c_str(), str.length(), s, true) ? true
-                                                                    : false;
+    return from_wstring(str.data(), str.length(), s);
   }
-#endif  // WCHAR_T_IS_UTF32
-  static inline base::string16 to_string16(const struct_type* s) {
-    return base::string16(s->str, s->length);
+  static inline std::u16string to_string16(const struct_type* s) {
+    return std::u16string(
+        reinterpret_cast<const std::u16string::value_type*>(s->str), s->length);
   }
-  static inline bool from_string16(const base::string16& str, struct_type* s) {
-    return cef_string_utf16_set(str.c_str(), str.length(), s, true) ? true
-                                                                    : false;
+  static inline bool from_string16(const std::u16string::value_type* data,
+                                   size_t length,
+                                   struct_type* s) {
+    return cef_string_utf16_set(reinterpret_cast<const char16_t*>(data), length,
+                                s, true)
+               ? true
+               : false;
+  }
+  static inline bool from_string16(const std::u16string& str, struct_type* s) {
+    return from_string16(str.data(), str.length(), s);
   }
 };
 
 ///
-// CEF string classes can convert between all supported string types. For
-// example, the CefStringWide class uses wchar_t as the underlying character
-// type and provides two approaches for converting data to/from a UTF8 string
-// (std::string).
-// <p>
-// 1. Implicit conversion using the assignment operator overload.
-// <pre>
-//   CefStringWide aCefString;
-//   std::string aUTF8String;
-//   aCefString = aUTF8String; // Assign std::string to CefStringWide
-//   aUTF8String = aCefString; // Assign CefStringWide to std::string
-// </pre>
-// 2. Explicit conversion using the FromString/ToString methods.
-// <pre>
-//   CefStringWide aCefString;
-//   std::string aUTF8String;
-//   aCefString.FromString(aUTF8String); // Assign std::string to CefStringWide
-//   aUTF8String = aCefString.ToString(); // Assign CefStringWide to std::string
-// </pre>
-// Conversion will only occur if the assigned value is a different string type.
-// Assigning a std::string to a CefStringUTF8, for example, will copy the data
-// without performing a conversion.
-// </p>
-// CEF string classes are safe for reading from multiple threads but not for
-// modification. It is the user's responsibility to provide synchronization if
-// modifying CEF strings from multiple threads.
+/// CEF string classes can convert between all supported string types. For
+/// example, the CefStringWide class uses wchar_t as the underlying character
+/// type and provides two approaches for converting data to/from a UTF8 string
+/// (std::string).
+///
+/// 1. Implicit conversion using the assignment operator overload.
+/// <pre>
+///   CefStringWide aCefString;
+///   std::string aUTF8String;
+///   aCefString = aUTF8String; // Assign std::string to CefStringWide
+///   aUTF8String = aCefString; // Assign CefStringWide to std::string
+/// </pre>
+///
+/// 2. Explicit conversion using the FromString/ToString methods.
+/// <pre>
+///   CefStringWide aCefString;
+///   std::string aUTF8String;
+///   aCefString.FromString(aUTF8String); // Assign std::string to CefStringWide
+///   aUTF8String = aCefString.ToString(); // Assign CefStringWide to
+///   std::string
+/// </pre>
+///
+/// Conversion will only occur if the assigned value is a different string type.
+/// Assigning a std::string to a CefStringUTF8, for example, will copy the data
+/// without performing a conversion.
+///
+/// CEF string classes are safe for reading from multiple threads but not for
+/// modification. It is the user's responsibility to provide synchronization if
+/// modifying CEF strings from multiple threads.
 ///
 template <class traits>
-class CefStringBase {
+class CefStringBase final {
  public:
   typedef typename traits::char_type char_type;
   typedef typename traits::struct_type struct_type;
   typedef typename traits::userfree_struct_type userfree_struct_type;
 
   ///
-  // Default constructor.
+  /// Default constructor.
   ///
   CefStringBase() : string_(NULL), owner_(false) {}
 
   ///
-  // Create a new string from an existing string. Data will always be copied.
+  /// Create a new string from an existing string. Data will always be copied.
   ///
   CefStringBase(const CefStringBase& str) : string_(NULL), owner_(false) {
     FromString(str.c_str(), str.length(), true);
   }
 
   ///
-  // Create a new string from an existing std::string. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Create a new string from an existing std::string. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
   CefStringBase(const std::string& src) : string_(NULL), owner_(false) {
     FromString(src);
   }
-  CefStringBase(const char* src) : string_(NULL), owner_(false) {
-    if (src)
-      FromString(std::string(src));
+  CefStringBase(const char* src, size_t length = 0)
+      : string_(NULL), owner_(false) {
+    if (src) {
+      FromString(src, length);
+    }
   }
 
   ///
-  // Create a new string from an existing std::wstring. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Create a new string from an existing std::wstring. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
   CefStringBase(const std::wstring& src) : string_(NULL), owner_(false) {
     FromWString(src);
   }
-  CefStringBase(const wchar_t* src) : string_(NULL), owner_(false) {
-    if (src)
-      FromWString(std::wstring(src));
+  CefStringBase(const wchar_t* src, size_t length = 0)
+      : string_(NULL), owner_(false) {
+    if (src) {
+      FromWString(src, length);
+    }
   }
 
-#if defined(WCHAR_T_IS_UTF32)
   ///
-  // Create a new string from an existing string16. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Create a new string from an existing string16. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
-  CefStringBase(const base::string16& src) : string_(NULL), owner_(false) {
+  CefStringBase(const std::u16string& src) : string_(NULL), owner_(false) {
     FromString16(src);
   }
-  CefStringBase(const char16* src) : string_(NULL), owner_(false) {
-    if (src)
-      FromString16(base::string16(src));
+  CefStringBase(const std::u16string::value_type* src, size_t length = 0)
+      : string_(NULL), owner_(false) {
+    if (src) {
+      FromString16(src, length);
+    }
   }
-#endif  // WCHAR_T_IS_UTF32
 
   ///
-  // Create a new string from an existing character array. If |copy| is true
-  // this class will copy the data. Otherwise, this class will reference the
-  // existing data. Referenced data must exist for the lifetime of this class
-  // and will not be freed by this class.
+  /// Create a new string from an existing character array. If |copy| is true
+  /// this class will copy the data. Otherwise, this class will reference the
+  /// existing data. Referenced data must exist for the lifetime of this class
+  /// and will not be freed by this class.
   ///
   CefStringBase(const char_type* src, size_t src_len, bool copy)
       : string_(NULL), owner_(false) {
-    if (src && src_len > 0)
+    if (src && src_len > 0) {
       FromString(src, src_len, copy);
+    }
   }
 
   ///
-  // Create a new string referencing an existing string structure without taking
-  // ownership. Referenced structures must exist for the lifetime of this class
-  // and will not be freed by this class.
+  /// Create a new string referencing an existing string structure without
+  /// taking ownership. Referenced structures must exist for the lifetime of
+  /// this class and will not be freed by this class.
   ///
   CefStringBase(const struct_type* src) : string_(NULL), owner_(false) {
-    if (!src)
+    if (!src) {
       return;
+    }
     // Reference the existing structure without taking ownership.
     Attach(const_cast<struct_type*>(src), false);
   }
 
-  virtual ~CefStringBase() { ClearAndFree(); }
+  ~CefStringBase() { ClearAndFree(); }
 
-  // The following methods are named for compatibility with the standard library
-  // string template types.
+  /// The following methods are named for compatibility with the standard
+  /// library string template types.
 
   ///
-  // Return a read-only pointer to the string data.
+  /// Return a read-only pointer to the string data.
   ///
   const char_type* c_str() const { return (string_ ? string_->str : NULL); }
 
   ///
-  // Return the length of the string data.
+  /// Return the length of the string data.
   ///
   size_t length() const { return (string_ ? string_->length : 0); }
 
   ///
-  // Return the length of the string data.
+  /// Return the length of the string data.
   ///
   inline size_t size() const { return length(); }
 
   ///
-  // Returns true if the string is empty.
+  /// Returns true if the string is empty.
   ///
   bool empty() const { return (string_ == NULL || string_->length == 0); }
 
   ///
-  // Compare this string to the specified string.
+  /// Compare this string to the specified string.
   ///
   int compare(const CefStringBase& str) const {
-    if (empty() && str.empty())
+    if (empty() && str.empty()) {
       return 0;
-    if (empty())
+    }
+    if (empty()) {
       return -1;
-    if (str.empty())
+    }
+    if (str.empty()) {
       return 1;
+    }
     return traits::compare(string_, str.GetStruct());
   }
 
   ///
-  // Clear the string data.
+  /// Clear the string data.
   ///
   void clear() {
-    if (string_)
+    if (string_) {
       traits::clear(string_);
+    }
   }
 
   ///
-  // Swap this string's contents with the specified string.
+  /// Swap this string's contents with the specified string.
   ///
   void swap(CefStringBase& str) {
     struct_type* tmp_string = string_;
@@ -429,19 +507,19 @@ class CefStringBase {
   // The following methods are unique to CEF string template types.
 
   ///
-  // Returns true if this class owns the underlying string structure.
+  /// Returns true if this class owns the underlying string structure.
   ///
   bool IsOwner() const { return owner_; }
 
   ///
-  // Returns a read-only pointer to the underlying string structure. May return
-  // NULL if no structure is currently allocated.
+  /// Returns a read-only pointer to the underlying string structure. May return
+  /// NULL if no structure is currently allocated.
   ///
   const struct_type* GetStruct() const { return string_; }
 
   ///
-  // Returns a writable pointer to the underlying string structure. Will never
-  // return NULL.
+  /// Returns a writable pointer to the underlying string structure. Will never
+  /// return NULL.
   ///
   struct_type* GetWritableStruct() {
     AllocIfNeeded();
@@ -449,12 +527,13 @@ class CefStringBase {
   }
 
   ///
-  // Clear the state of this class. The underlying string structure and data
-  // will be freed if this class owns the structure.
+  /// Clear the state of this class. The underlying string structure and data
+  /// will be freed if this class owns the structure.
   ///
   void ClearAndFree() {
-    if (!string_)
+    if (!string_) {
       return;
+    }
     if (owner_) {
       clear();
       delete string_;
@@ -464,8 +543,8 @@ class CefStringBase {
   }
 
   ///
-  // Attach to the specified string structure. If |owner| is true this class
-  // will take ownership of the structure.
+  /// Attach to the specified string structure. If |owner| is true this class
+  /// will take ownership of the structure.
   ///
   void Attach(struct_type* str, bool owner) {
     // Free the previous structure and data, if any.
@@ -476,30 +555,31 @@ class CefStringBase {
   }
 
   ///
-  // Take ownership of the specified userfree structure's string data. The
-  // userfree structure itself will be freed. Only use this method with userfree
-  // structures.
+  /// Take ownership of the specified userfree structure's string data. The
+  /// userfree structure itself will be freed. Only use this method with
+  /// userfree structures.
   ///
   void AttachToUserFree(userfree_struct_type str) {
     // Free the previous structure and data, if any.
     ClearAndFree();
 
-    if (!str)
+    if (!str) {
       return;
+    }
 
     AllocIfNeeded();
     owner_ = true;
     memcpy(string_, str, sizeof(struct_type));
 
-    // Free the |str| structure but not the data.
+    /// Free the |str| structure but not the data.
     memset(str, 0, sizeof(struct_type));
     traits::userfree_free(str);
   }
 
   ///
-  // Detach from the underlying string structure. To avoid memory leaks only use
-  // this method if you already hold a pointer to the underlying string
-  // structure.
+  /// Detach from the underlying string structure. To avoid memory leaks only
+  /// use this method if you already hold a pointer to the underlying string
+  /// structure.
   ///
   void Detach() {
     string_ = NULL;
@@ -507,29 +587,36 @@ class CefStringBase {
   }
 
   ///
-  // Create a userfree structure and give it ownership of this class' string
-  // data. This class will be disassociated from the data. May return NULL if
-  // this string class currently contains no data.
+  /// Create a userfree structure and give it ownership of this class' string
+  /// data. This class will be disassociated from the data. May return NULL if
+  /// this string class currently contains no data.
   ///
   userfree_struct_type DetachToUserFree() {
-    if (empty())
+    if (empty()) {
       return NULL;
+    }
 
     userfree_struct_type str = traits::userfree_alloc();
-    memcpy(str, string_, sizeof(struct_type));
+    if (owner_) {
+      // Transfer ownership of the data to |str|.
+      memcpy(str, string_, sizeof(struct_type));
+      // Free this class' structure but not the data.
+      memset(string_, 0, sizeof(struct_type));
+    } else {
+      // Copy the data to |str|.
+      traits::set(string_->str, string_->length, str, /*copy=*/true);
+    }
 
-    // Free this class' structure but not the data.
-    memset(string_, 0, sizeof(struct_type));
     ClearAndFree();
 
     return str;
   }
 
   ///
-  // Set this string's data to the specified character array. If |copy| is true
-  // this class will copy the data. Otherwise, this class will reference the
-  // existing data. Referenced data must exist for the lifetime of this class
-  // and will not be freed by this class.
+  /// Set this string's data to the specified character array. If |copy| is true
+  /// this class will copy the data. Otherwise, this class will reference the
+  /// existing data. Referenced data must exist for the lifetime of this class
+  /// and will not be freed by this class.
   ///
   bool FromString(const char_type* src, size_t src_len, bool copy) {
     if (src == NULL || src_len == 0) {
@@ -541,9 +628,9 @@ class CefStringBase {
   }
 
   ///
-  // Set this string's data from an existing ASCII string. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Set this string's data from an existing ASCII string. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
   bool FromASCII(const char* str) {
     size_t len = str ? strlen(str) : 0;
@@ -556,19 +643,20 @@ class CefStringBase {
   }
 
   ///
-  // Return this string's data as a std::string. Translation will occur if
-  // necessary based on the underlying string type.
+  /// Return this string's data as a std::string. Translation will occur if
+  /// necessary based on the underlying string type.
   ///
   std::string ToString() const {
-    if (empty())
+    if (empty()) {
       return std::string();
+    }
     return traits::to_string(string_);
   }
 
   ///
-  // Set this string's data from an existing std::string. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Set this string's data from an existing std::string. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
   bool FromString(const std::string& str) {
     if (str.empty()) {
@@ -580,19 +668,37 @@ class CefStringBase {
   }
 
   ///
-  // Return this string's data as a std::wstring. Translation will occur if
-  // necessary based on the underlying string type.
+  /// Set this string's data from existing |data| and optional |length|. Data
+  /// will be always copied. Translation will occur if necessary based on the
+  /// underlying string type.
+  ///
+  bool FromString(const std::string::value_type* data, size_t length = 0) {
+    if (data && length == 0) {
+      length = std::char_traits<std::string::value_type>::length(data);
+    }
+    if (!data || length == 0) {
+      clear();
+      return true;
+    }
+    AllocIfNeeded();
+    return traits::from_string(data, length, string_);
+  }
+
+  ///
+  /// Return this string's data as a std::wstring. Translation will occur if
+  /// necessary based on the underlying string type.
   ///
   std::wstring ToWString() const {
-    if (empty())
+    if (empty()) {
       return std::wstring();
+    }
     return traits::to_wstring(string_);
   }
 
   ///
-  // Set this string's data from an existing std::wstring. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Set this string's data from an existing std::wstring. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
   bool FromWString(const std::wstring& str) {
     if (str.empty()) {
@@ -604,21 +710,39 @@ class CefStringBase {
   }
 
   ///
-  // Return this string's data as a string16. Translation will occur if
-  // necessary based on the underlying string type.
+  /// Set this string's data from existing |data| and optional |length|. Data
+  /// will be always copied. Translation will occur if necessary based on the
+  /// underlying string type.
   ///
-  base::string16 ToString16() const {
-    if (empty())
-      return base::string16();
+  bool FromWString(const std::wstring::value_type* data, size_t length = 0) {
+    if (data && length == 0) {
+      length = std::char_traits<std::wstring::value_type>::length(data);
+    }
+    if (!data || length == 0) {
+      clear();
+      return true;
+    }
+    AllocIfNeeded();
+    return traits::from_wstring(data, length, string_);
+  }
+
+  ///
+  /// Return this string's data as a string16. Translation will occur if
+  /// necessary based on the underlying string type.
+  ///
+  std::u16string ToString16() const {
+    if (empty()) {
+      return std::u16string();
+    }
     return traits::to_string16(string_);
   }
 
   ///
-  // Set this string's data from an existing string16. Data will be always
-  // copied. Translation will occur if necessary based on the underlying string
-  // type.
+  /// Set this string's data from an existing string16. Data will be always
+  /// copied. Translation will occur if necessary based on the underlying string
+  /// type.
   ///
-  bool FromString16(const base::string16& str) {
+  bool FromString16(const std::u16string& str) {
     if (str.empty()) {
       clear();
       return true;
@@ -628,7 +752,24 @@ class CefStringBase {
   }
 
   ///
-  // Comparison operator overloads.
+  /// Set this string's data from existing |data| and optional |length|. Data
+  /// will be always copied. Translation will occur if necessary based on the
+  /// underlying string type.
+  ///
+  bool FromString16(const std::u16string::value_type* data, size_t length = 0) {
+    if (data && length == 0) {
+      length = std::char_traits<std::u16string::value_type>::length(data);
+    }
+    if (!data || length == 0) {
+      clear();
+      return true;
+    }
+    AllocIfNeeded();
+    return traits::from_string16(data, length, string_);
+  }
+
+  ///
+  /// Comparison operator overloads.
   ///
   bool operator<(const CefStringBase& str) const { return (compare(str) < 0); }
   bool operator<=(const CefStringBase& str) const {
@@ -646,7 +787,7 @@ class CefStringBase {
   }
 
   ///
-  // Assignment operator overloads.
+  /// Assignment operator overloads.
   ///
   CefStringBase& operator=(const CefStringBase& str) {
     FromString(str.c_str(), str.length(), true);
@@ -657,8 +798,8 @@ class CefStringBase {
     FromString(str);
     return *this;
   }
-  CefStringBase& operator=(const char* str) {
-    FromString(std::string(str));
+  CefStringBase& operator=(const std::string::value_type* str) {
+    FromString(str);
     return *this;
   }
   operator std::wstring() const { return ToWString(); }
@@ -666,21 +807,19 @@ class CefStringBase {
     FromWString(str);
     return *this;
   }
-  CefStringBase& operator=(const wchar_t* str) {
-    FromWString(std::wstring(str));
+  CefStringBase& operator=(const std::wstring::value_type* str) {
+    FromWString(str);
     return *this;
   }
-#if defined(WCHAR_T_IS_UTF32)
-  operator base::string16() const { return ToString16(); }
-  CefStringBase& operator=(const base::string16& str) {
+  operator std::u16string() const { return ToString16(); }
+  CefStringBase& operator=(const std::u16string& str) {
     FromString16(str);
     return *this;
   }
-  CefStringBase& operator=(const char16* str) {
-    FromString16(base::string16(str));
+  CefStringBase& operator=(const std::u16string::value_type* str) {
+    FromString16(str);
     return *this;
   }
-#endif  // WCHAR_T_IS_UTF32
 #if defined(USING_CHROMIUM_INCLUDES)
   // The base::FilePath constructor is marked as explicit so provide the
   // conversion here for convenience.
@@ -694,7 +833,7 @@ class CefStringBase {
 #endif  // USING_CHROMIUM_INCLUDES
 
  private:
-  // Allocate the string structure if it doesn't already exist.
+  /// Allocate the string structure if it doesn't already exist.
   void AllocIfNeeded() {
     if (string_ == NULL) {
       string_ = new struct_type;
diff --git a/src/include/internal/cef_thread_internal.h b/src/include/internal/cef_thread_internal.h
index f326bcd14..7df3be86c 100644
--- a/src/include/internal/cef_thread_internal.h
+++ b/src/include/internal/cef_thread_internal.h
@@ -53,9 +53,9 @@ typedef pid_t cef_platform_thread_id_t;
 #endif
 
 ///
-// Returns the current platform thread ID.
+/// Returns the current platform thread ID.
 ///
-CEF_EXPORT cef_platform_thread_id_t cef_get_current_platform_thread_id();
+CEF_EXPORT cef_platform_thread_id_t cef_get_current_platform_thread_id(void);
 
 #if defined(OS_WIN)
 typedef DWORD cef_platform_thread_handle_t;
@@ -66,10 +66,10 @@ typedef pthread_t cef_platform_thread_handle_t;
 #endif
 
 ///
-// Returns the current platform thread handle.
+/// Returns the current platform thread handle.
 ///
 CEF_EXPORT cef_platform_thread_handle_t
-cef_get_current_platform_thread_handle();
+cef_get_current_platform_thread_handle(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/internal/cef_time.h b/src/include/internal/cef_time.h
index 5435e5996..1a3d6c31a 100644
--- a/src/include/internal/cef_time.h
+++ b/src/include/internal/cef_time.h
@@ -35,53 +35,117 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
 #include <time.h>
+
 #include "include/internal/cef_export.h"
 
 ///
-// Time information. Values should always be in UTC.
+/// Represents a wall clock time in UTC. Values are not guaranteed to be
+/// monotonically non-decreasing and are subject to large amounts of skew.
+/// Time is stored internally as microseconds since the Windows epoch (1601).
+///
+/// This is equivalent of Chromium `base::Time` (see base/time/time.h).
+///
+typedef struct _cef_basetime_t {
+  int64_t val;
+} cef_basetime_t;
+
+///
+/// Time information. Values should always be in UTC.
 ///
 typedef struct _cef_time_t {
-  int year;          // Four or five digit year "2007" (1601 to 30827 on
-                     //   Windows, 1970 to 2038 on 32-bit POSIX)
-  int month;         // 1-based month (values 1 = January, etc.)
-  int day_of_week;   // 0-based day of week (0 = Sunday, etc.)
-  int day_of_month;  // 1-based day of month (1-31)
-  int hour;          // Hour within the current day (0-23)
-  int minute;        // Minute within the current hour (0-59)
-  int second;        // Second within the current minute (0-59 plus leap
-                     //   seconds which may take it up to 60).
-  int millisecond;   // Milliseconds within the current second (0-999)
+  ///
+  /// Four or five digit year "2007" (1601 to 30827 on Windows, 1970 to 2038 on
+  /// 32-bit POSIX)
+  ///
+  int year;
+
+  ///
+  /// 1-based month (values 1 = January, etc.)
+  ///
+  int month;
+
+  ///
+  /// 0-based day of week (0 = Sunday, etc.)
+  ///
+  int day_of_week;
+
+  ///
+  /// 1-based day of month (1-31)
+  ///
+  int day_of_month;
+
+  ///
+  /// Hour within the current day (0-23)
+  ///
+  int hour;
+
+  ///
+  /// Minute within the current hour (0-59)
+  ///
+  int minute;
+
+  ///
+  /// Second within the current minute (0-59 plus leap seconds which may take
+  /// it up to 60).
+  ///
+  int second;
+
+  ///
+  /// Milliseconds within the current second (0-999)
+  ///
+  int millisecond;
 } cef_time_t;
 
 ///
-// Converts cef_time_t to/from time_t. Returns true (1) on success and false (0)
-// on failure.
+/// Converts cef_time_t to/from time_t. Returns true (1) on success and false
+/// (0) on failure.
 ///
 CEF_EXPORT int cef_time_to_timet(const cef_time_t* cef_time, time_t* time);
 CEF_EXPORT int cef_time_from_timet(time_t time, cef_time_t* cef_time);
 
 ///
-// Converts cef_time_t to/from a double which is the number of seconds since
-// epoch (Jan 1, 1970). Webkit uses this format to represent time. A value of 0
-// means "not initialized". Returns true (1) on success and false (0) on
-// failure.
+/// Converts cef_time_t to/from a double which is the number of seconds since
+/// epoch (Jan 1, 1970). Webkit uses this format to represent time. A value of 0
+/// means "not initialized". Returns true (1) on success and false (0) on
+/// failure.
 ///
 CEF_EXPORT int cef_time_to_doublet(const cef_time_t* cef_time, double* time);
 CEF_EXPORT int cef_time_from_doublet(double time, cef_time_t* cef_time);
 
 ///
-// Retrieve the current system time.
-//
+/// Retrieve the current system time. Returns true (1) on success and false (0)
+/// on failure.
+///
 CEF_EXPORT int cef_time_now(cef_time_t* cef_time);
 
 ///
-// Retrieve the delta in milliseconds between two time values.
+/// Retrieve the current system time.
+///
+CEF_EXPORT cef_basetime_t cef_basetime_now(void);
+
+///
+/// Retrieve the delta in milliseconds between two time values. Returns true (1)
+/// on success and false (0) on failure.
 //
 CEF_EXPORT int cef_time_delta(const cef_time_t* cef_time1,
                               const cef_time_t* cef_time2,
                               long long* delta);
 
+///
+/// Converts cef_time_t to cef_basetime_t. Returns true (1) on success and
+/// false (0) on failure.
+///
+CEF_EXPORT int cef_time_to_basetime(const cef_time_t* from, cef_basetime_t* to);
+
+///
+/// Converts cef_basetime_t to cef_time_t. Returns true (1) on success and
+/// false (0) on failure.
+///
+CEF_EXPORT int cef_time_from_basetime(const cef_basetime_t from,
+                                      cef_time_t* to);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/internal/cef_time_wrappers.h b/src/include/internal/cef_time_wrappers.h
new file mode 100644
index 000000000..7b5cbfb87
--- /dev/null
+++ b/src/include/internal/cef_time_wrappers.h
@@ -0,0 +1,111 @@
+// Copyright (c) 2022 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_INTERNAL_CEF_TIME_WRAPPERS_H_
+#define CEF_INCLUDE_INTERNAL_CEF_TIME_WRAPPERS_H_
+#pragma once
+
+#include "include/internal/cef_time.h"
+
+#if defined(USING_CHROMIUM_INCLUDES)
+#include "base/time/time.h"
+#endif
+
+///
+/// Represents a wall clock time in UTC. Values are not guaranteed to be
+/// monotonically non-decreasing and are subject to large amounts of skew.
+/// Time is stored internally as microseconds since the Windows epoch (1601).
+///
+/// This is equivalent of Chromium `base::Time` (see base/time/time.h).
+///
+class CefBaseTime : public cef_basetime_t {
+ public:
+  CefBaseTime() : cef_basetime_t{} {}
+  CefBaseTime(const cef_basetime_t& value) : cef_basetime_t(value) {}
+
+#if defined(USING_CHROMIUM_INCLUDES)
+  CefBaseTime(const base::Time& value)
+      : cef_basetime_t{value.ToDeltaSinceWindowsEpoch().InMicroseconds()} {}
+
+  operator base::Time() const {
+    return base::Time::FromDeltaSinceWindowsEpoch(base::Microseconds(val));
+  }
+#endif
+
+  static CefBaseTime Now() { return cef_basetime_now(); }
+};
+
+///
+/// Class representing a time.
+///
+class CefTime : public cef_time_t {
+ public:
+  CefTime() : cef_time_t{} {}
+  CefTime(const cef_time_t& r) : cef_time_t(r) {}
+  explicit CefTime(time_t r) { SetTimeT(r); }
+  explicit CefTime(double r) { SetDoubleT(r); }
+
+  ///
+  /// Converts to/from time_t.
+  ///
+  void SetTimeT(time_t r) { cef_time_from_timet(r, this); }
+  time_t GetTimeT() const {
+    time_t time = 0;
+    cef_time_to_timet(this, &time);
+    return time;
+  }
+
+  ///
+  /// Converts to/from a double which is the number of seconds since epoch
+  /// (Jan 1, 1970). Webkit uses this format to represent time. A value of 0
+  /// means "not initialized".
+  ///
+  void SetDoubleT(double r) { cef_time_from_doublet(r, this); }
+  double GetDoubleT() const {
+    double time = 0;
+    cef_time_to_doublet(this, &time);
+    return time;
+  }
+
+  ///
+  /// Set this object to now.
+  ///
+  void Now() { cef_time_now(this); }
+
+  ///
+  /// Return the delta between this object and |other| in milliseconds.
+  ///
+  long long Delta(const CefTime& other) {
+    long long delta = 0;
+    cef_time_delta(this, &other, &delta);
+    return delta;
+  }
+};
+
+#endif  // CEF_INCLUDE_INTERNAL_CEF_TIME_WRAPPERS_H_
diff --git a/src/include/internal/cef_trace_event_internal.h b/src/include/internal/cef_trace_event_internal.h
index 6df870717..3c726a86e 100644
--- a/src/include/internal/cef_trace_event_internal.h
+++ b/src/include/internal/cef_trace_event_internal.h
@@ -45,77 +45,66 @@ extern "C" {
 //   may not include "(quotes) chars.
 // - |argX_name|, |argX_val|, |valueX_name|, |valeX_val| are optional parameters
 //   and represent pairs of name and values of arguments
-// - |copy| is used to avoid memory scoping issues with the |name| and
-//   |arg_name| parameters by copying them
 // - |id| is used to disambiguate counters with the same name, or match async
 //   trace events
 
 CEF_EXPORT void cef_trace_event_instant(const char* category,
                                         const char* name,
                                         const char* arg1_name,
-                                        uint64 arg1_val,
+                                        uint64_t arg1_val,
                                         const char* arg2_name,
-                                        uint64 arg2_val,
-                                        int copy);
+                                        uint64_t arg2_val);
 CEF_EXPORT void cef_trace_event_begin(const char* category,
                                       const char* name,
                                       const char* arg1_name,
-                                      uint64 arg1_val,
+                                      uint64_t arg1_val,
                                       const char* arg2_name,
-                                      uint64 arg2_val,
-                                      int copy);
+                                      uint64_t arg2_val);
 CEF_EXPORT void cef_trace_event_end(const char* category,
                                     const char* name,
                                     const char* arg1_name,
-                                    uint64 arg1_val,
+                                    uint64_t arg1_val,
                                     const char* arg2_name,
-                                    uint64 arg2_val,
-                                    int copy);
+                                    uint64_t arg2_val);
 CEF_EXPORT void cef_trace_counter(const char* category,
                                   const char* name,
                                   const char* value1_name,
-                                  uint64 value1_val,
+                                  uint64_t value1_val,
                                   const char* value2_name,
-                                  uint64 value2_val,
-                                  int copy);
+                                  uint64_t value2_val);
 CEF_EXPORT void cef_trace_counter_id(const char* category,
                                      const char* name,
-                                     uint64 id,
+                                     uint64_t id,
                                      const char* value1_name,
-                                     uint64 value1_val,
+                                     uint64_t value1_val,
                                      const char* value2_name,
-                                     uint64 value2_val,
-                                     int copy);
+                                     uint64_t value2_val);
 CEF_EXPORT void cef_trace_event_async_begin(const char* category,
                                             const char* name,
-                                            uint64 id,
+                                            uint64_t id,
                                             const char* arg1_name,
-                                            uint64 arg1_val,
+                                            uint64_t arg1_val,
                                             const char* arg2_name,
-                                            uint64 arg2_val,
-                                            int copy);
+                                            uint64_t arg2_val);
 CEF_EXPORT void cef_trace_event_async_step_into(const char* category,
                                                 const char* name,
-                                                uint64 id,
-                                                uint64 step,
+                                                uint64_t id,
+                                                uint64_t step,
                                                 const char* arg1_name,
-                                                uint64 arg1_val,
-                                                int copy);
+                                                uint64_t arg1_val);
 CEF_EXPORT void cef_trace_event_async_step_past(const char* category,
                                                 const char* name,
-                                                uint64 id,
-                                                uint64 step,
+                                                uint64_t id,
+                                                uint64_t step,
                                                 const char* arg1_name,
-                                                uint64 arg1_val,
-                                                int copy);
+                                                uint64_t arg1_val);
 CEF_EXPORT void cef_trace_event_async_end(const char* category,
                                           const char* name,
-                                          uint64 id,
+                                          uint64_t id,
                                           const char* arg1_name,
-                                          uint64 arg1_val,
+                                          uint64_t arg1_val,
                                           const char* arg2_name,
-                                          uint64 arg2_val,
-                                          int copy);
+                                          uint64_t arg2_val);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/internal/cef_types.h b/src/include/internal/cef_types.h
index 8efe76406..63272e32e 100644
--- a/src/include/internal/cef_types.h
+++ b/src/include/internal/cef_types.h
@@ -31,15 +31,20 @@
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_H_
 #pragma once
 
-#include "include/base/cef_basictypes.h"
+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include "include/internal/cef_string.h"
 #include "include/internal/cef_string_list.h"
 #include "include/internal/cef_time.h"
+#include "include/internal/cef_types_content_settings.h"
+#include "include/internal/cef_types_geometry.h"
 
 // Bring in platform-specific definitions.
 #if defined(OS_WIN)
 #include "include/internal/cef_types_win.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "include/internal/cef_types_mac.h"
 #elif defined(OS_LINUX)
 #include "include/internal/cef_types_linux.h"
@@ -47,7 +52,7 @@
 
 // 32-bit ARGB color value, not premultiplied. The color components are always
 // in a known order. Equivalent to the SkColor type.
-typedef uint32 cef_color_t;
+typedef uint32_t cef_color_t;
 
 // Return the alpha byte from a cef_color_t value.
 #define CefColorGetA(color) (((color) >> 24) & 0xFF)
@@ -64,440 +69,541 @@ typedef uint32 cef_color_t;
       (static_cast<unsigned>(a) << 24) | (static_cast<unsigned>(r) << 16) | \
       (static_cast<unsigned>(g) << 8) | (static_cast<unsigned>(b) << 0))
 
-// Return an int64 value with the specified low and high int32 component values.
-#define CefInt64Set(int32_low, int32_high)                                \
-  static_cast<int64>((static_cast<uint32>(int32_low)) |                   \
-                     (static_cast<int64>(static_cast<int32>(int32_high))) \
-                         << 32)
+// Return an int64_t value with the specified low and high int32_t component
+// values.
+#define CefInt64Set(int32_low, int32_high) \
+  static_cast<int64_t>(                    \
+      (static_cast<uint32_t>(int32_low)) | \
+      (static_cast<int64_t>(static_cast<int32_t>(int32_high))) << 32)
 
-// Return the low int32 value from an int64 value.
-#define CefInt64GetLow(int64_val) static_cast<int32>(int64_val)
-// Return the high int32 value from an int64 value.
+// Return the low int32_t value from an int64_t value.
+#define CefInt64GetLow(int64_val) static_cast<int32_t>(int64_val)
+// Return the high int32_t value from an int64_t value.
 #define CefInt64GetHigh(int64_val) \
-  static_cast<int32>((static_cast<int64>(int64_val) >> 32) & 0xFFFFFFFFL)
+  static_cast<int32_t>((static_cast<int64_t>(int64_val) >> 32) & 0xFFFFFFFFL)
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 ///
-// Log severity levels.
+/// Log severity levels.
 ///
 typedef enum {
   ///
-  // Default logging (currently INFO logging).
+  /// Default logging (currently INFO logging).
   ///
   LOGSEVERITY_DEFAULT,
 
   ///
-  // Verbose logging.
+  /// Verbose logging.
   ///
   LOGSEVERITY_VERBOSE,
 
   ///
-  // DEBUG logging.
+  /// DEBUG logging.
   ///
   LOGSEVERITY_DEBUG = LOGSEVERITY_VERBOSE,
 
   ///
-  // INFO logging.
+  /// INFO logging.
   ///
   LOGSEVERITY_INFO,
 
   ///
-  // WARNING logging.
+  /// WARNING logging.
   ///
   LOGSEVERITY_WARNING,
 
   ///
-  // ERROR logging.
+  /// ERROR logging.
   ///
   LOGSEVERITY_ERROR,
 
   ///
-  // Completely disable logging.
+  /// FATAL logging.
+  ///
+  LOGSEVERITY_FATAL,
+
+  ///
+  /// Disable logging to file for all messages, and to stderr for messages with
+  /// severity less than FATAL.
   ///
   LOGSEVERITY_DISABLE = 99
 } cef_log_severity_t;
 
 ///
-// Represents the state of a setting.
+/// Log items prepended to each log line.
+///
+typedef enum {
+  ///
+  /// Prepend the default list of items.
+  ///
+  LOG_ITEMS_DEFAULT = 0,
+
+  ///
+  /// Prepend no items.
+  ///
+  LOG_ITEMS_NONE = 1,
+
+  ///
+  /// Prepend the process ID.
+  ///
+  LOG_ITEMS_FLAG_PROCESS_ID = 1 << 1,
+
+  ///
+  /// Prepend the thread ID.
+  ///
+  LOG_ITEMS_FLAG_THREAD_ID = 1 << 2,
+
+  ///
+  /// Prepend the timestamp.
+  ///
+  LOG_ITEMS_FLAG_TIME_STAMP = 1 << 3,
+
+  ///
+  /// Prepend the tickcount.
+  ///
+  LOG_ITEMS_FLAG_TICK_COUNT = 1 << 4,
+
+} cef_log_items_t;
+
+///
+/// Represents the state of a setting.
 ///
 typedef enum {
   ///
-  // Use the default state for the setting.
+  /// Use the default state for the setting.
   ///
   STATE_DEFAULT = 0,
 
   ///
-  // Enable or allow the setting.
+  /// Enable or allow the setting.
   ///
   STATE_ENABLED,
 
   ///
-  // Disable or disallow the setting.
+  /// Disable or disallow the setting.
   ///
   STATE_DISABLED,
 } cef_state_t;
 
 ///
-// Initialization settings. Specify NULL or 0 to get the recommended default
-// values. Many of these and other settings can also configured using command-
-// line switches.
+/// Initialization settings. Specify NULL or 0 to get the recommended default
+/// values. Many of these and other settings can also configured using command-
+/// line switches.
 ///
 typedef struct _cef_settings_t {
   ///
-  // Size of this structure.
+  /// Size of this structure.
   ///
   size_t size;
 
   ///
-  // Set to true (1) to use a single process for the browser and renderer. This
-  // run mode is not officially supported by Chromium and is less stable than
-  // the multi-process default. Also configurable using the "single-process"
-  // command-line switch.
-  ///
-  int single_process;
-
-  ///
-  // Set to true (1) to disable the sandbox for sub-processes. See
-  // cef_sandbox_win.h for requirements to enable the sandbox on Windows. Also
-  // configurable using the "no-sandbox" command-line switch.
+  /// Set to true (1) to disable the sandbox for sub-processes. See
+  /// cef_sandbox_win.h for requirements to enable the sandbox on Windows. Also
+  /// configurable using the "no-sandbox" command-line switch.
   ///
   int no_sandbox;
 
   ///
-  // The path to a separate executable that will be launched for sub-processes.
-  // If this value is empty on Windows or Linux then the main process executable
-  // will be used. If this value is empty on macOS then a helper executable must
-  // exist at "Contents/Frameworks/<app> Helper.app/Contents/MacOS/<app> Helper"
-  // in the top-level app bundle. See the comments on CefExecuteProcess() for
-  // details. Also configurable using the "browser-subprocess-path" command-line
-  // switch.
+  /// The path to a separate executable that will be launched for sub-processes.
+  /// If this value is empty on Windows or Linux then the main process
+  /// executable will be used. If this value is empty on macOS then a helper
+  /// executable must exist at "Contents/Frameworks/<app>
+  /// Helper.app/Contents/MacOS/<app> Helper" in the top-level app bundle. See
+  /// the comments on CefExecuteProcess() for details. If this value is
+  /// non-empty then it must be an absolute path. Also configurable using the
+  /// "browser-subprocess-path" command-line switch.
   ///
   cef_string_t browser_subprocess_path;
 
   ///
-  // The path to the CEF framework directory on macOS. If this value is empty
-  // then the framework must exist at "Contents/Frameworks/Chromium Embedded
-  // Framework.framework" in the top-level app bundle. Also configurable using
-  // the "framework-dir-path" command-line switch.
+  /// The path to the CEF framework directory on macOS. If this value is empty
+  /// then the framework must exist at "Contents/Frameworks/Chromium Embedded
+  /// Framework.framework" in the top-level app bundle. If this value is
+  /// non-empty then it must be an absolute path. Also configurable using the
+  /// "framework-dir-path" command-line switch.
   ///
   cef_string_t framework_dir_path;
 
   ///
-  // Set to true (1) to have the browser process message loop run in a separate
-  // thread. If false (0) than the CefDoMessageLoopWork() function must be
-  // called from your application message loop. This option is only supported on
-  // Windows.
+  /// The path to the main bundle on macOS. If this value is empty then it
+  /// defaults to the top-level app bundle. If this value is non-empty then it
+  /// must be an absolute path. Also configurable using the "main-bundle-path"
+  /// command-line switch.
+  ///
+  cef_string_t main_bundle_path;
+
+  ///
+  /// Set to true (1) to enable use of the Chrome runtime in CEF. This feature
+  /// is considered experimental and is not recommended for most users at this
+  /// time. See issue #2969 for details.
+  ///
+  int chrome_runtime;
+
+  ///
+  /// Set to true (1) to have the browser process message loop run in a separate
+  /// thread. If false (0) then the CefDoMessageLoopWork() function must be
+  /// called from your application message loop. This option is only supported
+  /// on Windows and Linux.
   ///
   int multi_threaded_message_loop;
 
   ///
-  // Set to true (1) to control browser process main (UI) thread message pump
-  // scheduling via the CefBrowserProcessHandler::OnScheduleMessagePumpWork()
-  // callback. This option is recommended for use in combination with the
-  // CefDoMessageLoopWork() function in cases where the CEF message loop must be
-  // integrated into an existing application message loop (see additional
-  // comments and warnings on CefDoMessageLoopWork). Enabling this option is not
-  // recommended for most users; leave this option disabled and use either the
-  // CefRunMessageLoop() function or multi_threaded_message_loop if possible.
+  /// Set to true (1) to control browser process main (UI) thread message pump
+  /// scheduling via the CefBrowserProcessHandler::OnScheduleMessagePumpWork()
+  /// callback. This option is recommended for use in combination with the
+  /// CefDoMessageLoopWork() function in cases where the CEF message loop must
+  /// be integrated into an existing application message loop (see additional
+  /// comments and warnings on CefDoMessageLoopWork). Enabling this option is
+  /// not recommended for most users; leave this option disabled and use either
+  /// the CefRunMessageLoop() function or multi_threaded_message_loop if
+  /// possible.
   ///
   int external_message_pump;
 
   ///
-  // Set to true (1) to enable windowless (off-screen) rendering support. Do not
-  // enable this value if the application does not use windowless rendering as
-  // it may reduce rendering performance on some systems.
+  /// Set to true (1) to enable windowless (off-screen) rendering support. Do
+  /// not enable this value if the application does not use windowless rendering
+  /// as it may reduce rendering performance on some systems.
   ///
   int windowless_rendering_enabled;
 
   ///
-  // Set to true (1) to disable configuration of browser process features using
-  // standard CEF and Chromium command-line arguments. Configuration can still
-  // be specified using CEF data structures or via the
-  // CefApp::OnBeforeCommandLineProcessing() method.
+  /// Set to true (1) to disable configuration of browser process features using
+  /// standard CEF and Chromium command-line arguments. Configuration can still
+  /// be specified using CEF data structures or via the
+  /// CefApp::OnBeforeCommandLineProcessing() method.
   ///
   int command_line_args_disabled;
 
   ///
-  // The location where cache data will be stored on disk. If empty then
-  // browsers will be created in "incognito mode" where in-memory caches are
-  // used for storage and no data is persisted to disk. HTML5 databases such as
-  // localStorage will only persist across sessions if a cache path is
-  // specified. Can be overridden for individual CefRequestContext instances via
-  // the CefRequestContextSettings.cache_path value.
+  /// The directory where data for the global browser cache will be stored on
+  /// disk. If this value is non-empty then it must be an absolute path that is
+  /// either equal to or a child directory of CefSettings.root_cache_path. If
+  /// this value is empty then browsers will be created in "incognito mode"
+  /// where in-memory caches are used for storage and no profile-specific data
+  /// is persisted to disk (installation-specific data will still be persisted
+  /// in root_cache_path). HTML5 databases such as localStorage will only
+  /// persist across sessions if a cache path is specified. Can be overridden
+  /// for individual CefRequestContext instances via the
+  /// CefRequestContextSettings.cache_path value. When using the Chrome runtime
+  /// any child directory value will be ignored and the "default" profile (also
+  /// a child directory) will be used instead.
   ///
   cef_string_t cache_path;
 
   ///
-  // The location where user data such as spell checking dictionary files will
-  // be stored on disk. If empty then the default platform-specific user data
-  // directory will be used ("~/.cef_user_data" directory on Linux,
-  // "~/Library/Application Support/CEF/User Data" directory on Mac OS X,
-  // "Local Settings\Application Data\CEF\User Data" directory under the user
-  // profile directory on Windows).
-  ///
-  cef_string_t user_data_path;
-
-  ///
-  // To persist session cookies (cookies without an expiry date or validity
-  // interval) by default when using the global cookie manager set this value to
-  // true (1). Session cookies are generally intended to be transient and most
-  // Web browsers do not persist them. A |cache_path| value must also be
-  // specified to enable this feature. Also configurable using the
-  // "persist-session-cookies" command-line switch. Can be overridden for
-  // individual CefRequestContext instances via the
-  // CefRequestContextSettings.persist_session_cookies value.
+  /// The root directory for installation-specific data and the parent directory
+  /// for profile-specific data. All CefSettings.cache_path and
+  /// CefRequestContextSettings.cache_path values must have this parent
+  /// directory in common. If this value is empty and CefSettings.cache_path is
+  /// non-empty then it will default to the CefSettings.cache_path value. Any
+  /// non-empty value must be an absolute path. If both values are empty then
+  /// the default platform-specific directory will be used
+  /// ("~/.config/cef_user_data" directory on Linux, "~/Library/Application
+  /// Support/CEF/User Data" directory on MacOS, "AppData\Local\CEF\User Data"
+  /// directory under the user profile directory on Windows). Use of the default
+  /// directory is not recommended in production applications (see below).
+  ///
+  /// Multiple application instances writing to the same root_cache_path
+  /// directory could result in data corruption. A process singleton lock based
+  /// on the root_cache_path value is therefore used to protect against this.
+  /// This singleton behavior applies to all CEF-based applications using
+  /// version 120 or newer. You should customize root_cache_path for your
+  /// application and implement CefBrowserProcessHandler::
+  /// OnAlreadyRunningAppRelaunch, which will then be called on any app relaunch
+  /// with the same root_cache_path value.
+  ///
+  /// Failure to set the root_cache_path value correctly may result in startup
+  /// crashes or other unexpected behaviors (for example, the sandbox blocking
+  /// read/write access to certain files).
+  ///
+  cef_string_t root_cache_path;
+
+  ///
+  /// To persist session cookies (cookies without an expiry date or validity
+  /// interval) by default when using the global cookie manager set this value
+  /// to true (1). Session cookies are generally intended to be transient and
+  /// most Web browsers do not persist them. A |cache_path| value must also be
+  /// specified to enable this feature. Also configurable using the
+  /// "persist-session-cookies" command-line switch. Can be overridden for
+  /// individual CefRequestContext instances via the
+  /// CefRequestContextSettings.persist_session_cookies value.
   ///
   int persist_session_cookies;
 
   ///
-  // To persist user preferences as a JSON file in the cache path directory set
-  // this value to true (1). A |cache_path| value must also be specified
-  // to enable this feature. Also configurable using the
-  // "persist-user-preferences" command-line switch. Can be overridden for
-  // individual CefRequestContext instances via the
-  // CefRequestContextSettings.persist_user_preferences value.
+  /// To persist user preferences as a JSON file in the cache path directory set
+  /// this value to true (1). A |cache_path| value must also be specified
+  /// to enable this feature. Also configurable using the
+  /// "persist-user-preferences" command-line switch. Can be overridden for
+  /// individual CefRequestContext instances via the
+  /// CefRequestContextSettings.persist_user_preferences value.
   ///
   int persist_user_preferences;
 
   ///
-  // Value that will be returned as the User-Agent HTTP header. If empty the
-  // default User-Agent string will be used. Also configurable using the
-  // "user-agent" command-line switch.
+  /// Value that will be returned as the User-Agent HTTP header. If empty the
+  /// default User-Agent string will be used. Also configurable using the
+  /// "user-agent" command-line switch.
   ///
   cef_string_t user_agent;
 
   ///
-  // Value that will be inserted as the product portion of the default
-  // User-Agent string. If empty the Chromium product version will be used. If
-  // |userAgent| is specified this value will be ignored. Also configurable
-  // using the "product-version" command-line switch.
+  /// Value that will be inserted as the product portion of the default
+  /// User-Agent string. If empty the Chromium product version will be used. If
+  /// |userAgent| is specified this value will be ignored. Also configurable
+  /// using the "user-agent-product" command-line switch.
   ///
-  cef_string_t product_version;
+  cef_string_t user_agent_product;
 
   ///
-  // The locale string that will be passed to WebKit. If empty the default
-  // locale of "en-US" will be used. This value is ignored on Linux where locale
-  // is determined using environment variable parsing with the precedence order:
-  // LANGUAGE, LC_ALL, LC_MESSAGES and LANG. Also configurable using the "lang"
-  // command-line switch.
+  /// The locale string that will be passed to WebKit. If empty the default
+  /// locale of "en-US" will be used. This value is ignored on Linux where
+  /// locale is determined using environment variable parsing with the
+  /// precedence order: LANGUAGE, LC_ALL, LC_MESSAGES and LANG. Also
+  /// configurable using the "lang" command-line switch.
   ///
   cef_string_t locale;
 
   ///
-  // The directory and file name to use for the debug log. If empty a default
-  // log file name and location will be used. On Windows and Linux a "debug.log"
-  // file will be written in the main executable directory. On Mac OS X a
-  // "~/Library/Logs/<app name>_debug.log" file will be written where <app name>
-  // is the name of the main app executable. Also configurable using the
-  // "log-file" command-line switch.
+  /// The directory and file name to use for the debug log. If empty a default
+  /// log file name and location will be used. On Windows and Linux a
+  /// "debug.log" file will be written in the main executable directory. On
+  /// MacOS a "~/Library/Logs/[app name]_debug.log" file will be written where
+  /// [app name] is the name of the main app executable. Also configurable using
+  /// the "log-file" command-line switch.
   ///
   cef_string_t log_file;
 
   ///
-  // The log severity. Only messages of this severity level or higher will be
-  // logged. Also configurable using the "log-severity" command-line switch with
-  // a value of "verbose", "info", "warning", "error", "error-report" or
-  // "disable".
+  /// The log severity. Only messages of this severity level or higher will be
+  /// logged. When set to DISABLE no messages will be written to the log file,
+  /// but FATAL messages will still be output to stderr. Also configurable using
+  /// the "log-severity" command-line switch with a value of "verbose", "info",
+  /// "warning", "error", "fatal" or "disable".
   ///
   cef_log_severity_t log_severity;
 
   ///
-  // Custom flags that will be used when initializing the V8 JavaScript engine.
-  // The consequences of using custom flags may not be well tested. Also
-  // configurable using the "js-flags" command-line switch.
+  /// The log items prepended to each log line. If not set the default log items
+  /// will be used. Also configurable using the "log-items" command-line switch
+  /// with a value of "none" for no log items, or a comma-delimited list of
+  /// values "pid", "tid", "timestamp" or "tickcount" for custom log items.
+  ///
+  cef_log_items_t log_items;
+
+  ///
+  /// Custom flags that will be used when initializing the V8 JavaScript engine.
+  /// The consequences of using custom flags may not be well tested. Also
+  /// configurable using the "js-flags" command-line switch.
   ///
   cef_string_t javascript_flags;
 
   ///
-  // The fully qualified path for the resources directory. If this value is
-  // empty the cef.pak and/or devtools_resources.pak files must be located in
-  // the module directory on Windows/Linux or the app bundle Resources directory
-  // on Mac OS X. Also configurable using the "resources-dir-path" command-line
-  // switch.
+  /// The fully qualified path for the resources directory. If this value is
+  /// empty the *.pak files must be located in the module directory on
+  /// Windows/Linux or the app bundle Resources directory on MacOS. If this
+  /// value is non-empty then it must be an absolute path. Also configurable
+  /// using the "resources-dir-path" command-line switch.
   ///
   cef_string_t resources_dir_path;
 
   ///
-  // The fully qualified path for the locales directory. If this value is empty
-  // the locales directory must be located in the module directory. This value
-  // is ignored on Mac OS X where pack files are always loaded from the app
-  // bundle Resources directory. Also configurable using the "locales-dir-path"
-  // command-line switch.
+  /// The fully qualified path for the locales directory. If this value is empty
+  /// the locales directory must be located in the module directory. If this
+  /// value is non-empty then it must be an absolute path. This value is ignored
+  /// on MacOS where pack files are always loaded from the app bundle Resources
+  /// directory. Also configurable using the "locales-dir-path" command-line
+  /// switch.
   ///
   cef_string_t locales_dir_path;
 
   ///
-  // Set to true (1) to disable loading of pack files for resources and locales.
-  // A resource bundle handler must be provided for the browser and render
-  // processes via CefApp::GetResourceBundleHandler() if loading of pack files
-  // is disabled. Also configurable using the "disable-pack-loading" command-
-  // line switch.
+  /// Set to true (1) to disable loading of pack files for resources and
+  /// locales. A resource bundle handler must be provided for the browser and
+  /// render processes via CefApp::GetResourceBundleHandler() if loading of pack
+  /// files is disabled. Also configurable using the "disable-pack-loading"
+  /// command- line switch.
   ///
   int pack_loading_disabled;
 
   ///
-  // Set to a value between 1024 and 65535 to enable remote debugging on the
-  // specified port. For example, if 8080 is specified the remote debugging URL
-  // will be http://localhost:8080. CEF can be remotely debugged from any CEF or
-  // Chrome browser window. Also configurable using the "remote-debugging-port"
-  // command-line switch.
+  /// Set to a value between 1024 and 65535 to enable remote debugging on the
+  /// specified port. Also configurable using the "remote-debugging-port"
+  /// command-line switch. Specifying 0 via the command-line switch will result
+  /// in the selection of an ephemeral port and the port number will be printed
+  /// as part of the WebSocket endpoint URL to stderr. If a cache directory path
+  /// is provided the port will also be written to the
+  /// <cache-dir>/DevToolsActivePort file. Remote debugging can be accessed by
+  /// loading the chrome://inspect page in Google Chrome. Port numbers 9222 and
+  /// 9229 are discoverable by default. Other port numbers may need to be
+  /// configured via "Discover network targets" on the Devices tab.
   ///
   int remote_debugging_port;
 
   ///
-  // The number of stack trace frames to capture for uncaught exceptions.
-  // Specify a positive value to enable the CefRenderProcessHandler::
-  // OnUncaughtException() callback. Specify 0 (default value) and
-  // OnUncaughtException() will not be called. Also configurable using the
-  // "uncaught-exception-stack-size" command-line switch.
+  /// The number of stack trace frames to capture for uncaught exceptions.
+  /// Specify a positive value to enable the
+  /// CefRenderProcessHandler::OnUncaughtException() callback. Specify 0
+  /// (default value) and OnUncaughtException() will not be called. Also
+  /// configurable using the "uncaught-exception-stack-size" command-line
+  /// switch.
   ///
   int uncaught_exception_stack_size;
 
   ///
-  // Set to true (1) to ignore errors related to invalid SSL certificates.
-  // Enabling this setting can lead to potential security vulnerabilities like
-  // "man in the middle" attacks. Applications that load content from the
-  // internet should not enable this setting. Also configurable using the
-  // "ignore-certificate-errors" command-line switch. Can be overridden for
-  // individual CefRequestContext instances via the
-  // CefRequestContextSettings.ignore_certificate_errors value.
+  /// Background color used for the browser before a document is loaded and when
+  /// no document color is specified. The alpha component must be either fully
+  /// opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
+  /// opaque then the RGB components will be used as the background color. If
+  /// the alpha component is fully transparent for a windowed browser then the
+  /// default value of opaque white be used. If the alpha component is fully
+  /// transparent for a windowless (off-screen) browser then transparent
+  /// painting will be enabled.
   ///
-  int ignore_certificate_errors;
+  cef_color_t background_color;
 
   ///
-  // Set to true (1) to enable date-based expiration of built in network
-  // security information (i.e. certificate transparency logs, HSTS preloading
-  // and pinning information). Enabling this option improves network security
-  // but may cause HTTPS load failures when using CEF binaries built more than
-  // 10 weeks in the past. See https://www.certificate-transparency.org/ and
-  // https://www.chromium.org/hsts for details. Also configurable using the
-  // "enable-net-security-expiration" command-line switch. Can be overridden for
-  // individual CefRequestContext instances via the
-  // CefRequestContextSettings.enable_net_security_expiration value.
+  /// Comma delimited ordered list of language codes without any whitespace that
+  /// will be used in the "Accept-Language" HTTP request header and
+  /// "navigator.language" JS attribute. Can be overridden for individual
+  /// CefRequestContext instances via the
+  /// CefRequestContextSettings.accept_language_list value.
   ///
-  int enable_net_security_expiration;
+  cef_string_t accept_language_list;
 
   ///
-  // Background color used for the browser before a document is loaded and when
-  // no document color is specified. The alpha component must be either fully
-  // opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
-  // opaque then the RGB components will be used as the background color. If the
-  // alpha component is fully transparent for a windowed browser then the
-  // default value of opaque white be used. If the alpha component is fully
-  // transparent for a windowless (off-screen) browser then transparent painting
-  // will be enabled.
+  /// Comma delimited list of schemes supported by the associated
+  /// CefCookieManager. If |cookieable_schemes_exclude_defaults| is false (0)
+  /// the default schemes ("http", "https", "ws" and "wss") will also be
+  /// supported. Not specifying a |cookieable_schemes_list| value and setting
+  /// |cookieable_schemes_exclude_defaults| to true (1) will disable all loading
+  /// and saving of cookies. These settings will only impact the global
+  /// CefRequestContext. Individual CefRequestContext instances can be
+  /// configured via the CefRequestContextSettings.cookieable_schemes_list and
+  /// CefRequestContextSettings.cookieable_schemes_exclude_defaults values.
   ///
-  cef_color_t background_color;
+  cef_string_t cookieable_schemes_list;
+  int cookieable_schemes_exclude_defaults;
 
   ///
-  // Comma delimited ordered list of language codes without any whitespace that
-  // will be used in the "Accept-Language" HTTP header. May be overridden on a
-  // per-browser basis using the CefBrowserSettings.accept_language_list value.
-  // If both values are empty then "en-US,en" will be used. Can be overridden
-  // for individual CefRequestContext instances via the
-  // CefRequestContextSettings.accept_language_list value.
+  /// Specify an ID to enable Chrome policy management via Platform and OS-user
+  /// policies. On Windows, this is a registry key like
+  /// "SOFTWARE\\Policies\\Google\\Chrome". On MacOS, this is a bundle ID like
+  /// "com.google.Chrome". On Linux, this is an absolute directory path like
+  /// "/etc/opt/chrome/policies". Only supported with the Chrome runtime. See
+  /// https://support.google.com/chrome/a/answer/9037717 for details.
   ///
-  cef_string_t accept_language_list;
+  /// Chrome Browser Cloud Management integration, when enabled via the
+  /// "enable-chrome-browser-cloud-management" command-line flag, will also use
+  /// the specified ID. See https://support.google.com/chrome/a/answer/9116814
+  /// for details.
+  ///
+  cef_string_t chrome_policy_id;
+
+  ///
+  /// Specify an ID for an ICON resource that can be loaded from the main
+  /// executable and used when creating default Chrome windows such as DevTools
+  /// and Task Manager. If unspecified the default Chromium ICON (IDR_MAINFRAME
+  /// [101]) will be loaded from libcef.dll. Only supported with the Chrome
+  /// runtime on Windows.
+  ///
+  int chrome_app_icon_id;
 } cef_settings_t;
 
 ///
-// Request context initialization settings. Specify NULL or 0 to get the
-// recommended default values.
+/// Request context initialization settings. Specify NULL or 0 to get the
+/// recommended default values.
 ///
 typedef struct _cef_request_context_settings_t {
   ///
-  // Size of this structure.
+  /// Size of this structure.
   ///
   size_t size;
 
   ///
-  // The location where cache data will be stored on disk. If empty then
-  // browsers will be created in "incognito mode" where in-memory caches are
-  // used for storage and no data is persisted to disk. HTML5 databases such as
-  // localStorage will only persist across sessions if a cache path is
-  // specified. To share the global browser cache and related configuration set
-  // this value to match the CefSettings.cache_path value.
+  /// The directory where cache data for this request context will be stored on
+  /// disk. If this value is non-empty then it must be an absolute path that is
+  /// either equal to or a child directory of CefSettings.root_cache_path. If
+  /// this value is empty then browsers will be created in "incognito mode"
+  /// where in-memory caches are used for storage and no profile-specific data
+  /// is persisted to disk (installation-specific data will still be persisted
+  /// in root_cache_path). HTML5 databases such as localStorage will only
+  /// persist across sessions if a cache path is specified. To share the global
+  /// browser cache and related configuration set this value to match the
+  /// CefSettings.cache_path value.
   ///
   cef_string_t cache_path;
 
   ///
-  // To persist session cookies (cookies without an expiry date or validity
-  // interval) by default when using the global cookie manager set this value to
-  // true (1). Session cookies are generally intended to be transient and most
-  // Web browsers do not persist them. Can be set globally using the
-  // CefSettings.persist_session_cookies value. This value will be ignored if
-  // |cache_path| is empty or if it matches the CefSettings.cache_path value.
+  /// To persist session cookies (cookies without an expiry date or validity
+  /// interval) by default when using the global cookie manager set this value
+  /// to true (1). Session cookies are generally intended to be transient and
+  /// most Web browsers do not persist them. Can be set globally using the
+  /// CefSettings.persist_session_cookies value. This value will be ignored if
+  /// |cache_path| is empty or if it matches the CefSettings.cache_path value.
   ///
   int persist_session_cookies;
 
   ///
-  // To persist user preferences as a JSON file in the cache path directory set
-  // this value to true (1). Can be set globally using the
-  // CefSettings.persist_user_preferences value. This value will be ignored if
-  // |cache_path| is empty or if it matches the CefSettings.cache_path value.
+  /// To persist user preferences as a JSON file in the cache path directory set
+  /// this value to true (1). Can be set globally using the
+  /// CefSettings.persist_user_preferences value. This value will be ignored if
+  /// |cache_path| is empty or if it matches the CefSettings.cache_path value.
   ///
   int persist_user_preferences;
 
   ///
-  // Set to true (1) to ignore errors related to invalid SSL certificates.
-  // Enabling this setting can lead to potential security vulnerabilities like
-  // "man in the middle" attacks. Applications that load content from the
-  // internet should not enable this setting. Can be set globally using the
-  // CefSettings.ignore_certificate_errors value. This value will be ignored if
-  // |cache_path| matches the CefSettings.cache_path value.
-  ///
-  int ignore_certificate_errors;
-
-  ///
-  // Set to true (1) to enable date-based expiration of built in network
-  // security information (i.e. certificate transparency logs, HSTS preloading
-  // and pinning information). Enabling this option improves network security
-  // but may cause HTTPS load failures when using CEF binaries built more than
-  // 10 weeks in the past. See https://www.certificate-transparency.org/ and
-  // https://www.chromium.org/hsts for details. Can be set globally using the
-  // CefSettings.enable_net_security_expiration value.
+  /// Comma delimited ordered list of language codes without any whitespace that
+  /// will be used in the "Accept-Language" HTTP request header and
+  /// "navigator.language" JS attribute. Can be set globally using the
+  /// CefSettings.accept_language_list value. If all values are empty then
+  /// "en-US,en" will be used. This value will be ignored if |cache_path|
+  /// matches the CefSettings.cache_path value.
   ///
-  int enable_net_security_expiration;
+  cef_string_t accept_language_list;
 
   ///
-  // Comma delimited ordered list of language codes without any whitespace that
-  // will be used in the "Accept-Language" HTTP header. Can be set globally
-  // using the CefSettings.accept_language_list value or overridden on a per-
-  // browser basis using the CefBrowserSettings.accept_language_list value. If
-  // all values are empty then "en-US,en" will be used. This value will be
-  // ignored if |cache_path| matches the CefSettings.cache_path value.
+  /// Comma delimited list of schemes supported by the associated
+  /// CefCookieManager. If |cookieable_schemes_exclude_defaults| is false (0)
+  /// the default schemes ("http", "https", "ws" and "wss") will also be
+  /// supported. Not specifying a |cookieable_schemes_list| value and setting
+  /// |cookieable_schemes_exclude_defaults| to true (1) will disable all loading
+  /// and saving of cookies. These values will be ignored if |cache_path|
+  /// matches the CefSettings.cache_path value.
   ///
-  cef_string_t accept_language_list;
+  cef_string_t cookieable_schemes_list;
+  int cookieable_schemes_exclude_defaults;
 } cef_request_context_settings_t;
 
 ///
-// Browser initialization settings. Specify NULL or 0 to get the recommended
-// default values. The consequences of using custom values may not be well
-// tested. Many of these and other settings can also configured using command-
-// line switches.
+/// Browser initialization settings. Specify NULL or 0 to get the recommended
+/// default values. The consequences of using custom values may not be well
+/// tested. Many of these and other settings can also configured using command-
+/// line switches.
 ///
 typedef struct _cef_browser_settings_t {
   ///
-  // Size of this structure.
+  /// Size of this structure.
   ///
   size_t size;
 
   ///
-  // The maximum rate in frames per second (fps) that CefRenderHandler::OnPaint
-  // will be called for a windowless browser. The actual fps may be lower if
-  // the browser cannot generate frames at the requested rate. The minimum
-  // value is 1 and the maximum value is 60 (default 30). This value can also be
-  // changed dynamically via CefBrowserHost::SetWindowlessFrameRate.
+  /// The maximum rate in frames per second (fps) that CefRenderHandler::OnPaint
+  /// will be called for a windowless browser. The actual fps may be lower if
+  /// the browser cannot generate frames at the requested rate. The minimum
+  /// value is 1 and the maximum value is 60 (default 30). This value can also
+  /// be changed dynamically via CefBrowserHost::SetWindowlessFrameRate.
   ///
   int windowless_frame_rate;
 
-  // The below values map to WebPreferences settings.
+  /// BEGIN values that map to WebPreferences settings.
 
   ///
-  // Font settings.
+  /// Font settings.
   ///
   cef_string_t standard_font_family;
   cef_string_t fixed_font_family;
@@ -511,350 +617,364 @@ typedef struct _cef_browser_settings_t {
   int minimum_logical_font_size;
 
   ///
-  // Default encoding for Web content. If empty "ISO-8859-1" will be used. Also
-  // configurable using the "default-encoding" command-line switch.
+  /// Default encoding for Web content. If empty "ISO-8859-1" will be used. Also
+  /// configurable using the "default-encoding" command-line switch.
   ///
   cef_string_t default_encoding;
 
   ///
-  // Controls the loading of fonts from remote sources. Also configurable using
-  // the "disable-remote-fonts" command-line switch.
+  /// Controls the loading of fonts from remote sources. Also configurable using
+  /// the "disable-remote-fonts" command-line switch.
   ///
   cef_state_t remote_fonts;
 
   ///
-  // Controls whether JavaScript can be executed. Also configurable using the
-  // "disable-javascript" command-line switch.
+  /// Controls whether JavaScript can be executed. Also configurable using the
+  /// "disable-javascript" command-line switch.
   ///
   cef_state_t javascript;
 
   ///
-  // Controls whether JavaScript can be used to close windows that were not
-  // opened via JavaScript. JavaScript can still be used to close windows that
-  // were opened via JavaScript or that have no back/forward history. Also
-  // configurable using the "disable-javascript-close-windows" command-line
-  // switch.
+  /// Controls whether JavaScript can be used to close windows that were not
+  /// opened via JavaScript. JavaScript can still be used to close windows that
+  /// were opened via JavaScript or that have no back/forward history. Also
+  /// configurable using the "disable-javascript-close-windows" command-line
+  /// switch.
   ///
   cef_state_t javascript_close_windows;
 
   ///
-  // Controls whether JavaScript can access the clipboard. Also configurable
-  // using the "disable-javascript-access-clipboard" command-line switch.
+  /// Controls whether JavaScript can access the clipboard. Also configurable
+  /// using the "disable-javascript-access-clipboard" command-line switch.
   ///
   cef_state_t javascript_access_clipboard;
 
   ///
-  // Controls whether DOM pasting is supported in the editor via
-  // execCommand("paste"). The |javascript_access_clipboard| setting must also
-  // be enabled. Also configurable using the "disable-javascript-dom-paste"
-  // command-line switch.
+  /// Controls whether DOM pasting is supported in the editor via
+  /// execCommand("paste"). The |javascript_access_clipboard| setting must also
+  /// be enabled. Also configurable using the "disable-javascript-dom-paste"
+  /// command-line switch.
   ///
   cef_state_t javascript_dom_paste;
 
   ///
-  // Controls whether any plugins will be loaded. Also configurable using the
-  // "disable-plugins" command-line switch.
-  ///
-  cef_state_t plugins;
-
-  ///
-  // Controls whether file URLs will have access to all URLs. Also configurable
-  // using the "allow-universal-access-from-files" command-line switch.
-  ///
-  cef_state_t universal_access_from_file_urls;
-
-  ///
-  // Controls whether file URLs will have access to other file URLs. Also
-  // configurable using the "allow-access-from-files" command-line switch.
-  ///
-  cef_state_t file_access_from_file_urls;
-
-  ///
-  // Controls whether web security restrictions (same-origin policy) will be
-  // enforced. Disabling this setting is not recommend as it will allow risky
-  // security behavior such as cross-site scripting (XSS). Also configurable
-  // using the "disable-web-security" command-line switch.
-  ///
-  cef_state_t web_security;
-
-  ///
-  // Controls whether image URLs will be loaded from the network. A cached image
-  // will still be rendered if requested. Also configurable using the
-  // "disable-image-loading" command-line switch.
+  /// Controls whether image URLs will be loaded from the network. A cached
+  /// image will still be rendered if requested. Also configurable using the
+  /// "disable-image-loading" command-line switch.
   ///
   cef_state_t image_loading;
 
   ///
-  // Controls whether standalone images will be shrunk to fit the page. Also
-  // configurable using the "image-shrink-standalone-to-fit" command-line
-  // switch.
+  /// Controls whether standalone images will be shrunk to fit the page. Also
+  /// configurable using the "image-shrink-standalone-to-fit" command-line
+  /// switch.
   ///
   cef_state_t image_shrink_standalone_to_fit;
 
   ///
-  // Controls whether text areas can be resized. Also configurable using the
-  // "disable-text-area-resize" command-line switch.
+  /// Controls whether text areas can be resized. Also configurable using the
+  /// "disable-text-area-resize" command-line switch.
   ///
   cef_state_t text_area_resize;
 
   ///
-  // Controls whether the tab key can advance focus to links. Also configurable
-  // using the "disable-tab-to-links" command-line switch.
+  /// Controls whether the tab key can advance focus to links. Also configurable
+  /// using the "disable-tab-to-links" command-line switch.
   ///
   cef_state_t tab_to_links;
 
   ///
-  // Controls whether local storage can be used. Also configurable using the
-  // "disable-local-storage" command-line switch.
+  /// Controls whether local storage can be used. Also configurable using the
+  /// "disable-local-storage" command-line switch.
   ///
   cef_state_t local_storage;
 
   ///
-  // Controls whether databases can be used. Also configurable using the
-  // "disable-databases" command-line switch.
+  /// Controls whether databases can be used. Also configurable using the
+  /// "disable-databases" command-line switch.
   ///
   cef_state_t databases;
 
   ///
-  // Controls whether the application cache can be used. Also configurable using
-  // the "disable-application-cache" command-line switch.
+  /// Controls whether WebGL can be used. Note that WebGL requires hardware
+  /// support and may not work on all systems even when enabled. Also
+  /// configurable using the "disable-webgl" command-line switch.
   ///
-  cef_state_t application_cache;
+  cef_state_t webgl;
+
+  /// END values that map to WebPreferences settings.
 
   ///
-  // Controls whether WebGL can be used. Note that WebGL requires hardware
-  // support and may not work on all systems even when enabled. Also
-  // configurable using the "disable-webgl" command-line switch.
+  /// Background color used for the browser before a document is loaded and when
+  /// no document color is specified. The alpha component must be either fully
+  /// opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
+  /// opaque then the RGB components will be used as the background color. If
+  /// the alpha component is fully transparent for a windowed browser then the
+  /// CefSettings.background_color value will be used. If the alpha component is
+  /// fully transparent for a windowless (off-screen) browser then transparent
+  /// painting will be enabled.
   ///
-  cef_state_t webgl;
+  cef_color_t background_color;
 
   ///
-  // Background color used for the browser before a document is loaded and when
-  // no document color is specified. The alpha component must be either fully
-  // opaque (0xFF) or fully transparent (0x00). If the alpha component is fully
-  // opaque then the RGB components will be used as the background color. If the
-  // alpha component is fully transparent for a windowed browser then the
-  // CefSettings.background_color value will be used. If the alpha component is
-  // fully transparent for a windowless (off-screen) browser then transparent
-  // painting will be enabled.
+  /// Controls whether the Chrome status bubble will be used. Only supported
+  /// with the Chrome runtime. For details about the status bubble see
+  /// https://www.chromium.org/user-experience/status-bubble/
   ///
-  cef_color_t background_color;
+  cef_state_t chrome_status_bubble;
 
   ///
-  // Comma delimited ordered list of language codes without any whitespace that
-  // will be used in the "Accept-Language" HTTP header. May be set globally
-  // using the CefBrowserSettings.accept_language_list value. If both values are
-  // empty then "en-US,en" will be used.
+  /// Controls whether the Chrome zoom bubble will be shown when zooming. Only
+  /// supported with the Chrome runtime.
   ///
-  cef_string_t accept_language_list;
+  cef_state_t chrome_zoom_bubble;
 } cef_browser_settings_t;
 
 ///
-// Return value types.
+/// Return value types.
 ///
 typedef enum {
   ///
-  // Cancel immediately.
+  /// Cancel immediately.
   ///
   RV_CANCEL = 0,
 
   ///
-  // Continue immediately.
+  /// Continue immediately.
   ///
   RV_CONTINUE,
 
   ///
-  // Continue asynchronously (usually via a callback).
+  /// Continue asynchronously (usually via a callback).
   ///
   RV_CONTINUE_ASYNC,
 } cef_return_value_t;
 
 ///
-// URL component parts.
+/// URL component parts.
 ///
 typedef struct _cef_urlparts_t {
   ///
-  // The complete URL specification.
+  /// The complete URL specification.
   ///
   cef_string_t spec;
 
   ///
-  // Scheme component not including the colon (e.g., "http").
+  /// Scheme component not including the colon (e.g., "http").
   ///
   cef_string_t scheme;
 
   ///
-  // User name component.
+  /// User name component.
   ///
   cef_string_t username;
 
   ///
-  // Password component.
+  /// Password component.
   ///
   cef_string_t password;
 
   ///
-  // Host component. This may be a hostname, an IPv4 address or an IPv6 literal
-  // surrounded by square brackets (e.g., "[2001:db8::1]").
+  /// Host component. This may be a hostname, an IPv4 address or an IPv6 literal
+  /// surrounded by square brackets (e.g., "[2001:db8::1]").
   ///
   cef_string_t host;
 
   ///
-  // Port number component.
+  /// Port number component.
   ///
   cef_string_t port;
 
   ///
-  // Origin contains just the scheme, host, and port from a URL. Equivalent to
-  // clearing any username and password, replacing the path with a slash, and
-  // clearing everything after that. This value will be empty for non-standard
-  // URLs.
+  /// Origin contains just the scheme, host, and port from a URL. Equivalent to
+  /// clearing any username and password, replacing the path with a slash, and
+  /// clearing everything after that. This value will be empty for non-standard
+  /// URLs.
   ///
   cef_string_t origin;
 
   ///
-  // Path component including the first slash following the host.
+  /// Path component including the first slash following the host.
   ///
   cef_string_t path;
 
   ///
-  // Query string component (i.e., everything following the '?').
+  /// Query string component (i.e., everything following the '?').
   ///
   cef_string_t query;
+
+  ///
+  /// Fragment (hash) identifier component (i.e., the string following the '#').
+  ///
+  cef_string_t fragment;
 } cef_urlparts_t;
 
 ///
-// Cookie information.
+/// Cookie priority values.
+///
+typedef enum {
+  CEF_COOKIE_PRIORITY_LOW = -1,
+  CEF_COOKIE_PRIORITY_MEDIUM = 0,
+  CEF_COOKIE_PRIORITY_HIGH = 1,
+} cef_cookie_priority_t;
+
+///
+/// Cookie same site values.
+///
+typedef enum {
+  CEF_COOKIE_SAME_SITE_UNSPECIFIED,
+  CEF_COOKIE_SAME_SITE_NO_RESTRICTION,
+  CEF_COOKIE_SAME_SITE_LAX_MODE,
+  CEF_COOKIE_SAME_SITE_STRICT_MODE,
+} cef_cookie_same_site_t;
+
+///
+/// Cookie information.
 ///
 typedef struct _cef_cookie_t {
   ///
-  // The cookie name.
+  /// The cookie name.
   ///
   cef_string_t name;
 
   ///
-  // The cookie value.
+  /// The cookie value.
   ///
   cef_string_t value;
 
   ///
-  // If |domain| is empty a host cookie will be created instead of a domain
-  // cookie. Domain cookies are stored with a leading "." and are visible to
-  // sub-domains whereas host cookies are not.
+  /// If |domain| is empty a host cookie will be created instead of a domain
+  /// cookie. Domain cookies are stored with a leading "." and are visible to
+  /// sub-domains whereas host cookies are not.
   ///
   cef_string_t domain;
 
   ///
-  // If |path| is non-empty only URLs at or below the path will get the cookie
-  // value.
+  /// If |path| is non-empty only URLs at or below the path will get the cookie
+  /// value.
   ///
   cef_string_t path;
 
   ///
-  // If |secure| is true the cookie will only be sent for HTTPS requests.
+  /// If |secure| is true the cookie will only be sent for HTTPS requests.
   ///
   int secure;
 
   ///
-  // If |httponly| is true the cookie will only be sent for HTTP requests.
+  /// If |httponly| is true the cookie will only be sent for HTTP requests.
   ///
   int httponly;
 
   ///
-  // The cookie creation date. This is automatically populated by the system on
-  // cookie creation.
+  /// The cookie creation date. This is automatically populated by the system on
+  /// cookie creation.
   ///
-  cef_time_t creation;
+  cef_basetime_t creation;
 
   ///
-  // The cookie last access date. This is automatically populated by the system
-  // on access.
+  /// The cookie last access date. This is automatically populated by the system
+  /// on access.
   ///
-  cef_time_t last_access;
+  cef_basetime_t last_access;
 
   ///
-  // The cookie expiration date is only valid if |has_expires| is true.
+  /// The cookie expiration date is only valid if |has_expires| is true.
   ///
   int has_expires;
-  cef_time_t expires;
+  cef_basetime_t expires;
+
+  ///
+  /// Same site.
+  ///
+  cef_cookie_same_site_t same_site;
+
+  ///
+  /// Priority.
+  ///
+  cef_cookie_priority_t priority;
 } cef_cookie_t;
 
 ///
-// Process termination status values.
+/// Process termination status values.
 ///
 typedef enum {
   ///
-  // Non-zero exit status.
+  /// Non-zero exit status.
   ///
   TS_ABNORMAL_TERMINATION,
 
   ///
-  // SIGKILL or task manager kill.
+  /// SIGKILL or task manager kill.
   ///
   TS_PROCESS_WAS_KILLED,
 
   ///
-  // Segmentation fault.
+  /// Segmentation fault.
   ///
   TS_PROCESS_CRASHED,
+
+  ///
+  /// Out of memory. Some platforms may use TS_PROCESS_CRASHED instead.
+  ///
+  TS_PROCESS_OOM,
 } cef_termination_status_t;
 
 ///
-// Path key values.
+/// Path key values.
 ///
 typedef enum {
   ///
-  // Current directory.
+  /// Current directory.
   ///
   PK_DIR_CURRENT,
 
   ///
-  // Directory containing PK_FILE_EXE.
+  /// Directory containing PK_FILE_EXE.
   ///
   PK_DIR_EXE,
 
   ///
-  // Directory containing PK_FILE_MODULE.
+  /// Directory containing PK_FILE_MODULE.
   ///
   PK_DIR_MODULE,
 
   ///
-  // Temporary directory.
+  /// Temporary directory.
   ///
   PK_DIR_TEMP,
 
   ///
-  // Path and filename of the current executable.
+  /// Path and filename of the current executable.
   ///
   PK_FILE_EXE,
 
   ///
-  // Path and filename of the module containing the CEF code (usually the libcef
-  // module).
+  /// Path and filename of the module containing the CEF code (usually the
+  /// libcef module).
   ///
   PK_FILE_MODULE,
 
   ///
-  // "Local Settings\Application Data" directory under the user profile
-  // directory on Windows.
+  /// "Local Settings\Application Data" directory under the user profile
+  /// directory on Windows.
   ///
   PK_LOCAL_APP_DATA,
 
   ///
-  // "Application Data" directory under the user profile directory on Windows
-  // and "~/Library/Application Support" directory on Mac OS X.
+  /// "Application Data" directory under the user profile directory on Windows
+  /// and "~/Library/Application Support" directory on MacOS.
   ///
   PK_USER_DATA,
 
   ///
-  // Directory containing application resources. Can be configured via
-  // CefSettings.resources_dir_path.
+  /// Directory containing application resources. Can be configured via
+  /// CefSettings.resources_dir_path.
   ///
   PK_DIR_RESOURCES,
 } cef_path_key_t;
 
 ///
-// Storage types.
+/// Storage types.
 ///
 typedef enum {
   ST_LOCALSTORAGE = 0,
@@ -862,72 +982,23 @@ typedef enum {
 } cef_storage_type_t;
 
 ///
-// Supported error code values. See net\base\net_error_list.h for complete
-// descriptions of the error codes.
+/// Supported error code values. For the complete list of error values see
+/// "include/base/internal/cef_net_error_list.h".
 ///
 typedef enum {
+  // No error.
   ERR_NONE = 0,
-  ERR_FAILED = -2,
-  ERR_ABORTED = -3,
-  ERR_INVALID_ARGUMENT = -4,
-  ERR_INVALID_HANDLE = -5,
-  ERR_FILE_NOT_FOUND = -6,
-  ERR_TIMED_OUT = -7,
-  ERR_FILE_TOO_BIG = -8,
-  ERR_UNEXPECTED = -9,
-  ERR_ACCESS_DENIED = -10,
-  ERR_NOT_IMPLEMENTED = -11,
-  ERR_CONNECTION_CLOSED = -100,
-  ERR_CONNECTION_RESET = -101,
-  ERR_CONNECTION_REFUSED = -102,
-  ERR_CONNECTION_ABORTED = -103,
-  ERR_CONNECTION_FAILED = -104,
-  ERR_NAME_NOT_RESOLVED = -105,
-  ERR_INTERNET_DISCONNECTED = -106,
-  ERR_SSL_PROTOCOL_ERROR = -107,
-  ERR_ADDRESS_INVALID = -108,
-  ERR_ADDRESS_UNREACHABLE = -109,
-  ERR_SSL_CLIENT_AUTH_CERT_NEEDED = -110,
-  ERR_TUNNEL_CONNECTION_FAILED = -111,
-  ERR_NO_SSL_VERSIONS_ENABLED = -112,
-  ERR_SSL_VERSION_OR_CIPHER_MISMATCH = -113,
-  ERR_SSL_RENEGOTIATION_REQUESTED = -114,
-  ERR_CERT_COMMON_NAME_INVALID = -200,
-  ERR_CERT_BEGIN = ERR_CERT_COMMON_NAME_INVALID,
-  ERR_CERT_DATE_INVALID = -201,
-  ERR_CERT_AUTHORITY_INVALID = -202,
-  ERR_CERT_CONTAINS_ERRORS = -203,
-  ERR_CERT_NO_REVOCATION_MECHANISM = -204,
-  ERR_CERT_UNABLE_TO_CHECK_REVOCATION = -205,
-  ERR_CERT_REVOKED = -206,
-  ERR_CERT_INVALID = -207,
-  ERR_CERT_WEAK_SIGNATURE_ALGORITHM = -208,
-  // -209 is available: was ERR_CERT_NOT_IN_DNS.
-  ERR_CERT_NON_UNIQUE_NAME = -210,
-  ERR_CERT_WEAK_KEY = -211,
-  ERR_CERT_NAME_CONSTRAINT_VIOLATION = -212,
-  ERR_CERT_VALIDITY_TOO_LONG = -213,
-  ERR_CERT_END = ERR_CERT_VALIDITY_TOO_LONG,
-  ERR_INVALID_URL = -300,
-  ERR_DISALLOWED_URL_SCHEME = -301,
-  ERR_UNKNOWN_URL_SCHEME = -302,
-  ERR_TOO_MANY_REDIRECTS = -310,
-  ERR_UNSAFE_REDIRECT = -311,
-  ERR_UNSAFE_PORT = -312,
-  ERR_INVALID_RESPONSE = -320,
-  ERR_INVALID_CHUNKED_ENCODING = -321,
-  ERR_METHOD_NOT_SUPPORTED = -322,
-  ERR_UNEXPECTED_PROXY_AUTH = -323,
-  ERR_EMPTY_RESPONSE = -324,
-  ERR_RESPONSE_HEADERS_TOO_BIG = -325,
-  ERR_CACHE_MISS = -400,
-  ERR_INSECURE_RESPONSE = -501,
+
+#define NET_ERROR(label, value) ERR_##label = value,
+#include "include/base/internal/cef_net_error_list.h"
+#undef NET_ERROR
+
 } cef_errorcode_t;
 
 ///
-// Supported certificate status code values. See net\cert\cert_status_flags.h
-// for more information. CERT_STATUS_NONE is new in CEF because we use an
-// enum while cert_status_flags.h uses a typedef and static const variables.
+/// Supported certificate status code values. See net\cert\cert_status_flags.h
+/// for more information. CERT_STATUS_NONE is new in CEF because we use an
+/// enum while cert_status_flags.h uses a typedef and static const variables.
 ///
 typedef enum {
   CERT_STATUS_NONE = 0,
@@ -957,27 +1028,80 @@ typedef enum {
 } cef_cert_status_t;
 
 ///
-// The manner in which a link click should be opened. These constants match
-// their equivalents in Chromium's window_open_disposition.h and should not be
-// renumbered.
+/// The manner in which a link click should be opened. These constants match
+/// their equivalents in Chromium's window_open_disposition.h and should not be
+/// renumbered.
 ///
 typedef enum {
-  WOD_UNKNOWN,
-  WOD_CURRENT_TAB,
-  WOD_SINGLETON_TAB,
-  WOD_NEW_FOREGROUND_TAB,
-  WOD_NEW_BACKGROUND_TAB,
-  WOD_NEW_POPUP,
-  WOD_NEW_WINDOW,
-  WOD_SAVE_TO_DISK,
-  WOD_OFF_THE_RECORD,
-  WOD_IGNORE_ACTION
+  CEF_WOD_UNKNOWN,
+
+  ///
+  /// Current tab. This is the default in most cases.
+  ///
+  CEF_WOD_CURRENT_TAB,
+
+  ///
+  /// Indicates that only one tab with the url should exist in the same window.
+  ///
+  CEF_WOD_SINGLETON_TAB,
+
+  ///
+  /// Shift key + Middle mouse button or meta/ctrl key while clicking.
+  ///
+  CEF_WOD_NEW_FOREGROUND_TAB,
+
+  ///
+  /// Middle mouse button or meta/ctrl key while clicking.
+  ///
+  CEF_WOD_NEW_BACKGROUND_TAB,
+
+  ///
+  /// New popup window.
+  ///
+  CEF_WOD_NEW_POPUP,
+
+  ///
+  /// Shift key while clicking.
+  ///
+  CEF_WOD_NEW_WINDOW,
+
+  ///
+  /// Alt key while clicking.
+  ///
+  CEF_WOD_SAVE_TO_DISK,
+
+  ///
+  /// New off-the-record (incognito) window.
+  ///
+  CEF_WOD_OFF_THE_RECORD,
+
+  ///
+  /// Special case error condition from the renderer.
+  ///
+  CEF_WOD_IGNORE_ACTION,
+
+  ///
+  /// Activates an existing tab containing the url, rather than navigating.
+  /// This is similar to SINGLETON_TAB, but searches across all windows from
+  /// the current profile and anonymity (instead of just the current one);
+  /// closes the current tab on switching if the current tab was the NTP with
+  /// no session history; and behaves like CURRENT_TAB instead of
+  /// NEW_FOREGROUND_TAB when no existing tab is found.
+  ///
+  CEF_WOD_SWITCH_TO_TAB,
+
+  ///
+  /// Creates a new document picture-in-picture window showing a child WebView.
+  ///
+  CEF_WOD_NEW_PICTURE_IN_PICTURE,
+
+  CEF_WOD_MAX_VALUE = CEF_WOD_NEW_PICTURE_IN_PICTURE,
 } cef_window_open_disposition_t;
 
 ///
-// "Verb" of a drag-and-drop operation as negotiated between the source and
-// destination. These constants match their equivalents in WebCore's
-// DragActions.h and should not be renumbered.
+/// "Verb" of a drag-and-drop operation as negotiated between the source and
+/// destination. These constants match their equivalents in WebCore's
+/// DragActions.h and should not be renumbered.
 ///
 typedef enum {
   DRAG_OPERATION_NONE = 0,
@@ -991,7 +1115,26 @@ typedef enum {
 } cef_drag_operations_mask_t;
 
 ///
-// V8 access control values.
+/// Input mode of a virtual keyboard. These constants match their equivalents
+/// in Chromium's text_input_mode.h and should not be renumbered.
+/// See https://html.spec.whatwg.org/#input-modalities:-the-inputmode-attribute
+///
+typedef enum {
+  CEF_TEXT_INPUT_MODE_DEFAULT,
+  CEF_TEXT_INPUT_MODE_NONE,
+  CEF_TEXT_INPUT_MODE_TEXT,
+  CEF_TEXT_INPUT_MODE_TEL,
+  CEF_TEXT_INPUT_MODE_URL,
+  CEF_TEXT_INPUT_MODE_EMAIL,
+  CEF_TEXT_INPUT_MODE_NUMERIC,
+  CEF_TEXT_INPUT_MODE_DECIMAL,
+  CEF_TEXT_INPUT_MODE_SEARCH,
+
+  CEF_TEXT_INPUT_MODE_MAX = CEF_TEXT_INPUT_MODE_SEARCH,
+} cef_text_input_mode_t;
+
+///
+/// V8 access control values.
 ///
 typedef enum {
   V8_ACCESS_CONTROL_DEFAULT = 0,
@@ -1001,18 +1144,32 @@ typedef enum {
 } cef_v8_accesscontrol_t;
 
 ///
-// V8 property attribute values.
+/// V8 property attribute values.
 ///
 typedef enum {
-  V8_PROPERTY_ATTRIBUTE_NONE = 0,            // Writeable, Enumerable,
-                                             //   Configurable
-  V8_PROPERTY_ATTRIBUTE_READONLY = 1 << 0,   // Not writeable
-  V8_PROPERTY_ATTRIBUTE_DONTENUM = 1 << 1,   // Not enumerable
-  V8_PROPERTY_ATTRIBUTE_DONTDELETE = 1 << 2  // Not configurable
+  ///
+  /// Writeable, Enumerable, Configurable
+  ///
+  V8_PROPERTY_ATTRIBUTE_NONE = 0,
+
+  ///
+  /// Not writeable
+  ///
+  V8_PROPERTY_ATTRIBUTE_READONLY = 1 << 0,
+
+  ///
+  /// Not enumerable
+  ///
+  V8_PROPERTY_ATTRIBUTE_DONTENUM = 1 << 1,
+
+  ///
+  /// Not configurable
+  ///
+  V8_PROPERTY_ATTRIBUTE_DONTDELETE = 1 << 2
 } cef_v8_propertyattribute_t;
 
 ///
-// Post data elements may represent either bytes or files.
+/// Post data elements may represent either bytes or files.
 ///
 typedef enum {
   PDE_TYPE_EMPTY = 0,
@@ -1021,497 +1178,538 @@ typedef enum {
 } cef_postdataelement_type_t;
 
 ///
-// Resource type for a request.
+/// Resource type for a request. These constants match their equivalents in
+/// Chromium's ResourceType and should not be renumbered.
 ///
 typedef enum {
   ///
-  // Top level page.
+  /// Top level page.
   ///
   RT_MAIN_FRAME = 0,
 
   ///
-  // Frame or iframe.
+  /// Frame or iframe.
   ///
   RT_SUB_FRAME,
 
   ///
-  // CSS stylesheet.
+  /// CSS stylesheet.
   ///
   RT_STYLESHEET,
 
   ///
-  // External script.
+  /// External script.
   ///
   RT_SCRIPT,
 
   ///
-  // Image (jpg/gif/png/etc).
+  /// Image (jpg/gif/png/etc).
   ///
   RT_IMAGE,
 
   ///
-  // Font.
+  /// Font.
   ///
   RT_FONT_RESOURCE,
 
   ///
-  // Some other subresource. This is the default type if the actual type is
-  // unknown.
+  /// Some other subresource. This is the default type if the actual type is
+  /// unknown.
   ///
   RT_SUB_RESOURCE,
 
   ///
-  // Object (or embed) tag for a plugin, or a resource that a plugin requested.
+  /// Object (or embed) tag for a plugin, or a resource that a plugin requested.
   ///
   RT_OBJECT,
 
   ///
-  // Media resource.
+  /// Media resource.
   ///
   RT_MEDIA,
 
   ///
-  // Main resource of a dedicated worker.
+  /// Main resource of a dedicated worker.
   ///
   RT_WORKER,
 
   ///
-  // Main resource of a shared worker.
+  /// Main resource of a shared worker.
   ///
   RT_SHARED_WORKER,
 
   ///
-  // Explicitly requested prefetch.
+  /// Explicitly requested prefetch.
   ///
   RT_PREFETCH,
 
   ///
-  // Favicon.
+  /// Favicon.
   ///
   RT_FAVICON,
 
   ///
-  // XMLHttpRequest.
+  /// XMLHttpRequest.
   ///
   RT_XHR,
 
   ///
-  // A request for a <ping>
+  /// A request for a "<ping>".
   ///
   RT_PING,
 
   ///
-  // Main resource of a service worker.
+  /// Main resource of a service worker.
   ///
   RT_SERVICE_WORKER,
 
   ///
-  // A report of Content Security Policy violations.
+  /// A report of Content Security Policy violations.
   ///
   RT_CSP_REPORT,
 
   ///
-  // A resource that a plugin requested.
+  /// A resource that a plugin requested.
   ///
   RT_PLUGIN_RESOURCE,
+
+  ///
+  /// A main-frame service worker navigation preload request.
+  ///
+  RT_NAVIGATION_PRELOAD_MAIN_FRAME = 19,
+
+  ///
+  /// A sub-frame service worker navigation preload request.
+  ///
+  RT_NAVIGATION_PRELOAD_SUB_FRAME,
 } cef_resource_type_t;
 
 ///
-// Transition type for a request. Made up of one source value and 0 or more
-// qualifiers.
+/// Transition type for a request. Made up of one source value and 0 or more
+/// qualifiers.
 ///
 typedef enum {
   ///
-  // Source is a link click or the JavaScript window.open function. This is
-  // also the default value for requests like sub-resource loads that are not
-  // navigations.
+  /// Source is a link click or the JavaScript window.open function. This is
+  /// also the default value for requests like sub-resource loads that are not
+  /// navigations.
   ///
   TT_LINK = 0,
 
   ///
-  // Source is some other "explicit" navigation action such as creating a new
-  // browser or using the LoadURL function. This is also the default value
-  // for navigations where the actual type is unknown.
+  /// Source is some other "explicit" navigation. This is the default value for
+  /// navigations where the actual type is unknown. See also
+  /// TT_DIRECT_LOAD_FLAG.
   ///
   TT_EXPLICIT = 1,
 
   ///
-  // Source is a subframe navigation. This is any content that is automatically
-  // loaded in a non-toplevel frame. For example, if a page consists of several
-  // frames containing ads, those ad URLs will have this transition type.
-  // The user may not even realize the content in these pages is a separate
-  // frame, so may not care about the URL.
+  /// User got to this page through a suggestion in the UI (for example, via the
+  /// destinations page). Chrome runtime only.
+  ///
+  TT_AUTO_BOOKMARK = 2,
+
+  ///
+  /// Source is a subframe navigation. This is any content that is automatically
+  /// loaded in a non-toplevel frame. For example, if a page consists of several
+  /// frames containing ads, those ad URLs will have this transition type.
+  /// The user may not even realize the content in these pages is a separate
+  /// frame, so may not care about the URL.
   ///
   TT_AUTO_SUBFRAME = 3,
 
   ///
-  // Source is a subframe navigation explicitly requested by the user that will
-  // generate new navigation entries in the back/forward list. These are
-  // probably more important than frames that were automatically loaded in
-  // the background because the user probably cares about the fact that this
-  // link was loaded.
+  /// Source is a subframe navigation explicitly requested by the user that will
+  /// generate new navigation entries in the back/forward list. These are
+  /// probably more important than frames that were automatically loaded in
+  /// the background because the user probably cares about the fact that this
+  /// link was loaded.
   ///
   TT_MANUAL_SUBFRAME = 4,
 
   ///
-  // Source is a form submission by the user. NOTE: In some situations
-  // submitting a form does not result in this transition type. This can happen
-  // if the form uses a script to submit the contents.
+  /// User got to this page by typing in the URL bar and selecting an entry
+  /// that did not look like a URL.  For example, a match might have the URL
+  /// of a Google search result page, but appear like "Search Google for ...".
+  /// These are not quite the same as EXPLICIT navigations because the user
+  /// didn't type or see the destination URL. Chrome runtime only.
+  /// See also TT_KEYWORD.
+  ///
+  TT_GENERATED = 5,
+
+  ///
+  /// This is a toplevel navigation. This is any content that is automatically
+  /// loaded in a toplevel frame.  For example, opening a tab to show the ASH
+  /// screen saver, opening the devtools window, opening the NTP after the safe
+  /// browsing warning, opening web-based dialog boxes are examples of
+  /// AUTO_TOPLEVEL navigations. Chrome runtime only.
+  ///
+  TT_AUTO_TOPLEVEL = 6,
+
+  ///
+  /// Source is a form submission by the user. NOTE: In some situations
+  /// submitting a form does not result in this transition type. This can happen
+  /// if the form uses a script to submit the contents.
   ///
   TT_FORM_SUBMIT = 7,
 
   ///
-  // Source is a "reload" of the page via the Reload function or by re-visiting
-  // the same URL. NOTE: This is distinct from the concept of whether a
-  // particular load uses "reload semantics" (i.e. bypasses cached data).
+  /// Source is a "reload" of the page via the Reload function or by re-visiting
+  /// the same URL. NOTE: This is distinct from the concept of whether a
+  /// particular load uses "reload semantics" (i.e. bypasses cached data).
   ///
   TT_RELOAD = 8,
 
   ///
-  // General mask defining the bits used for the source values.
+  /// The url was generated from a replaceable keyword other than the default
+  /// search provider. If the user types a keyword (which also applies to
+  /// tab-to-search) in the omnibox this qualifier is applied to the transition
+  /// type of the generated url. TemplateURLModel then may generate an
+  /// additional visit with a transition type of TT_KEYWORD_GENERATED against
+  /// the url 'http://' + keyword. For example, if you do a tab-to-search
+  /// against wikipedia the generated url has a transition qualifer of
+  /// TT_KEYWORD, and TemplateURLModel generates a visit for 'wikipedia.org'
+  /// with a transition type of TT_KEYWORD_GENERATED. Chrome runtime only.
+  ///
+  TT_KEYWORD = 9,
+
+  ///
+  /// Corresponds to a visit generated for a keyword. See description of
+  /// TT_KEYWORD for more details. Chrome runtime only.
+  ///
+  TT_KEYWORD_GENERATED = 10,
+
+  ///
+  /// General mask defining the bits used for the source values.
   ///
   TT_SOURCE_MASK = 0xFF,
 
-  // Qualifiers.
-  // Any of the core values above can be augmented by one or more qualifiers.
-  // These qualifiers further define the transition.
+  /// Qualifiers.
+  /// Any of the core values above can be augmented by one or more qualifiers.
+  /// These qualifiers further define the transition.
 
   ///
-  // Attempted to visit a URL but was blocked.
+  /// Attempted to visit a URL but was blocked.
   ///
   TT_BLOCKED_FLAG = 0x00800000,
 
   ///
-  // Used the Forward or Back function to navigate among browsing history.
+  /// Used the Forward or Back function to navigate among browsing history.
+  /// Will be ORed to the transition type for the original load.
   ///
   TT_FORWARD_BACK_FLAG = 0x01000000,
 
   ///
-  // The beginning of a navigation chain.
+  /// Loaded a URL directly via CreateBrowser, LoadURL or LoadRequest.
+  ///
+  TT_DIRECT_LOAD_FLAG = 0x02000000,
+
+  ///
+  /// User is navigating to the home page. Chrome runtime only.
+  ///
+  TT_HOME_PAGE_FLAG = 0x04000000,
+
+  ///
+  /// The transition originated from an external application; the exact
+  /// definition of this is embedder dependent. Chrome runtime and
+  /// extension system only.
+  ///
+  TT_FROM_API_FLAG = 0x08000000,
+
+  ///
+  /// The beginning of a navigation chain.
   ///
   TT_CHAIN_START_FLAG = 0x10000000,
 
   ///
-  // The last transition in a redirect chain.
+  /// The last transition in a redirect chain.
   ///
   TT_CHAIN_END_FLAG = 0x20000000,
 
   ///
-  // Redirects caused by JavaScript or a meta refresh tag on the page.
+  /// Redirects caused by JavaScript or a meta refresh tag on the page.
   ///
   TT_CLIENT_REDIRECT_FLAG = 0x40000000,
 
   ///
-  // Redirects sent from the server by HTTP headers.
+  /// Redirects sent from the server by HTTP headers.
   ///
   TT_SERVER_REDIRECT_FLAG = 0x80000000,
 
   ///
-  // Used to test whether a transition involves a redirect.
+  /// Used to test whether a transition involves a redirect.
   ///
   TT_IS_REDIRECT_MASK = 0xC0000000,
 
   ///
-  // General mask defining the bits used for the qualifiers.
+  /// General mask defining the bits used for the qualifiers.
   ///
   TT_QUALIFIER_MASK = 0xFFFFFF00,
 } cef_transition_type_t;
 
 ///
-// Flags used to customize the behavior of CefURLRequest.
+/// Flags used to customize the behavior of CefURLRequest.
 ///
 typedef enum {
   ///
-  // Default behavior.
+  /// Default behavior.
   ///
   UR_FLAG_NONE = 0,
 
   ///
-  // If set the cache will be skipped when handling the request. Setting this
-  // value is equivalent to specifying the "Cache-Control: no-cache" request
-  // header. Setting this value in combination with UR_FLAG_ONLY_FROM_CACHE will
-  // cause the request to fail.
+  /// If set the cache will be skipped when handling the request. Setting this
+  /// value is equivalent to specifying the "Cache-Control: no-cache" request
+  /// header. Setting this value in combination with UR_FLAG_ONLY_FROM_CACHE
+  /// will cause the request to fail.
   ///
   UR_FLAG_SKIP_CACHE = 1 << 0,
 
   ///
-  // If set the request will fail if it cannot be served from the cache (or some
-  // equivalent local store). Setting this value is equivalent to specifying the
-  // "Cache-Control: only-if-cached" request header. Setting this value in
-  // combination with UR_FLAG_SKIP_CACHE will cause the request to fail.
+  /// If set the request will fail if it cannot be served from the cache (or
+  /// some equivalent local store). Setting this value is equivalent to
+  /// specifying the "Cache-Control: only-if-cached" request header. Setting
+  /// this value in combination with UR_FLAG_SKIP_CACHE or UR_FLAG_DISABLE_CACHE
+  /// will cause the request to fail.
   ///
   UR_FLAG_ONLY_FROM_CACHE = 1 << 1,
 
   ///
-  // If set user name, password, and cookies may be sent with the request, and
-  // cookies may be saved from the response.
+  /// If set the cache will not be used at all. Setting this value is equivalent
+  /// to specifying the "Cache-Control: no-store" request header. Setting this
+  /// value in combination with UR_FLAG_ONLY_FROM_CACHE will cause the request
+  /// to fail.
+  ///
+  UR_FLAG_DISABLE_CACHE = 1 << 2,
+
+  ///
+  /// If set user name, password, and cookies may be sent with the request, and
+  /// cookies may be saved from the response.
   ///
-  UR_FLAG_ALLOW_STORED_CREDENTIALS = 1 << 2,
+  UR_FLAG_ALLOW_STORED_CREDENTIALS = 1 << 3,
 
   ///
-  // If set upload progress events will be generated when a request has a body.
+  /// If set upload progress events will be generated when a request has a body.
   ///
-  UR_FLAG_REPORT_UPLOAD_PROGRESS = 1 << 3,
+  UR_FLAG_REPORT_UPLOAD_PROGRESS = 1 << 4,
 
   ///
-  // If set the CefURLRequestClient::OnDownloadData method will not be called.
+  /// If set the CefURLRequestClient::OnDownloadData method will not be called.
   ///
-  UR_FLAG_NO_DOWNLOAD_DATA = 1 << 4,
+  UR_FLAG_NO_DOWNLOAD_DATA = 1 << 5,
 
   ///
-  // If set 5XX redirect errors will be propagated to the observer instead of
-  // automatically re-tried. This currently only applies for requests
-  // originated in the browser process.
+  /// If set 5XX redirect errors will be propagated to the observer instead of
+  /// automatically re-tried. This currently only applies for requests
+  /// originated in the browser process.
   ///
-  UR_FLAG_NO_RETRY_ON_5XX = 1 << 5,
+  UR_FLAG_NO_RETRY_ON_5XX = 1 << 6,
 
   ///
-  // If set 3XX responses will cause the fetch to halt immediately rather than
-  // continue through the redirect.
+  /// If set 3XX responses will cause the fetch to halt immediately rather than
+  /// continue through the redirect.
   ///
-  UR_FLAG_STOP_ON_REDIRECT = 1 << 6,
+  UR_FLAG_STOP_ON_REDIRECT = 1 << 7,
 } cef_urlrequest_flags_t;
 
 ///
-// Flags that represent CefURLRequest status.
+/// Flags that represent CefURLRequest status.
 ///
 typedef enum {
   ///
-  // Unknown status.
+  /// Unknown status.
   ///
   UR_UNKNOWN = 0,
 
   ///
-  // Request succeeded.
+  /// Request succeeded.
   ///
   UR_SUCCESS,
 
   ///
-  // An IO request is pending, and the caller will be informed when it is
-  // completed.
+  /// An IO request is pending, and the caller will be informed when it is
+  /// completed.
   ///
   UR_IO_PENDING,
 
   ///
-  // Request was canceled programatically.
+  /// Request was canceled programatically.
   ///
   UR_CANCELED,
 
   ///
-  // Request failed for some reason.
+  /// Request failed for some reason.
   ///
   UR_FAILED,
 } cef_urlrequest_status_t;
 
-///
-// Structure representing a point.
-///
-typedef struct _cef_point_t {
-  int x;
-  int y;
-} cef_point_t;
-
-///
-// Structure representing a rectangle.
-///
-typedef struct _cef_rect_t {
-  int x;
-  int y;
-  int width;
-  int height;
-} cef_rect_t;
-
-///
-// Structure representing a size.
-///
-typedef struct _cef_size_t {
-  int width;
-  int height;
-} cef_size_t;
-
-///
-// Structure representing a range.
-///
-typedef struct _cef_range_t {
-  int from;
-  int to;
-} cef_range_t;
-
-///
-// Structure representing insets.
-///
-typedef struct _cef_insets_t {
-  int top;
-  int left;
-  int bottom;
-  int right;
-} cef_insets_t;
-
-///
-// Structure representing a draggable region.
+/// Structure representing a draggable region.
 ///
 typedef struct _cef_draggable_region_t {
   ///
-  // Bounds of the region.
+  /// Bounds of the region.
   ///
   cef_rect_t bounds;
 
   ///
-  // True (1) this this region is draggable and false (0) otherwise.
+  /// True (1) this this region is draggable and false (0) otherwise.
   ///
   int draggable;
 } cef_draggable_region_t;
 
 ///
-// Existing process IDs.
+/// Existing process IDs.
 ///
 typedef enum {
   ///
-  // Browser process.
+  /// Browser process.
   ///
   PID_BROWSER,
   ///
-  // Renderer process.
+  /// Renderer process.
   ///
   PID_RENDERER,
 } cef_process_id_t;
 
 ///
-// Existing thread IDs.
+/// Existing thread IDs.
 ///
 typedef enum {
   // BROWSER PROCESS THREADS -- Only available in the browser process.
 
   ///
-  // The main thread in the browser. This will be the same as the main
-  // application thread if CefInitialize() is called with a
-  // CefSettings.multi_threaded_message_loop value of false. Do not perform
-  // blocking tasks on this thread. All tasks posted after
-  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
-  // are guaranteed to run. This thread will outlive all other CEF threads.
+  /// The main thread in the browser. This will be the same as the main
+  /// application thread if CefInitialize() is called with a
+  /// CefSettings.multi_threaded_message_loop value of false. Do not perform
+  /// blocking tasks on this thread. All tasks posted after
+  /// CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  /// are guaranteed to run. This thread will outlive all other CEF threads.
   ///
   TID_UI,
 
   ///
-  // Used for blocking tasks (e.g. file system access) where the user won't
-  // notice if the task takes an arbitrarily long time to complete. All tasks
-  // posted after CefBrowserProcessHandler::OnContextInitialized() and before
-  // CefShutdown() are guaranteed to run.
+  /// Used for blocking tasks like file system access where the user won't
+  /// notice if the task takes an arbitrarily long time to complete. All tasks
+  /// posted after CefBrowserProcessHandler::OnContextInitialized() and before
+  /// CefShutdown() are guaranteed to run.
   ///
   TID_FILE_BACKGROUND,
-  TID_FILE = TID_FILE_BACKGROUND,
 
   ///
-  // Used for blocking tasks (e.g. file system access) that affect UI or
-  // responsiveness of future user interactions. Do not use if an immediate
-  // response to a user interaction is expected. All tasks posted after
-  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
-  // are guaranteed to run.
-  // Examples:
-  // - Updating the UI to reflect progress on a long task.
-  // - Loading data that might be shown in the UI after a future user
-  //   interaction.
+  /// Used for blocking tasks like file system access that affect UI or
+  /// responsiveness of future user interactions. Do not use if an immediate
+  /// response to a user interaction is expected. All tasks posted after
+  /// CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  /// are guaranteed to run.
+  /// Examples:
+  /// - Updating the UI to reflect progress on a long task.
+  /// - Loading data that might be shown in the UI after a future user
+  ///   interaction.
   ///
   TID_FILE_USER_VISIBLE,
 
   ///
-  // Used for blocking tasks (e.g. file system access) that affect UI
-  // immediately after a user interaction. All tasks posted after
-  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
-  // are guaranteed to run.
-  // Example: Generating data shown in the UI immediately after a click.
+  /// Used for blocking tasks like file system access that affect UI
+  /// immediately after a user interaction. All tasks posted after
+  /// CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  /// are guaranteed to run.
+  /// Example: Generating data shown in the UI immediately after a click.
   ///
   TID_FILE_USER_BLOCKING,
 
   ///
-  // Used to process IPC and network messages. Do not perform blocking tasks on
-  // this thread. All tasks posted after
-  // CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
-  // are guaranteed to run.
+  /// Used to launch and terminate browser processes.
+  ///
+  TID_PROCESS_LAUNCHER,
+
+  ///
+  /// Used to process IPC and network messages. Do not perform blocking tasks on
+  /// this thread. All tasks posted after
+  /// CefBrowserProcessHandler::OnContextInitialized() and before CefShutdown()
+  /// are guaranteed to run.
   ///
   TID_IO,
 
   // RENDER PROCESS THREADS -- Only available in the render process.
 
   ///
-  // The main thread in the renderer. Used for all WebKit and V8 interaction.
-  // Tasks may be posted to this thread after
-  // CefRenderProcessHandler::OnRenderThreadCreated but are not guaranteed to
-  // run before sub-process termination (sub-processes may be killed at any time
-  // without warning).
+  /// The main thread in the renderer. Used for all WebKit and V8 interaction.
+  /// Tasks may be posted to this thread after
+  /// CefRenderProcessHandler::OnWebKitInitialized but are not guaranteed to
+  /// run before sub-process termination (sub-processes may be killed at any
+  /// time without warning).
   ///
   TID_RENDERER,
 } cef_thread_id_t;
 
 ///
-// Thread priority values listed in increasing order of importance.
+/// Thread priority values listed in increasing order of importance.
 ///
 typedef enum {
   ///
-  // Suitable for threads that shouldn't disrupt high priority work.
+  /// Suitable for threads that shouldn't disrupt high priority work.
   ///
   TP_BACKGROUND,
 
   ///
-  // Default priority level.
+  /// Default priority level.
   ///
   TP_NORMAL,
 
   ///
-  // Suitable for threads which generate data for the display (at ~60Hz).
+  /// Suitable for threads which generate data for the display (at ~60Hz).
   ///
   TP_DISPLAY,
 
   ///
-  // Suitable for low-latency, glitch-resistant audio.
+  /// Suitable for low-latency, glitch-resistant audio.
   ///
   TP_REALTIME_AUDIO,
 } cef_thread_priority_t;
 
 ///
-// Message loop types. Indicates the set of asynchronous events that a message
-// loop can process.
+/// Message loop types. Indicates the set of asynchronous events that a message
+/// loop can process.
 ///
 typedef enum {
   ///
-  // Supports tasks and timers.
+  /// Supports tasks and timers.
   ///
   ML_TYPE_DEFAULT,
 
   ///
-  // Supports tasks, timers and native UI events (e.g. Windows messages).
+  /// Supports tasks, timers and native UI events (e.g. Windows messages).
   ///
   ML_TYPE_UI,
 
   ///
-  // Supports tasks, timers and asynchronous IO events.
+  /// Supports tasks, timers and asynchronous IO events.
   ///
   ML_TYPE_IO,
 } cef_message_loop_type_t;
 
 ///
-// Windows COM initialization mode. Specifies how COM will be initialized for a
-// new thread.
+/// Windows COM initialization mode. Specifies how COM will be initialized for a
+/// new thread.
 ///
 typedef enum {
   ///
-  // No COM initialization.
+  /// No COM initialization.
   ///
   COM_INIT_MODE_NONE,
 
   ///
-  // Initialize COM using single-threaded apartments.
+  /// Initialize COM using single-threaded apartments.
   ///
   COM_INIT_MODE_STA,
 
   ///
-  // Initialize COM using multi-threaded apartments.
+  /// Initialize COM using multi-threaded apartments.
   ///
   COM_INIT_MODE_MTA,
 } cef_com_init_mode_t;
 
 ///
-// Supported value types.
+/// Supported value types.
 ///
 typedef enum {
   VTYPE_INVALID = 0,
@@ -1526,7 +1724,7 @@ typedef enum {
 } cef_value_type_t;
 
 ///
-// Supported JavaScript dialog types.
+/// Supported JavaScript dialog types.
 ///
 typedef enum {
   JSDIALOGTYPE_ALERT = 0,
@@ -1535,64 +1733,64 @@ typedef enum {
 } cef_jsdialog_type_t;
 
 ///
-// Screen information used when window rendering is disabled. This structure is
-// passed as a parameter to CefRenderHandler::GetScreenInfo and should be filled
-// in by the client.
+/// Screen information used when window rendering is disabled. This structure is
+/// passed as a parameter to CefRenderHandler::GetScreenInfo and should be
+/// filled in by the client.
 ///
 typedef struct _cef_screen_info_t {
   ///
-  // Device scale factor. Specifies the ratio between physical and logical
-  // pixels.
+  /// Device scale factor. Specifies the ratio between physical and logical
+  /// pixels.
   ///
   float device_scale_factor;
 
   ///
-  // The screen depth in bits per pixel.
+  /// The screen depth in bits per pixel.
   ///
   int depth;
 
   ///
-  // The bits per color component. This assumes that the colors are balanced
-  // equally.
+  /// The bits per color component. This assumes that the colors are balanced
+  /// equally.
   ///
   int depth_per_component;
 
   ///
-  // This can be true for black and white printers.
+  /// This can be true for black and white printers.
   ///
   int is_monochrome;
 
   ///
-  // This is set from the rcMonitor member of MONITORINFOEX, to whit:
-  //   "A RECT structure that specifies the display monitor rectangle,
-  //   expressed in virtual-screen coordinates. Note that if the monitor
-  //   is not the primary display monitor, some of the rectangle's
-  //   coordinates may be negative values."
+  /// This is set from the rcMonitor member of MONITORINFOEX, to whit:
+  ///   "A RECT structure that specifies the display monitor rectangle,
+  ///   expressed in virtual-screen coordinates. Note that if the monitor
+  ///   is not the primary display monitor, some of the rectangle's
+  ///   coordinates may be negative values."
   //
-  // The |rect| and |available_rect| properties are used to determine the
-  // available surface for rendering popup views.
+  /// The |rect| and |available_rect| properties are used to determine the
+  /// available surface for rendering popup views.
   ///
   cef_rect_t rect;
 
   ///
-  // This is set from the rcWork member of MONITORINFOEX, to whit:
-  //   "A RECT structure that specifies the work area rectangle of the
-  //   display monitor that can be used by applications, expressed in
-  //   virtual-screen coordinates. Windows uses this rectangle to
-  //   maximize an application on the monitor. The rest of the area in
-  //   rcMonitor contains system windows such as the task bar and side
-  //   bars. Note that if the monitor is not the primary display monitor,
-  //   some of the rectangle's coordinates may be negative values".
+  /// This is set from the rcWork member of MONITORINFOEX, to whit:
+  ///   "A RECT structure that specifies the work area rectangle of the
+  ///   display monitor that can be used by applications, expressed in
+  ///   virtual-screen coordinates. Windows uses this rectangle to
+  ///   maximize an application on the monitor. The rest of the area in
+  ///   rcMonitor contains system windows such as the task bar and side
+  ///   bars. Note that if the monitor is not the primary display monitor,
+  ///   some of the rectangle's coordinates may be negative values".
   //
-  // The |rect| and |available_rect| properties are used to determine the
-  // available surface for rendering popup views.
+  /// The |rect| and |available_rect| properties are used to determine the
+  /// available surface for rendering popup views.
   ///
   cef_rect_t available_rect;
 } cef_screen_info_t;
 
 ///
-// Supported menu IDs. Non-English translations can be provided for the
-// IDS_MENU_* strings in CefResourceBundleHandler::GetLocalizedString().
+/// Supported menu IDs. Non-English translations can be provided for the
+/// IDS_MENU_* strings in CefResourceBundleHandler::GetLocalizedString().
 ///
 typedef enum {
   // Navigation.
@@ -1626,8 +1824,7 @@ typedef enum {
   MENU_ID_NO_SPELLING_SUGGESTIONS = 205,
   MENU_ID_ADD_TO_DICTIONARY = 206,
 
-  // Custom menu items originating from the renderer process. For example,
-  // plugin placeholder menu items or Flash menu items.
+  // Custom menu items originating from the renderer process.
   MENU_ID_CUSTOM_FIRST = 220,
   MENU_ID_CUSTOM_LAST = 250,
 
@@ -1639,7 +1836,7 @@ typedef enum {
 } cef_menu_id_t;
 
 ///
-// Mouse button types.
+/// Mouse button types.
 ///
 typedef enum {
   MBT_LEFT = 0,
@@ -1648,28 +1845,112 @@ typedef enum {
 } cef_mouse_button_type_t;
 
 ///
-// Structure representing mouse event information.
+/// Structure representing mouse event information.
 ///
 typedef struct _cef_mouse_event_t {
   ///
-  // X coordinate relative to the left side of the view.
+  /// X coordinate relative to the left side of the view.
   ///
   int x;
 
   ///
-  // Y coordinate relative to the top side of the view.
+  /// Y coordinate relative to the top side of the view.
   ///
   int y;
 
   ///
-  // Bit flags describing any pressed modifier keys. See
-  // cef_event_flags_t for values.
+  /// Bit flags describing any pressed modifier keys. See
+  /// cef_event_flags_t for values.
   ///
-  uint32 modifiers;
+  uint32_t modifiers;
 } cef_mouse_event_t;
 
 ///
-// Paint element types.
+/// Touch points states types.
+///
+typedef enum {
+  CEF_TET_RELEASED = 0,
+  CEF_TET_PRESSED,
+  CEF_TET_MOVED,
+  CEF_TET_CANCELLED
+} cef_touch_event_type_t;
+
+///
+/// The device type that caused the event.
+///
+typedef enum {
+  CEF_POINTER_TYPE_TOUCH = 0,
+  CEF_POINTER_TYPE_MOUSE,
+  CEF_POINTER_TYPE_PEN,
+  CEF_POINTER_TYPE_ERASER,
+  CEF_POINTER_TYPE_UNKNOWN
+} cef_pointer_type_t;
+
+///
+/// Structure representing touch event information.
+///
+typedef struct _cef_touch_event_t {
+  ///
+  /// Id of a touch point. Must be unique per touch, can be any number except
+  /// -1. Note that a maximum of 16 concurrent touches will be tracked; touches
+  /// beyond that will be ignored.
+  ///
+  int id;
+
+  ///
+  /// X coordinate relative to the left side of the view.
+  ///
+  float x;
+
+  ///
+  /// Y coordinate relative to the top side of the view.
+  ///
+  float y;
+
+  ///
+  /// X radius in pixels. Set to 0 if not applicable.
+  ///
+  float radius_x;
+
+  ///
+  /// Y radius in pixels. Set to 0 if not applicable.
+  ///
+  float radius_y;
+
+  ///
+  /// Rotation angle in radians. Set to 0 if not applicable.
+  ///
+  float rotation_angle;
+
+  ///
+  /// The normalized pressure of the pointer input in the range of [0,1].
+  /// Set to 0 if not applicable.
+  ///
+  float pressure;
+
+  ///
+  /// The state of the touch point. Touches begin with one CEF_TET_PRESSED event
+  /// followed by zero or more CEF_TET_MOVED events and finally one
+  /// CEF_TET_RELEASED or CEF_TET_CANCELLED event. Events not respecting this
+  /// order will be ignored.
+  ///
+  cef_touch_event_type_t type;
+
+  ///
+  /// Bit flags describing any pressed modifier keys. See
+  /// cef_event_flags_t for values.
+  ///
+  uint32_t modifiers;
+
+  ///
+  /// The device type that caused the event.
+  ///
+  cef_pointer_type_t pointer_type;
+
+} cef_touch_event_t;
+
+///
+/// Paint element types.
 ///
 typedef enum {
   PET_VIEW = 0,
@@ -1677,7 +1958,7 @@ typedef enum {
 } cef_paint_element_type_t;
 
 ///
-// Supported event bit flags.
+/// Supported event bit flags.
 ///
 typedef enum {
   EVENTFLAG_NONE = 0,
@@ -1688,16 +1969,18 @@ typedef enum {
   EVENTFLAG_LEFT_MOUSE_BUTTON = 1 << 4,
   EVENTFLAG_MIDDLE_MOUSE_BUTTON = 1 << 5,
   EVENTFLAG_RIGHT_MOUSE_BUTTON = 1 << 6,
-  // Mac OS-X command key.
+  /// Mac OS-X command key.
   EVENTFLAG_COMMAND_DOWN = 1 << 7,
   EVENTFLAG_NUM_LOCK_ON = 1 << 8,
   EVENTFLAG_IS_KEY_PAD = 1 << 9,
   EVENTFLAG_IS_LEFT = 1 << 10,
   EVENTFLAG_IS_RIGHT = 1 << 11,
+  EVENTFLAG_ALTGR_DOWN = 1 << 12,
+  EVENTFLAG_IS_REPEAT = 1 << 13,
 } cef_event_flags_t;
 
 ///
-// Supported menu item types.
+/// Supported menu item types.
 ///
 typedef enum {
   MENUITEMTYPE_NONE,
@@ -1709,88 +1992,100 @@ typedef enum {
 } cef_menu_item_type_t;
 
 ///
-// Supported context menu type flags.
+/// Supported context menu type flags.
 ///
 typedef enum {
   ///
-  // No node is selected.
+  /// No node is selected.
   ///
   CM_TYPEFLAG_NONE = 0,
   ///
-  // The top page is selected.
+  /// The top page is selected.
   ///
   CM_TYPEFLAG_PAGE = 1 << 0,
   ///
-  // A subframe page is selected.
+  /// A subframe page is selected.
   ///
   CM_TYPEFLAG_FRAME = 1 << 1,
   ///
-  // A link is selected.
+  /// A link is selected.
   ///
   CM_TYPEFLAG_LINK = 1 << 2,
   ///
-  // A media node is selected.
+  /// A media node is selected.
   ///
   CM_TYPEFLAG_MEDIA = 1 << 3,
   ///
-  // There is a textual or mixed selection that is selected.
+  /// There is a textual or mixed selection that is selected.
   ///
   CM_TYPEFLAG_SELECTION = 1 << 4,
   ///
-  // An editable element is selected.
+  /// An editable element is selected.
   ///
   CM_TYPEFLAG_EDITABLE = 1 << 5,
 } cef_context_menu_type_flags_t;
 
 ///
-// Supported context menu media types.
+/// Supported context menu media types. These constants match their equivalents
+/// in Chromium's ContextMenuDataMediaType and should not be renumbered.
 ///
 typedef enum {
   ///
-  // No special node is in context.
+  /// No special node is in context.
   ///
   CM_MEDIATYPE_NONE,
   ///
-  // An image node is selected.
+  /// An image node is selected.
   ///
   CM_MEDIATYPE_IMAGE,
   ///
-  // A video node is selected.
+  /// A video node is selected.
   ///
   CM_MEDIATYPE_VIDEO,
   ///
-  // An audio node is selected.
+  /// An audio node is selected.
   ///
   CM_MEDIATYPE_AUDIO,
   ///
-  // A file node is selected.
+  /// An canvas node is selected.
+  ///
+  CM_MEDIATYPE_CANVAS,
+  ///
+  /// A file node is selected.
   ///
   CM_MEDIATYPE_FILE,
   ///
-  // A plugin node is selected.
+  /// A plugin node is selected.
   ///
   CM_MEDIATYPE_PLUGIN,
 } cef_context_menu_media_type_t;
 
 ///
-// Supported context menu media state bit flags.
+/// Supported context menu media state bit flags. These constants match their
+/// equivalents in Chromium's ContextMenuData::MediaFlags and should not be
+/// renumbered.
 ///
 typedef enum {
   CM_MEDIAFLAG_NONE = 0,
-  CM_MEDIAFLAG_ERROR = 1 << 0,
+  CM_MEDIAFLAG_IN_ERROR = 1 << 0,
   CM_MEDIAFLAG_PAUSED = 1 << 1,
   CM_MEDIAFLAG_MUTED = 1 << 2,
   CM_MEDIAFLAG_LOOP = 1 << 3,
   CM_MEDIAFLAG_CAN_SAVE = 1 << 4,
   CM_MEDIAFLAG_HAS_AUDIO = 1 << 5,
-  CM_MEDIAFLAG_HAS_VIDEO = 1 << 6,
-  CM_MEDIAFLAG_CONTROL_ROOT_ELEMENT = 1 << 7,
+  CM_MEDIAFLAG_CAN_TOGGLE_CONTROLS = 1 << 6,
+  CM_MEDIAFLAG_CONTROLS = 1 << 7,
   CM_MEDIAFLAG_CAN_PRINT = 1 << 8,
   CM_MEDIAFLAG_CAN_ROTATE = 1 << 9,
+  CM_MEDIAFLAG_CAN_PICTURE_IN_PICTURE = 1 << 10,
+  CM_MEDIAFLAG_PICTURE_IN_PICTURE = 1 << 11,
+  CM_MEDIAFLAG_CAN_LOOP = 1 << 12,
 } cef_context_menu_media_state_flags_t;
 
 ///
-// Supported context menu edit state bit flags.
+/// Supported context menu edit state bit flags. These constants match their
+/// equivalents in Chromium's ContextMenuDataEditFlags and should not be
+/// renumbered.
 ///
 typedef enum {
   CM_EDITFLAG_NONE = 0,
@@ -1802,106 +2097,118 @@ typedef enum {
   CM_EDITFLAG_CAN_DELETE = 1 << 5,
   CM_EDITFLAG_CAN_SELECT_ALL = 1 << 6,
   CM_EDITFLAG_CAN_TRANSLATE = 1 << 7,
+  CM_EDITFLAG_CAN_EDIT_RICHLY = 1 << 8,
 } cef_context_menu_edit_state_flags_t;
 
 ///
-// Key event types.
+/// Supported quick menu state bit flags.
+///
+typedef enum {
+  QM_EDITFLAG_NONE = 0,
+  QM_EDITFLAG_CAN_ELLIPSIS = 1 << 0,
+  QM_EDITFLAG_CAN_CUT = 1 << 1,
+  QM_EDITFLAG_CAN_COPY = 1 << 2,
+  QM_EDITFLAG_CAN_PASTE = 1 << 3,
+} cef_quick_menu_edit_state_flags_t;
+
+///
+/// Key event types.
 ///
 typedef enum {
   ///
-  // Notification that a key transitioned from "up" to "down".
+  /// Notification that a key transitioned from "up" to "down".
   ///
   KEYEVENT_RAWKEYDOWN = 0,
 
   ///
-  // Notification that a key was pressed. This does not necessarily correspond
-  // to a character depending on the key and language. Use KEYEVENT_CHAR for
-  // character input.
+  /// Notification that a key was pressed. This does not necessarily correspond
+  /// to a character depending on the key and language. Use KEYEVENT_CHAR for
+  /// character input.
   ///
   KEYEVENT_KEYDOWN,
 
   ///
-  // Notification that a key was released.
+  /// Notification that a key was released.
   ///
   KEYEVENT_KEYUP,
 
   ///
-  // Notification that a character was typed. Use this for text input. Key
-  // down events may generate 0, 1, or more than one character event depending
-  // on the key, locale, and operating system.
+  /// Notification that a character was typed. Use this for text input. Key
+  /// down events may generate 0, 1, or more than one character event depending
+  /// on the key, locale, and operating system.
   ///
   KEYEVENT_CHAR
 } cef_key_event_type_t;
 
 ///
-// Structure representing keyboard event information.
+/// Structure representing keyboard event information.
 ///
 typedef struct _cef_key_event_t {
   ///
-  // The type of keyboard event.
+  /// The type of keyboard event.
   ///
   cef_key_event_type_t type;
 
   ///
-  // Bit flags describing any pressed modifier keys. See
-  // cef_event_flags_t for values.
+  /// Bit flags describing any pressed modifier keys. See
+  /// cef_event_flags_t for values.
   ///
-  uint32 modifiers;
+  uint32_t modifiers;
 
   ///
-  // The Windows key code for the key event. This value is used by the DOM
-  // specification. Sometimes it comes directly from the event (i.e. on
-  // Windows) and sometimes it's determined using a mapping function. See
-  // WebCore/platform/chromium/KeyboardCodes.h for the list of values.
+  /// The Windows key code for the key event. This value is used by the DOM
+  /// specification. Sometimes it comes directly from the event (i.e. on
+  /// Windows) and sometimes it's determined using a mapping function. See
+  /// WebCore/platform/chromium/KeyboardCodes.h for the list of values.
   ///
   int windows_key_code;
 
   ///
-  // The actual key code genenerated by the platform.
+  /// The actual key code genenerated by the platform.
   ///
   int native_key_code;
 
   ///
-  // Indicates whether the event is considered a "system key" event (see
-  // http://msdn.microsoft.com/en-us/library/ms646286(VS.85).aspx for details).
-  // This value will always be false on non-Windows platforms.
+  /// Indicates whether the event is considered a "system key" event (see
+  /// http://msdn.microsoft.com/en-us/library/ms646286(VS.85).aspx for details).
+  /// This value will always be false on non-Windows platforms.
   ///
   int is_system_key;
 
   ///
-  // The character generated by the keystroke.
+  /// The character generated by the keystroke.
   ///
-  char16 character;
+  char16_t character;
 
   ///
-  // Same as |character| but unmodified by any concurrently-held modifiers
-  // (except shift). This is useful for working out shortcut keys.
+  /// Same as |character| but unmodified by any concurrently-held modifiers
+  /// (except shift). This is useful for working out shortcut keys.
   ///
-  char16 unmodified_character;
+  char16_t unmodified_character;
 
   ///
-  // True if the focus is currently on an editable field on the page. This is
-  // useful for determining if standard key events should be intercepted.
+  /// True if the focus is currently on an editable field on the page. This is
+  /// useful for determining if standard key events should be intercepted.
   ///
   int focus_on_editable_field;
 } cef_key_event_t;
 
 ///
-// Focus sources.
+/// Focus sources.
 ///
 typedef enum {
   ///
-  // The source is explicit navigation via the API (LoadURL(), etc).
+  /// The source is explicit navigation via the API (LoadURL(), etc).
   ///
   FOCUS_SOURCE_NAVIGATION = 0,
   ///
-  // The source is a system-generated focus event.
+  /// The source is a system-generated focus event.
   ///
   FOCUS_SOURCE_SYSTEM,
 } cef_focus_source_t;
 
 ///
-// Navigation types.
+/// Navigation types.
 ///
 typedef enum {
   NAVIGATION_LINK_CLICKED = 0,
@@ -1913,10 +2220,10 @@ typedef enum {
 } cef_navigation_type_t;
 
 ///
-// Supported XML encoding types. The parser supports ASCII, ISO-8859-1, and
-// UTF16 (LE and BE) by default. All other types must be translated to UTF8
-// before being passed to the parser. If a BOM is detected and the correct
-// decoder is available then that decoder will be used automatically.
+/// Supported XML encoding types. The parser supports ASCII, ISO-8859-1, and
+/// UTF16 (LE and BE) by default. All other types must be translated to UTF8
+/// before being passed to the parser. If a BOM is detected and the correct
+/// decoder is available then that decoder will be used automatically.
 ///
 typedef enum {
   XML_ENCODING_NONE = 0,
@@ -1927,7 +2234,7 @@ typedef enum {
 } cef_xml_encoding_type_t;
 
 ///
-// XML node types.
+/// XML node types.
 ///
 typedef enum {
   XML_NODE_UNSUPPORTED = 0,
@@ -1944,7 +2251,7 @@ typedef enum {
 } cef_xml_node_type_t;
 
 ///
-// Popup window features.
+/// Popup window features.
 ///
 typedef struct _cef_popup_features_t {
   int x;
@@ -1956,14 +2263,12 @@ typedef struct _cef_popup_features_t {
   int height;
   int heightSet;
 
-  int menuBarVisible;
-  int statusBarVisible;
-  int toolBarVisible;
-  int scrollbarsVisible;
+  /// True (1) if browser interface elements should be hidden.
+  int isPopup;
 } cef_popup_features_t;
 
 ///
-// DOM document types.
+/// DOM document types.
 ///
 typedef enum {
   DOM_DOCUMENT_TYPE_UNKNOWN = 0,
@@ -1973,7 +2278,7 @@ typedef enum {
 } cef_dom_document_type_t;
 
 ///
-// DOM event category flags.
+/// DOM event category flags.
 ///
 typedef enum {
   DOM_EVENT_CATEGORY_UNKNOWN = 0x0,
@@ -1996,7 +2301,7 @@ typedef enum {
 } cef_dom_event_category_t;
 
 ///
-// DOM event processing phases.
+/// DOM event processing phases.
 ///
 typedef enum {
   DOM_EVENT_PHASE_UNKNOWN = 0,
@@ -2006,7 +2311,7 @@ typedef enum {
 } cef_dom_event_phase_t;
 
 ///
-// DOM node types.
+/// DOM node types.
 ///
 typedef enum {
   DOM_NODE_TYPE_UNSUPPORTED = 0,
@@ -2022,53 +2327,74 @@ typedef enum {
 } cef_dom_node_type_t;
 
 ///
-// Supported file dialog modes.
-///
-typedef enum {
-  ///
-  // Requires that the file exists before allowing the user to pick it.
+/// DOM form control types. Should be kept in sync with Chromium's
+/// blink::mojom::FormControlType type.
+///
+typedef enum {
+  DOM_FORM_CONTROL_TYPE_UNSUPPORTED = 0,
+  DOM_FORM_CONTROL_TYPE_BUTTON_BUTTON,
+  DOM_FORM_CONTROL_TYPE_BUTTON_SUBMIT,
+  DOM_FORM_CONTROL_TYPE_BUTTON_RESET,
+  DOM_FORM_CONTROL_TYPE_BUTTON_SELECT_LIST,
+  DOM_FORM_CONTROL_TYPE_BUTTON_POPOVER,
+  DOM_FORM_CONTROL_TYPE_FIELDSET,
+  DOM_FORM_CONTROL_TYPE_INPUT_BUTTON,
+  DOM_FORM_CONTROL_TYPE_INPUT_CHECKBOX,
+  DOM_FORM_CONTROL_TYPE_INPUT_COLOR,
+  DOM_FORM_CONTROL_TYPE_INPUT_DATE,
+  DOM_FORM_CONTROL_TYPE_INPUT_DATETIME_LOCAL,
+  DOM_FORM_CONTROL_TYPE_INPUT_EMAIL,
+  DOM_FORM_CONTROL_TYPE_INPUT_FILE,
+  DOM_FORM_CONTROL_TYPE_INPUT_HIDDEN,
+  DOM_FORM_CONTROL_TYPE_INPUT_IMAGE,
+  DOM_FORM_CONTROL_TYPE_INPUT_MONTH,
+  DOM_FORM_CONTROL_TYPE_INPUT_NUMBER,
+  DOM_FORM_CONTROL_TYPE_INPUT_PASSWORD,
+  DOM_FORM_CONTROL_TYPE_INPUT_RADIO,
+  DOM_FORM_CONTROL_TYPE_INPUT_RANGE,
+  DOM_FORM_CONTROL_TYPE_INPUT_RESET,
+  DOM_FORM_CONTROL_TYPE_INPUT_SEARCH,
+  DOM_FORM_CONTROL_TYPE_INPUT_SUBMIT,
+  DOM_FORM_CONTROL_TYPE_INPUT_TELEPHONE,
+  DOM_FORM_CONTROL_TYPE_INPUT_TEXT,
+  DOM_FORM_CONTROL_TYPE_INPUT_TIME,
+  DOM_FORM_CONTROL_TYPE_INPUT_URL,
+  DOM_FORM_CONTROL_TYPE_INPUT_WEEK,
+  DOM_FORM_CONTROL_TYPE_OUTPUT,
+  DOM_FORM_CONTROL_TYPE_SELECT_ONE,
+  DOM_FORM_CONTROL_TYPE_SELECT_MULTIPLE,
+  DOM_FORM_CONTROL_TYPE_SELECT_LIST,
+  DOM_FORM_CONTROL_TYPE_TEXT_AREA,
+} cef_dom_form_control_type_t;
+
+///
+/// Supported file dialog modes.
+///
+typedef enum {
+  ///
+  /// Requires that the file exists before allowing the user to pick it.
   ///
   FILE_DIALOG_OPEN = 0,
 
   ///
-  // Like Open, but allows picking multiple files to open.
+  /// Like Open, but allows picking multiple files to open.
   ///
   FILE_DIALOG_OPEN_MULTIPLE,
 
   ///
-  // Like Open, but selects a folder to open.
+  /// Like Open, but selects a folder to open.
   ///
   FILE_DIALOG_OPEN_FOLDER,
 
   ///
-  // Allows picking a nonexistent file, and prompts to overwrite if the file
-  // already exists.
+  /// Allows picking a nonexistent file, and prompts to overwrite if the file
+  /// already exists.
   ///
   FILE_DIALOG_SAVE,
-
-  ///
-  // General mask defining the bits used for the type values.
-  ///
-  FILE_DIALOG_TYPE_MASK = 0xFF,
-
-  // Qualifiers.
-  // Any of the type values above can be augmented by one or more qualifiers.
-  // These qualifiers further define the dialog behavior.
-
-  ///
-  // Prompt to overwrite if the user selects an existing file with the Save
-  // dialog.
-  ///
-  FILE_DIALOG_OVERWRITEPROMPT_FLAG = 0x01000000,
-
-  ///
-  // Do not display read-only files.
-  ///
-  FILE_DIALOG_HIDEREADONLY_FLAG = 0x02000000,
 } cef_file_dialog_mode_t;
 
 ///
-// Print job color mode values.
+/// Print job color mode values.
 ///
 typedef enum {
   COLOR_MODEL_UNKNOWN,
@@ -2095,7 +2421,7 @@ typedef enum {
 } cef_color_model_t;
 
 ///
-// Print job duplex mode values.
+/// Print job duplex mode values.
 ///
 typedef enum {
   DUPLEX_MODE_UNKNOWN = -1,
@@ -2105,7 +2431,7 @@ typedef enum {
 } cef_duplex_mode_t;
 
 ///
-// Cursor type values.
+/// Cursor type values.
 ///
 typedef enum {
   CT_POINTER = 0,
@@ -2151,13 +2477,19 @@ typedef enum {
   CT_ZOOMOUT,
   CT_GRAB,
   CT_GRABBING,
+  CT_MIDDLE_PANNING_VERTICAL,
+  CT_MIDDLE_PANNING_HORIZONTAL,
   CT_CUSTOM,
+  CT_DND_NONE,
+  CT_DND_MOVE,
+  CT_DND_COPY,
+  CT_DND_LINK,
 } cef_cursor_type_t;
 
 ///
-// Structure representing cursor information. |buffer| will be
-// |size.width|*|size.height|*4 bytes in size and represents a BGRA image with
-// an upper-left origin.
+/// Structure representing cursor information. |buffer| will be
+/// |size.width|*|size.height|*4 bytes in size and represents a BGRA image with
+/// an upper-left origin.
 ///
 typedef struct _cef_cursor_info_t {
   cef_point_t hotspot;
@@ -2167,189 +2499,170 @@ typedef struct _cef_cursor_info_t {
 } cef_cursor_info_t;
 
 ///
-// URI unescape rules passed to CefURIDecode().
+/// URI unescape rules passed to CefURIDecode().
 ///
 typedef enum {
   ///
-  // Don't unescape anything at all.
+  /// Don't unescape anything at all.
   ///
   UU_NONE = 0,
 
   ///
-  // Don't unescape anything special, but all normal unescaping will happen.
-  // This is a placeholder and can't be combined with other flags (since it's
-  // just the absence of them). All other unescape rules imply "normal" in
-  // addition to their special meaning. Things like escaped letters, digits,
-  // and most symbols will get unescaped with this mode.
+  /// Don't unescape anything special, but all normal unescaping will happen.
+  /// This is a placeholder and can't be combined with other flags (since it's
+  /// just the absence of them). All other unescape rules imply "normal" in
+  /// addition to their special meaning. Things like escaped letters, digits,
+  /// and most symbols will get unescaped with this mode.
   ///
   UU_NORMAL = 1 << 0,
 
   ///
-  // Convert %20 to spaces. In some places where we're showing URLs, we may
-  // want this. In places where the URL may be copied and pasted out, then
-  // you wouldn't want this since it might not be interpreted in one piece
-  // by other applications.
+  /// Convert %20 to spaces. In some places where we're showing URLs, we may
+  /// want this. In places where the URL may be copied and pasted out, then
+  /// you wouldn't want this since it might not be interpreted in one piece
+  /// by other applications.
   ///
   UU_SPACES = 1 << 1,
 
   ///
-  // Unescapes '/' and '\\'. If these characters were unescaped, the resulting
-  // URL won't be the same as the source one. Moreover, they are dangerous to
-  // unescape in strings that will be used as file paths or names. This value
-  // should only be used when slashes don't have special meaning, like data
-  // URLs.
+  /// Unescapes '/' and '\\'. If these characters were unescaped, the resulting
+  /// URL won't be the same as the source one. Moreover, they are dangerous to
+  /// unescape in strings that will be used as file paths or names. This value
+  /// should only be used when slashes don't have special meaning, like data
+  /// URLs.
   ///
   UU_PATH_SEPARATORS = 1 << 2,
 
   ///
-  // Unescapes various characters that will change the meaning of URLs,
-  // including '%', '+', '&', '#'. Does not unescape path separators.
-  // If these characters were unescaped, the resulting URL won't be the same
-  // as the source one. This flag is used when generating final output like
-  // filenames for URLs where we won't be interpreting as a URL and want to do
-  // as much unescaping as possible.
+  /// Unescapes various characters that will change the meaning of URLs,
+  /// including '%', '+', '&', '#'. Does not unescape path separators.
+  /// If these characters were unescaped, the resulting URL won't be the same
+  /// as the source one. This flag is used when generating final output like
+  /// filenames for URLs where we won't be interpreting as a URL and want to do
+  /// as much unescaping as possible.
   ///
   UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS = 1 << 3,
 
   ///
-  // Unescapes characters that can be used in spoofing attempts (such as LOCK)
-  // and control characters (such as BiDi control characters and %01).  This
-  // INCLUDES NULLs.  This is used for rare cases such as data: URL decoding
-  // where the result is binary data.
-  //
-  // DO NOT use UU_SPOOFING_AND_CONTROL_CHARS if the URL is going to be
-  // displayed in the UI for security reasons.
-  ///
-  UU_SPOOFING_AND_CONTROL_CHARS = 1 << 4,
-
-  ///
-  // URL queries use "+" for space. This flag controls that replacement.
+  /// URL queries use "+" for space. This flag controls that replacement.
   ///
-  UU_REPLACE_PLUS_WITH_SPACE = 1 << 5,
+  UU_REPLACE_PLUS_WITH_SPACE = 1 << 4,
 } cef_uri_unescape_rule_t;
 
 ///
-// Options that can be passed to CefParseJSON.
+/// Options that can be passed to CefParseJSON.
 ///
 typedef enum {
   ///
-  // Parses the input strictly according to RFC 4627. See comments in Chromium's
-  // base/json/json_reader.h file for known limitations/deviations from the RFC.
+  /// Parses the input strictly according to RFC 4627. See comments in
+  /// Chromium's base/json/json_reader.h file for known limitations/
+  /// deviations from the RFC.
   ///
   JSON_PARSER_RFC = 0,
 
   ///
-  // Allows commas to exist after the last element in structures.
+  /// Allows commas to exist after the last element in structures.
   ///
   JSON_PARSER_ALLOW_TRAILING_COMMAS = 1 << 0,
 } cef_json_parser_options_t;
 
 ///
-// Error codes that can be returned from CefParseJSONAndReturnError.
-///
-typedef enum {
-  JSON_NO_ERROR = 0,
-  JSON_INVALID_ESCAPE,
-  JSON_SYNTAX_ERROR,
-  JSON_UNEXPECTED_TOKEN,
-  JSON_TRAILING_COMMA,
-  JSON_TOO_MUCH_NESTING,
-  JSON_UNEXPECTED_DATA_AFTER_ROOT,
-  JSON_UNSUPPORTED_ENCODING,
-  JSON_UNQUOTED_DICTIONARY_KEY,
-  JSON_PARSE_ERROR_COUNT
-} cef_json_parser_error_t;
-
-///
-// Options that can be passed to CefWriteJSON.
+/// Options that can be passed to CefWriteJSON.
 ///
 typedef enum {
   ///
-  // Default behavior.
+  /// Default behavior.
   ///
   JSON_WRITER_DEFAULT = 0,
 
   ///
-  // This option instructs the writer that if a Binary value is encountered,
-  // the value (and key if within a dictionary) will be omitted from the
-  // output, and success will be returned. Otherwise, if a binary value is
-  // encountered, failure will be returned.
+  /// This option instructs the writer that if a Binary value is encountered,
+  /// the value (and key if within a dictionary) will be omitted from the
+  /// output, and success will be returned. Otherwise, if a binary value is
+  /// encountered, failure will be returned.
   ///
   JSON_WRITER_OMIT_BINARY_VALUES = 1 << 0,
 
   ///
-  // This option instructs the writer to write doubles that have no fractional
-  // part as a normal integer (i.e., without using exponential notation
-  // or appending a '.0') as long as the value is within the range of a
-  // 64-bit int.
+  /// This option instructs the writer to write doubles that have no fractional
+  /// part as a normal integer (i.e., without using exponential notation
+  /// or appending a '.0') as long as the value is within the range of a
+  /// 64-bit int.
   ///
   JSON_WRITER_OMIT_DOUBLE_TYPE_PRESERVATION = 1 << 1,
 
   ///
-  // Return a slightly nicer formatted json string (pads with whitespace to
-  // help with readability).
+  /// Return a slightly nicer formatted json string (pads with whitespace to
+  /// help with readability).
   ///
   JSON_WRITER_PRETTY_PRINT = 1 << 2,
 } cef_json_writer_options_t;
 
 ///
-// Margin type for PDF printing.
+/// Margin type for PDF printing.
 ///
 typedef enum {
   ///
-  // Default margins.
+  /// Default margins of 1cm (~0.4 inches).
   ///
   PDF_PRINT_MARGIN_DEFAULT,
 
   ///
-  // No margins.
+  /// No margins.
   ///
   PDF_PRINT_MARGIN_NONE,
 
   ///
-  // Minimum margins.
-  ///
-  PDF_PRINT_MARGIN_MINIMUM,
-
-  ///
-  // Custom margins using the |margin_*| values from cef_pdf_print_settings_t.
+  /// Custom margins using the |margin_*| values from cef_pdf_print_settings_t.
   ///
   PDF_PRINT_MARGIN_CUSTOM,
 } cef_pdf_print_margin_type_t;
 
 ///
-// Structure representing PDF print settings.
+/// Structure representing PDF print settings. These values match the parameters
+/// supported by the DevTools Page.printToPDF function. See
+/// https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF
 ///
 typedef struct _cef_pdf_print_settings_t {
   ///
-  // Page title to display in the header. Only used if |header_footer_enabled|
-  // is set to true (1).
+  /// Set to true (1) for landscape mode or false (0) for portrait mode.
+  ///
+  int landscape;
+
+  ///
+  /// Set to true (1) to print background graphics.
+  ///
+  int print_background;
+
+  ///
+  /// The percentage to scale the PDF by before printing (e.g. .5 is 50%).
+  /// If this value is less than or equal to zero the default value of 1.0
+  /// will be used.
   ///
-  cef_string_t header_footer_title;
+  double scale;
 
   ///
-  // URL to display in the footer. Only used if |header_footer_enabled| is set
-  // to true (1).
+  /// Output paper size in inches. If either of these values is less than or
+  /// equal to zero then the default paper size (letter, 8.5 x 11 inches) will
+  /// be used.
   ///
-  cef_string_t header_footer_url;
+  double paper_width;
+  double paper_height;
 
   ///
-  // Output page size in microns. If either of these values is less than or
-  // equal to zero then the default paper size (A4) will be used.
+  /// Set to true (1) to prefer page size as defined by css. Defaults to false
+  /// (0), in which case the content will be scaled to fit the paper size.
   ///
-  int page_width;
-  int page_height;
+  int prefer_css_page_size;
 
   ///
-  // The percentage to scale the PDF by before printing (e.g. 50 is 50%).
-  // If this value is less than or equal to zero the default value of 100
-  // will be used.
+  /// Margin type.
   ///
-  int scale_factor;
+  cef_pdf_print_margin_type_t margin_type;
 
   ///
-  // Margins in millimeters. Only used if |margin_type| is set to
-  // PDF_PRINT_MARGIN_CUSTOM.
+  /// Margins in inches. Only used if |margin_type| is set to
+  /// PDF_PRINT_MARGIN_CUSTOM.
   ///
   double margin_top;
   double margin_right;
@@ -2357,38 +2670,60 @@ typedef struct _cef_pdf_print_settings_t {
   double margin_left;
 
   ///
-  // Margin type.
+  /// Paper ranges to print, one based, e.g., '1-5, 8, 11-13'. Pages are printed
+  /// in the document order, not in the order specified, and no more than once.
+  /// Defaults to empty string, which implies the entire document is printed.
+  /// The page numbers are quietly capped to actual page count of the document,
+  /// and ranges beyond the end of the document are ignored. If this results in
+  /// no pages to print, an error is reported. It is an error to specify a range
+  /// with start greater than end.
   ///
-  cef_pdf_print_margin_type_t margin_type;
+  cef_string_t page_ranges;
 
   ///
-  // Set to true (1) to print headers and footers or false (0) to not print
-  // headers and footers.
+  /// Set to true (1) to display the header and/or footer. Modify
+  /// |header_template| and/or |footer_template| to customize the display.
   ///
-  int header_footer_enabled;
+  int display_header_footer;
 
   ///
-  // Set to true (1) to print the selection only or false (0) to print all.
+  /// HTML template for the print header. Only displayed if
+  /// |display_header_footer| is true (1). Should be valid HTML markup with
+  /// the following classes used to inject printing values into them:
+  ///
+  /// - date: formatted print date
+  /// - title: document title
+  /// - url: document location
+  /// - pageNumber: current page number
+  /// - totalPages: total pages in the document
+  ///
+  /// For example, "<span class=title></span>" would generate a span containing
+  /// the title.
   ///
-  int selection_only;
+  cef_string_t header_template;
 
   ///
-  // Set to true (1) for landscape mode or false (0) for portrait mode.
+  /// HTML template for the print footer. Only displayed if
+  /// |display_header_footer| is true (1). Uses the same format as
+  /// |header_template|.
   ///
-  int landscape;
+  cef_string_t footer_template;
 
   ///
-  // Set to true (1) to print background graphics or false (0) to not print
-  // background graphics.
+  /// Set to true (1) to generate tagged (accessible) PDF.
   ///
-  int backgrounds_enabled;
+  int generate_tagged_pdf;
 
+  ///
+  /// Set to true (1) to generate a document outline.
+  ///
+  int generate_document_outline;
 } cef_pdf_print_settings_t;
 
 ///
-// Supported UI scale factors for the platform. SCALE_FACTOR_NONE is used for
-// density independent resources such as string, html/js files or an image that
-// can be used for any scale factors (such as wallpapers).
+/// Supported UI scale factors for the platform. SCALE_FACTOR_NONE is used for
+/// density independent resources such as string, html/js files or an image that
+/// can be used for any scale factors (such as wallpapers).
 ///
 typedef enum {
   SCALE_FACTOR_NONE = 0,
@@ -2404,151 +2739,125 @@ typedef enum {
 } cef_scale_factor_t;
 
 ///
-// Plugin policies supported by CefRequestContextHandler::OnBeforePluginLoad.
-///
-typedef enum {
-  ///
-  // Allow the content.
-  ///
-  PLUGIN_POLICY_ALLOW,
-
-  ///
-  // Allow important content and block unimportant content based on heuristics.
-  // The user can manually load blocked content.
-  ///
-  PLUGIN_POLICY_DETECT_IMPORTANT,
-
-  ///
-  // Block the content. The user can manually load blocked content.
-  ///
-  PLUGIN_POLICY_BLOCK,
-
-  ///
-  // Disable the content. The user cannot load disabled content.
-  ///
-  PLUGIN_POLICY_DISABLE,
-} cef_plugin_policy_t;
-
-///
-// Policy for how the Referrer HTTP header value will be sent during navigation.
-// If the `--no-referrers` command-line flag is specified then the policy value
-// will be ignored and the Referrer value will never be sent.
-// Must be kept synchronized with net::URLRequest::ReferrerPolicy from Chromium.
+/// Policy for how the Referrer HTTP header value will be sent during
+/// navigation. If the `--no-referrers` command-line flag is specified then the
+/// policy value will be ignored and the Referrer value will never be sent. Must
+/// be kept synchronized with net::URLRequest::ReferrerPolicy from Chromium.
 ///
 typedef enum {
   ///
-  // Clear the referrer header if the header value is HTTPS but the request
-  // destination is HTTP. This is the default behavior.
+  /// Clear the referrer header if the header value is HTTPS but the request
+  /// destination is HTTP. This is the default behavior.
   ///
   REFERRER_POLICY_CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
   REFERRER_POLICY_DEFAULT =
       REFERRER_POLICY_CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
 
   ///
-  // A slight variant on CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE:
-  // If the request destination is HTTP, an HTTPS referrer will be cleared. If
-  // the request's destination is cross-origin with the referrer (but does not
-  // downgrade), the referrer's granularity will be stripped down to an origin
-  // rather than a full URL. Same-origin requests will send the full referrer.
+  /// A slight variant on CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE:
+  /// If the request destination is HTTP, an HTTPS referrer will be cleared. If
+  /// the request's destination is cross-origin with the referrer (but does not
+  /// downgrade), the referrer's granularity will be stripped down to an origin
+  /// rather than a full URL. Same-origin requests will send the full referrer.
   ///
   REFERRER_POLICY_REDUCE_REFERRER_GRANULARITY_ON_TRANSITION_CROSS_ORIGIN,
 
   ///
-  // Strip the referrer down to an origin when the origin of the referrer is
-  // different from the destination's origin.
+  /// Strip the referrer down to an origin when the origin of the referrer is
+  /// different from the destination's origin.
   ///
   REFERRER_POLICY_ORIGIN_ONLY_ON_TRANSITION_CROSS_ORIGIN,
 
   ///
-  // Never change the referrer.
+  /// Never change the referrer.
   ///
   REFERRER_POLICY_NEVER_CLEAR_REFERRER,
 
   ///
-  // Strip the referrer down to the origin regardless of the redirect location.
+  /// Strip the referrer down to the origin regardless of the redirect location.
   ///
   REFERRER_POLICY_ORIGIN,
 
   ///
-  // Clear the referrer when the request's referrer is cross-origin with the
-  // request's destination.
+  /// Clear the referrer when the request's referrer is cross-origin with the
+  /// request's destination.
   ///
   REFERRER_POLICY_CLEAR_REFERRER_ON_TRANSITION_CROSS_ORIGIN,
 
   ///
-  // Strip the referrer down to the origin, but clear it entirely if the
-  // referrer value is HTTPS and the destination is HTTP.
+  /// Strip the referrer down to the origin, but clear it entirely if the
+  /// referrer value is HTTPS and the destination is HTTP.
   ///
   REFERRER_POLICY_ORIGIN_CLEAR_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
 
   ///
-  // Always clear the referrer regardless of the request destination.
+  /// Always clear the referrer regardless of the request destination.
   ///
   REFERRER_POLICY_NO_REFERRER,
 
-  // Always the last value in this enumeration.
-  REFERRER_POLICY_LAST_VALUE,
+  /// Always the last value in this enumeration.
+  REFERRER_POLICY_LAST_VALUE = REFERRER_POLICY_NO_REFERRER,
 } cef_referrer_policy_t;
 
 ///
-// Return values for CefResponseFilter::Filter().
+/// Return values for CefResponseFilter::Filter().
 ///
 typedef enum {
   ///
-  // Some or all of the pre-filter data was read successfully but more data is
-  // needed in order to continue filtering (filtered output is pending).
+  /// Some or all of the pre-filter data was read successfully but more data is
+  /// needed in order to continue filtering (filtered output is pending).
   ///
   RESPONSE_FILTER_NEED_MORE_DATA,
 
   ///
-  // Some or all of the pre-filter data was read successfully and all available
-  // filtered output has been written.
+  /// Some or all of the pre-filter data was read successfully and all available
+  /// filtered output has been written.
   ///
   RESPONSE_FILTER_DONE,
 
   ///
-  // An error occurred during filtering.
+  /// An error occurred during filtering.
   ///
   RESPONSE_FILTER_ERROR
 } cef_response_filter_status_t;
 
 ///
-// Describes how to interpret the components of a pixel.
+/// Describes how to interpret the components of a pixel.
 ///
 typedef enum {
   ///
-  // RGBA with 8 bits per pixel (32bits total).
+  /// RGBA with 8 bits per pixel (32bits total).
   ///
   CEF_COLOR_TYPE_RGBA_8888,
 
   ///
-  // BGRA with 8 bits per pixel (32bits total).
+  /// BGRA with 8 bits per pixel (32bits total).
   ///
   CEF_COLOR_TYPE_BGRA_8888,
 } cef_color_type_t;
 
 ///
-// Describes how to interpret the alpha component of a pixel.
+/// Describes how to interpret the alpha component of a pixel.
 ///
 typedef enum {
   ///
-  // No transparency. The alpha component is ignored.
+  /// No transparency. The alpha component is ignored.
   ///
   CEF_ALPHA_TYPE_OPAQUE,
 
   ///
-  // Transparency with pre-multiplied alpha component.
+  /// Transparency with pre-multiplied alpha component.
   ///
   CEF_ALPHA_TYPE_PREMULTIPLIED,
 
   ///
-  // Transparency with post-multiplied alpha component.
+  /// Transparency with post-multiplied alpha component.
   ///
   CEF_ALPHA_TYPE_POSTMULTIPLIED,
 } cef_alpha_type_t;
 
 ///
-// Text style types. Should be kepy in sync with gfx::TextStyle.
+/// Text style types. Should be kepy in sync with gfx::TextStyle.
 ///
 typedef enum {
   CEF_TEXT_STYLE_BOLD,
@@ -2559,111 +2868,112 @@ typedef enum {
 } cef_text_style_t;
 
 ///
-// Specifies where along the main axis the CefBoxLayout child views should be
-// laid out.
+/// Specifies where along the main axis the CefBoxLayout child views should be
+/// laid out.
 ///
 typedef enum {
   ///
-  // Child views will be left-aligned.
+  /// Child views will be left-aligned.
   ///
   CEF_MAIN_AXIS_ALIGNMENT_START,
 
   ///
-  // Child views will be center-aligned.
+  /// Child views will be center-aligned.
   ///
   CEF_MAIN_AXIS_ALIGNMENT_CENTER,
 
   ///
-  // Child views will be right-aligned.
+  /// Child views will be right-aligned.
   ///
   CEF_MAIN_AXIS_ALIGNMENT_END,
 } cef_main_axis_alignment_t;
 
 ///
-// Specifies where along the cross axis the CefBoxLayout child views should be
-// laid out.
+/// Specifies where along the cross axis the CefBoxLayout child views should be
+/// laid out.
 ///
 typedef enum {
   ///
-  // Child views will be stretched to fit.
+  /// Child views will be stretched to fit.
   ///
   CEF_CROSS_AXIS_ALIGNMENT_STRETCH,
 
   ///
-  // Child views will be left-aligned.
+  /// Child views will be left-aligned.
   ///
   CEF_CROSS_AXIS_ALIGNMENT_START,
 
   ///
-  // Child views will be center-aligned.
+  /// Child views will be center-aligned.
   ///
   CEF_CROSS_AXIS_ALIGNMENT_CENTER,
 
   ///
-  // Child views will be right-aligned.
+  /// Child views will be right-aligned.
   ///
   CEF_CROSS_AXIS_ALIGNMENT_END,
 } cef_cross_axis_alignment_t;
 
 ///
-// Settings used when initializing a CefBoxLayout.
+/// Settings used when initializing a CefBoxLayout.
 ///
 typedef struct _cef_box_layout_settings_t {
   ///
-  // If true (1) the layout will be horizontal, otherwise the layout will be
-  // vertical.
+  /// If true (1) the layout will be horizontal, otherwise the layout will be
+  /// vertical.
   ///
   int horizontal;
 
   ///
-  // Adds additional horizontal space between the child view area and the host
-  // view border.
+  /// Adds additional horizontal space between the child view area and the host
+  /// view border.
   ///
   int inside_border_horizontal_spacing;
 
   ///
-  // Adds additional vertical space between the child view area and the host
-  // view border.
+  /// Adds additional vertical space between the child view area and the host
+  /// view border.
   ///
   int inside_border_vertical_spacing;
 
   ///
-  // Adds additional space around the child view area.
+  /// Adds additional space around the child view area.
   ///
   cef_insets_t inside_border_insets;
 
   ///
-  // Adds additional space between child views.
+  /// Adds additional space between child views.
   ///
   int between_child_spacing;
 
   ///
-  // Specifies where along the main axis the child views should be laid out.
+  /// Specifies where along the main axis the child views should be laid out.
   ///
   cef_main_axis_alignment_t main_axis_alignment;
 
   ///
-  // Specifies where along the cross axis the child views should be laid out.
+  /// Specifies where along the cross axis the child views should be laid out.
   ///
   cef_cross_axis_alignment_t cross_axis_alignment;
 
   ///
-  // Minimum cross axis size.
+  /// Minimum cross axis size.
   ///
   int minimum_cross_axis_size;
 
   ///
-  // Default flex for views when none is specified via CefBoxLayout methods.
-  // Using the preferred size as the basis, free space along the main axis is
-  // distributed to views in the ratio of their flex weights. Similarly, if the
-  // views will overflow the parent, space is subtracted in these ratios. A flex
-  // of 0 means this view is not resized. Flex values must not be negative.
+  /// Default flex for views when none is specified via CefBoxLayout methods.
+  /// Using the preferred size as the basis, free space along the main axis is
+  /// distributed to views in the ratio of their flex weights. Similarly, if the
+  /// views will overflow the parent, space is subtracted in these ratios. A
+  /// flex of 0 means this view is not resized. Flex values must not be
+  /// negative.
   ///
   int default_flex;
 } cef_box_layout_settings_t;
 
 ///
-// Specifies the button display state.
+/// Specifies the button display state.
 ///
 typedef enum {
   CEF_BUTTON_STATE_NORMAL,
@@ -2673,28 +2983,28 @@ typedef enum {
 } cef_button_state_t;
 
 ///
-// Specifies the horizontal text alignment mode.
+/// Specifies the horizontal text alignment mode.
 ///
 typedef enum {
   ///
-  // Align the text's left edge with that of its display area.
+  /// Align the text's left edge with that of its display area.
   ///
   CEF_HORIZONTAL_ALIGNMENT_LEFT,
 
   ///
-  // Align the text's center with that of its display area.
+  /// Align the text's center with that of its display area.
   ///
   CEF_HORIZONTAL_ALIGNMENT_CENTER,
 
   ///
-  // Align the text's right edge with that of its display area.
+  /// Align the text's right edge with that of its display area.
   ///
   CEF_HORIZONTAL_ALIGNMENT_RIGHT,
 } cef_horizontal_alignment_t;
 
 ///
-// Specifies how a menu will be anchored for non-RTL languages. The opposite
-// position will be used for RTL languages.
+/// Specifies how a menu will be anchored for non-RTL languages. The opposite
+/// position will be used for RTL languages.
 ///
 typedef enum {
   CEF_MENU_ANCHOR_TOPLEFT,
@@ -2703,7 +3013,7 @@ typedef enum {
 } cef_menu_anchor_position_t;
 
 ///
-// Supported color types for menu items.
+/// Supported color types for menu items.
 ///
 typedef enum {
   CEF_MENU_COLOR_TEXT,
@@ -2715,8 +3025,8 @@ typedef enum {
   CEF_MENU_COLOR_COUNT,
 } cef_menu_color_type_t;
 
-// Supported SSL version values. See net/ssl/ssl_connection_status_flags.h
-// for more information.
+/// Supported SSL version values. See net/ssl/ssl_connection_status_flags.h
+/// for more information.
 typedef enum {
   SSL_CONNECTION_VERSION_UNKNOWN = 0,  // Unknown SSL version.
   SSL_CONNECTION_VERSION_SSL2 = 1,
@@ -2724,70 +3034,744 @@ typedef enum {
   SSL_CONNECTION_VERSION_TLS1 = 3,
   SSL_CONNECTION_VERSION_TLS1_1 = 4,
   SSL_CONNECTION_VERSION_TLS1_2 = 5,
-  // Reserve 6 for TLS 1.3.
+  SSL_CONNECTION_VERSION_TLS1_3 = 6,
   SSL_CONNECTION_VERSION_QUIC = 7,
 } cef_ssl_version_t;
 
-// Supported SSL content status flags. See content/public/common/ssl_status.h
-// for more information.
+/// Supported SSL content status flags. See content/public/common/ssl_status.h
+/// for more information.
 typedef enum {
   SSL_CONTENT_NORMAL_CONTENT = 0,
   SSL_CONTENT_DISPLAYED_INSECURE_CONTENT = 1 << 0,
   SSL_CONTENT_RAN_INSECURE_CONTENT = 1 << 1,
 } cef_ssl_content_status_t;
 
-///
-// Error codes for CDM registration. See cef_web_plugin.h for details.
-///
+//
+/// Configuration options for registering a custom scheme.
+/// These values are used when calling AddCustomScheme.
+//
 typedef enum {
+  CEF_SCHEME_OPTION_NONE = 0,
+
+  ///
+  /// If CEF_SCHEME_OPTION_STANDARD is set the scheme will be treated as a
+  /// standard scheme. Standard schemes are subject to URL canonicalization and
+  /// parsing rules as defined in the Common Internet Scheme Syntax RFC 1738
+  /// Section 3.1 available at http://www.ietf.org/rfc/rfc1738.txt
+  //
+  /// In particular, the syntax for standard scheme URLs must be of the form:
+  /// <pre>
+  ///  [scheme]://[username]:[password]@[host]:[port]/[url-path]
+  /// </pre> Standard scheme URLs must have a host component that is a fully
+  /// qualified domain name as defined in Section 3.5 of RFC 1034 [13] and
+  /// Section 2.1 of RFC 1123. These URLs will be canonicalized to
+  /// "scheme://host/path" in the simplest case and
+  /// "scheme://username:password@host:port/path" in the most explicit case. For
+  /// example, "scheme:host/path" and "scheme:///host/path" will both be
+  /// canonicalized to "scheme://host/path". The origin of a standard scheme URL
+  /// is the combination of scheme, host and port (i.e., "scheme://host:port" in
+  /// the most explicit case).
+  //
+  /// For non-standard scheme URLs only the "scheme:" component is parsed and
+  /// canonicalized. The remainder of the URL will be passed to the handler as-
+  /// is. For example, "scheme:///some%20text" will remain the same.
+  /// Non-standard scheme URLs cannot be used as a target for form submission.
+  ///
+  CEF_SCHEME_OPTION_STANDARD = 1 << 0,
+
+  ///
+  /// If CEF_SCHEME_OPTION_LOCAL is set the scheme will be treated with the same
+  /// security rules as those applied to "file" URLs. Normal pages cannot link
+  /// to or access local URLs. Also, by default, local URLs can only perform
+  /// XMLHttpRequest calls to the same URL (origin + path) that originated the
+  /// request. To allow XMLHttpRequest calls from a local URL to other URLs with
+  /// the same origin set the CefSettings.file_access_from_file_urls_allowed
+  /// value to true (1). To allow XMLHttpRequest calls from a local URL to all
+  /// origins set the CefSettings.universal_access_from_file_urls_allowed value
+  /// to true (1).
+  ///
+  CEF_SCHEME_OPTION_LOCAL = 1 << 1,
+
   ///
-  // No error. Registration completed successfully.
+  /// If CEF_SCHEME_OPTION_DISPLAY_ISOLATED is set the scheme can only be
+  /// displayed from other content hosted with the same scheme. For example,
+  /// pages in other origins cannot create iframes or hyperlinks to URLs with
+  /// the scheme. For schemes that must be accessible from other schemes don't
+  /// set this, set CEF_SCHEME_OPTION_CORS_ENABLED, and use CORS
+  /// "Access-Control-Allow-Origin" headers to further restrict access.
   ///
-  CEF_CDM_REGISTRATION_ERROR_NONE,
+  CEF_SCHEME_OPTION_DISPLAY_ISOLATED = 1 << 2,
 
   ///
-  // Required files or manifest contents are missing.
+  /// If CEF_SCHEME_OPTION_SECURE is set the scheme will be treated with the
+  /// same security rules as those applied to "https" URLs. For example, loading
+  /// this scheme from other secure schemes will not trigger mixed content
+  /// warnings.
   ///
-  CEF_CDM_REGISTRATION_ERROR_INCORRECT_CONTENTS,
+  CEF_SCHEME_OPTION_SECURE = 1 << 3,
 
   ///
-  // The CDM is incompatible with the current Chromium version.
+  /// If CEF_SCHEME_OPTION_CORS_ENABLED is set the scheme can be sent CORS
+  /// requests. This value should be set in most cases where
+  /// CEF_SCHEME_OPTION_STANDARD is set.
   ///
-  CEF_CDM_REGISTRATION_ERROR_INCOMPATIBLE,
+  CEF_SCHEME_OPTION_CORS_ENABLED = 1 << 4,
 
   ///
-  // CDM registration is not supported at this time.
+  /// If CEF_SCHEME_OPTION_CSP_BYPASSING is set the scheme can bypass Content-
+  /// Security-Policy (CSP) checks. This value should not be set in most cases
+  /// where CEF_SCHEME_OPTION_STANDARD is set.
   ///
-  CEF_CDM_REGISTRATION_ERROR_NOT_SUPPORTED,
-} cef_cdm_registration_error_t;
+  CEF_SCHEME_OPTION_CSP_BYPASSING = 1 << 5,
+
+  ///
+  /// If CEF_SCHEME_OPTION_FETCH_ENABLED is set the scheme can perform Fetch API
+  /// requests.
+  ///
+  CEF_SCHEME_OPTION_FETCH_ENABLED = 1 << 6,
+} cef_scheme_options_t;
 
 ///
-// Structure representing IME composition underline information. This is a thin
-// wrapper around Blink's WebCompositionUnderline class and should be kept in
-// sync with that.
+/// Structure representing a range.
+///
+typedef struct _cef_range_t {
+  uint32_t from;
+  uint32_t to;
+} cef_range_t;
+
+///
+/// Composition underline style.
+///
+typedef enum {
+  CEF_CUS_SOLID,
+  CEF_CUS_DOT,
+  CEF_CUS_DASH,
+  CEF_CUS_NONE,
+} cef_composition_underline_style_t;
+
+///
+/// Structure representing IME composition underline information. This is a thin
+/// wrapper around Blink's WebCompositionUnderline class and should be kept in
+/// sync with that.
 ///
 typedef struct _cef_composition_underline_t {
   ///
-  // Underline character range.
+  /// Underline character range.
   ///
   cef_range_t range;
 
   ///
-  // Text color.
+  /// Text color.
   ///
   cef_color_t color;
 
   ///
-  // Background color.
+  /// Background color.
   ///
   cef_color_t background_color;
 
   ///
-  // Set to true (1) for thick underline.
+  /// Set to true (1) for thick underline.
   ///
   int thick;
+
+  ///
+  /// Style.
+  ///
+  cef_composition_underline_style_t style;
 } cef_composition_underline_t;
 
+///
+/// Enumerates the various representations of the ordering of audio channels.
+/// Must be kept synchronized with media::ChannelLayout from Chromium.
+/// See media\base\channel_layout.h
+///
+typedef enum {
+  CEF_CHANNEL_LAYOUT_NONE = 0,
+  CEF_CHANNEL_LAYOUT_UNSUPPORTED = 1,
+
+  /// Front C
+  CEF_CHANNEL_LAYOUT_MONO = 2,
+
+  /// Front L, Front R
+  CEF_CHANNEL_LAYOUT_STEREO = 3,
+
+  /// Front L, Front R, Back C
+  CEF_CHANNEL_LAYOUT_2_1 = 4,
+
+  /// Front L, Front R, Front C
+  CEF_CHANNEL_LAYOUT_SURROUND = 5,
+
+  /// Front L, Front R, Front C, Back C
+  CEF_CHANNEL_LAYOUT_4_0 = 6,
+
+  /// Front L, Front R, Side L, Side R
+  CEF_CHANNEL_LAYOUT_2_2 = 7,
+
+  /// Front L, Front R, Back L, Back R
+  CEF_CHANNEL_LAYOUT_QUAD = 8,
+
+  /// Front L, Front R, Front C, Side L, Side R
+  CEF_CHANNEL_LAYOUT_5_0 = 9,
+
+  /// Front L, Front R, Front C, LFE, Side L, Side R
+  CEF_CHANNEL_LAYOUT_5_1 = 10,
+
+  /// Front L, Front R, Front C, Back L, Back R
+  CEF_CHANNEL_LAYOUT_5_0_BACK = 11,
+
+  /// Front L, Front R, Front C, LFE, Back L, Back R
+  CEF_CHANNEL_LAYOUT_5_1_BACK = 12,
+
+  /// Front L, Front R, Front C, Side L, Side R, Back L, Back R
+  CEF_CHANNEL_LAYOUT_7_0 = 13,
+
+  /// Front L, Front R, Front C, LFE, Side L, Side R, Back L, Back R
+  CEF_CHANNEL_LAYOUT_7_1 = 14,
+
+  /// Front L, Front R, Front C, LFE, Side L, Side R, Front LofC, Front RofC
+  CEF_CHANNEL_LAYOUT_7_1_WIDE = 15,
+
+  /// Stereo L, Stereo R
+  CEF_CHANNEL_LAYOUT_STEREO_DOWNMIX = 16,
+
+  /// Stereo L, Stereo R, LFE
+  CEF_CHANNEL_LAYOUT_2POINT1 = 17,
+
+  /// Stereo L, Stereo R, Front C, LFE
+  CEF_CHANNEL_LAYOUT_3_1 = 18,
+
+  /// Stereo L, Stereo R, Front C, Rear C, LFE
+  CEF_CHANNEL_LAYOUT_4_1 = 19,
+
+  /// Stereo L, Stereo R, Front C, Side L, Side R, Back C
+  CEF_CHANNEL_LAYOUT_6_0 = 20,
+
+  /// Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC
+  CEF_CHANNEL_LAYOUT_6_0_FRONT = 21,
+
+  /// Stereo L, Stereo R, Front C, Rear L, Rear R, Rear C
+  CEF_CHANNEL_LAYOUT_HEXAGONAL = 22,
+
+  /// Stereo L, Stereo R, Front C, LFE, Side L, Side R, Rear Center
+  CEF_CHANNEL_LAYOUT_6_1 = 23,
+
+  /// Stereo L, Stereo R, Front C, LFE, Back L, Back R, Rear Center
+  CEF_CHANNEL_LAYOUT_6_1_BACK = 24,
+
+  /// Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC, LFE
+  CEF_CHANNEL_LAYOUT_6_1_FRONT = 25,
+
+  /// Front L, Front R, Front C, Side L, Side R, Front LofC, Front RofC
+  CEF_CHANNEL_LAYOUT_7_0_FRONT = 26,
+
+  /// Front L, Front R, Front C, LFE, Back L, Back R, Front LofC, Front RofC
+  CEF_CHANNEL_LAYOUT_7_1_WIDE_BACK = 27,
+
+  /// Front L, Front R, Front C, Side L, Side R, Rear L, Back R, Back C.
+  CEF_CHANNEL_LAYOUT_OCTAGONAL = 28,
+
+  /// Channels are not explicitly mapped to speakers.
+  CEF_CHANNEL_LAYOUT_DISCRETE = 29,
+
+  /// Front L, Front R, Front C. Front C contains the keyboard mic audio. This
+  /// layout is only intended for input for WebRTC. The Front C channel
+  /// is stripped away in the WebRTC audio input pipeline and never seen outside
+  /// of that.
+  CEF_CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC = 30,
+
+  /// Front L, Front R, Side L, Side R, LFE
+  CEF_CHANNEL_LAYOUT_4_1_QUAD_SIDE = 31,
+
+  /// Actual channel layout is specified in the bitstream and the actual channel
+  /// count is unknown at Chromium media pipeline level (useful for audio
+  /// pass-through mode).
+  CEF_CHANNEL_LAYOUT_BITSTREAM = 32,
+
+  /// Front L, Front R, Front C, LFE, Side L, Side R,
+  /// Front Height L, Front Height R, Rear Height L, Rear Height R
+  /// Will be represented as six channels (5.1) due to eight channel limit
+  /// kMaxConcurrentChannels
+  CEF_CHANNEL_LAYOUT_5_1_4_DOWNMIX = 33,
+
+  /// Max value, must always equal the largest entry ever logged.
+  CEF_CHANNEL_LAYOUT_MAX = CEF_CHANNEL_LAYOUT_5_1_4_DOWNMIX
+} cef_channel_layout_t;
+
+///
+/// Structure representing the audio parameters for setting up the audio
+/// handler.
+///
+typedef struct _cef_audio_parameters_t {
+  ///
+  /// Layout of the audio channels
+  ///
+  cef_channel_layout_t channel_layout;
+
+  ///
+  /// Sample rate
+  //
+  int sample_rate;
+
+  ///
+  /// Number of frames per buffer
+  ///
+  int frames_per_buffer;
+} cef_audio_parameters_t;
+
+///
+/// Result codes for CefMediaRouter::CreateRoute. Should be kept in sync with
+/// Chromium's media_router::mojom::RouteRequestResultCode type.
+///
+typedef enum {
+  CEF_MRCR_UNKNOWN_ERROR = 0,
+  CEF_MRCR_OK = 1,
+  CEF_MRCR_TIMED_OUT = 2,
+  CEF_MRCR_ROUTE_NOT_FOUND = 3,
+  CEF_MRCR_SINK_NOT_FOUND = 4,
+  CEF_MRCR_INVALID_ORIGIN = 5,
+  CEF_MRCR_NO_SUPPORTED_PROVIDER = 7,
+  CEF_MRCR_CANCELLED = 8,
+  CEF_MRCR_ROUTE_ALREADY_EXISTS = 9,
+  CEF_MRCR_ROUTE_ALREADY_TERMINATED = 11,
+} cef_media_route_create_result_t;
+
+///
+/// Connection state for a MediaRoute object.
+///
+typedef enum {
+  CEF_MRCS_UNKNOWN,
+  CEF_MRCS_CONNECTING,
+  CEF_MRCS_CONNECTED,
+  CEF_MRCS_CLOSED,
+  CEF_MRCS_TERMINATED,
+} cef_media_route_connection_state_t;
+
+///
+/// Icon types for a MediaSink object. Should be kept in sync with Chromium's
+/// media_router::SinkIconType type.
+///
+typedef enum {
+  CEF_MSIT_CAST,
+  CEF_MSIT_CAST_AUDIO_GROUP,
+  CEF_MSIT_CAST_AUDIO,
+  CEF_MSIT_MEETING,
+  CEF_MSIT_HANGOUT,
+  CEF_MSIT_EDUCATION,
+  CEF_MSIT_WIRED_DISPLAY,
+  CEF_MSIT_GENERIC,
+
+  CEF_MSIT_TOTAL_COUNT,  // The total number of values.
+} cef_media_sink_icon_type_t;
+
+///
+/// Device information for a MediaSink object.
+///
+typedef struct _cef_media_sink_device_info_t {
+  cef_string_t ip_address;
+  int port;
+  cef_string_t model_name;
+} cef_media_sink_device_info_t;
+
+///
+/// Represents commands available to TextField.
+///
+typedef enum {
+  CEF_TFC_CUT = 1,
+  CEF_TFC_COPY,
+  CEF_TFC_PASTE,
+  CEF_TFC_UNDO,
+  CEF_TFC_DELETE,
+  CEF_TFC_SELECT_ALL,
+} cef_text_field_commands_t;
+
+///
+/// Chrome toolbar types.
+///
+typedef enum {
+  CEF_CTT_NONE = 1,
+  CEF_CTT_NORMAL,
+  CEF_CTT_LOCATION,
+} cef_chrome_toolbar_type_t;
+
+///
+/// Chrome page action icon types. Should be kept in sync with Chromium's
+/// PageActionIconType type.
+///
+typedef enum {
+  CEF_CPAIT_BOOKMARK_STAR = 0,
+  CEF_CPAIT_CLICK_TO_CALL,
+  CEF_CPAIT_COOKIE_CONTROLS,
+  CEF_CPAIT_FILE_SYSTEM_ACCESS,
+  CEF_CPAIT_FIND,
+  CEF_CPAIT_HIGH_EFFICIENCY,
+  CEF_CPAIT_INTENT_PICKER,
+  CEF_CPAIT_LOCAL_CARD_MIGRATION,
+  CEF_CPAIT_MANAGE_PASSWORDS,
+  CEF_CPAIT_PAYMENTS_OFFER_NOTIFICATION,
+  CEF_CPAIT_PRICE_TRACKING,
+  CEF_CPAIT_PWA_INSTALL,
+  CEF_CPAIT_QR_CODE_GENERATOR,
+  CEF_CPAIT_READER_MODE,
+  CEF_CPAIT_SAVE_AUTOFILL_ADDRESS,
+  CEF_CPAIT_SAVE_CARD,
+  CEF_CPAIT_SEND_TAB_TO_SELF,
+  CEF_CPAIT_SHARING_HUB,
+  CEF_CPAIT_SIDE_SEARCH,
+  CEF_CPAIT_SMS_REMOTE_FETCHER,
+  CEF_CPAIT_TRANSLATE,
+  CEF_CPAIT_VIRTUAL_CARD_ENROLL,
+  CEF_CPAIT_VIRTUAL_CARD_MANUAL_FALLBACK,
+  CEF_CPAIT_ZOOM,
+  CEF_CPAIT_SAVE_IBAN,
+  CEF_CPAIT_MANDATORY_REAUTH,
+  CEF_CPAIT_PRICE_INSIGHTS,
+  CEF_CPAIT_PRICE_READ_ANYTHING,
+  CEF_CPAIT_MAX_VALUE = CEF_CPAIT_PRICE_READ_ANYTHING,
+} cef_chrome_page_action_icon_type_t;
+
+///
+/// Chrome toolbar button types. Should be kept in sync with CEF's internal
+/// ToolbarButtonType type.
+///
+typedef enum {
+  CEF_CTBT_CAST = 0,
+  CEF_CTBT_DOWNLOAD,
+  CEF_CTBT_SEND_TAB_TO_SELF,
+  CEF_CTBT_SIDE_PANEL,
+  CEF_CTBT_MAX_VALUE = CEF_CTBT_SIDE_PANEL,
+} cef_chrome_toolbar_button_type_t;
+
+///
+/// Docking modes supported by CefWindow::AddOverlay.
+///
+typedef enum {
+  CEF_DOCKING_MODE_TOP_LEFT = 1,
+  CEF_DOCKING_MODE_TOP_RIGHT,
+  CEF_DOCKING_MODE_BOTTOM_LEFT,
+  CEF_DOCKING_MODE_BOTTOM_RIGHT,
+  CEF_DOCKING_MODE_CUSTOM,
+} cef_docking_mode_t;
+
+///
+/// Show states supported by CefWindowDelegate::GetInitialShowState.
+///
+typedef enum {
+  // Show the window as normal.
+  CEF_SHOW_STATE_NORMAL = 1,
+
+  // Show the window as minimized.
+  CEF_SHOW_STATE_MINIMIZED,
+
+  // Show the window as maximized.
+  CEF_SHOW_STATE_MAXIMIZED,
+
+  // Show the window as fullscreen.
+  CEF_SHOW_STATE_FULLSCREEN,
+
+  // Show the window as hidden (no dock thumbnail).
+  // Only supported on MacOS.
+  CEF_SHOW_STATE_HIDDEN,
+} cef_show_state_t;
+
+///
+/// Values indicating what state of the touch handle is set.
+///
+typedef enum {
+  CEF_THS_FLAG_NONE = 0,
+  CEF_THS_FLAG_ENABLED = 1 << 0,
+  CEF_THS_FLAG_ORIENTATION = 1 << 1,
+  CEF_THS_FLAG_ORIGIN = 1 << 2,
+  CEF_THS_FLAG_ALPHA = 1 << 3,
+} cef_touch_handle_state_flags_t;
+
+typedef struct _cef_touch_handle_state_t {
+  ///
+  /// Touch handle id. Increments for each new touch handle.
+  ///
+  int touch_handle_id;
+
+  ///
+  /// Combination of cef_touch_handle_state_flags_t values indicating what state
+  /// is set.
+  ///
+  uint32_t flags;
+
+  ///
+  /// Enabled state. Only set if |flags| contains CEF_THS_FLAG_ENABLED.
+  ///
+  int enabled;
+
+  ///
+  /// Orientation state. Only set if |flags| contains CEF_THS_FLAG_ORIENTATION.
+  ///
+  cef_horizontal_alignment_t orientation;
+  int mirror_vertical;
+  int mirror_horizontal;
+
+  ///
+  /// Origin state. Only set if |flags| contains CEF_THS_FLAG_ORIGIN.
+  ///
+  cef_point_t origin;
+
+  ///
+  /// Alpha state. Only set if |flags| contains CEF_THS_FLAG_ALPHA.
+  ///
+  float alpha;
+} cef_touch_handle_state_t;
+
+///
+/// Media access permissions used by OnRequestMediaAccessPermission.
+///
+typedef enum {
+  ///
+  /// No permission.
+  ///
+  CEF_MEDIA_PERMISSION_NONE = 0,
+
+  ///
+  /// Device audio capture permission.
+  ///
+  CEF_MEDIA_PERMISSION_DEVICE_AUDIO_CAPTURE = 1 << 0,
+
+  ///
+  /// Device video capture permission.
+  ///
+  CEF_MEDIA_PERMISSION_DEVICE_VIDEO_CAPTURE = 1 << 1,
+
+  ///
+  /// Desktop audio capture permission.
+  ///
+  CEF_MEDIA_PERMISSION_DESKTOP_AUDIO_CAPTURE = 1 << 2,
+
+  ///
+  /// Desktop video capture permission.
+  ///
+  CEF_MEDIA_PERMISSION_DESKTOP_VIDEO_CAPTURE = 1 << 3,
+} cef_media_access_permission_types_t;
+
+///
+/// Permission types used with OnShowPermissionPrompt. Some types are
+/// platform-specific or only supported with the Chrome runtime. Should be kept
+/// in sync with Chromium's permissions::RequestType type.
+///
+typedef enum {
+  CEF_PERMISSION_TYPE_NONE = 0,
+  CEF_PERMISSION_TYPE_ACCESSIBILITY_EVENTS = 1 << 0,
+  CEF_PERMISSION_TYPE_AR_SESSION = 1 << 1,
+  CEF_PERMISSION_TYPE_CAMERA_PAN_TILT_ZOOM = 1 << 2,
+  CEF_PERMISSION_TYPE_CAMERA_STREAM = 1 << 3,
+  CEF_PERMISSION_TYPE_CAPTURED_SURFACE_CONTROL = 1 << 4,
+  CEF_PERMISSION_TYPE_CLIPBOARD = 1 << 5,
+  CEF_PERMISSION_TYPE_TOP_LEVEL_STORAGE_ACCESS = 1 << 6,
+  CEF_PERMISSION_TYPE_DISK_QUOTA = 1 << 7,
+  CEF_PERMISSION_TYPE_LOCAL_FONTS = 1 << 8,
+  CEF_PERMISSION_TYPE_GEOLOCATION = 1 << 9,
+  CEF_PERMISSION_TYPE_IDLE_DETECTION = 1 << 10,
+  CEF_PERMISSION_TYPE_MIC_STREAM = 1 << 11,
+  CEF_PERMISSION_TYPE_MIDI = 1 << 12,
+  CEF_PERMISSION_TYPE_MIDI_SYSEX = 1 << 13,
+  CEF_PERMISSION_TYPE_MULTIPLE_DOWNLOADS = 1 << 14,
+  CEF_PERMISSION_TYPE_NOTIFICATIONS = 1 << 15,
+  CEF_PERMISSION_TYPE_PROTECTED_MEDIA_IDENTIFIER = 1 << 16,
+  CEF_PERMISSION_TYPE_REGISTER_PROTOCOL_HANDLER = 1 << 17,
+  CEF_PERMISSION_TYPE_STORAGE_ACCESS = 1 << 18,
+  CEF_PERMISSION_TYPE_VR_SESSION = 1 << 19,
+  CEF_PERMISSION_TYPE_WINDOW_MANAGEMENT = 1 << 20,
+  CEF_PERMISSION_TYPE_FILE_SYSTEM_ACCESS = 1 << 21,
+} cef_permission_request_types_t;
+
+///
+/// Permission request results.
+///
+typedef enum {
+  ///
+  /// Accept the permission request as an explicit user action.
+  ///
+  CEF_PERMISSION_RESULT_ACCEPT,
+
+  ///
+  /// Deny the permission request as an explicit user action.
+  ///
+  CEF_PERMISSION_RESULT_DENY,
+
+  ///
+  /// Dismiss the permission request as an explicit user action.
+  ///
+  CEF_PERMISSION_RESULT_DISMISS,
+
+  ///
+  /// Ignore the permission request. If the prompt remains unhandled (e.g.
+  /// OnShowPermissionPrompt returns false and there is no default permissions
+  /// UI) then any related promises may remain unresolved.
+  ///
+  CEF_PERMISSION_RESULT_IGNORE,
+} cef_permission_request_result_t;
+
+///
+/// Certificate types supported by CefTestServer::CreateAndStart. The matching
+/// certificate file must exist in the "net/data/ssl/certificates" directory.
+/// See CefSetDataDirectoryForTests() for related configuration.
+///
+typedef enum {
+  /// Valid certificate using the IP (127.0.0.1). Loads the "ok_cert.pem" file.
+  CEF_TEST_CERT_OK_IP,
+
+  /// Valid certificate using the domain ("localhost"). Loads the
+  /// "localhost_cert.pem" file.
+  CEF_TEST_CERT_OK_DOMAIN,
+
+  /// Expired certificate. Loads the "expired_cert.pem" file.
+  CEF_TEST_CERT_EXPIRED,
+} cef_test_cert_type_t;
+
+///
+/// Preferences type passed to
+/// CefBrowserProcessHandler::OnRegisterCustomPreferences.
+///
+typedef enum {
+  /// Global preferences registered a single time at application startup.
+  CEF_PREFERENCES_TYPE_GLOBAL,
+
+  /// Request context preferences registered each time a new CefRequestContext
+  /// is created.
+  CEF_PREFERENCES_TYPE_REQUEST_CONTEXT,
+} cef_preferences_type_t;
+
+///
+/// Download interrupt reasons. Should be kept in sync with
+/// Chromium's download::DownloadInterruptReason type.
+///
+typedef enum {
+  CEF_DOWNLOAD_INTERRUPT_REASON_NONE = 0,
+
+  /// Generic file operation failure.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_FAILED = 1,
+
+  /// The file cannot be accessed due to security restrictions.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED = 2,
+
+  /// There is not enough room on the drive.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE = 3,
+
+  /// The directory or file name is too long.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_NAME_TOO_LONG = 5,
+
+  /// The file is too large for the file system to handle.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_TOO_LARGE = 6,
+
+  /// The file contains a virus.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_VIRUS_INFECTED = 7,
+
+  /// The file was in use. Too many files are opened at once. We have run out of
+  /// memory.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_TRANSIENT_ERROR = 10,
+
+  /// The file was blocked due to local policy.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_BLOCKED = 11,
+
+  /// An attempt to check the safety of the download failed due to unexpected
+  /// reasons. See http://crbug.com/153212.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_SECURITY_CHECK_FAILED = 12,
+
+  /// An attempt was made to seek past the end of a file in opening
+  /// a file (as part of resuming a previously interrupted download).
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_TOO_SHORT = 13,
+
+  /// The partial file didn't match the expected hash.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_HASH_MISMATCH = 14,
+
+  /// The source and the target of the download were the same.
+  CEF_DOWNLOAD_INTERRUPT_REASON_FILE_SAME_AS_SOURCE = 15,
+
+  // Network errors.
+
+  /// Generic network failure.
+  CEF_DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED = 20,
+
+  /// The network operation timed out.
+  CEF_DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT = 21,
+
+  /// The network connection has been lost.
+  CEF_DOWNLOAD_INTERRUPT_REASON_NETWORK_DISCONNECTED = 22,
+
+  /// The server has gone down.
+  CEF_DOWNLOAD_INTERRUPT_REASON_NETWORK_SERVER_DOWN = 23,
+
+  /// The network request was invalid. This may be due to the original URL or a
+  /// redirected URL:
+  /// - Having an unsupported scheme.
+  /// - Being an invalid URL.
+  /// - Being disallowed by policy.
+  CEF_DOWNLOAD_INTERRUPT_REASON_NETWORK_INVALID_REQUEST = 24,
+
+  // Server responses.
+
+  /// The server indicates that the operation has failed (generic).
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED = 30,
+
+  /// The server does not support range requests.
+  /// Internal use only:  must restart from the beginning.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_NO_RANGE = 31,
+
+  /// The server does not have the requested data.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT = 33,
+
+  /// Server didn't authorize access to resource.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED = 34,
+
+  /// Server certificate problem.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_CERT_PROBLEM = 35,
+
+  /// Server access forbidden.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_FORBIDDEN = 36,
+
+  /// Unexpected server response. This might indicate that the responding server
+  /// may not be the intended server.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_UNREACHABLE = 37,
+
+  /// The server sent fewer bytes than the content-length header. It may
+  /// indicate that the connection was closed prematurely, or the Content-Length
+  /// header was invalid. The download is only interrupted if strong validators
+  /// are present. Otherwise, it is treated as finished.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_CONTENT_LENGTH_MISMATCH = 38,
+
+  /// An unexpected cross-origin redirect happened.
+  CEF_DOWNLOAD_INTERRUPT_REASON_SERVER_CROSS_ORIGIN_REDIRECT = 39,
+
+  // User input.
+
+  /// The user canceled the download.
+  CEF_DOWNLOAD_INTERRUPT_REASON_USER_CANCELED = 40,
+
+  /// The user shut down the browser.
+  /// Internal use only:  resume pending downloads if possible.
+  CEF_DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN = 41,
+
+  // Crash.
+
+  /// The browser crashed.
+  /// Internal use only:  resume pending downloads if possible.
+  CEF_DOWNLOAD_INTERRUPT_REASON_CRASH = 50,
+} cef_download_interrupt_reason_t;
+
+///
+/// Specifies the gesture commands.
+///
+typedef enum {
+  CEF_GESTURE_COMMAND_BACK,
+  CEF_GESTURE_COMMAND_FORWARD,
+} cef_gesture_command_t;
+
+///
+/// Specifies the zoom commands supported by CefBrowserHost::Zoom.
+///
+typedef enum {
+  CEF_ZOOM_COMMAND_OUT,
+  CEF_ZOOM_COMMAND_RESET,
+  CEF_ZOOM_COMMAND_IN,
+} cef_zoom_command_t;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/internal/cef_types_content_settings.h b/src/include/internal/cef_types_content_settings.h
new file mode 100644
index 000000000..8ae77ae34
--- /dev/null
+++ b/src/include/internal/cef_types_content_settings.h
@@ -0,0 +1,443 @@
+// Copyright (c) 2023 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_CONTENT_SETTINGS_H_
+#define CEF_INCLUDE_INTERNAL_CEF_TYPES_CONTENT_SETTINGS_H_
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///
+/// Supported content setting types. Some types are platform-specific or only
+/// supported with the Chrome runtime. Should be kept in sync with Chromium's
+/// ContentSettingsType type.
+///
+typedef enum {
+  // This setting governs whether cookies are enabled by the user in the
+  /// provided context. However, it may be overridden by other settings. This
+  /// enum should NOT be read directly to determine whether cookies are enabled;
+  /// the client should instead rely on the CookieSettings API.
+  CEF_CONTENT_SETTING_TYPE_COOKIES = 0,
+  CEF_CONTENT_SETTING_TYPE_IMAGES,
+  CEF_CONTENT_SETTING_TYPE_JAVASCRIPT,
+
+  /// This setting governs both popups and unwanted redirects like tab-unders
+  /// and framebusting.
+  CEF_CONTENT_SETTING_TYPE_POPUPS,
+
+  CEF_CONTENT_SETTING_TYPE_GEOLOCATION,
+  CEF_CONTENT_SETTING_TYPE_NOTIFICATIONS,
+  CEF_CONTENT_SETTING_TYPE_AUTO_SELECT_CERTIFICATE,
+  CEF_CONTENT_SETTING_TYPE_MIXEDSCRIPT,
+  CEF_CONTENT_SETTING_TYPE_MEDIASTREAM_MIC,
+  CEF_CONTENT_SETTING_TYPE_MEDIASTREAM_CAMERA,
+  CEF_CONTENT_SETTING_TYPE_PROTOCOL_HANDLERS,
+  CEF_CONTENT_SETTING_TYPE_DEPRECATED_PPAPI_BROKER,
+  CEF_CONTENT_SETTING_TYPE_AUTOMATIC_DOWNLOADS,
+
+  /// Advanced device-specific functions on MIDI devices. MIDI-SysEx
+  /// communications can be used for changing the MIDI device's persistent state
+  /// such as firmware.
+  CEF_CONTENT_SETTING_TYPE_MIDI_SYSEX,
+
+  CEF_CONTENT_SETTING_TYPE_SSL_CERT_DECISIONS,
+  CEF_CONTENT_SETTING_TYPE_PROTECTED_MEDIA_IDENTIFIER,
+  CEF_CONTENT_SETTING_TYPE_APP_BANNER,
+  CEF_CONTENT_SETTING_TYPE_SITE_ENGAGEMENT,
+  CEF_CONTENT_SETTING_TYPE_DURABLE_STORAGE,
+  CEF_CONTENT_SETTING_TYPE_USB_CHOOSER_DATA,
+  CEF_CONTENT_SETTING_TYPE_BLUETOOTH_GUARD,
+  CEF_CONTENT_SETTING_TYPE_BACKGROUND_SYNC,
+  CEF_CONTENT_SETTING_TYPE_AUTOPLAY,
+  CEF_CONTENT_SETTING_TYPE_IMPORTANT_SITE_INFO,
+  CEF_CONTENT_SETTING_TYPE_PERMISSION_AUTOBLOCKER_DATA,
+  CEF_CONTENT_SETTING_TYPE_ADS,
+
+  /// Website setting which stores metadata for the subresource filter to aid in
+  /// decisions for whether or not to show the UI.
+  CEF_CONTENT_SETTING_TYPE_ADS_DATA,
+
+  /// MIDI stands for Musical Instrument Digital Interface. It is a standard
+  /// that allows electronic musical instruments, computers, and other devices
+  /// to communicate with each other.
+  CEF_CONTENT_SETTING_TYPE_MIDI,
+
+  /// This content setting type is for caching password protection service's
+  /// verdicts of each origin.
+  CEF_CONTENT_SETTING_TYPE_PASSWORD_PROTECTION,
+
+  /// Website setting which stores engagement data for media related to a
+  /// specific origin.
+  CEF_CONTENT_SETTING_TYPE_MEDIA_ENGAGEMENT,
+
+  /// Content setting which stores whether or not the site can play audible
+  /// sound. This will not block playback but instead the user will not hear it.
+  CEF_CONTENT_SETTING_TYPE_SOUND,
+
+  /// Website setting which stores the list of client hints that the origin
+  /// requested the browser to remember. The browser is expected to send all
+  /// client hints in the HTTP request headers for every resource requested
+  /// from that origin.
+  CEF_CONTENT_SETTING_TYPE_CLIENT_HINTS,
+
+  /// Generic Sensor API covering ambient-light-sensor, accelerometer, gyroscope
+  /// and magnetometer are all mapped to a single content_settings_type.
+  /// Setting for the Generic Sensor API covering ambient-light-sensor,
+  /// accelerometer, gyroscope and magnetometer. These are all mapped to a
+  /// single ContentSettingsType.
+  CEF_CONTENT_SETTING_TYPE_SENSORS,
+
+  /// Content setting which stores whether or not the user has granted the site
+  /// permission to respond to accessibility events, which can be used to
+  /// provide a custom accessibility experience. Requires explicit user consent
+  /// because some users may not want sites to know they're using assistive
+  /// technology.
+  CEF_CONTENT_SETTING_TYPE_ACCESSIBILITY_EVENTS,
+
+  /// Used to store whether to allow a website to install a payment handler.
+  CEF_CONTENT_SETTING_TYPE_PAYMENT_HANDLER,
+
+  /// Content setting which stores whether to allow sites to ask for permission
+  /// to access USB devices. If this is allowed specific device permissions are
+  /// stored under USB_CHOOSER_DATA.
+  CEF_CONTENT_SETTING_TYPE_USB_GUARD,
+
+  /// Nothing is stored in this setting at present. Please refer to
+  /// BackgroundFetchPermissionContext for details on how this permission
+  /// is ascertained.
+  CEF_CONTENT_SETTING_TYPE_BACKGROUND_FETCH,
+
+  /// Website setting which stores the amount of times the user has dismissed
+  /// intent picker UI without explicitly choosing an option.
+  CEF_CONTENT_SETTING_TYPE_INTENT_PICKER_DISPLAY,
+
+  /// Used to store whether to allow a website to detect user active/idle state.
+  CEF_CONTENT_SETTING_TYPE_IDLE_DETECTION,
+
+  /// Content settings for access to serial ports. The "guard" content setting
+  /// stores whether to allow sites to ask for permission to access a port. The
+  /// permissions granted to access particular ports are stored in the "chooser
+  /// data" website setting.
+  CEF_CONTENT_SETTING_TYPE_SERIAL_GUARD,
+  CEF_CONTENT_SETTING_TYPE_SERIAL_CHOOSER_DATA,
+
+  /// Nothing is stored in this setting at present. Please refer to
+  /// PeriodicBackgroundSyncPermissionContext for details on how this permission
+  /// is ascertained.
+  /// This content setting is not registered because it does not require access
+  /// to any existing providers.
+  CEF_CONTENT_SETTING_TYPE_PERIODIC_BACKGROUND_SYNC,
+
+  /// Content setting which stores whether to allow sites to ask for permission
+  /// to do Bluetooth scanning.
+  CEF_CONTENT_SETTING_TYPE_BLUETOOTH_SCANNING,
+
+  /// Content settings for access to HID devices. The "guard" content setting
+  /// stores whether to allow sites to ask for permission to access a device.
+  /// The permissions granted to access particular devices are stored in the
+  /// "chooser data" website setting.
+  CEF_CONTENT_SETTING_TYPE_HID_GUARD,
+  CEF_CONTENT_SETTING_TYPE_HID_CHOOSER_DATA,
+
+  /// Wake Lock API, which has two lock types: screen and system locks.
+  /// Currently, screen locks do not need any additional permission, and system
+  /// locks are always denied while the right UI is worked out.
+  CEF_CONTENT_SETTING_TYPE_WAKE_LOCK_SCREEN,
+  CEF_CONTENT_SETTING_TYPE_WAKE_LOCK_SYSTEM,
+
+  /// Legacy SameSite cookie behavior. This disables SameSite=Lax-by-default,
+  /// SameSite=None requires Secure, and Schemeful Same-Site, forcing the
+  /// legacy behavior wherein 1) cookies that don't specify SameSite are treated
+  /// as SameSite=None, 2) SameSite=None cookies are not required to be Secure,
+  /// and 3) schemeful same-site is not active.
+  ///
+  /// This will also be used to revert to legacy behavior when future changes
+  /// in cookie handling are introduced.
+  CEF_CONTENT_SETTING_TYPE_LEGACY_COOKIE_ACCESS,
+
+  /// Content settings which stores whether to allow sites to ask for permission
+  /// to save changes to an original file selected by the user through the
+  /// File System Access API.
+  CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_WRITE_GUARD,
+
+  /// Used to store whether to allow a website to exchange data with NFC
+  /// devices.
+  CEF_CONTENT_SETTING_TYPE_NFC,
+
+  /// Website setting to store permissions granted to access particular
+  /// Bluetooth devices.
+  CEF_CONTENT_SETTING_TYPE_BLUETOOTH_CHOOSER_DATA,
+
+  /// Full access to the system clipboard (sanitized read without user gesture,
+  /// and unsanitized read and write with user gesture).
+  CEF_CONTENT_SETTING_TYPE_CLIPBOARD_READ_WRITE,
+
+  /// This is special-cased in the permissions layer to always allow, and as
+  /// such doesn't have associated prefs data.
+  CEF_CONTENT_SETTING_TYPE_CLIPBOARD_SANITIZED_WRITE,
+
+  /// This content setting type is for caching safe browsing real time url
+  /// check's verdicts of each origin.
+  CEF_CONTENT_SETTING_TYPE_SAFE_BROWSING_URL_CHECK_DATA,
+
+  /// Used to store whether a site is allowed to request AR or VR sessions with
+  /// the WebXr Device API.
+  CEF_CONTENT_SETTING_TYPE_VR,
+  CEF_CONTENT_SETTING_TYPE_AR,
+
+  /// Content setting which stores whether to allow site to open and read files
+  /// and directories selected through the File System Access API.
+  CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_READ_GUARD,
+
+  /// Access to first party storage in a third-party context. Exceptions are
+  /// scoped to the combination of requesting/top-level origin, and are managed
+  /// through the Storage Access API. For the time being, this content setting
+  /// exists in parallel to third-party cookie rules stored in COOKIES.
+  CEF_CONTENT_SETTING_TYPE_STORAGE_ACCESS,
+
+  /// Content setting which stores whether to allow a site to control camera
+  /// movements. It does not give access to camera.
+  CEF_CONTENT_SETTING_TYPE_CAMERA_PAN_TILT_ZOOM,
+
+  /// Content setting for Screen Enumeration and Screen Detail functionality.
+  /// Permits access to detailed multi-screen information, like size and
+  /// position. Permits placing fullscreen and windowed content on specific
+  /// screens. See also: https://w3c.github.io/window-placement
+  CEF_CONTENT_SETTING_TYPE_WINDOW_MANAGEMENT,
+
+  /// Stores whether to allow insecure websites to make private network
+  /// requests.
+  /// See also: https://wicg.github.io/cors-rfc1918
+  /// Set through enterprise policies only.
+  CEF_CONTENT_SETTING_TYPE_INSECURE_PRIVATE_NETWORK,
+
+  /// Content setting which stores whether or not a site can access low-level
+  /// locally installed font data using the Local Fonts Access API.
+  CEF_CONTENT_SETTING_TYPE_LOCAL_FONTS,
+
+  /// Stores per-origin state for permission auto-revocation (for all permission
+  /// types).
+  CEF_CONTENT_SETTING_TYPE_PERMISSION_AUTOREVOCATION_DATA,
+
+  /// Stores per-origin state of the most recently selected directory for the
+  /// use by the File System Access API.
+  CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_LAST_PICKED_DIRECTORY,
+
+  /// Controls access to the getDisplayMedia API.
+  CEF_CONTENT_SETTING_TYPE_DISPLAY_CAPTURE,
+
+  /// Website setting to store permissions metadata granted to paths on the
+  /// local file system via the File System Access API.
+  /// |FILE_SYSTEM_WRITE_GUARD| is the corresponding "guard" setting. The stored
+  /// data represents valid permission only if
+  /// |FILE_SYSTEM_ACCESS_EXTENDED_PERMISSION| is enabled via user opt-in.
+  /// Otherwise, they represent "recently granted but revoked permission", which
+  /// are used to restore the permission.
+  CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_ACCESS_CHOOSER_DATA,
+
+  /// Stores a grant that allows a relying party to send a request for identity
+  /// information to specified identity providers, potentially through any
+  /// anti-tracking measures that would otherwise prevent it. This setting is
+  /// associated with the relying party's origin.
+  CEF_CONTENT_SETTING_TYPE_FEDERATED_IDENTITY_SHARING,
+
+  /// Whether to use the v8 optimized JIT for running JavaScript on the page.
+  CEF_CONTENT_SETTING_TYPE_JAVASCRIPT_JIT,
+
+  /// Content setting which stores user decisions to allow loading a site over
+  /// HTTP. Entries are added by hostname when a user bypasses the HTTPS-First
+  /// Mode interstitial warning when a site does not support HTTPS. Allowed
+  /// hosts are exact hostname matches -- subdomains of a host on the allowlist
+  /// must be separately allowlisted.
+  CEF_CONTENT_SETTING_TYPE_HTTP_ALLOWED,
+
+  /// Stores metadata related to form fill, such as e.g. whether user data was
+  /// autofilled on a specific website.
+  CEF_CONTENT_SETTING_TYPE_FORMFILL_METADATA,
+
+  /// Setting to indicate that there is an active federated sign-in session
+  /// between a specified relying party and a specified identity provider for
+  /// a specified account. When this is present it allows access to session
+  /// management capabilities between the sites. This setting is associated
+  /// with the relying party's origin.
+  // Obsolete on Nov 2023.
+  CEF_CONTENT_SETTING_TYPE_DEPRECATED_FEDERATED_IDENTITY_ACTIVE_SESSION,
+
+  /// Setting to indicate whether Chrome should automatically apply darkening to
+  /// web content.
+  CEF_CONTENT_SETTING_TYPE_AUTO_DARK_WEB_CONTENT,
+
+  /// Setting to indicate whether Chrome should request the desktop view of a
+  /// site instead of the mobile one.
+  CEF_CONTENT_SETTING_TYPE_REQUEST_DESKTOP_SITE,
+
+  /// Setting to indicate whether browser should allow signing into a website
+  /// via the browser FedCM API.
+  CEF_CONTENT_SETTING_TYPE_FEDERATED_IDENTITY_API,
+
+  /// Stores notification interactions per origin for the past 90 days.
+  /// Interactions per origin are pre-aggregated over seven-day windows: A
+  /// notification interaction or display is assigned to the last Monday
+  /// midnight in local time.
+  CEF_CONTENT_SETTING_TYPE_NOTIFICATION_INTERACTIONS,
+
+  /// Website setting which stores the last reduced accept language negotiated
+  /// for a given origin, to be used on future visits to the origin.
+  CEF_CONTENT_SETTING_TYPE_REDUCED_ACCEPT_LANGUAGE,
+
+  /// Website setting which is used for NotificationPermissionReviewService to
+  /// store origin blocklist from review notification permissions feature.
+  CEF_CONTENT_SETTING_TYPE_NOTIFICATION_PERMISSION_REVIEW,
+
+  /// Website setting to store permissions granted to access particular devices
+  /// in private network.
+  CEF_CONTENT_SETTING_TYPE_PRIVATE_NETWORK_GUARD,
+  CEF_CONTENT_SETTING_TYPE_PRIVATE_NETWORK_CHOOSER_DATA,
+
+  /// Website setting which stores whether the browser has observed the user
+  /// signing into an identity-provider based on observing the IdP-SignIn-Status
+  /// HTTP header.
+  CEF_CONTENT_SETTING_TYPE_FEDERATED_IDENTITY_IDENTITY_PROVIDER_SIGNIN_STATUS,
+
+  /// Website setting which is used for UnusedSitePermissionsService to
+  /// store revoked permissions of unused sites from unused site permissions
+  /// feature.
+  CEF_CONTENT_SETTING_TYPE_REVOKED_UNUSED_SITE_PERMISSIONS,
+
+  /// Similar to STORAGE_ACCESS, but applicable at the page-level rather than
+  /// being specific to a frame.
+  CEF_CONTENT_SETTING_TYPE_TOP_LEVEL_STORAGE_ACCESS,
+
+  /// Setting to indicate whether user has opted in to allowing auto re-authn
+  /// via the FedCM API.
+  CEF_CONTENT_SETTING_TYPE_FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION,
+
+  /// Website setting which stores whether the user has explicitly registered
+  /// a website as an identity-provider.
+  CEF_CONTENT_SETTING_TYPE_FEDERATED_IDENTITY_IDENTITY_PROVIDER_REGISTRATION,
+
+  /// Content setting which is used to indicate whether anti-abuse functionality
+  /// should be enabled.
+  CEF_CONTENT_SETTING_TYPE_ANTI_ABUSE,
+
+  /// Content setting used to indicate whether third-party storage partitioning
+  /// should be enabled.
+  CEF_CONTENT_SETTING_TYPE_THIRD_PARTY_STORAGE_PARTITIONING,
+
+  /// Used to indicate whether HTTPS-First Mode is enabled on the hostname.
+  CEF_CONTENT_SETTING_TYPE_HTTPS_ENFORCED,
+
+  /// Setting for enabling the `getAllScreensMedia` API. Spec link:
+  /// https://github.com/screen-share/capture-all-screens
+  CEF_CONTENT_SETTING_TYPE_ALL_SCREEN_CAPTURE,
+
+  /// Stores per origin metadata for cookie controls.
+  CEF_CONTENT_SETTING_TYPE_COOKIE_CONTROLS_METADATA,
+
+  /// Content Setting for temporary 3PC accesses granted by user behavior
+  /// heuristics.
+  CEF_CONTENT_SETTING_TYPE_TPCD_HEURISTICS_GRANTS,
+
+  /// Content Setting for 3PC accesses granted by metadata delivered via the
+  /// component updater service. This type will only be used when
+  /// `net::features::kTpcdMetadataGrants` is enabled.
+  CEF_CONTENT_SETTING_TYPE_TPCD_METADATA_GRANTS,
+
+  /// Content Setting for 3PC accesses granted via 3PC deprecation trial.
+  CEF_CONTENT_SETTING_TYPE_TPCD_TRIAL,
+
+  /// Content Setting for 3PC accesses granted via top-level 3PC deprecation
+  /// trial. Similar to TPCD_TRIAL, but applicable at the page-level for the
+  /// lifetime of the page that served the token, rather than being specific to
+  /// a requesting-origin/top-level-site combination and persistent.
+  CEF_CONTENT_SETTING_TYPE_TOP_LEVEL_TPCD_TRIAL,
+
+  /// Content setting used to indicate whether entering picture-in-picture
+  /// automatically should be enabled.
+  CEF_CONTENT_SETTING_TYPE_AUTO_PICTURE_IN_PICTURE,
+
+  /// Whether user has opted into keeping file/directory permissions persistent
+  /// between visits for a given origin. When enabled, permission metadata
+  /// stored under |FILE_SYSTEM_ACCESS_CHOOSER_DATA| can auto-grant incoming
+  /// permission request.
+  CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_ACCESS_EXTENDED_PERMISSION,
+
+  /// Whether the FSA Persistent Permissions restore prompt is eligible to be
+  /// shown to the user, for a given origin.
+  CEF_CONTENT_SETTING_TYPE_FILE_SYSTEM_ACCESS_RESTORE_PERMISSION,
+
+  /// Whether an application capturing another tab, may scroll and zoom
+  /// the captured tab.
+  CEF_CONTENT_SETTING_TYPE_CAPTURED_SURFACE_CONTROL,
+
+  /// Content setting for access to smart card readers.
+  /// The "guard" content setting stores whether to allow sites to access the
+  /// Smart Card API.
+  CEF_CONTENT_SETTING_TYPE_SMART_CARD_GUARD,
+  CEF_CONTENT_SETTING_TYPE_SMART_CARD_DATA,
+
+  /// Content settings for access to printers for the Web Printing API.
+  CEF_CONTENT_SETTING_TYPE_WEB_PRINTING,
+
+  /// Content setting used to indicate whether entering HTML Fullscreen
+  /// automatically (i.e. without transient activation) should be enabled.
+  CEF_CONTENT_SETTING_TYPE_AUTOMATIC_FULLSCREEN,
+
+  /// Content settings used to indicate that a web app is allowed to prompt the
+  /// user for the installation of sub apps.
+  CEF_CONTENT_SETTING_TYPE_SUB_APP_INSTALLATION_PROMPTS,
+
+  /// Whether an application can enumerate audio output device.
+  CEF_CONTENT_SETTING_TYPE_SPEAKER_SELECTION,
+
+  CEF_CONTENT_SETTING_TYPE_NUM_TYPES,
+} cef_content_setting_types_t;
+
+///
+/// Supported content setting values. Should be kept in sync with Chromium's
+/// ContentSetting type.
+///
+typedef enum {
+  CEF_CONTENT_SETTING_VALUE_DEFAULT = 0,
+  CEF_CONTENT_SETTING_VALUE_ALLOW,
+  CEF_CONTENT_SETTING_VALUE_BLOCK,
+  CEF_CONTENT_SETTING_VALUE_ASK,
+  CEF_CONTENT_SETTING_VALUE_SESSION_ONLY,
+  CEF_CONTENT_SETTING_VALUE_DETECT_IMPORTANT_CONTENT,
+
+  CEF_CONTENT_SETTING_VALUE_NUM_VALUES
+} cef_content_setting_values_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_CONTENT_SETTINGS_H_
diff --git a/src/include/internal/cef_types_geometry.h b/src/include/internal/cef_types_geometry.h
new file mode 100644
index 000000000..7410f15d6
--- /dev/null
+++ b/src/include/internal/cef_types_geometry.h
@@ -0,0 +1,78 @@
+// Copyright (c) 2014 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CEF_INCLUDE_INTERNAL_CEF_TYPES_GEOMETRY_H_
+#define CEF_INCLUDE_INTERNAL_CEF_TYPES_GEOMETRY_H_
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///
+/// Structure representing a point.
+///
+typedef struct _cef_point_t {
+  int x;
+  int y;
+} cef_point_t;
+
+///
+/// Structure representing a rectangle.
+///
+typedef struct _cef_rect_t {
+  int x;
+  int y;
+  int width;
+  int height;
+} cef_rect_t;
+
+///
+/// Structure representing a size.
+///
+typedef struct _cef_size_t {
+  int width;
+  int height;
+} cef_size_t;
+
+///
+/// Structure representing insets.
+///
+typedef struct _cef_insets_t {
+  int top;
+  int left;
+  int bottom;
+  int right;
+} cef_insets_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_GEOMETRY_H_
diff --git a/src/include/internal/cef_types_linux.h b/src/include/internal/cef_types_linux.h
index f5e1747eb..171cda32d 100644
--- a/src/include/internal/cef_types_linux.h
+++ b/src/include/internal/cef_types_linux.h
@@ -32,18 +32,28 @@
 #pragma once
 
 #include "include/base/cef_build.h"
+#include "include/cef_config.h"
 
 #if defined(OS_LINUX)
 
+#if defined(CEF_X11)
 typedef union _XEvent XEvent;
 typedef struct _XDisplay XDisplay;
+#endif
 
 #include "include/internal/cef_export.h"
 #include "include/internal/cef_string.h"
+#include "include/internal/cef_types_geometry.h"
 
 // Handle types.
+#if defined(CEF_X11)
 #define cef_cursor_handle_t unsigned long
 #define cef_event_handle_t XEvent*
+#else
+#define cef_cursor_handle_t void*
+#define cef_event_handle_t void*
+#endif
+
 #define cef_window_handle_t unsigned long
 
 #define kNullCursorHandle 0
@@ -55,13 +65,15 @@ extern "C" {
 #endif
 
 ///
-// Return the singleton X11 display shared with Chromium. The display is not
-// thread-safe and must only be accessed on the browser process UI thread.
+/// Return the singleton X11 display shared with Chromium. The display is not
+/// thread-safe and must only be accessed on the browser process UI thread.
 ///
-CEF_EXPORT XDisplay* cef_get_xdisplay();
+#if defined(CEF_X11)
+CEF_EXPORT XDisplay* cef_get_xdisplay(void);
+#endif
 
 ///
-// Structure representing CefExecuteProcess arguments.
+/// Structure representing CefExecuteProcess arguments.
 ///
 typedef struct _cef_main_args_t {
   int argc;
@@ -69,35 +81,58 @@ typedef struct _cef_main_args_t {
 } cef_main_args_t;
 
 ///
-// Class representing window information.
+/// Class representing window information.
 ///
 typedef struct _cef_window_info_t {
-  unsigned int x;
-  unsigned int y;
-  unsigned int width;
-  unsigned int height;
+  ///
+  /// The initial title of the window, to be set when the window is created.
+  /// Some layout managers (e.g., Compiz) can look at the window title
+  /// in order to decide where to place the window when it is
+  /// created. When this attribute is not empty, the window title will
+  /// be set before the window is mapped to the dispay. Otherwise the
+  /// title will be initially empty.
+  ///
+  cef_string_t window_name;
 
   ///
-  // Pointer for the parent window.
+  /// Initial window bounds.
+  ///
+  cef_rect_t bounds;
+
+  ///
+  /// Pointer for the parent window.
   ///
   cef_window_handle_t parent_window;
 
   ///
-  // Set to true (1) to create the browser using windowless (off-screen)
-  // rendering. No window will be created for the browser and all rendering will
-  // occur via the CefRenderHandler interface. The |parent_window| value will be
-  // used to identify monitor info and to act as the parent window for dialogs,
-  // context menus, etc. If |parent_window| is not provided then the main screen
-  // monitor will be used and some functionality that requires a parent window
-  // may not function correctly. In order to create windowless browsers the
-  // CefSettings.windowless_rendering_enabled value must be set to true.
-  // Transparent painting is enabled by default but can be disabled by setting
-  // CefBrowserSettings.background_color to an opaque value.
+  /// Set to true (1) to create the browser using windowless (off-screen)
+  /// rendering. No window will be created for the browser and all rendering
+  /// will occur via the CefRenderHandler interface. The |parent_window| value
+  /// will be used to identify monitor info and to act as the parent window for
+  /// dialogs, context menus, etc. If |parent_window| is not provided then the
+  /// main screen monitor will be used and some functionality that requires a
+  /// parent window may not function correctly. In order to create windowless
+  /// browsers the CefSettings.windowless_rendering_enabled value must be set to
+  /// true. Transparent painting is enabled by default but can be disabled by
+  /// setting CefBrowserSettings.background_color to an opaque value.
   ///
   int windowless_rendering_enabled;
 
   ///
-  // Pointer for the new browser window. Only used with windowed rendering.
+  /// Set to true (1) to enable shared textures for windowless rendering. Only
+  /// valid if windowless_rendering_enabled above is also set to true. Currently
+  /// only supported on Windows (D3D11).
+  ///
+  int shared_texture_enabled;
+
+  ///
+  /// Set to true (1) to enable the ability to issue BeginFrame requests from
+  /// the client application by calling CefBrowserHost::SendExternalBeginFrame.
+  ///
+  int external_begin_frame_enabled;
+
+  ///
+  /// Pointer for the new browser window. Only used with windowed rendering.
   ///
   cef_window_handle_t window;
 } cef_window_info_t;
diff --git a/src/include/internal/cef_types_mac.h b/src/include/internal/cef_types_mac.h
index 3bd62d0ea..8ee619e65 100644
--- a/src/include/internal/cef_types_mac.h
+++ b/src/include/internal/cef_types_mac.h
@@ -33,39 +33,48 @@
 
 #include "include/base/cef_build.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "include/internal/cef_string.h"
+#include "include/internal/cef_types_geometry.h"
 
 // Handle types.
-#ifdef __cplusplus
-#ifdef __OBJC__
-@class NSCursor;
-@class NSEvent;
-@class NSView;
-#else
-class NSCursor;
-class NSEvent;
-struct NSView;
-#endif
-#define cef_cursor_handle_t NSCursor*
-#define cef_event_handle_t NSEvent*
-#define cef_window_handle_t NSView*
-#else
+// Actually NSCursor*
 #define cef_cursor_handle_t void*
+// Acutally NSEvent*
 #define cef_event_handle_t void*
+// Actually NSView*
 #define cef_window_handle_t void*
-#endif
 
 #define kNullCursorHandle NULL
 #define kNullEventHandle NULL
 #define kNullWindowHandle NULL
 
+#ifdef __OBJC__
+#if __has_feature(objc_arc)
+#define CAST_CEF_CURSOR_HANDLE_TO_NSCURSOR(handle) ((__bridge NSCursor*)handle)
+#define CAST_CEF_EVENT_HANDLE_TO_NSEVENT(handle) ((__bridge NSEvent*)handle)
+#define CAST_CEF_WINDOW_HANDLE_TO_NSVIEW(handle) ((__bridge NSView*)handle)
+
+#define CAST_NSCURSOR_TO_CEF_CURSOR_HANDLE(cursor) ((__bridge void*)cursor)
+#define CAST_NSEVENT_TO_CEF_EVENT_HANDLE(event) ((__bridge void*)event)
+#define CAST_NSVIEW_TO_CEF_WINDOW_HANDLE(view) ((__bridge void*)view)
+#else  // __has_feature(objc_arc)
+#define CAST_CEF_CURSOR_HANDLE_TO_NSCURSOR(handle) ((NSCursor*)handle)
+#define CAST_CEF_EVENT_HANDLE_TO_NSEVENT(handle) ((NSEvent*)handle)
+#define CAST_CEF_WINDOW_HANDLE_TO_NSVIEW(handle) ((NSView*)handle)
+
+#define CAST_NSCURSOR_TO_CEF_CURSOR_HANDLE(cursor) ((void*)cursor)
+#define CAST_NSEVENT_TO_CEF_EVENT_HANDLE(event) ((void*)event)
+#define CAST_NSVIEW_TO_CEF_WINDOW_HANDLE(view) ((void*)view)
+#endif  // __has_feature(objc_arc)
+#endif  // __OBJC__
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 ///
-// Structure representing CefExecuteProcess arguments.
+/// Structure representing CefExecuteProcess arguments.
 ///
 typedef struct _cef_main_args_t {
   int argc;
@@ -73,41 +82,56 @@ typedef struct _cef_main_args_t {
 } cef_main_args_t;
 
 ///
-// Class representing window information.
+/// Class representing window information.
 ///
 typedef struct _cef_window_info_t {
   cef_string_t window_name;
-  int x;
-  int y;
-  int width;
-  int height;
 
   ///
-  // Set to true (1) to create the view initially hidden.
+  /// Initial window bounds.
+  ///
+  cef_rect_t bounds;
+
+  ///
+  /// Set to true (1) to create the view initially hidden.
   ///
   int hidden;
 
   ///
-  // NSView pointer for the parent view.
+  /// NSView pointer for the parent view.
   ///
   cef_window_handle_t parent_view;
 
   ///
-  // Set to true (1) to create the browser using windowless (off-screen)
-  // rendering. No view will be created for the browser and all rendering will
-  // occur via the CefRenderHandler interface. The |parent_view| value will be
-  // used to identify monitor info and to act as the parent view for dialogs,
-  // context menus, etc. If |parent_view| is not provided then the main screen
-  // monitor will be used and some functionality that requires a parent view
-  // may not function correctly. In order to create windowless browsers the
-  // CefSettings.windowless_rendering_enabled value must be set to true.
-  // Transparent painting is enabled by default but can be disabled by setting
-  // CefBrowserSettings.background_color to an opaque value.
+  /// Set to true (1) to create the browser using windowless (off-screen)
+  /// rendering. No view will be created for the browser and all rendering will
+  /// occur via the CefRenderHandler interface. The |parent_view| value will be
+  /// used to identify monitor info and to act as the parent view for dialogs,
+  /// context menus, etc. If |parent_view| is not provided then the main screen
+  /// monitor will be used and some functionality that requires a parent view
+  /// may not function correctly. In order to create windowless browsers the
+  /// CefSettings.windowless_rendering_enabled value must be set to true.
+  /// Transparent painting is enabled by default but can be disabled by setting
+  /// CefBrowserSettings.background_color to an opaque value.
   ///
   int windowless_rendering_enabled;
 
   ///
-  // NSView pointer for the new browser view. Only used with windowed rendering.
+  /// Set to true (1) to enable shared textures for windowless rendering. Only
+  /// valid if windowless_rendering_enabled above is also set to true. Currently
+  /// only supported on Windows (D3D11).
+  ///
+  int shared_texture_enabled;
+
+  ///
+  /// Set to true (1) to enable the ability to issue BeginFrame from the client
+  /// application.
+  ///
+  int external_begin_frame_enabled;
+
+  ///
+  /// NSView pointer for the new browser view. Only used with windowed
+  /// rendering.
   ///
   cef_window_handle_t view;
 } cef_window_info_t;
@@ -116,6 +140,6 @@ typedef struct _cef_window_info_t {
 }
 #endif
 
-#endif  // OS_MACOSX
+#endif  // OS_MAC
 
 #endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_MAC_H_
diff --git a/src/include/internal/cef_types_win.h b/src/include/internal/cef_types_win.h
index 50a2ebfad..abf80c7d3 100644
--- a/src/include/internal/cef_types_win.h
+++ b/src/include/internal/cef_types_win.h
@@ -35,7 +35,9 @@
 
 #if defined(OS_WIN)
 #include <windows.h>
+
 #include "include/internal/cef_string.h"
+#include "include/internal/cef_types_geometry.h"
 
 // Handle types.
 #define cef_cursor_handle_t HCURSOR
@@ -51,41 +53,53 @@ extern "C" {
 #endif
 
 ///
-// Structure representing CefExecuteProcess arguments.
+/// Structure representing CefExecuteProcess arguments.
 ///
-typedef struct _cef_main_args_t { HINSTANCE instance; } cef_main_args_t;
+typedef struct _cef_main_args_t {
+  HINSTANCE instance;
+} cef_main_args_t;
 
 ///
-// Structure representing window information.
+/// Structure representing window information.
 ///
 typedef struct _cef_window_info_t {
   // Standard parameters required by CreateWindowEx()
   DWORD ex_style;
   cef_string_t window_name;
   DWORD style;
-  int x;
-  int y;
-  int width;
-  int height;
+  cef_rect_t bounds;
   cef_window_handle_t parent_window;
   HMENU menu;
 
   ///
-  // Set to true (1) to create the browser using windowless (off-screen)
-  // rendering. No window will be created for the browser and all rendering will
-  // occur via the CefRenderHandler interface. The |parent_window| value will be
-  // used to identify monitor info and to act as the parent window for dialogs,
-  // context menus, etc. If |parent_window| is not provided then the main screen
-  // monitor will be used and some functionality that requires a parent window
-  // may not function correctly. In order to create windowless browsers the
-  // CefSettings.windowless_rendering_enabled value must be set to true.
-  // Transparent painting is enabled by default but can be disabled by setting
-  // CefBrowserSettings.background_color to an opaque value.
+  /// Set to true (1) to create the browser using windowless (off-screen)
+  /// rendering. No window will be created for the browser and all rendering
+  /// will occur via the CefRenderHandler interface. The |parent_window| value
+  /// will be used to identify monitor info and to act as the parent window for
+  /// dialogs, context menus, etc. If |parent_window| is not provided then the
+  /// main screen monitor will be used and some functionality that requires a
+  /// parent window may not function correctly. In order to create windowless
+  /// browsers the CefSettings.windowless_rendering_enabled value must be set to
+  /// true. Transparent painting is enabled by default but can be disabled by
+  /// setting CefBrowserSettings.background_color to an opaque value.
   ///
   int windowless_rendering_enabled;
 
   ///
-  // Handle for the new browser window. Only used with windowed rendering.
+  /// Set to true (1) to enable shared textures for windowless rendering. Only
+  /// valid if windowless_rendering_enabled above is also set to true. Currently
+  /// only supported on Windows (D3D11).
+  ///
+  int shared_texture_enabled;
+
+  ///
+  /// Set to true (1) to enable the ability to issue BeginFrame requests from
+  /// the client application by calling CefBrowserHost::SendExternalBeginFrame.
+  ///
+  int external_begin_frame_enabled;
+
+  ///
+  /// Handle for the new browser window. Only used with windowed rendering.
   ///
   cef_window_handle_t window;
 } cef_window_info_t;
diff --git a/src/include/internal/cef_types_wrappers.h b/src/include/internal/cef_types_wrappers.h
index 147926e90..f3d2aeb23 100644
--- a/src/include/internal/cef_types_wrappers.h
+++ b/src/include/internal/cef_types_wrappers.h
@@ -31,24 +31,29 @@
 #define CEF_INCLUDE_INTERNAL_CEF_TYPES_WRAPPERS_H_
 #pragma once
 
+#include <limits>
+
 #include "include/internal/cef_string.h"
 #include "include/internal/cef_string_list.h"
 #include "include/internal/cef_types.h"
 
 ///
-// Template class that provides common functionality for CEF structure wrapping.
+/// Template class that provides common functionality for CEF structure
+/// wrapping. Use only with non-POD types that benefit from referencing unowned
+/// members.
 ///
 template <class traits>
 class CefStructBase : public traits::struct_type {
  public:
-  typedef typename traits::struct_type struct_type;
+  using struct_type = typename traits::struct_type;
 
   CefStructBase() : attached_to_(NULL) { Init(); }
   virtual ~CefStructBase() {
     // Only clear this object's data if it isn't currently attached to a
     // structure.
-    if (!attached_to_)
+    if (!attached_to_) {
       Clear(this);
+    }
   }
 
   CefStructBase(const CefStructBase& r) {
@@ -61,22 +66,15 @@ class CefStructBase : public traits::struct_type {
   }
 
   ///
-  // Clear this object's values.
-  ///
-  void Reset() {
-    Clear(this);
-    Init();
-  }
-
-  ///
-  // Attach to the source structure's existing values. DetachTo() can be called
-  // to insert the values back into the existing structure.
+  /// Attach to the source structure's existing values. DetachTo() can be called
+  /// to insert the values back into the existing structure.
   ///
   void AttachTo(struct_type& source) {
     // Only clear this object's data if it isn't currently attached to a
     // structure.
-    if (!attached_to_)
+    if (!attached_to_) {
       Clear(this);
+    }
 
     // This object is now attached to the new structure.
     attached_to_ = &source;
@@ -86,7 +84,7 @@ class CefStructBase : public traits::struct_type {
   }
 
   ///
-  // Relinquish ownership of values to the target structure.
+  /// Relinquish ownership of values to the target structure.
   ///
   void DetachTo(struct_type& target) {
     if (attached_to_ != &target) {
@@ -103,8 +101,8 @@ class CefStructBase : public traits::struct_type {
   }
 
   ///
-  // Set this object's values. If |copy| is true the source structure's values
-  // will be copied instead of referenced.
+  /// Set this object's values. If |copy| is true the source structure's values
+  /// will be copied instead of referenced.
   ///
   void Set(const struct_type& source, bool copy) {
     traits::set(&source, this, copy);
@@ -131,30 +129,14 @@ class CefStructBase : public traits::struct_type {
   struct_type* attached_to_;
 };
 
-struct CefPointTraits {
-  typedef cef_point_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
 ///
-// Class representing a point.
+/// Class representing a point.
 ///
-class CefPoint : public CefStructBase<CefPointTraits> {
+class CefPoint : public cef_point_t {
  public:
-  typedef CefStructBase<CefPointTraits> parent;
-
-  CefPoint() : parent() {}
-  CefPoint(const cef_point_t& r) : parent(r) {}
-  CefPoint(const CefPoint& r) : parent(r) {}
-  CefPoint(int x, int y) : parent() { Set(x, y); }
+  CefPoint() : cef_point_t{} {}
+  CefPoint(const cef_point_t& r) : cef_point_t(r) {}
+  CefPoint(int x, int y) : cef_point_t{x, y} {}
 
   bool IsEmpty() const { return x <= 0 && y <= 0; }
   void Set(int x_val, int y_val) { x = x_val, y = y_val; }
@@ -168,41 +150,26 @@ inline bool operator!=(const CefPoint& a, const CefPoint& b) {
   return !(a == b);
 }
 
-struct CefRectTraits {
-  typedef cef_rect_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
 ///
-// Class representing a rectangle.
+/// Class representing a rectangle.
 ///
-class CefRect : public CefStructBase<CefRectTraits> {
+class CefRect : public cef_rect_t {
  public:
-  typedef CefStructBase<CefRectTraits> parent;
-
-  CefRect() : parent() {}
-  CefRect(const cef_rect_t& r) : parent(r) {}
-  CefRect(const CefRect& r) : parent(r) {}
-  CefRect(int x, int y, int width, int height) : parent() {
-    Set(x, y, width, height);
-  }
+  CefRect() : cef_rect_t{} {}
+  CefRect(const cef_rect_t& r) : cef_rect_t(r) {}
+  CefRect(int x, int y, int width, int height)
+      : cef_rect_t{x, y, width, height} {}
 
   bool IsEmpty() const { return width <= 0 || height <= 0; }
   void Set(int x_val, int y_val, int width_val, int height_val) {
     x = x_val, y = y_val, width = width_val, height = height_val;
   }
 
-  // Returns true if the point identified by point_x and point_y falls inside
-  // this rectangle.  The point (x, y) is inside the rectangle, but the
-  // point (x + width, y + height) is not.
+  ///
+  /// Returns true if the point identified by point_x and point_y falls inside
+  /// this rectangle.  The point (x, y) is inside the rectangle, but the
+  /// point (x + width, y + height) is not.
+  ///
   bool Contains(int point_x, int point_y) const {
     return (point_x >= x) && (point_x < x + width) && (point_y >= y) &&
            (point_y < y + height);
@@ -220,30 +187,14 @@ inline bool operator!=(const CefRect& a, const CefRect& b) {
   return !(a == b);
 }
 
-struct CefSizeTraits {
-  typedef cef_size_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
 ///
-// Class representing a size.
+/// Class representing a size.
 ///
-class CefSize : public CefStructBase<CefSizeTraits> {
+class CefSize : public cef_size_t {
  public:
-  typedef CefStructBase<CefSizeTraits> parent;
-
-  CefSize() : parent() {}
-  CefSize(const cef_size_t& r) : parent(r) {}
-  CefSize(const CefSize& r) : parent(r) {}
-  CefSize(int width, int height) : parent() { Set(width, height); }
+  CefSize() : cef_size_t{} {}
+  CefSize(const cef_size_t& r) : cef_size_t(r) {}
+  CefSize(int width, int height) : cef_size_t{width, height} {}
 
   bool IsEmpty() const { return width <= 0 || height <= 0; }
   void Set(int width_val, int height_val) {
@@ -259,30 +210,19 @@ inline bool operator!=(const CefSize& a, const CefSize& b) {
   return !(a == b);
 }
 
-struct CefRangeTraits {
-  typedef cef_range_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
 ///
-// Class representing a range.
+/// Class representing a range.
 ///
-class CefRange : public CefStructBase<CefRangeTraits> {
+class CefRange : public cef_range_t {
  public:
-  typedef CefStructBase<CefRangeTraits> parent;
+  CefRange() : cef_range_t{} {}
+  CefRange(const cef_range_t& r) : cef_range_t(r) {}
+  CefRange(uint32_t from, uint32_t to) : cef_range_t{from, to} {}
 
-  CefRange() : parent() {}
-  CefRange(const cef_range_t& r) : parent(r) {}
-  CefRange(const CefRange& r) : parent(r) {}
-  CefRange(int from, int to) : parent() { Set(from, to); }
+  static CefRange InvalidRange() {
+    return CefRange((std::numeric_limits<uint32_t>::max)(),
+                    (std::numeric_limits<uint32_t>::max)());
+  }
 
   void Set(int from_val, int to_val) { from = from_val, to = to_val; }
 };
@@ -295,32 +235,15 @@ inline bool operator!=(const CefRange& a, const CefRange& b) {
   return !(a == b);
 }
 
-struct CefInsetsTraits {
-  typedef cef_insets_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
 ///
-// Class representing insets.
+/// Class representing insets.
 ///
-class CefInsets : public CefStructBase<CefInsetsTraits> {
+class CefInsets : public cef_insets_t {
  public:
-  typedef CefStructBase<CefInsetsTraits> parent;
-
-  CefInsets() : parent() {}
-  CefInsets(const cef_insets_t& r) : parent(r) {}
-  CefInsets(const CefInsets& r) : parent(r) {}
-  CefInsets(int top, int left, int bottom, int right) : parent() {
-    Set(top, left, bottom, right);
-  }
+  CefInsets() : cef_insets_t{} {}
+  CefInsets(const cef_insets_t& r) : cef_insets_t(r) {}
+  CefInsets(int top, int left, int bottom, int right)
+      : cef_insets_t{top, left, bottom, right} {}
 
   void Set(int top_val, int left_val, int bottom_val, int right_val) {
     top = top_val, left = left_val, bottom = bottom_val, right = right_val;
@@ -336,32 +259,16 @@ inline bool operator!=(const CefInsets& a, const CefInsets& b) {
   return !(a == b);
 }
 
-struct CefDraggableRegionTraits {
-  typedef cef_draggable_region_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
-
 ///
-// Class representing a draggable region.
+/// Class representing a draggable region.
 ///
-class CefDraggableRegion : public CefStructBase<CefDraggableRegionTraits> {
+class CefDraggableRegion : public cef_draggable_region_t {
  public:
-  typedef CefStructBase<CefDraggableRegionTraits> parent;
-
-  CefDraggableRegion() : parent() {}
-  CefDraggableRegion(const cef_draggable_region_t& r) : parent(r) {}
-  CefDraggableRegion(const CefDraggableRegion& r) : parent(r) {}
-  CefDraggableRegion(const CefRect& bounds, bool draggable) : parent() {
-    Set(bounds, draggable);
-  }
+  CefDraggableRegion() : cef_draggable_region_t{} {}
+  CefDraggableRegion(const cef_draggable_region_t& r)
+      : cef_draggable_region_t(r) {}
+  CefDraggableRegion(const cef_rect_t& bounds, bool draggable)
+      : cef_draggable_region_t{bounds, draggable} {}
 
   void Set(const CefRect& bounds_val, bool draggable_val) {
     bounds = bounds_val, draggable = draggable_val;
@@ -378,46 +285,22 @@ inline bool operator!=(const CefDraggableRegion& a,
   return !(a == b);
 }
 
-struct CefScreenInfoTraits {
-  typedef cef_screen_info_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->device_scale_factor = src->device_scale_factor;
-    target->depth = src->depth;
-    target->depth_per_component = src->depth_per_component;
-    target->is_monochrome = src->is_monochrome;
-    target->rect = src->rect;
-    target->available_rect = src->available_rect;
-  }
-};
-
 ///
-// Class representing the virtual screen information for use when window
-// rendering is disabled.
+/// Class representing the virtual screen information for use when window
+/// rendering is disabled.
 ///
-class CefScreenInfo : public CefStructBase<CefScreenInfoTraits> {
+class CefScreenInfo : public cef_screen_info_t {
  public:
-  typedef CefStructBase<CefScreenInfoTraits> parent;
-
-  CefScreenInfo() : parent() {}
-  CefScreenInfo(const cef_screen_info_t& r) : parent(r) {}
-  CefScreenInfo(const CefScreenInfo& r) : parent(r) {}
+  CefScreenInfo() : cef_screen_info_t{} {}
+  CefScreenInfo(const cef_screen_info_t& r) : cef_screen_info_t(r) {}
   CefScreenInfo(float device_scale_factor,
                 int depth,
                 int depth_per_component,
                 bool is_monochrome,
-                const CefRect& rect,
-                const CefRect& available_rect)
-      : parent() {
-    Set(device_scale_factor, depth, depth_per_component, is_monochrome, rect,
-        available_rect);
-  }
+                const cef_rect_t& rect,
+                const cef_rect_t& available_rect)
+      : cef_screen_info_t{device_scale_factor, depth, depth_per_component,
+                          is_monochrome,       rect,  available_rect} {}
 
   void Set(float device_scale_factor_val,
            int depth_val,
@@ -434,118 +317,77 @@ class CefScreenInfo : public CefStructBase<CefScreenInfoTraits> {
   }
 };
 
-struct CefKeyEventTraits {
-  typedef cef_key_event_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->type = src->type;
-    target->modifiers = src->modifiers;
-    target->windows_key_code = src->windows_key_code;
-    target->native_key_code = src->native_key_code;
-    target->is_system_key = src->is_system_key;
-    target->character = src->character;
-    target->unmodified_character = src->unmodified_character;
-    target->focus_on_editable_field = src->focus_on_editable_field;
-  }
+///
+/// Class representing a a keyboard event.
+///
+class CefKeyEvent : public cef_key_event_t {
+ public:
+  CefKeyEvent() : cef_key_event_t{} {}
+  CefKeyEvent(const cef_key_event_t& r) : cef_key_event_t(r) {}
 };
 
 ///
-// Class representing a a keyboard event.
+/// Class representing a mouse event.
 ///
-typedef CefStructBase<CefKeyEventTraits> CefKeyEvent;
-
-struct CefMouseEventTraits {
-  typedef cef_mouse_event_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->x = src->x;
-    target->y = src->y;
-    target->modifiers = src->modifiers;
-  }
+class CefMouseEvent : public cef_mouse_event_t {
+ public:
+  CefMouseEvent() : cef_mouse_event_t{} {}
+  CefMouseEvent(const cef_mouse_event_t& r) : cef_mouse_event_t(r) {}
 };
 
 ///
-// Class representing a mouse event.
+/// Class representing a touch event.
 ///
-typedef CefStructBase<CefMouseEventTraits> CefMouseEvent;
-
-struct CefPopupFeaturesTraits {
-  typedef cef_popup_features_t struct_type;
-
-  static inline void init(struct_type* s) {
-    s->menuBarVisible = true;
-    s->statusBarVisible = true;
-    s->toolBarVisible = true;
-    s->scrollbarsVisible = true;
-  }
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->x = src->x;
-    target->xSet = src->xSet;
-    target->y = src->y;
-    target->ySet = src->ySet;
-    target->width = src->width;
-    target->widthSet = src->widthSet;
-    target->height = src->height;
-    target->heightSet = src->heightSet;
-    target->menuBarVisible = src->menuBarVisible;
-    target->statusBarVisible = src->statusBarVisible;
-    target->toolBarVisible = src->toolBarVisible;
-    target->scrollbarsVisible = src->scrollbarsVisible;
-  }
+class CefTouchEvent : public cef_touch_event_t {
+ public:
+  CefTouchEvent() : cef_touch_event_t{} {}
+  CefTouchEvent(const cef_touch_event_t& r) : cef_touch_event_t(r) {}
 };
 
 ///
-// Class representing popup window features.
+/// Class representing popup window features.
 ///
-typedef CefStructBase<CefPopupFeaturesTraits> CefPopupFeatures;
+class CefPopupFeatures : public cef_popup_features_t {
+ public:
+  CefPopupFeatures() : cef_popup_features_t{} {}
+  CefPopupFeatures(const cef_popup_features_t& r) : cef_popup_features_t(r) {}
+};
 
 struct CefSettingsTraits {
-  typedef cef_settings_t struct_type;
+  using struct_type = cef_settings_t;
 
   static inline void init(struct_type* s) { s->size = sizeof(struct_type); }
 
   static inline void clear(struct_type* s) {
     cef_string_clear(&s->browser_subprocess_path);
     cef_string_clear(&s->framework_dir_path);
+    cef_string_clear(&s->main_bundle_path);
     cef_string_clear(&s->cache_path);
-    cef_string_clear(&s->user_data_path);
+    cef_string_clear(&s->root_cache_path);
     cef_string_clear(&s->user_agent);
-    cef_string_clear(&s->product_version);
+    cef_string_clear(&s->user_agent_product);
     cef_string_clear(&s->locale);
     cef_string_clear(&s->log_file);
     cef_string_clear(&s->javascript_flags);
     cef_string_clear(&s->resources_dir_path);
     cef_string_clear(&s->locales_dir_path);
     cef_string_clear(&s->accept_language_list);
+    cef_string_clear(&s->cookieable_schemes_list);
+    cef_string_clear(&s->chrome_policy_id);
   }
 
   static inline void set(const struct_type* src,
                          struct_type* target,
                          bool copy) {
-    target->single_process = src->single_process;
     target->no_sandbox = src->no_sandbox;
     cef_string_set(src->browser_subprocess_path.str,
                    src->browser_subprocess_path.length,
                    &target->browser_subprocess_path, copy);
     cef_string_set(src->framework_dir_path.str, src->framework_dir_path.length,
                    &target->framework_dir_path, copy);
+    cef_string_set(src->main_bundle_path.str, src->main_bundle_path.length,
+                   &target->main_bundle_path, copy);
+    target->chrome_runtime = src->chrome_runtime;
     target->multi_threaded_message_loop = src->multi_threaded_message_loop;
     target->external_message_pump = src->external_message_pump;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
@@ -553,20 +395,21 @@ struct CefSettingsTraits {
 
     cef_string_set(src->cache_path.str, src->cache_path.length,
                    &target->cache_path, copy);
-    cef_string_set(src->user_data_path.str, src->user_data_path.length,
-                   &target->user_data_path, copy);
+    cef_string_set(src->root_cache_path.str, src->root_cache_path.length,
+                   &target->root_cache_path, copy);
     target->persist_session_cookies = src->persist_session_cookies;
     target->persist_user_preferences = src->persist_user_preferences;
 
     cef_string_set(src->user_agent.str, src->user_agent.length,
                    &target->user_agent, copy);
-    cef_string_set(src->product_version.str, src->product_version.length,
-                   &target->product_version, copy);
+    cef_string_set(src->user_agent_product.str, src->user_agent_product.length,
+                   &target->user_agent_product, copy);
     cef_string_set(src->locale.str, src->locale.length, &target->locale, copy);
 
     cef_string_set(src->log_file.str, src->log_file.length, &target->log_file,
                    copy);
     target->log_severity = src->log_severity;
+    target->log_items = src->log_items;
     cef_string_set(src->javascript_flags.str, src->javascript_flags.length,
                    &target->javascript_flags, copy);
 
@@ -577,30 +420,38 @@ struct CefSettingsTraits {
     target->pack_loading_disabled = src->pack_loading_disabled;
     target->remote_debugging_port = src->remote_debugging_port;
     target->uncaught_exception_stack_size = src->uncaught_exception_stack_size;
-    target->ignore_certificate_errors = src->ignore_certificate_errors;
-    target->enable_net_security_expiration =
-        src->enable_net_security_expiration;
     target->background_color = src->background_color;
 
     cef_string_set(src->accept_language_list.str,
                    src->accept_language_list.length,
                    &target->accept_language_list, copy);
+
+    cef_string_set(src->cookieable_schemes_list.str,
+                   src->cookieable_schemes_list.length,
+                   &target->cookieable_schemes_list, copy);
+    target->cookieable_schemes_exclude_defaults =
+        src->cookieable_schemes_exclude_defaults;
+
+    cef_string_set(src->chrome_policy_id.str, src->chrome_policy_id.length,
+                   &target->chrome_policy_id, copy);
+    target->chrome_app_icon_id = src->chrome_app_icon_id;
   }
 };
 
 ///
-// Class representing initialization settings.
+/// Class representing initialization settings.
 ///
-typedef CefStructBase<CefSettingsTraits> CefSettings;
+using CefSettings = CefStructBase<CefSettingsTraits>;
 
 struct CefRequestContextSettingsTraits {
-  typedef cef_request_context_settings_t struct_type;
+  using struct_type = cef_request_context_settings_t;
 
   static inline void init(struct_type* s) { s->size = sizeof(struct_type); }
 
   static inline void clear(struct_type* s) {
     cef_string_clear(&s->cache_path);
     cef_string_clear(&s->accept_language_list);
+    cef_string_clear(&s->cookieable_schemes_list);
   }
 
   static inline void set(const struct_type* src,
@@ -610,23 +461,26 @@ struct CefRequestContextSettingsTraits {
                    &target->cache_path, copy);
     target->persist_session_cookies = src->persist_session_cookies;
     target->persist_user_preferences = src->persist_user_preferences;
-    target->ignore_certificate_errors = src->ignore_certificate_errors;
-    target->enable_net_security_expiration =
-        src->enable_net_security_expiration;
     cef_string_set(src->accept_language_list.str,
                    src->accept_language_list.length,
                    &target->accept_language_list, copy);
+
+    cef_string_set(src->cookieable_schemes_list.str,
+                   src->cookieable_schemes_list.length,
+                   &target->cookieable_schemes_list, copy);
+    target->cookieable_schemes_exclude_defaults =
+        src->cookieable_schemes_exclude_defaults;
   }
 };
 
 ///
-// Class representing request context initialization settings.
+/// Class representing request context initialization settings.
 ///
-typedef CefStructBase<CefRequestContextSettingsTraits>
-    CefRequestContextSettings;
+using CefRequestContextSettings =
+    CefStructBase<CefRequestContextSettingsTraits>;
 
 struct CefBrowserSettingsTraits {
-  typedef cef_browser_settings_t struct_type;
+  using struct_type = cef_browser_settings_t;
 
   static inline void init(struct_type* s) { s->size = sizeof(struct_type); }
 
@@ -638,7 +492,6 @@ struct CefBrowserSettingsTraits {
     cef_string_clear(&s->cursive_font_family);
     cef_string_clear(&s->fantasy_font_family);
     cef_string_clear(&s->default_encoding);
-    cef_string_clear(&s->accept_language_list);
   }
 
   static inline void set(const struct_type* src,
@@ -676,11 +529,6 @@ struct CefBrowserSettingsTraits {
     target->javascript_close_windows = src->javascript_close_windows;
     target->javascript_access_clipboard = src->javascript_access_clipboard;
     target->javascript_dom_paste = src->javascript_dom_paste;
-    target->plugins = src->plugins;
-    target->universal_access_from_file_urls =
-        src->universal_access_from_file_urls;
-    target->file_access_from_file_urls = src->file_access_from_file_urls;
-    target->web_security = src->web_security;
     target->image_loading = src->image_loading;
     target->image_shrink_standalone_to_fit =
         src->image_shrink_standalone_to_fit;
@@ -688,24 +536,22 @@ struct CefBrowserSettingsTraits {
     target->tab_to_links = src->tab_to_links;
     target->local_storage = src->local_storage;
     target->databases = src->databases;
-    target->application_cache = src->application_cache;
     target->webgl = src->webgl;
 
     target->background_color = src->background_color;
 
-    cef_string_set(src->accept_language_list.str,
-                   src->accept_language_list.length,
-                   &target->accept_language_list, copy);
+    target->chrome_status_bubble = src->chrome_status_bubble;
+    target->chrome_zoom_bubble = src->chrome_zoom_bubble;
   }
 };
 
 ///
-// Class representing browser initialization settings.
+/// Class representing browser initialization settings.
 ///
-typedef CefStructBase<CefBrowserSettingsTraits> CefBrowserSettings;
+using CefBrowserSettings = CefStructBase<CefBrowserSettingsTraits>;
 
 struct CefURLPartsTraits {
-  typedef cef_urlparts_t struct_type;
+  using struct_type = cef_urlparts_t;
 
   static inline void init(struct_type* s) {}
 
@@ -719,6 +565,7 @@ struct CefURLPartsTraits {
     cef_string_clear(&s->origin);
     cef_string_clear(&s->path);
     cef_string_clear(&s->query);
+    cef_string_clear(&s->fragment);
   }
 
   static inline void set(const struct_type* src,
@@ -735,72 +582,28 @@ struct CefURLPartsTraits {
     cef_string_set(src->origin.str, src->origin.length, &target->origin, copy);
     cef_string_set(src->path.str, src->path.length, &target->path, copy);
     cef_string_set(src->query.str, src->query.length, &target->query, copy);
+    cef_string_set(src->fragment.str, src->fragment.length, &target->fragment,
+                   copy);
   }
 };
 
 ///
-// Class representing a URL's component parts.
+/// Class representing a URL's component parts.
 ///
-typedef CefStructBase<CefURLPartsTraits> CefURLParts;
-
-struct CefTimeTraits {
-  typedef cef_time_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
-};
+using CefURLParts = CefStructBase<CefURLPartsTraits>;
 
 ///
-// Class representing a time.
+/// Class representing the state of a touch handle.
 ///
-class CefTime : public CefStructBase<CefTimeTraits> {
+class CefTouchHandleState : public cef_touch_handle_state_t {
  public:
-  typedef CefStructBase<CefTimeTraits> parent;
-
-  CefTime() : parent() {}
-  CefTime(const cef_time_t& r) : parent(r) {}
-  CefTime(const CefTime& r) : parent(r) {}
-  explicit CefTime(time_t r) : parent() { SetTimeT(r); }
-  explicit CefTime(double r) : parent() { SetDoubleT(r); }
-
-  // Converts to/from time_t.
-  void SetTimeT(time_t r) { cef_time_from_timet(r, this); }
-  time_t GetTimeT() const {
-    time_t time = 0;
-    cef_time_to_timet(this, &time);
-    return time;
-  }
-
-  // Converts to/from a double which is the number of seconds since epoch
-  // (Jan 1, 1970). Webkit uses this format to represent time. A value of 0
-  // means "not initialized".
-  void SetDoubleT(double r) { cef_time_from_doublet(r, this); }
-  double GetDoubleT() const {
-    double time = 0;
-    cef_time_to_doublet(this, &time);
-    return time;
-  }
-
-  // Set this object to now.
-  void Now() { cef_time_now(this); }
-
-  // Return the delta between this object and |other| in milliseconds.
-  long long Delta(const CefTime& other) {
-    long long delta = 0;
-    cef_time_delta(this, &other, &delta);
-    return delta;
-  }
+  CefTouchHandleState() : cef_touch_handle_state_t{} {}
+  CefTouchHandleState(const cef_touch_handle_state_t& r)
+      : cef_touch_handle_state_t(r) {}
 };
 
 struct CefCookieTraits {
-  typedef cef_cookie_t struct_type;
+  using struct_type = cef_cookie_t;
 
   static inline void init(struct_type* s) {}
 
@@ -824,123 +627,125 @@ struct CefCookieTraits {
     target->last_access = src->last_access;
     target->has_expires = src->has_expires;
     target->expires = src->expires;
+    target->same_site = src->same_site;
+    target->priority = src->priority;
   }
 };
 
 ///
-// Class representing a cookie.
+/// Class representing a cookie.
 ///
-typedef CefStructBase<CefCookieTraits> CefCookie;
-
-struct CefCursorInfoTraits {
-  typedef cef_cursor_info_t struct_type;
-
-  static inline void init(struct_type* s) {}
-
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->hotspot = src->hotspot;
-    target->image_scale_factor = src->image_scale_factor;
-    target->buffer = src->buffer;
-    target->size = src->size;
-  }
-};
+using CefCookie = CefStructBase<CefCookieTraits>;
 
 ///
-// Class representing cursor information.
+/// Class representing cursor information.
 ///
-typedef CefStructBase<CefCursorInfoTraits> CefCursorInfo;
+class CefCursorInfo : public cef_cursor_info_t {
+ public:
+  CefCursorInfo() : cef_cursor_info_t{} {}
+  CefCursorInfo(const cef_cursor_info_t& r) : cef_cursor_info_t(r) {}
+};
 
 struct CefPdfPrintSettingsTraits {
-  typedef cef_pdf_print_settings_t struct_type;
+  using struct_type = cef_pdf_print_settings_t;
 
   static inline void init(struct_type* s) {}
 
   static inline void clear(struct_type* s) {
-    cef_string_clear(&s->header_footer_title);
-    cef_string_clear(&s->header_footer_url);
+    cef_string_clear(&s->page_ranges);
+    cef_string_clear(&s->header_template);
+    cef_string_clear(&s->footer_template);
   }
 
   static inline void set(const struct_type* src,
                          struct_type* target,
                          bool copy) {
-    cef_string_set(src->header_footer_title.str,
-                   src->header_footer_title.length,
-                   &target->header_footer_title, copy);
-    cef_string_set(src->header_footer_url.str, src->header_footer_url.length,
-                   &target->header_footer_url, copy);
-
-    target->page_width = src->page_width;
-    target->page_height = src->page_height;
-
-    target->scale_factor = src->scale_factor;
+    target->landscape = src->landscape;
+    target->print_background = src->print_background;
+    target->scale = src->scale;
+    target->paper_width = src->paper_width;
+    target->paper_height = src->paper_height;
+    target->prefer_css_page_size = src->prefer_css_page_size;
 
+    target->margin_type = src->margin_type;
     target->margin_top = src->margin_top;
     target->margin_right = src->margin_right;
     target->margin_bottom = src->margin_bottom;
     target->margin_left = src->margin_left;
-    target->margin_type = src->margin_type;
 
-    target->header_footer_enabled = src->header_footer_enabled;
-    target->selection_only = src->selection_only;
-    target->landscape = src->landscape;
-    target->backgrounds_enabled = src->backgrounds_enabled;
+    cef_string_set(src->page_ranges.str, src->page_ranges.length,
+                   &target->page_ranges, copy);
+
+    target->display_header_footer = src->display_header_footer;
+    cef_string_set(src->header_template.str, src->header_template.length,
+                   &target->header_template, copy);
+    cef_string_set(src->footer_template.str, src->footer_template.length,
+                   &target->footer_template, copy);
+
+    target->generate_tagged_pdf = src->generate_tagged_pdf;
+    target->generate_document_outline = src->generate_document_outline;
   }
 };
 
 ///
-// Class representing PDF print settings
+/// Class representing PDF print settings
 ///
-typedef CefStructBase<CefPdfPrintSettingsTraits> CefPdfPrintSettings;
-
-struct CefBoxLayoutSettingsTraits {
-  typedef cef_box_layout_settings_t struct_type;
-
-  static inline void init(struct_type* s) {}
+using CefPdfPrintSettings = CefStructBase<CefPdfPrintSettingsTraits>;
 
-  static inline void clear(struct_type* s) {}
+///
+/// Class representing CefBoxLayout settings.
+///
+class CefBoxLayoutSettings : public cef_box_layout_settings_t {
+ public:
+  CefBoxLayoutSettings() : cef_box_layout_settings_t{} {}
+  CefBoxLayoutSettings(const cef_box_layout_settings_t& r)
+      : cef_box_layout_settings_t(r) {}
+};
 
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    *target = *src;
-  }
+///
+/// Class representing IME composition underline.
+///
+class CefCompositionUnderline : public cef_composition_underline_t {
+ public:
+  CefCompositionUnderline() : cef_composition_underline_t{} {}
+  CefCompositionUnderline(const cef_composition_underline_t& r)
+      : cef_composition_underline_t(r) {}
 };
 
 ///
-// Class representing CefBoxLayout settings.
+/// Class representing CefAudioParameters settings
 ///
-typedef CefStructBase<CefBoxLayoutSettingsTraits> CefBoxLayoutSettings;
+class CefAudioParameters : public cef_audio_parameters_t {
+ public:
+  CefAudioParameters() : cef_audio_parameters_t{} {}
+  CefAudioParameters(const cef_audio_parameters_t& r)
+      : cef_audio_parameters_t(r) {}
+};
 
-struct CefCompositionUnderlineTraits {
-  typedef cef_composition_underline_t struct_type;
+struct CefMediaSinkDeviceInfoTraits {
+  using struct_type = cef_media_sink_device_info_t;
 
-  static inline void init(struct_type* s) {
-    s->range.from = 0;
-    s->range.to = 0;
-    s->color = 0;
-    s->background_color = 0;
-    s->thick = 0;
-  }
+  static inline void init(struct_type* s) {}
 
-  static inline void clear(struct_type* s) {}
+  static inline void clear(struct_type* s) {
+    cef_string_clear(&s->ip_address);
+    cef_string_clear(&s->model_name);
+  }
 
   static inline void set(const struct_type* src,
                          struct_type* target,
                          bool copy) {
-    target->range = src->range;
-    target->color = src->color;
-    target->background_color = src->background_color;
-    target->thick = src->thick;
+    cef_string_set(src->ip_address.str, src->ip_address.length,
+                   &target->ip_address, copy);
+    target->port = src->port;
+    cef_string_set(src->model_name.str, src->model_name.length,
+                   &target->model_name, copy);
   }
 };
 
 ///
-// Class representing IME composition underline.
+/// Class representing MediaSink device info.
 ///
-typedef CefStructBase<CefCompositionUnderlineTraits> CefCompositionUnderline;
+using CefMediaSinkDeviceInfo = CefStructBase<CefMediaSinkDeviceInfoTraits>;
 
 #endif  // CEF_INCLUDE_INTERNAL_CEF_TYPES_WRAPPERS_H_
diff --git a/src/include/internal/cef_win.h b/src/include/internal/cef_win.h
index 8b30a4fec..a37d21c5a 100644
--- a/src/include/internal/cef_win.h
+++ b/src/include/internal/cef_win.h
@@ -31,38 +31,23 @@
 #define CEF_INCLUDE_INTERNAL_CEF_WIN_H_
 #pragma once
 
+#include "include/internal/cef_app_win.h"
 #include "include/internal/cef_types_win.h"
 #include "include/internal/cef_types_wrappers.h"
 
-///
 // Handle types.
-///
 #define CefCursorHandle cef_cursor_handle_t
 #define CefEventHandle cef_event_handle_t
 #define CefWindowHandle cef_window_handle_t
 
-struct CefMainArgsTraits {
-  typedef cef_main_args_t struct_type;
-
-  static inline void init(struct_type* s) {}
-  static inline void clear(struct_type* s) {}
-
-  static inline void set(const struct_type* src,
-                         struct_type* target,
-                         bool copy) {
-    target->instance = src->instance;
-  }
-};
-
-// Class representing CefExecuteProcess arguments.
-class CefMainArgs : public CefStructBase<CefMainArgsTraits> {
+///
+/// Class representing CefExecuteProcess arguments.
+///
+class CefMainArgs : public cef_main_args_t {
  public:
-  typedef CefStructBase<CefMainArgsTraits> parent;
-
-  CefMainArgs() : parent() {}
-  explicit CefMainArgs(const cef_main_args_t& r) : parent(r) {}
-  explicit CefMainArgs(const CefMainArgs& r) : parent(r) {}
-  explicit CefMainArgs(HINSTANCE hInstance) : parent() { instance = hInstance; }
+  CefMainArgs() : cef_main_args_t{} {}
+  CefMainArgs(const cef_main_args_t& r) : cef_main_args_t(r) {}
+  explicit CefMainArgs(HINSTANCE hInstance) : cef_main_args_t{hInstance} {}
 };
 
 struct CefWindowInfoTraits {
@@ -81,19 +66,18 @@ struct CefWindowInfoTraits {
     cef_string_set(src->window_name.str, src->window_name.length,
                    &target->window_name, copy);
     target->style = src->style;
-    target->x = src->x;
-    target->y = src->y;
-    target->width = src->width;
-    target->height = src->height;
+    target->bounds = src->bounds;
     target->parent_window = src->parent_window;
     target->menu = src->menu;
     target->windowless_rendering_enabled = src->windowless_rendering_enabled;
+    target->shared_texture_enabled = src->shared_texture_enabled;
+    target->external_begin_frame_enabled = src->external_begin_frame_enabled;
     target->window = src->window;
   }
 };
 
 ///
-// Class representing window information.
+/// Class representing window information.
 ///
 class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
  public:
@@ -103,45 +87,45 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   explicit CefWindowInfo(const cef_window_info_t& r) : parent(r) {}
   explicit CefWindowInfo(const CefWindowInfo& r) : parent(r) {}
 
+  CefWindowInfo& operator=(const CefWindowInfo&) = default;
+  CefWindowInfo& operator=(CefWindowInfo&&) = default;
+
   ///
-  // Create the browser as a child window.
+  /// Create the browser as a child window.
   ///
-  void SetAsChild(CefWindowHandle parent, RECT windowRect) {
+  void SetAsChild(CefWindowHandle parent, const CefRect& windowBounds) {
     style =
         WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_TABSTOP | WS_VISIBLE;
     parent_window = parent;
-    x = windowRect.left;
-    y = windowRect.top;
-    width = windowRect.right - windowRect.left;
-    height = windowRect.bottom - windowRect.top;
+    bounds = windowBounds;
   }
 
   ///
-  // Create the browser as a popup window.
+  /// Create the browser as a popup window.
   ///
   void SetAsPopup(CefWindowHandle parent, const CefString& windowName) {
     style =
         WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE;
     parent_window = parent;
-    x = CW_USEDEFAULT;
-    y = CW_USEDEFAULT;
-    width = CW_USEDEFAULT;
-    height = CW_USEDEFAULT;
+    bounds.x = CW_USEDEFAULT;
+    bounds.y = CW_USEDEFAULT;
+    bounds.width = CW_USEDEFAULT;
+    bounds.height = CW_USEDEFAULT;
 
     cef_string_copy(windowName.c_str(), windowName.length(), &window_name);
   }
 
   ///
-  // Create the browser using windowless (off-screen) rendering. No window
-  // will be created for the browser and all rendering will occur via the
-  // CefRenderHandler interface. The |parent| value will be used to identify
-  // monitor info and to act as the parent window for dialogs, context menus,
-  // etc. If |parent| is not provided then the main screen monitor will be used
-  // and some functionality that requires a parent window may not function
-  // correctly. In order to create windowless browsers the
-  // CefSettings.windowless_rendering_enabled value must be set to true.
-  // Transparent painting is enabled by default but can be disabled by setting
-  // CefBrowserSettings.background_color to an opaque value.
+  /// Create the browser using windowless (off-screen) rendering. No window
+  /// will be created for the browser and all rendering will occur via the
+  /// CefRenderHandler interface. The |parent| value will be used to identify
+  /// monitor info and to act as the parent window for dialogs, context menus,
+  /// etc. If |parent| is not provided then the main screen monitor will be used
+  /// and some functionality that requires a parent window may not function
+  /// correctly. In order to create windowless browsers the
+  /// CefSettings.windowless_rendering_enabled value must be set to true.
+  /// Transparent painting is enabled by default but can be disabled by setting
+  /// CefBrowserSettings.background_color to an opaque value.
   ///
   void SetAsWindowless(CefWindowHandle parent) {
     windowless_rendering_enabled = TRUE;
@@ -149,4 +133,45 @@ class CefWindowInfo : public CefStructBase<CefWindowInfoTraits> {
   }
 };
 
+#if defined(ARCH_CPU_32_BITS)
+///
+/// Run the main thread on 32-bit Windows using a fiber with the preferred 4MiB
+/// stack size. This function must be called at the top of the executable entry
+/// point function (`main()` or `wWinMain()`). It is used in combination with
+/// the initial stack size of 0.5MiB configured via the `/STACK:0x80000` linker
+/// flag on executable targets. This saves significant memory on threads (like
+/// those in the Windows thread pool, and others) whose stack size can only be
+/// controlled via the linker flag.
+///
+/// CEF's main thread needs at least a 1.5 MiB stack size in order to avoid
+/// stack overflow crashes. However, if this is set in the PE file then other
+/// threads get this size as well, leading to address-space exhaustion in 32-bit
+/// CEF. This function uses fibers to switch the main thread to a 4 MiB stack
+/// (roughly the same effective size as the 64-bit build's 8 MiB stack) before
+/// running any other code.
+///
+/// Choose the function variant that matches the entry point function type used
+/// by the executable. Reusing the entry point minimizes confusion when
+/// examining call stacks in crash reports.
+///
+/// If this function is already running on the fiber it will return -1
+/// immediately, meaning that execution should proceed with the remainder of the
+/// entry point function. Otherwise, this function will block until the entry
+/// point function has completed execution on the fiber and then return a result
+/// >= 0, meaning that the entry point function should return the result
+/// immediately without proceeding with execution.
+///
+int CefRunWinMainWithPreferredStackSize(wWinMainPtr wWinMain,
+                                        HINSTANCE hInstance,
+                                        LPWSTR lpCmdLine,
+                                        int nCmdShow);
+int CefRunMainWithPreferredStackSize(mainPtr main, int argc, char* argv[]);
+#endif  // defined(ARCH_CPU_32_BITS)
+
+///
+/// Set to true before calling Windows APIs like TrackPopupMenu that enter a
+/// modal message loop. Set to false after exiting the modal message loop.
+///
+void CefSetOSModalLoop(bool osModalLoop);
+
 #endif  // CEF_INCLUDE_INTERNAL_CEF_WIN_H_
diff --git a/src/include/test/cef_translator_test.h b/src/include/test/cef_translator_test.h
deleted file mode 100644
index 590b5a27d..000000000
--- a/src/include/test/cef_translator_test.h
+++ /dev/null
@@ -1,808 +0,0 @@
-// Copyright (c) 2015 Marshall A. Greenblatt. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-// Framework nor the names of its contributors may be used to endorse
-// or promote products derived from this software without specific prior
-// written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// ---------------------------------------------------------------------------
-//
-// The contents of this file must follow a specific format in order to
-// support the CEF translator tool. See the translator.README.txt file in the
-// tools directory for more information.
-//
-// THIS FILE IS FOR TESTING PURPOSES ONLY.
-//
-// The APIs defined in this file are for testing purposes only. They should only
-// be included from unit test targets.
-//
-
-#ifndef CEF_INCLUDE_TEST_CEF_TEST_H_
-#define CEF_INCLUDE_TEST_CEF_TEST_H_
-#pragma once
-
-#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \
-    !defined(UNIT_TEST)
-#error This file can be included for unit tests only
-#endif
-
-#include <map>
-#include <vector>
-
-#include "include/cef_base.h"
-
-class CefTranslatorTestRefPtrClient;
-class CefTranslatorTestRefPtrClientChild;
-class CefTranslatorTestRefPtrLibrary;
-class CefTranslatorTestRefPtrLibraryChild;
-class CefTranslatorTestScopedClient;
-class CefTranslatorTestScopedClientChild;
-class CefTranslatorTestScopedLibrary;
-class CefTranslatorTestScopedLibraryChild;
-
-// Test values.
-#define TEST_INT_VAL 5
-#define TEST_INT_VAL2 60
-#define TEST_BOOL_VAL true
-#define TEST_DOUBLE_VAL 4.543
-#define TEST_LONG_VAL -65
-#define TEST_SIZET_VAL 3U
-#define TEST_STRING_VAL "My test string"
-#define TEST_STRING_VAL2 "My 2nd test string"
-#define TEST_STRING_VAL3 "My 3rd test string"
-#define TEST_STRING_KEY "key0"
-#define TEST_STRING_KEY2 "key1"
-#define TEST_STRING_KEY3 "key2"
-#define TEST_X_VAL 44
-#define TEST_Y_VAL 754
-#define TEST_X_VAL2 900
-#define TEST_Y_VAL2 300
-
-///
-// Class for testing all of the possible data transfer types.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTest : public CefBaseRefCounted {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefRefPtr<CefTranslatorTest> Create();
-
-  // PRIMITIVE VALUES
-
-  ///
-  // Return a void value.
-  ///
-  /*--cef()--*/
-  virtual void GetVoid() = 0;
-
-  ///
-  // Return a bool value.
-  ///
-  /*--cef()--*/
-  virtual bool GetBool() = 0;
-
-  ///
-  // Return an int value.
-  ///
-  /*--cef()--*/
-  virtual int GetInt() = 0;
-
-  ///
-  // Return a double value.
-  ///
-  /*--cef()--*/
-  virtual double GetDouble() = 0;
-
-  ///
-  // Return a long value.
-  ///
-  /*--cef()--*/
-  virtual long GetLong() = 0;
-
-  ///
-  // Return a size_t value.
-  ///
-  /*--cef()--*/
-  virtual size_t GetSizet() = 0;
-
-  ///
-  // Set a void value.
-  ///
-  /*--cef()--*/
-  virtual bool SetVoid() = 0;
-
-  ///
-  // Set a bool value.
-  ///
-  /*--cef()--*/
-  virtual bool SetBool(bool val) = 0;
-
-  ///
-  // Set an int value.
-  ///
-  /*--cef()--*/
-  virtual bool SetInt(int val) = 0;
-
-  ///
-  // Set a double value.
-  ///
-  /*--cef()--*/
-  virtual bool SetDouble(double val) = 0;
-
-  ///
-  // Set a long value.
-  ///
-  /*--cef()--*/
-  virtual bool SetLong(long val) = 0;
-
-  ///
-  // Set a size_t value.
-  ///
-  /*--cef()--*/
-  virtual bool SetSizet(size_t val) = 0;
-
-  // PRIMITIVE LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<int> IntList;
-
-  ///
-  // Set a int list value.
-  ///
-  /*--cef()--*/
-  virtual bool SetIntList(const std::vector<int>& val) = 0;
-
-  ///
-  // Return an int list value by out-param.
-  ///
-  /*--cef(count_func=val:GetIntListSize)--*/
-  virtual bool GetIntListByRef(IntList& val) = 0;
-
-  ///
-  // Return the number of points that will be output above.
-  ///
-  /*--cef()--*/
-  virtual size_t GetIntListSize() = 0;
-
-  // STRING VALUES
-
-  ///
-  // Return a string value.
-  ///
-  /*--cef()--*/
-  virtual CefString GetString() = 0;
-
-  ///
-  // Set a string value.
-  ///
-  /*--cef()--*/
-  virtual bool SetString(const CefString& val) = 0;
-
-  ///
-  // Return a string value by out-param.
-  ///
-  /*--cef()--*/
-  virtual void GetStringByRef(CefString& val) = 0;
-
-  // STRING LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<CefString> StringList;
-
-  ///
-  // Set a string list value.
-  ///
-  /*--cef()--*/
-  virtual bool SetStringList(const std::vector<CefString>& val) = 0;
-
-  ///
-  // Return a string list value by out-param.
-  ///
-  /*--cef()--*/
-  virtual bool GetStringListByRef(StringList& val) = 0;
-
-  // STRING MAP VALUES
-
-  // Test both with and without a typedef.
-  typedef std::map<CefString, CefString> StringMap;
-
-  ///
-  // Set a string map value.
-  ///
-  /*--cef()--*/
-  virtual bool SetStringMap(const StringMap& val) = 0;
-
-  ///
-  // Return a string map value by out-param.
-  ///
-  /*--cef()--*/
-  virtual bool GetStringMapByRef(std::map<CefString, CefString>& val) = 0;
-
-  // STRING MULTIMAP VALUES
-
-  // Test both with and without a typedef.
-  typedef std::multimap<CefString, CefString> StringMultimap;
-
-  ///
-  // Set a string multimap value.
-  ///
-  /*--cef()--*/
-  virtual bool SetStringMultimap(
-      const std::multimap<CefString, CefString>& val) = 0;
-
-  ///
-  // Return a string multimap value by out-param.
-  ///
-  /*--cef()--*/
-  virtual bool GetStringMultimapByRef(StringMultimap& val) = 0;
-
-  // STRUCT VALUES
-
-  ///
-  // Return a point value.
-  ///
-  /*--cef()--*/
-  virtual CefPoint GetPoint() = 0;
-
-  ///
-  // Set a point value.
-  ///
-  /*--cef()--*/
-  virtual bool SetPoint(const CefPoint& val) = 0;
-
-  ///
-  // Return a point value by out-param.
-  ///
-  /*--cef()--*/
-  virtual void GetPointByRef(CefPoint& val) = 0;
-
-  // STRUCT LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<CefPoint> PointList;
-
-  ///
-  // Set a point list vlaue.
-  ///
-  /*--cef()--*/
-  virtual bool SetPointList(const std::vector<CefPoint>& val) = 0;
-
-  ///
-  // Return a point list value by out-param.
-  ///
-  /*--cef(count_func=val:GetPointListSize)--*/
-  virtual bool GetPointListByRef(PointList& val) = 0;
-
-  ///
-  // Return the number of points that will be output above.
-  ///
-  /*--cef()--*/
-  virtual size_t GetPointListSize() = 0;
-
-  // LIBRARY-SIDE REFPTR VALUES
-
-  ///
-  // Return an new library-side object.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefTranslatorTestRefPtrLibrary> GetRefPtrLibrary(
-      int val) = 0;
-
-  ///
-  // Set an object. Returns the value from
-  // CefTranslatorTestRefPtrLibrary::GetValue().
-  // This tests input and execution of a library-side object type.
-  ///
-  /*--cef()--*/
-  virtual int SetRefPtrLibrary(
-      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) = 0;
-
-  ///
-  // Set an object. Returns the object passed in. This tests input and output
-  // of a library-side object type.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefTranslatorTestRefPtrLibrary> SetRefPtrLibraryAndReturn(
-      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) = 0;
-
-  ///
-  // Set a child object. Returns the value from
-  // CefTranslatorTestRefPtrLibrary::GetValue(). This tests input of a library-
-  // side child object type and execution as the parent type.
-  ///
-  /*--cef()--*/
-  virtual int SetChildRefPtrLibrary(
-      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) = 0;
-
-  ///
-  // Set a child object. Returns the object as the parent type. This tests input
-  // of a library-side child object type and return as the parent type.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefTranslatorTestRefPtrLibrary>
-  SetChildRefPtrLibraryAndReturnParent(
-      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) = 0;
-
-  // LIBRARY-SIDE REFPTR LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>
-      RefPtrLibraryList;
-
-  ///
-  // Set an object list vlaue.
-  ///
-  /*--cef()--*/
-  virtual bool SetRefPtrLibraryList(
-      const std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>& val,
-      int val1,
-      int val2) = 0;
-
-  ///
-  // Return an object list value by out-param.
-  ///
-  /*--cef(count_func=val:GetRefPtrLibraryListSize)--*/
-  virtual bool GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
-                                         int val1,
-                                         int val2) = 0;
-
-  ///
-  // Return the number of object that will be output above.
-  ///
-  /*--cef()--*/
-  virtual size_t GetRefPtrLibraryListSize() = 0;
-
-  // CLIENT-SIDE REFPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // CefTranslatorTestRefPtrClient::GetValue().
-  // This tests input and execution of a client-side object type.
-  ///
-  /*--cef()--*/
-  virtual int SetRefPtrClient(CefRefPtr<CefTranslatorTestRefPtrClient> val) = 0;
-
-  ///
-  // Set an object. Returns the handler passed in. This tests input and output
-  // of a client-side object type.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefTranslatorTestRefPtrClient> SetRefPtrClientAndReturn(
-      CefRefPtr<CefTranslatorTestRefPtrClient> val) = 0;
-
-  ///
-  // Set a child object. Returns the value from
-  // CefTranslatorTestRefPtrClient::GetValue(). This tests input of a client-
-  // side child object type and execution as the parent type.
-  ///
-  /*--cef()--*/
-  virtual int SetChildRefPtrClient(
-      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) = 0;
-
-  ///
-  // Set a child object. Returns the object as the parent type. This tests
-  // input of a client-side child object type and return as the parent type.
-  ///
-  /*--cef()--*/
-  virtual CefRefPtr<CefTranslatorTestRefPtrClient>
-  SetChildRefPtrClientAndReturnParent(
-      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) = 0;
-
-  // CLIENT-SIDE REFPTR LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>
-      RefPtrClientList;
-
-  ///
-  // Set an object list vlaue.
-  ///
-  /*--cef()--*/
-  virtual bool SetRefPtrClientList(
-      const std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>& val,
-      int val1,
-      int val2) = 0;
-
-  ///
-  // Return an object list value by out-param.
-  ///
-  /*--cef(count_func=val:GetRefPtrLibraryListSize)--*/
-  virtual bool GetRefPtrClientListByRef(
-      RefPtrClientList& val,
-      CefRefPtr<CefTranslatorTestRefPtrClient> val1,
-      CefRefPtr<CefTranslatorTestRefPtrClient> val2) = 0;
-
-  ///
-  // Return the number of object that will be output above.
-  ///
-  /*--cef()--*/
-  virtual size_t GetRefPtrClientListSize() = 0;
-
-  // LIBRARY-SIDE OWNPTR VALUES
-
-  ///
-  // Return an new library-side object.
-  ///
-  /*--cef()--*/
-  virtual CefOwnPtr<CefTranslatorTestScopedLibrary> GetOwnPtrLibrary(
-      int val) = 0;
-
-  ///
-  // Set an object. Returns the value from
-  // CefTranslatorTestScopedLibrary::GetValue().
-  // This tests input and execution of a library-side object type.
-  ///
-  /*--cef()--*/
-  virtual int SetOwnPtrLibrary(
-      CefOwnPtr<CefTranslatorTestScopedLibrary> val) = 0;
-
-  ///
-  // Set an object. Returns the object passed in. This tests input and output
-  // of a library-side object type.
-  ///
-  /*--cef()--*/
-  virtual CefOwnPtr<CefTranslatorTestScopedLibrary> SetOwnPtrLibraryAndReturn(
-      CefOwnPtr<CefTranslatorTestScopedLibrary> val) = 0;
-
-  ///
-  // Set a child object. Returns the value from
-  // CefTranslatorTestScopedLibrary::GetValue(). This tests input of a library-
-  // side child object type and execution as the parent type.
-  ///
-  /*--cef()--*/
-  virtual int SetChildOwnPtrLibrary(
-      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) = 0;
-
-  ///
-  // Set a child object. Returns the object as the parent type. This tests input
-  // of a library-side child object type and return as the parent type.
-  ///
-  /*--cef()--*/
-  virtual CefOwnPtr<CefTranslatorTestScopedLibrary>
-  SetChildOwnPtrLibraryAndReturnParent(
-      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) = 0;
-
-  // CLIENT-SIDE OWNPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // CefTranslatorTestScopedClient::GetValue().
-  // This tests input and execution of a client-side object type.
-  ///
-  /*--cef()--*/
-  virtual int SetOwnPtrClient(CefOwnPtr<CefTranslatorTestScopedClient> val) = 0;
-
-  ///
-  // Set an object. Returns the handler passed in. This tests input and output
-  // of a client-side object type.
-  ///
-  /*--cef()--*/
-  virtual CefOwnPtr<CefTranslatorTestScopedClient> SetOwnPtrClientAndReturn(
-      CefOwnPtr<CefTranslatorTestScopedClient> val) = 0;
-
-  ///
-  // Set a child object. Returns the value from
-  // CefTranslatorTestScopedClient::GetValue(). This tests input of a client-
-  // side child object type and execution as the parent type.
-  ///
-  /*--cef()--*/
-  virtual int SetChildOwnPtrClient(
-      CefOwnPtr<CefTranslatorTestScopedClientChild> val) = 0;
-
-  ///
-  // Set a child object. Returns the object as the parent type. This tests
-  // input of a client-side child object type and return as the parent type.
-  ///
-  /*--cef()--*/
-  virtual CefOwnPtr<CefTranslatorTestScopedClient>
-  SetChildOwnPtrClientAndReturnParent(
-      CefOwnPtr<CefTranslatorTestScopedClientChild> val) = 0;
-
-  // LIBRARY-SIDE RAWPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // CefTranslatorTestScopedLibrary::GetValue().
-  // This tests input and execution of a library-side object type.
-  ///
-  /*--cef()--*/
-  virtual int SetRawPtrLibrary(
-      CefRawPtr<CefTranslatorTestScopedLibrary> val) = 0;
-
-  ///
-  // Set a child object. Returns the value from
-  // CefTranslatorTestScopedLibrary::GetValue(). This tests input of a library-
-  // side child object type and execution as the parent type.
-  ///
-  /*--cef()--*/
-  virtual int SetChildRawPtrLibrary(
-      CefRawPtr<CefTranslatorTestScopedLibraryChild> val) = 0;
-
-  // LIBRARY-SIDE RAWPTR LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>
-      RawPtrLibraryList;
-
-  ///
-  // Set an object list vlaue.
-  ///
-  /*--cef()--*/
-  virtual bool SetRawPtrLibraryList(
-      const std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>& val,
-      int val1,
-      int val2) = 0;
-
-  // CLIENT-SIDE RAWPTR VALUES
-
-  ///
-  // Set an object. Returns the value from
-  // CefTranslatorTestScopedClient::GetValue().
-  // This tests input and execution of a client-side object type.
-  ///
-  /*--cef()--*/
-  virtual int SetRawPtrClient(CefRawPtr<CefTranslatorTestScopedClient> val) = 0;
-
-  ///
-  // Set a child object. Returns the value from
-  // CefTranslatorTestScopedClient::GetValue(). This tests input of a client-
-  // side child object type and execution as the parent type.
-  ///
-  /*--cef()--*/
-  virtual int SetChildRawPtrClient(
-      CefRawPtr<CefTranslatorTestScopedClientChild> val) = 0;
-
-  // CLIENT-SIDE RAWPTR LIST VALUES
-
-  // Test both with and without a typedef.
-  typedef std::vector<CefRawPtr<CefTranslatorTestScopedClient>>
-      RawPtrClientList;
-
-  ///
-  // Set an object list vlaue.
-  ///
-  /*--cef()--*/
-  virtual bool SetRawPtrClientList(
-      const std::vector<CefRawPtr<CefTranslatorTestScopedClient>>& val,
-      int val1,
-      int val2) = 0;
-};
-
-///
-// Library-side test object for RefPtr.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTestRefPtrLibrary : public CefBaseRefCounted {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefRefPtr<CefTranslatorTestRefPtrLibrary> Create(int value);
-
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetValue() = 0;
-
-  ///
-  // Set a value.
-  ///
-  /*--cef()--*/
-  virtual void SetValue(int value) = 0;
-};
-
-///
-// Library-side child test object for RefPtr.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTestRefPtrLibraryChild
-    : public CefTranslatorTestRefPtrLibrary {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefRefPtr<CefTranslatorTestRefPtrLibraryChild> Create(int value,
-                                                               int other_value);
-
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetOtherValue() = 0;
-
-  ///
-  // Set a value.
-  ///
-  /*--cef()--*/
-  virtual void SetOtherValue(int value) = 0;
-};
-
-///
-// Another library-side child test object for RefPtr.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTestRefPtrLibraryChildChild
-    : public CefTranslatorTestRefPtrLibraryChild {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild>
-  Create(int value, int other_value, int other_other_value);
-
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetOtherOtherValue() = 0;
-
-  ///
-  // Set a value.
-  ///
-  /*--cef()--*/
-  virtual void SetOtherOtherValue(int value) = 0;
-};
-
-///
-// Client-side test object for RefPtr.
-///
-/*--cef(source=client)--*/
-class CefTranslatorTestRefPtrClient : public virtual CefBaseRefCounted {
- public:
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetValue() = 0;
-};
-
-///
-// Client-side child test object for RefPtr.
-///
-/*--cef(source=client)--*/
-class CefTranslatorTestRefPtrClientChild
-    : public CefTranslatorTestRefPtrClient {
- public:
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetOtherValue() = 0;
-};
-
-///
-// Library-side test object for OwnPtr/RawPtr.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTestScopedLibrary : public CefBaseScoped {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefOwnPtr<CefTranslatorTestScopedLibrary> Create(int value);
-
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetValue() = 0;
-
-  ///
-  // Set a value.
-  ///
-  /*--cef()--*/
-  virtual void SetValue(int value) = 0;
-};
-
-///
-// Library-side child test object for OwnPtr/RawPtr.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTestScopedLibraryChild
-    : public CefTranslatorTestScopedLibrary {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefOwnPtr<CefTranslatorTestScopedLibraryChild> Create(int value,
-                                                               int other_value);
-
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetOtherValue() = 0;
-
-  ///
-  // Set a value.
-  ///
-  /*--cef()--*/
-  virtual void SetOtherValue(int value) = 0;
-};
-
-///
-// Another library-side child test object for OwnPtr/RawPtr.
-///
-/*--cef(source=library)--*/
-class CefTranslatorTestScopedLibraryChildChild
-    : public CefTranslatorTestScopedLibraryChild {
- public:
-  ///
-  // Create the test object.
-  ///
-  /*--cef()--*/
-  static CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>
-  Create(int value, int other_value, int other_other_value);
-
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetOtherOtherValue() = 0;
-
-  ///
-  // Set a value.
-  ///
-  /*--cef()--*/
-  virtual void SetOtherOtherValue(int value) = 0;
-};
-
-///
-// Client-side test object for OwnPtr/RawPtr.
-///
-/*--cef(source=client)--*/
-class CefTranslatorTestScopedClient : public virtual CefBaseScoped {
- public:
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetValue() = 0;
-};
-
-///
-// Client-side child test object for OwnPtr/RawPtr.
-///
-/*--cef(source=client)--*/
-class CefTranslatorTestScopedClientChild
-    : public CefTranslatorTestScopedClient {
- public:
-  ///
-  // Return a value.
-  ///
-  /*--cef()--*/
-  virtual int GetOtherValue() = 0;
-};
-
-#endif  // CEF_INCLUDE_TEST_CEF_TEST_H_
diff --git a/src/include/views/cef_box_layout.h b/src/include/views/cef_box_layout.h
index 74989190e..14bb8d2f7 100644
--- a/src/include/views/cef_box_layout.h
+++ b/src/include/views/cef_box_layout.h
@@ -43,29 +43,29 @@
 class CefView;
 
 ///
-// A Layout manager that arranges child views vertically or horizontally in a
-// side-by-side fashion with spacing around and between the child views. The
-// child views are always sized according to their preferred size. If the
-// host's bounds provide insufficient space, child views will be clamped.
-// Excess space will not be distributed. Methods must be called on the browser
-// process UI thread unless otherwise indicated.
+/// A Layout manager that arranges child views vertically or horizontally in a
+/// side-by-side fashion with spacing around and between the child views. The
+/// child views are always sized according to their preferred size. If the
+/// host's bounds provide insufficient space, child views will be clamped.
+/// Excess space will not be distributed. Methods must be called on the browser
+/// process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefBoxLayout : public CefLayout {
  public:
   ///
-  // Set the flex weight for the given |view|. Using the preferred size as
-  // the basis, free space along the main axis is distributed to views in the
-  // ratio of their flex weights. Similarly, if the views will overflow the
-  // parent, space is subtracted in these ratios. A flex of 0 means this view is
-  // not resized. Flex values must not be negative.
+  /// Set the flex weight for the given |view|. Using the preferred size as
+  /// the basis, free space along the main axis is distributed to views in the
+  /// ratio of their flex weights. Similarly, if the views will overflow the
+  /// parent, space is subtracted in these ratios. A flex of 0 means this view
+  /// is not resized. Flex values must not be negative.
   ///
   /*--cef()--*/
   virtual void SetFlexForView(CefRefPtr<CefView> view, int flex) = 0;
 
   ///
-  // Clears the flex for the given |view|, causing it to use the default flex
-  // specified via CefBoxLayoutSettings.default_flex.
+  /// Clears the flex for the given |view|, causing it to use the default flex
+  /// specified via CefBoxLayoutSettings.default_flex.
   ///
   /*--cef()--*/
   virtual void ClearFlexForView(CefRefPtr<CefView> view) = 0;
diff --git a/src/include/views/cef_browser_view.h b/src/include/views/cef_browser_view.h
index 5d6cb5681..dc7efc24a 100644
--- a/src/include/views/cef_browser_view.h
+++ b/src/include/views/cef_browser_view.h
@@ -43,46 +43,67 @@
 #include "include/views/cef_view.h"
 
 ///
-// A View hosting a CefBrowser instance. Methods must be called on the browser
-// process UI thread unless otherwise indicated.
+/// A View hosting a CefBrowser instance. Methods must be called on the browser
+/// process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefBrowserView : public CefView {
  public:
   ///
-  // Create a new BrowserView. The underlying CefBrowser will not be created
-  // until this view is added to the views hierarchy.
+  /// Create a new BrowserView. The underlying CefBrowser will not be created
+  /// until this view is added to the views hierarchy. The optional |extra_info|
+  /// parameter provides an opportunity to specify extra information specific
+  /// to the created browser that will be passed to
+  /// CefRenderProcessHandler::OnBrowserCreated() in the render process.
   ///
   /*--cef(optional_param=client,optional_param=url,
-          optional_param=request_context,optional_param=delegate)--*/
+          optional_param=request_context,optional_param=delegate,
+          optional_param=extra_info)--*/
   static CefRefPtr<CefBrowserView> CreateBrowserView(
       CefRefPtr<CefClient> client,
       const CefString& url,
       const CefBrowserSettings& settings,
+      CefRefPtr<CefDictionaryValue> extra_info,
       CefRefPtr<CefRequestContext> request_context,
       CefRefPtr<CefBrowserViewDelegate> delegate);
 
   ///
-  // Returns the BrowserView associated with |browser|.
+  /// Returns the BrowserView associated with |browser|.
   ///
   /*--cef()--*/
   static CefRefPtr<CefBrowserView> GetForBrowser(CefRefPtr<CefBrowser> browser);
 
   ///
-  // Returns the CefBrowser hosted by this BrowserView. Will return NULL if the
-  // browser has not yet been created or has already been destroyed.
+  /// Returns the CefBrowser hosted by this BrowserView. Will return NULL if the
+  /// browser has not yet been created or has already been destroyed.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowser> GetBrowser() = 0;
 
   ///
-  // Sets whether accelerators registered with CefWindow::SetAccelerator are
-  // triggered before or after the event is sent to the CefBrowser. If
-  // |prefer_accelerators| is true then the matching accelerator will be
-  // triggered immediately and the event will not be sent to the CefBrowser. If
-  // |prefer_accelerators| is false then the matching accelerator will only be
-  // triggered if the event is not handled by web content or by
-  // CefKeyboardHandler. The default value is false.
+  /// Returns the Chrome toolbar associated with this BrowserView. Only
+  /// supported when using the Chrome runtime. The CefBrowserViewDelegate::
+  /// GetChromeToolbarType() method must return a value other than
+  /// CEF_CTT_NONE and the toolbar will not be available until after this
+  /// BrowserView is added to a CefWindow and CefViewDelegate::OnWindowChanged()
+  /// has been called.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefView> GetChromeToolbar() = 0;
+
+  ///
+  /// Sets whether normal priority accelerators are first forwarded to the web
+  /// content (`keydown` event handler) or CefKeyboardHandler. Normal priority
+  /// accelerators can be registered via CefWindow::SetAccelerator (with
+  /// |high_priority|=false) or internally for standard accelerators supported
+  /// by the Chrome runtime. If |prefer_accelerators| is true then the matching
+  /// accelerator will be triggered immediately (calling
+  /// CefWindowDelegate::OnAccelerator or CefCommandHandler::OnChromeCommand
+  /// respectively) and the event will not be forwarded to the web content or
+  /// CefKeyboardHandler first. If |prefer_accelerators| is false then the
+  /// matching accelerator will only be triggered if the event is not handled by
+  /// web content (`keydown` event handler that calls `event.preventDefault()`)
+  /// or by CefKeyboardHandler. The default value is false.
   ///
   /*--cef()--*/
   virtual void SetPreferAccelerators(bool prefer_accelerators) = 0;
diff --git a/src/include/views/cef_browser_view_delegate.h b/src/include/views/cef_browser_view_delegate.h
index 93eea91a0..e87a1f005 100644
--- a/src/include/views/cef_browser_view_delegate.h
+++ b/src/include/views/cef_browser_view_delegate.h
@@ -45,41 +45,43 @@ class CefBrowser;
 class CefBrowserView;
 
 ///
-// Implement this interface to handle BrowserView events. The methods of this
-// class will be called on the browser process UI thread unless otherwise
-// indicated.
+/// Implement this interface to handle BrowserView events. The methods of this
+/// class will be called on the browser process UI thread unless otherwise
+/// indicated.
 ///
 /*--cef(source=client)--*/
 class CefBrowserViewDelegate : public CefViewDelegate {
  public:
+  typedef cef_chrome_toolbar_type_t ChromeToolbarType;
+
   ///
-  // Called when |browser| associated with |browser_view| is created. This
-  // method will be called after CefLifeSpanHandler::OnAfterCreated() is called
-  // for |browser| and before OnPopupBrowserViewCreated() is called for
-  // |browser|'s parent delegate if |browser| is a popup.
+  /// Called when |browser| associated with |browser_view| is created. This
+  /// method will be called after CefLifeSpanHandler::OnAfterCreated() is called
+  /// for |browser| and before OnPopupBrowserViewCreated() is called for
+  /// |browser|'s parent delegate if |browser| is a popup.
   ///
   /*--cef()--*/
   virtual void OnBrowserCreated(CefRefPtr<CefBrowserView> browser_view,
                                 CefRefPtr<CefBrowser> browser) {}
 
   ///
-  // Called when |browser| associated with |browser_view| is destroyed. Release
-  // all references to |browser| and do not attempt to execute any methods on
-  // |browser| after this callback returns. This method will be called before
-  // CefLifeSpanHandler::OnBeforeClose() is called for |browser|.
+  /// Called when |browser| associated with |browser_view| is destroyed. Release
+  /// all references to |browser| and do not attempt to execute any methods on
+  /// |browser| after this callback returns. This method will be called before
+  /// CefLifeSpanHandler::OnBeforeClose() is called for |browser|.
   ///
   /*--cef()--*/
   virtual void OnBrowserDestroyed(CefRefPtr<CefBrowserView> browser_view,
                                   CefRefPtr<CefBrowser> browser) {}
 
   ///
-  // Called before a new popup BrowserView is created. The popup originated
-  // from |browser_view|. |settings| and |client| are the values returned from
-  // CefLifeSpanHandler::OnBeforePopup(). |is_devtools| will be true if the
-  // popup will be a DevTools browser. Return the delegate that will be used for
-  // the new popup BrowserView.
+  /// Called before a new popup BrowserView is created. The popup originated
+  /// from |browser_view|. |settings| and |client| are the values returned from
+  /// CefLifeSpanHandler::OnBeforePopup(). |is_devtools| will be true if the
+  /// popup will be a DevTools browser. Return the delegate that will be used
+  /// for the new popup BrowserView.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=client)--*/
   virtual CefRefPtr<CefBrowserViewDelegate> GetDelegateForPopupBrowserView(
       CefRefPtr<CefBrowserView> browser_view,
       const CefBrowserSettings& settings,
@@ -89,13 +91,13 @@ class CefBrowserViewDelegate : public CefViewDelegate {
   }
 
   ///
-  // Called after |popup_browser_view| is created. This method will be called
-  // after CefLifeSpanHandler::OnAfterCreated() and OnBrowserCreated() are
-  // called for the new popup browser. The popup originated from |browser_view|.
-  // |is_devtools| will be true if the popup is a DevTools browser. Optionally
-  // add |popup_browser_view| to the views hierarchy yourself and return true.
-  // Otherwise return false and a default CefWindow will be created for the
-  // popup.
+  /// Called after |popup_browser_view| is created. This method will be called
+  /// after CefLifeSpanHandler::OnAfterCreated() and OnBrowserCreated() are
+  /// called for the new popup browser. The popup originated from
+  /// |browser_view|. |is_devtools| will be true if the popup is a DevTools
+  /// browser. Optionally add |popup_browser_view| to the views hierarchy
+  /// yourself and return true. Otherwise return false and a default CefWindow
+  /// will be created for the popup.
   ///
   /*--cef()--*/
   virtual bool OnPopupBrowserViewCreated(
@@ -104,6 +106,40 @@ class CefBrowserViewDelegate : public CefViewDelegate {
       bool is_devtools) {
     return false;
   }
+
+  ///
+  /// Returns the Chrome toolbar type that will be available via
+  /// CefBrowserView::GetChromeToolbar(). See that method for related
+  /// documentation.
+  ///
+  /*--cef(default_retval=CEF_CTT_NONE)--*/
+  virtual ChromeToolbarType GetChromeToolbarType(
+      CefRefPtr<CefBrowserView> browser_view) {
+    return CEF_CTT_NONE;
+  }
+
+  ///
+  /// Return true to create frameless windows for Document picture-in-picture
+  /// popups. Content in frameless windows should specify draggable regions
+  /// using "-webkit-app-region: drag" CSS.
+  ///
+  /*--cef()--*/
+  virtual bool UseFramelessWindowForPictureInPicture(
+      CefRefPtr<CefBrowserView> browser_view) {
+    return false;
+  }
+
+  ///
+  /// Called when |browser_view| receives a gesture command. Return true to
+  /// handle (or disable) a |gesture_command| or false to propagate the gesture
+  /// to the browser for default handling. With the Chrome runtime these
+  /// commands can also be handled via CefCommandHandler::OnChromeCommand.
+  ///
+  /*--cef()--*/
+  virtual bool OnGestureCommand(CefRefPtr<CefBrowserView> browser_view,
+                                cef_gesture_command_t gesture_command) {
+    return false;
+  }
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BROWSER_VIEW_DELEGATE_H_
diff --git a/src/include/views/cef_button.h b/src/include/views/cef_button.h
index 039446ba0..944a7bb2a 100644
--- a/src/include/views/cef_button.h
+++ b/src/include/views/cef_button.h
@@ -43,46 +43,47 @@
 class CefLabelButton;
 
 ///
-// A View representing a button. Depending on the specific type, the button
-// could be implemented by a native control or custom rendered. Methods must be
-// called on the browser process UI thread unless otherwise indicated.
+/// A View representing a button. Depending on the specific type, the button
+/// could be implemented by a native control or custom rendered. Methods must be
+/// called on the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefButton : public CefView {
  public:
   ///
-  // Returns this Button as a LabelButton or NULL if this is not a LabelButton.
+  /// Returns this Button as a LabelButton or NULL if this is not a LabelButton.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefLabelButton> AsLabelButton() = 0;
 
   ///
-  // Sets the current display state of the Button.
+  /// Sets the current display state of the Button.
   ///
   /*--cef()--*/
   virtual void SetState(cef_button_state_t state) = 0;
 
   ///
-  // Returns the current display state of the Button.
+  /// Returns the current display state of the Button.
   ///
   /*--cef(default_retval=CEF_BUTTON_STATE_NORMAL)--*/
   virtual cef_button_state_t GetState() = 0;
 
   ///
-  // Sets the Button will use an ink drop effect for displaying state changes.
+  /// Sets the Button will use an ink drop effect for displaying state changes.
   ///
   /*--cef()--*/
   virtual void SetInkDropEnabled(bool enabled) = 0;
 
   ///
-  // Sets the tooltip text that will be displayed when the user hovers the mouse
-  // cursor over the Button.
+  /// Sets the tooltip text that will be displayed when the user hovers the
+  /// mouse cursor over the Button.
   ///
   /*--cef()--*/
   virtual void SetTooltipText(const CefString& tooltip_text) = 0;
 
   ///
-  // Sets the accessible name that will be exposed to assistive technology (AT).
+  /// Sets the accessible name that will be exposed to assistive technology
+  /// (AT).
   ///
   /*--cef()--*/
   virtual void SetAccessibleName(const CefString& name) = 0;
diff --git a/src/include/views/cef_button_delegate.h b/src/include/views/cef_button_delegate.h
index 77e77393f..3d6ee2274 100644
--- a/src/include/views/cef_button_delegate.h
+++ b/src/include/views/cef_button_delegate.h
@@ -43,23 +43,23 @@
 class CefButton;
 
 ///
-// Implement this interface to handle Button events. The methods of this class
-// will be called on the browser process UI thread unless otherwise indicated.
+/// Implement this interface to handle Button events. The methods of this class
+/// will be called on the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
 class CefButtonDelegate : public CefViewDelegate {
  public:
   ///
-  // Called when |button| is pressed.
+  /// Called when |button| is pressed.
   ///
   /*--cef()--*/
   virtual void OnButtonPressed(CefRefPtr<CefButton> button) = 0;
 
   ///
-  // Called when the state of |button| changes.
+  /// Called when the state of |button| changes.
   ///
   /*--cef()--*/
-  virtual void OnButtonStateChanged(CefRefPtr<CefButton> button){};
+  virtual void OnButtonStateChanged(CefRefPtr<CefButton> button) {}
 };
 
 #endif  // CEF_INCLUDE_VIEWS_CEF_BUTTON_DELEGATE_H_
diff --git a/src/include/views/cef_display.h b/src/include/views/cef_display.h
index de3e7ab82..4010cae96 100644
--- a/src/include/views/cef_display.h
+++ b/src/include/views/cef_display.h
@@ -43,35 +43,34 @@
 #include "include/cef_base.h"
 
 ///
-// This class typically, but not always, corresponds to a physical display
-// connected to the system. A fake Display may exist on a headless system, or a
-// Display may correspond to a remote, virtual display. All size and position
-// values are in density independent pixels (DIP) unless otherwise indicated.
-// Methods must be called on the browser process UI thread unless otherwise
-// indicated.
+/// This class typically, but not always, corresponds to a physical display
+/// connected to the system. A fake Display may exist on a headless system, or a
+/// Display may correspond to a remote, virtual display. All size and position
+/// values are in density independent pixel (DIP) coordinates unless otherwise
+/// indicated. Methods must be called on the browser process UI thread unless
+/// otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefDisplay : public CefBaseRefCounted {
  public:
   ///
-  // Returns the primary Display.
+  /// Returns the primary Display.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDisplay> GetPrimaryDisplay();
 
   ///
-  // Returns the Display nearest |point|. Set |input_pixel_coords| to true if
-  // |point| is in pixel coordinates instead of density independent pixels
-  // (DIP).
+  /// Returns the Display nearest |point|. Set |input_pixel_coords| to true if
+  /// |point| is in pixel screen coordinates instead of DIP screen coordinates.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDisplay> GetDisplayNearestPoint(const CefPoint& point,
                                                       bool input_pixel_coords);
 
   ///
-  // Returns the Display that most closely intersects |bounds|.  Set
-  // |input_pixel_coords| to true if |bounds| is in pixel coordinates instead of
-  // density independent pixels (DIP).
+  /// Returns the Display that most closely intersects |bounds|.  Set
+  /// |input_pixel_coords| to true if |bounds| is in pixel screen coordinates
+  /// instead of DIP screen coordinates.
   ///
   /*--cef()--*/
   static CefRefPtr<CefDisplay> GetDisplayMatchingBounds(
@@ -79,63 +78,92 @@ class CefDisplay : public CefBaseRefCounted {
       bool input_pixel_coords);
 
   ///
-  // Returns the total number of Displays. Mirrored displays are excluded; this
-  // method is intended to return the number of distinct, usable displays.
+  /// Returns the total number of Displays. Mirrored displays are excluded; this
+  /// method is intended to return the number of distinct, usable displays.
   ///
   /*--cef()--*/
   static size_t GetDisplayCount();
 
   ///
-  // Returns all Displays. Mirrored displays are excluded; this method is
-  // intended to return distinct, usable displays.
+  /// Returns all Displays. Mirrored displays are excluded; this method is
+  /// intended to return distinct, usable displays.
   ///
   /*--cef(count_func=displays:GetDisplayCount)--*/
   static void GetAllDisplays(std::vector<CefRefPtr<CefDisplay>>& displays);
 
   ///
-  // Returns the unique identifier for this Display.
+  /// Convert |point| from DIP screen coordinates to pixel screen coordinates.
+  /// This method is only used on Windows.
   ///
   /*--cef()--*/
-  virtual int64 GetID() = 0;
+  static CefPoint ConvertScreenPointToPixels(const CefPoint& point);
 
   ///
-  // Returns this Display's device pixel scale factor. This specifies how much
-  // the UI should be scaled when the actual output has more pixels than
-  // standard displays (which is around 100~120dpi). The potential return values
-  // differ by platform.
+  /// Convert |point| from pixel screen coordinates to DIP screen coordinates.
+  /// This method is only used on Windows.
+  ///
+  /*--cef()--*/
+  static CefPoint ConvertScreenPointFromPixels(const CefPoint& point);
+
+  ///
+  /// Convert |rect| from DIP screen coordinates to pixel screen coordinates.
+  /// This method is only used on Windows.
+  ///
+  /*--cef()--*/
+  static CefRect ConvertScreenRectToPixels(const CefRect& rect);
+
+  ///
+  /// Convert |rect| from pixel screen coordinates to DIP screen coordinates.
+  /// This method is only used on Windows.
+  ///
+  /*--cef()--*/
+  static CefRect ConvertScreenRectFromPixels(const CefRect& rect);
+
+  ///
+  /// Returns the unique identifier for this Display.
+  ///
+  /*--cef()--*/
+  virtual int64_t GetID() = 0;
+
+  ///
+  /// Returns this Display's device pixel scale factor. This specifies how much
+  /// the UI should be scaled when the actual output has more pixels than
+  /// standard displays (which is around 100~120dpi). The potential return
+  /// values differ by platform.
   ///
   /*--cef()--*/
   virtual float GetDeviceScaleFactor() = 0;
 
   ///
-  // Convert |point| from density independent pixels (DIP) to pixel coordinates
-  // using this Display's device scale factor.
+  /// Convert |point| from DIP coordinates to pixel coordinates using this
+  /// Display's device scale factor.
   ///
   /*--cef()--*/
   virtual void ConvertPointToPixels(CefPoint& point) = 0;
 
   ///
-  // Convert |point| from pixel coordinates to density independent pixels (DIP)
-  // using this Display's device scale factor.
+  /// Convert |point| from pixel coordinates to DIP coordinates using this
+  /// Display's device scale factor.
   ///
   /*--cef()--*/
   virtual void ConvertPointFromPixels(CefPoint& point) = 0;
 
   ///
-  // Returns this Display's bounds. This is the full size of the display.
+  /// Returns this Display's bounds in DIP screen coordinates. This is the full
+  /// size of the display.
   ///
   /*--cef()--*/
   virtual CefRect GetBounds() = 0;
 
   ///
-  // Returns this Display's work area. This excludes areas of the display that
-  // are occupied for window manager toolbars, etc.
+  /// Returns this Display's work area in DIP screen coordinates. This excludes
+  /// areas of the display that are occupied with window manager toolbars, etc.
   ///
   /*--cef()--*/
   virtual CefRect GetWorkArea() = 0;
 
   ///
-  // Returns this Display's rotation in degrees.
+  /// Returns this Display's rotation in degrees.
   ///
   /*--cef()--*/
   virtual int GetRotation() = 0;
diff --git a/src/include/views/cef_fill_layout.h b/src/include/views/cef_fill_layout.h
index a412f6310..eedbc94eb 100644
--- a/src/include/views/cef_fill_layout.h
+++ b/src/include/views/cef_fill_layout.h
@@ -41,9 +41,9 @@
 #include "include/views/cef_layout.h"
 
 ///
-// A simple Layout that causes the associated Panel's one child to be sized to
-// match the bounds of its parent. Methods must be called on the browser process
-// UI thread unless otherwise indicated.
+/// A simple Layout that causes the associated Panel's one child to be sized to
+/// match the bounds of its parent. Methods must be called on the browser
+/// process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefFillLayout : public CefLayout {};
diff --git a/src/include/views/cef_label_button.h b/src/include/views/cef_label_button.h
index da840025d..7d3e46a75 100644
--- a/src/include/views/cef_label_button.h
+++ b/src/include/views/cef_label_button.h
@@ -45,106 +45,101 @@
 class CefMenuButton;
 
 ///
-// LabelButton is a button with optional text and/or icon. Methods must be
-// called on the browser process UI thread unless otherwise indicated.
+/// LabelButton is a button with optional text and/or icon. Methods must be
+/// called on the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefLabelButton : public CefButton {
  public:
   ///
-  // Create a new LabelButton. A |delegate| must be provided to handle the
-  // button click. |text| will be shown on the LabelButton and used as the
-  // default accessible name. If |with_frame| is true the button will have a
-  // visible frame at all times, center alignment, additional padding and a
-  // default minimum size of 70x33 DIP. If |with_frame| is false the button will
-  // only have a visible frame on hover/press, left alignment, less padding and
-  // no default minimum size.
+  /// Create a new LabelButton. A |delegate| must be provided to handle the
+  /// button click. |text| will be shown on the LabelButton and used as the
+  /// default accessible name.
   ///
   /*--cef(optional_param=text)--*/
   static CefRefPtr<CefLabelButton> CreateLabelButton(
       CefRefPtr<CefButtonDelegate> delegate,
-      const CefString& text,
-      bool with_frame);
+      const CefString& text);
 
   ///
-  // Returns this LabelButton as a MenuButton or NULL if this is not a
-  // MenuButton.
+  /// Returns this LabelButton as a MenuButton or NULL if this is not a
+  /// MenuButton.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefMenuButton> AsMenuButton() = 0;
 
   ///
-  // Sets the text shown on the LabelButton. By default |text| will also be used
-  // as the accessible name.
+  /// Sets the text shown on the LabelButton. By default |text| will also be
+  /// used as the accessible name.
   ///
   /*--cef()--*/
   virtual void SetText(const CefString& text) = 0;
 
   ///
-  // Returns the text shown on the LabelButton.
+  /// Returns the text shown on the LabelButton.
   ///
   /*--cef()--*/
   virtual CefString GetText() = 0;
 
   ///
-  // Sets the image shown for |button_state|. When this Button is drawn if no
-  // image exists for the current state then the image for
-  // CEF_BUTTON_STATE_NORMAL, if any, will be shown.
+  /// Sets the image shown for |button_state|. When this Button is drawn if no
+  /// image exists for the current state then the image for
+  /// CEF_BUTTON_STATE_NORMAL, if any, will be shown.
   ///
   /*--cef(optional_param=image)--*/
   virtual void SetImage(cef_button_state_t button_state,
                         CefRefPtr<CefImage> image) = 0;
 
   ///
-  // Returns the image shown for |button_state|. If no image exists for that
-  // state then the image for CEF_BUTTON_STATE_NORMAL will be returned.
+  /// Returns the image shown for |button_state|. If no image exists for that
+  /// state then the image for CEF_BUTTON_STATE_NORMAL will be returned.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefImage> GetImage(cef_button_state_t button_state) = 0;
 
   ///
-  // Sets the text color shown for the specified button |for_state| to |color|.
+  /// Sets the text color shown for the specified button |for_state| to |color|.
   ///
   /*--cef()--*/
   virtual void SetTextColor(cef_button_state_t for_state,
                             cef_color_t color) = 0;
 
   ///
-  // Sets the text colors shown for the non-disabled states to |color|.
+  /// Sets the text colors shown for the non-disabled states to |color|.
   ///
   /*--cef()--*/
   virtual void SetEnabledTextColors(cef_color_t color) = 0;
 
   ///
-  // Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
-  // where:
-  // - FONT_FAMILY_LIST is a comma-separated list of font family names,
-  // - STYLES is an optional space-separated list of style names (case-sensitive
-  //   "Bold" and "Italic" are supported), and
-  // - SIZE is an integer font size in pixels with the suffix "px".
-  //
-  // Here are examples of valid font description strings:
-  // - "Arial, Helvetica, Bold Italic 14px"
-  // - "Arial, 14px"
+  /// Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
+  /// where:
+  /// - FONT_FAMILY_LIST is a comma-separated list of font family names,
+  /// - STYLES is an optional space-separated list of style names
+  ///   (case-sensitive "Bold" and "Italic" are supported), and
+  /// - SIZE is an integer font size in pixels with the suffix "px".
+  ///
+  /// Here are examples of valid font description strings:
+  /// - "Arial, Helvetica, Bold Italic 14px"
+  /// - "Arial, 14px"
   ///
   /*--cef()--*/
   virtual void SetFontList(const CefString& font_list) = 0;
 
   ///
-  // Sets the horizontal alignment; reversed in RTL. Default is
-  // CEF_HORIZONTAL_ALIGNMENT_CENTER.
+  /// Sets the horizontal alignment; reversed in RTL. Default is
+  /// CEF_HORIZONTAL_ALIGNMENT_CENTER.
   ///
   /*--cef()--*/
   virtual void SetHorizontalAlignment(cef_horizontal_alignment_t alignment) = 0;
 
   ///
-  // Reset the minimum size of this LabelButton to |size|.
+  /// Reset the minimum size of this LabelButton to |size|.
   ///
   /*--cef()--*/
   virtual void SetMinimumSize(const CefSize& size) = 0;
 
   ///
-  // Reset the maximum size of this LabelButton to |size|.
+  /// Reset the maximum size of this LabelButton to |size|.
   ///
   /*--cef()--*/
   virtual void SetMaximumSize(const CefSize& size) = 0;
diff --git a/src/include/views/cef_layout.h b/src/include/views/cef_layout.h
index 454ff01b1..61687dab5 100644
--- a/src/include/views/cef_layout.h
+++ b/src/include/views/cef_layout.h
@@ -44,27 +44,27 @@ class CefBoxLayout;
 class CefFillLayout;
 
 ///
-// A Layout handles the sizing of the children of a Panel according to
-// implementation-specific heuristics. Methods must be called on the browser
-// process UI thread unless otherwise indicated.
+/// A Layout handles the sizing of the children of a Panel according to
+/// implementation-specific heuristics. Methods must be called on the browser
+/// process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefLayout : public CefBaseRefCounted {
  public:
   ///
-  // Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout.
+  /// Returns this Layout as a BoxLayout or NULL if this is not a BoxLayout.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBoxLayout> AsBoxLayout() = 0;
 
   ///
-  // Returns this Layout as a FillLayout or NULL if this is not a FillLayout.
+  /// Returns this Layout as a FillLayout or NULL if this is not a FillLayout.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefFillLayout> AsFillLayout() = 0;
 
   ///
-  // Returns true if this Layout is valid.
+  /// Returns true if this Layout is valid.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
diff --git a/src/include/views/cef_menu_button.h b/src/include/views/cef_menu_button.h
index 965c49b4d..11f1bf456 100644
--- a/src/include/views/cef_menu_button.h
+++ b/src/include/views/cef_menu_button.h
@@ -43,36 +43,34 @@
 #include "include/views/cef_menu_button_delegate.h"
 
 ///
-// MenuButton is a button with optional text, icon and/or menu marker that shows
-// a menu when clicked with the left mouse button. All size and position values
-// are in density independent pixels (DIP) unless otherwise indicated. Methods
-// must be called on the browser process UI thread unless otherwise indicated.
+/// MenuButton is a button with optional text, icon and/or menu marker that
+/// shows a menu when clicked with the left mouse button. All size and position
+/// values are in density independent pixels (DIP) unless otherwise indicated.
+/// Methods must be called on the browser process UI thread unless otherwise
+/// indicated.
 ///
 /*--cef(source=library)--*/
 class CefMenuButton : public CefLabelButton {
  public:
   ///
-  // Create a new MenuButton. A |delegate| must be provided to call ShowMenu()
-  // when the button is clicked. |text| will be shown on the MenuButton and used
-  // as the default accessible name. If |with_frame| is true the button will
-  // have a visible frame at all times, center alignment, additional padding and
-  // a default minimum size of 70x33 DIP. If |with_frame| is false the button
-  // will only have a visible frame on hover/press, left alignment, less padding
-  // and no default minimum size. If |with_menu_marker| is true a menu marker
-  // will be added to the button.
+  /// Create a new MenuButton. A |delegate| must be provided to call ShowMenu()
+  /// when the button is clicked. |text| will be shown on the MenuButton and
+  /// used as the default accessible name. If |with_frame| is true the button
+  /// will have a visible frame at all times, center alignment, additional
+  /// padding and a default minimum size of 70x33 DIP. If |with_frame| is false
+  /// the button will only have a visible frame on hover/press, left alignment,
+  /// less padding and no default minimum size.
   ///
   /*--cef(optional_param=text)--*/
   static CefRefPtr<CefMenuButton> CreateMenuButton(
       CefRefPtr<CefMenuButtonDelegate> delegate,
-      const CefString& text,
-      bool with_frame,
-      bool with_menu_marker);
+      const CefString& text);
 
   ///
-  // Show a menu with contents |menu_model|. |screen_point| specifies the menu
-  // position in screen coordinates. |anchor_position| specifies how the menu
-  // will be anchored relative to |screen_point|. This method should be called
-  // from CefMenuButtonDelegate::OnMenuButtonPressed().
+  /// Show a menu with contents |menu_model|. |screen_point| specifies the menu
+  /// position in screen coordinates. |anchor_position| specifies how the menu
+  /// will be anchored relative to |screen_point|. This method should be called
+  /// from CefMenuButtonDelegate::OnMenuButtonPressed().
   ///
   /*--cef()--*/
   virtual void ShowMenu(CefRefPtr<CefMenuModel> menu_model,
@@ -80,8 +78,8 @@ class CefMenuButton : public CefLabelButton {
                         cef_menu_anchor_position_t anchor_position) = 0;
 
   ///
-  // Show the menu for this button. Results in a call to
-  // CefMenuButtonDelegate::OnMenuButtonPressed().
+  /// Show the menu for this button. Results in a call to
+  /// CefMenuButtonDelegate::OnMenuButtonPressed().
   ///
   /*--cef()--*/
   virtual void TriggerMenu() = 0;
diff --git a/src/include/views/cef_menu_button_delegate.h b/src/include/views/cef_menu_button_delegate.h
index 787b179ce..333e80e19 100644
--- a/src/include/views/cef_menu_button_delegate.h
+++ b/src/include/views/cef_menu_button_delegate.h
@@ -43,24 +43,24 @@
 class CefMenuButton;
 
 ///
-// MenuButton pressed lock is released when this object is destroyed.
+/// MenuButton pressed lock is released when this object is destroyed.
 ///
 /*--cef(source=library)--*/
 class CefMenuButtonPressedLock : public CefBaseRefCounted {};
 
 ///
-// Implement this interface to handle MenuButton events. The methods of this
-// class will be called on the browser process UI thread unless otherwise
-// indicated.
+/// Implement this interface to handle MenuButton events. The methods of this
+/// class will be called on the browser process UI thread unless otherwise
+/// indicated.
 ///
 /*--cef(source=client)--*/
 class CefMenuButtonDelegate : public CefButtonDelegate {
  public:
   ///
-  // Called when |button| is pressed. Call CefMenuButton::ShowMenu() to show a
-  // popup menu at |screen_point|. When showing a custom popup such as a window
-  // keep a reference to |button_pressed_lock| until the popup is hidden to
-  // maintain the pressed button state.
+  /// Called when |button| is pressed. Call CefMenuButton::ShowMenu() to show a
+  /// popup menu at |screen_point|. When showing a custom popup such as a window
+  /// keep a reference to |button_pressed_lock| until the popup is hidden to
+  /// maintain the pressed button state.
   ///
   /*--cef()--*/
   virtual void OnMenuButtonPressed(
diff --git a/src/include/views/cef_overlay_controller.h b/src/include/views/cef_overlay_controller.h
new file mode 100644
index 000000000..038c26d5a
--- /dev/null
+++ b/src/include/views/cef_overlay_controller.h
@@ -0,0 +1,210 @@
+// Copyright (c) 2021 Marshall A. Greenblatt. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ---------------------------------------------------------------------------
+//
+// The contents of this file must follow a specific format in order to
+// support the CEF translator tool. See the translator.README.txt file in the
+// tools directory for more information.
+//
+
+#ifndef CEF_INCLUDE_VIEWS_CEF_OVERLAY_CONTROLLER_H_
+#define CEF_INCLUDE_VIEWS_CEF_OVERLAY_CONTROLLER_H_
+#pragma once
+
+#include "include/cef_base.h"
+
+class CefView;
+class CefWindow;
+
+///
+/// Controller for an overlay that contains a contents View added via
+/// CefWindow::AddOverlayView. Methods exposed by this controller should be
+/// called in preference to methods of the same name exposed by the contents
+/// View unless otherwise indicated. Methods must be called on the browser
+/// process UI thread unless otherwise indicated.
+///
+/*--cef(source=library)--*/
+class CefOverlayController : public CefBaseRefCounted {
+ public:
+  ///
+  /// Returns true if this object is valid.
+  ///
+  /*--cef()--*/
+  virtual bool IsValid() = 0;
+
+  ///
+  /// Returns true if this object is the same as |that| object.
+  ///
+  /*--cef()--*/
+  virtual bool IsSame(CefRefPtr<CefOverlayController> that) = 0;
+
+  ///
+  /// Returns the contents View for this overlay.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefView> GetContentsView() = 0;
+
+  ///
+  /// Returns the top-level Window hosting this overlay. Use this method instead
+  /// of calling GetWindow() on the contents View.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefWindow> GetWindow() = 0;
+
+  ///
+  /// Returns the docking mode for this overlay.
+  ///
+  /*--cef(default_retval=CEF_DOCKING_MODE_TOP_LEFT)--*/
+  virtual cef_docking_mode_t GetDockingMode() = 0;
+
+  ///
+  /// Destroy this overlay.
+  ///
+  /*--cef()--*/
+  virtual void Destroy() = 0;
+
+  ///
+  /// Sets the bounds (size and position) of this overlay. This will set the
+  /// bounds of the contents View to match and trigger a re-layout if necessary.
+  /// |bounds| is in parent coordinates and any insets configured on this
+  /// overlay will be ignored. Use this method only for overlays created with a
+  /// docking mode value of CEF_DOCKING_MODE_CUSTOM. With other docking modes
+  /// modify the insets of this overlay and/or layout of the contents View and
+  /// call SizeToPreferredSize() instead to calculate the new size and
+  /// re-position the overlay if necessary.
+  ///
+  /*--cef()--*/
+  virtual void SetBounds(const CefRect& bounds) = 0;
+
+  ///
+  /// Returns the bounds (size and position) of this overlay in parent
+  /// coordinates.
+  ///
+  /*--cef()--*/
+  virtual CefRect GetBounds() = 0;
+
+  ///
+  /// Returns the bounds (size and position) of this overlay in DIP screen
+  /// coordinates.
+  ///
+  /*--cef()--*/
+  virtual CefRect GetBoundsInScreen() = 0;
+
+  ///
+  /// Sets the size of this overlay without changing the position. This will set
+  /// the size of the contents View to match and trigger a re-layout if
+  /// necessary. |size| is in parent coordinates and any insets configured on
+  /// this overlay will be ignored. Use this method only for overlays created
+  /// with a docking mode value of CEF_DOCKING_MODE_CUSTOM. With other docking
+  /// modes modify the insets of this overlay and/or layout of the contents View
+  /// and call SizeToPreferredSize() instead to calculate the new size and
+  /// re-position the overlay if necessary.
+  ///
+  /*--cef()--*/
+  virtual void SetSize(const CefSize& size) = 0;
+
+  ///
+  /// Returns the size of this overlay in parent coordinates.
+  ///
+  /*--cef()--*/
+  virtual CefSize GetSize() = 0;
+
+  ///
+  /// Sets the position of this overlay without changing the size. |position| is
+  /// in parent coordinates and any insets configured on this overlay will
+  /// be ignored. Use this method only for overlays created with a docking mode
+  /// value of CEF_DOCKING_MODE_CUSTOM. With other docking modes modify the
+  /// insets of this overlay and/or layout of the contents View and call
+  /// SizeToPreferredSize() instead to calculate the new size and re-position
+  /// the overlay if necessary.
+  ///
+  /*--cef()--*/
+  virtual void SetPosition(const CefPoint& position) = 0;
+
+  ///
+  /// Returns the position of this overlay in parent coordinates.
+  ///
+  /*--cef()--*/
+  virtual CefPoint GetPosition() = 0;
+
+  ///
+  /// Sets the insets for this overlay. |insets| is in parent coordinates. Use
+  /// this method only for overlays created with a docking mode value other than
+  /// CEF_DOCKING_MODE_CUSTOM.
+  ///
+  /*--cef()--*/
+  virtual void SetInsets(const CefInsets& insets) = 0;
+
+  ///
+  /// Returns the insets for this overlay in parent coordinates.
+  ///
+  /*--cef()--*/
+  virtual CefInsets GetInsets() = 0;
+
+  ///
+  /// Size this overlay to its preferred size and trigger a re-layout if
+  /// necessary. The position of overlays created with a docking mode value of
+  /// CEF_DOCKING_MODE_CUSTOM will not be modified by calling this method. With
+  /// other docking modes this method may re-position the overlay if necessary
+  /// to accommodate the new size and any insets configured on the contents
+  /// View.
+  ///
+  /*--cef()--*/
+  virtual void SizeToPreferredSize() = 0;
+
+  ///
+  /// Sets whether this overlay is visible. Overlays are hidden by default. If
+  /// this overlay is hidden then it and any child Views will not be drawn and,
+  /// if any of those Views currently have focus, then focus will also be
+  /// cleared. Painting is scheduled as needed.
+  ///
+  /*--cef()--*/
+  virtual void SetVisible(bool visible) = 0;
+
+  ///
+  /// Returns whether this overlay is visible. A View may be visible but still
+  /// not drawn in a Window if any parent Views are hidden. Call IsDrawn() to
+  /// determine whether this overlay and all parent Views are visible and will
+  /// be drawn.
+  ///
+  /*--cef()--*/
+  virtual bool IsVisible() = 0;
+
+  ///
+  /// Returns whether this overlay is visible and drawn in a Window. A View is
+  /// drawn if it and all parent Views are visible. To determine if the
+  /// containing Window is visible to the user on-screen call IsVisible() on the
+  /// Window.
+  ///
+  /*--cef()--*/
+  virtual bool IsDrawn() = 0;
+};
+
+#endif  // CEF_INCLUDE_VIEWS_CEF_OVERLAY_CONTROLLER_H_
diff --git a/src/include/views/cef_panel.h b/src/include/views/cef_panel.h
index 4a4fb9093..f74c22816 100644
--- a/src/include/views/cef_panel.h
+++ b/src/include/views/cef_panel.h
@@ -47,92 +47,92 @@ class CefLayout;
 class CefWindow;
 
 ///
-// A Panel is a container in the views hierarchy that can contain other Views
-// as children. Methods must be called on the browser process UI thread unless
-// otherwise indicated.
+/// A Panel is a container in the views hierarchy that can contain other Views
+/// as children. Methods must be called on the browser process UI thread unless
+/// otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefPanel : public CefView {
  public:
   ///
-  // Create a new Panel.
+  /// Create a new Panel.
   ///
   /*--cef(optional_param=delegate)--*/
   static CefRefPtr<CefPanel> CreatePanel(CefRefPtr<CefPanelDelegate> delegate);
 
   ///
-  // Returns this Panel as a Window or NULL if this is not a Window.
+  /// Returns this Panel as a Window or NULL if this is not a Window.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefWindow> AsWindow() = 0;
 
   ///
-  // Set this Panel's Layout to FillLayout and return the FillLayout object.
+  /// Set this Panel's Layout to FillLayout and return the FillLayout object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefFillLayout> SetToFillLayout() = 0;
 
   ///
-  // Set this Panel's Layout to BoxLayout and return the BoxLayout object.
+  /// Set this Panel's Layout to BoxLayout and return the BoxLayout object.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBoxLayout> SetToBoxLayout(
       const CefBoxLayoutSettings& settings) = 0;
 
   ///
-  // Get the Layout.
+  /// Get the Layout.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefLayout> GetLayout() = 0;
 
   ///
-  // Lay out the child Views (set their bounds based on sizing heuristics
-  // specific to the current Layout).
+  /// Lay out the child Views (set their bounds based on sizing heuristics
+  /// specific to the current Layout).
   ///
   /*--cef()--*/
   virtual void Layout() = 0;
 
   ///
-  // Add a child View.
+  /// Add a child View.
   ///
   /*--cef()--*/
   virtual void AddChildView(CefRefPtr<CefView> view) = 0;
 
   ///
-  // Add a child View at the specified |index|. If |index| matches the result of
-  // GetChildCount() then the View will be added at the end.
+  /// Add a child View at the specified |index|. If |index| matches the result
+  /// of GetChildCount() then the View will be added at the end.
   ///
   /*--cef(index_param=index)--*/
   virtual void AddChildViewAt(CefRefPtr<CefView> view, int index) = 0;
 
   ///
-  // Move the child View to the specified |index|. A negative value for |index|
-  // will move the View to the end.
+  /// Move the child View to the specified |index|. A negative value for |index|
+  /// will move the View to the end.
   ///
   /*--cef()--*/
   virtual void ReorderChildView(CefRefPtr<CefView> view, int index) = 0;
 
   ///
-  // Remove a child View. The View can then be added to another Panel.
+  /// Remove a child View. The View can then be added to another Panel.
   ///
   /*--cef()--*/
   virtual void RemoveChildView(CefRefPtr<CefView> view) = 0;
 
   ///
-  // Remove all child Views. The removed Views will be deleted if the client
-  // holds no references to them.
+  /// Remove all child Views. The removed Views will be deleted if the client
+  /// holds no references to them.
   ///
   /*--cef()--*/
   virtual void RemoveAllChildViews() = 0;
 
   ///
-  // Returns the number of child Views.
+  /// Returns the number of child Views.
   ///
   /*--cef()--*/
   virtual size_t GetChildViewCount() = 0;
 
   ///
-  // Returns the child View at the specified |index|.
+  /// Returns the child View at the specified |index|.
   ///
   /*--cef(index_param=index)--*/
   virtual CefRefPtr<CefView> GetChildViewAt(int index) = 0;
diff --git a/src/include/views/cef_panel_delegate.h b/src/include/views/cef_panel_delegate.h
index cd496119d..107683866 100644
--- a/src/include/views/cef_panel_delegate.h
+++ b/src/include/views/cef_panel_delegate.h
@@ -41,8 +41,8 @@
 #include "include/views/cef_view_delegate.h"
 
 ///
-// Implement this interface to handle Panel events. The methods of this class
-// will be called on the browser process UI thread unless otherwise indicated.
+/// Implement this interface to handle Panel events. The methods of this class
+/// will be called on the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
 class CefPanelDelegate : public CefViewDelegate {};
diff --git a/src/include/views/cef_scroll_view.h b/src/include/views/cef_scroll_view.h
index da472bd4a..fb624590a 100644
--- a/src/include/views/cef_scroll_view.h
+++ b/src/include/views/cef_scroll_view.h
@@ -41,59 +41,59 @@
 #include "include/views/cef_view.h"
 
 ///
-// A ScrollView will show horizontal and/or vertical scrollbars when necessary
-// based on the size of the attached content view. Methods must be called on the
-// browser process UI thread unless otherwise indicated.
+/// A ScrollView will show horizontal and/or vertical scrollbars when necessary
+/// based on the size of the attached content view. Methods must be called on
+/// the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefScrollView : public CefView {
  public:
   ///
-  // Create a new ScrollView.
+  /// Create a new ScrollView.
   ///
   /*--cef(optional_param=delegate)--*/
   static CefRefPtr<CefScrollView> CreateScrollView(
       CefRefPtr<CefViewDelegate> delegate);
 
   ///
-  // Set the content View. The content View must have a specified size (e.g.
-  // via CefView::SetBounds or CefViewDelegate::GetPreferredSize).
+  /// Set the content View. The content View must have a specified size (e.g.
+  /// via CefView::SetBounds or CefViewDelegate::GetPreferredSize).
   ///
   /*--cef()--*/
   virtual void SetContentView(CefRefPtr<CefView> view) = 0;
 
   ///
-  // Returns the content View.
+  /// Returns the content View.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefView> GetContentView() = 0;
 
   ///
-  // Returns the visible region of the content View.
+  /// Returns the visible region of the content View.
   ///
   /*--cef()--*/
   virtual CefRect GetVisibleContentRect() = 0;
 
   ///
-  // Returns true if the horizontal scrollbar is currently showing.
+  /// Returns true if the horizontal scrollbar is currently showing.
   ///
   /*--cef()--*/
   virtual bool HasHorizontalScrollbar() = 0;
 
   ///
-  // Returns the height of the horizontal scrollbar.
+  /// Returns the height of the horizontal scrollbar.
   ///
   /*--cef()--*/
   virtual int GetHorizontalScrollbarHeight() = 0;
 
   ///
-  // Returns true if the vertical scrollbar is currently showing.
+  /// Returns true if the vertical scrollbar is currently showing.
   ///
   /*--cef()--*/
   virtual bool HasVerticalScrollbar() = 0;
 
   ///
-  // Returns the width of the vertical scrollbar.
+  /// Returns the width of the vertical scrollbar.
   ///
   /*--cef()--*/
   virtual int GetVerticalScrollbarWidth() = 0;
diff --git a/src/include/views/cef_textfield.h b/src/include/views/cef_textfield.h
index 9b53f722a..b0a274ee1 100644
--- a/src/include/views/cef_textfield.h
+++ b/src/include/views/cef_textfield.h
@@ -42,177 +42,177 @@
 #include "include/views/cef_view.h"
 
 ///
-// A Textfield supports editing of text. This control is custom rendered with no
-// platform-specific code. Methods must be called on the browser process UI
-// thread unless otherwise indicated.
+/// A Textfield supports editing of text. This control is custom rendered with
+/// no platform-specific code. Methods must be called on the browser process UI
+/// thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefTextfield : public CefView {
  public:
   ///
-  // Create a new Textfield.
+  /// Create a new Textfield.
   ///
   /*--cef(optional_param=delegate)--*/
   static CefRefPtr<CefTextfield> CreateTextfield(
       CefRefPtr<CefTextfieldDelegate> delegate);
 
   ///
-  // Sets whether the text will be displayed as asterisks.
+  /// Sets whether the text will be displayed as asterisks.
   ///
   /*--cef()--*/
   virtual void SetPasswordInput(bool password_input) = 0;
 
   ///
-  // Returns true if the text will be displayed as asterisks.
+  /// Returns true if the text will be displayed as asterisks.
   ///
   /*--cef()--*/
   virtual bool IsPasswordInput() = 0;
 
   ///
-  // Sets whether the text will read-only.
+  /// Sets whether the text will read-only.
   ///
   /*--cef()--*/
   virtual void SetReadOnly(bool read_only) = 0;
 
   ///
-  // Returns true if the text is read-only.
+  /// Returns true if the text is read-only.
   ///
   /*--cef()--*/
   virtual bool IsReadOnly() = 0;
 
   ///
-  // Returns the currently displayed text.
+  /// Returns the currently displayed text.
   ///
   /*--cef()--*/
   virtual CefString GetText() = 0;
 
   ///
-  // Sets the contents to |text|. The cursor will be moved to end of the text if
-  // the current position is outside of the text range.
+  /// Sets the contents to |text|. The cursor will be moved to end of the text
+  /// if the current position is outside of the text range.
   ///
   /*--cef()--*/
   virtual void SetText(const CefString& text) = 0;
 
   ///
-  // Appends |text| to the previously-existing text.
+  /// Appends |text| to the previously-existing text.
   ///
   /*--cef()--*/
   virtual void AppendText(const CefString& text) = 0;
 
   ///
-  // Inserts |text| at the current cursor position replacing any selected text.
+  /// Inserts |text| at the current cursor position replacing any selected text.
   ///
   /*--cef()--*/
   virtual void InsertOrReplaceText(const CefString& text) = 0;
 
   ///
-  // Returns true if there is any selected text.
+  /// Returns true if there is any selected text.
   ///
   /*--cef()--*/
   virtual bool HasSelection() = 0;
 
   ///
-  // Returns the currently selected text.
+  /// Returns the currently selected text.
   ///
   /*--cef()--*/
   virtual CefString GetSelectedText() = 0;
 
   ///
-  // Selects all text. If |reversed| is true the range will end at the logical
-  // beginning of the text; this generally shows the leading portion of text
-  // that overflows its display area.
+  /// Selects all text. If |reversed| is true the range will end at the logical
+  /// beginning of the text; this generally shows the leading portion of text
+  /// that overflows its display area.
   ///
   /*--cef()--*/
   virtual void SelectAll(bool reversed) = 0;
 
   ///
-  // Clears the text selection and sets the caret to the end.
+  /// Clears the text selection and sets the caret to the end.
   ///
   /*--cef()--*/
   virtual void ClearSelection() = 0;
 
   ///
-  // Returns the selected logical text range.
+  /// Returns the selected logical text range.
   ///
   /*--cef()--*/
   virtual CefRange GetSelectedRange() = 0;
 
   ///
-  // Selects the specified logical text range.
+  /// Selects the specified logical text range.
   ///
   /*--cef()--*/
   virtual void SelectRange(const CefRange& range) = 0;
 
   ///
-  // Returns the current cursor position.
+  /// Returns the current cursor position.
   ///
   /*--cef()--*/
   virtual size_t GetCursorPosition() = 0;
 
   ///
-  // Sets the text color.
+  /// Sets the text color.
   ///
   /*--cef()--*/
   virtual void SetTextColor(cef_color_t color) = 0;
 
   ///
-  // Returns the text color.
+  /// Returns the text color.
   ///
   /*--cef()--*/
   virtual cef_color_t GetTextColor() = 0;
 
   ///
-  // Sets the selection text color.
+  /// Sets the selection text color.
   ///
   /*--cef()--*/
   virtual void SetSelectionTextColor(cef_color_t color) = 0;
 
   ///
-  // Returns the selection text color.
+  /// Returns the selection text color.
   ///
   /*--cef()--*/
   virtual cef_color_t GetSelectionTextColor() = 0;
 
   ///
-  // Sets the selection background color.
+  /// Sets the selection background color.
   ///
   /*--cef()--*/
   virtual void SetSelectionBackgroundColor(cef_color_t color) = 0;
 
   ///
-  // Returns the selection background color.
+  /// Returns the selection background color.
   ///
   /*--cef()--*/
   virtual cef_color_t GetSelectionBackgroundColor() = 0;
 
   ///
-  // Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
-  // where:
-  // - FONT_FAMILY_LIST is a comma-separated list of font family names,
-  // - STYLES is an optional space-separated list of style names (case-sensitive
-  //   "Bold" and "Italic" are supported), and
-  // - SIZE is an integer font size in pixels with the suffix "px".
-  //
-  // Here are examples of valid font description strings:
-  // - "Arial, Helvetica, Bold Italic 14px"
-  // - "Arial, 14px"
+  /// Sets the font list. The format is "<FONT_FAMILY_LIST>,[STYLES] <SIZE>",
+  /// where:
+  /// - FONT_FAMILY_LIST is a comma-separated list of font family names,
+  /// - STYLES is an optional space-separated list of style names
+  ///   (case-sensitive "Bold" and "Italic" are supported), and
+  /// - SIZE is an integer font size in pixels with the suffix "px".
+  ///
+  /// Here are examples of valid font description strings:
+  /// - "Arial, Helvetica, Bold Italic 14px"
+  /// - "Arial, 14px"
   ///
   /*--cef()--*/
   virtual void SetFontList(const CefString& font_list) = 0;
 
   ///
-  // Applies |color| to the specified |range| without changing the default
-  // color. If |range| is empty the color will be set on the complete text
-  // contents.
+  /// Applies |color| to the specified |range| without changing the default
+  /// color. If |range| is empty the color will be set on the complete text
+  /// contents.
   ///
   /*--cef()--*/
   virtual void ApplyTextColor(cef_color_t color, const CefRange& range) = 0;
 
   ///
-  // Applies |style| to the specified |range| without changing the default
-  // style. If |add| is true the style will be added, otherwise the style will
-  // be removed. If |range| is empty the style will be set on the complete text
-  // contents.
+  /// Applies |style| to the specified |range| without changing the default
+  /// style. If |add| is true the style will be added, otherwise the style will
+  /// be removed. If |range| is empty the style will be set on the complete text
+  /// contents.
   ///
   /*--cef()--*/
   virtual void ApplyTextStyle(cef_text_style_t style,
@@ -220,49 +220,46 @@ class CefTextfield : public CefView {
                               const CefRange& range) = 0;
 
   ///
-  // Returns true if the action associated with the specified command id is
-  // enabled. See additional comments on ExecuteCommand().
+  /// Returns true if the action associated with the specified command id is
+  /// enabled. See additional comments on ExecuteCommand().
   ///
   /*--cef()--*/
-  virtual bool IsCommandEnabled(int command_id) = 0;
+  virtual bool IsCommandEnabled(cef_text_field_commands_t command_id) = 0;
 
   ///
-  // Performs the action associated with the specified command id. Valid values
-  // include IDS_APP_UNDO, IDS_APP_REDO, IDS_APP_CUT, IDS_APP_COPY,
-  // IDS_APP_PASTE, IDS_APP_DELETE, IDS_APP_SELECT_ALL, IDS_DELETE_* and
-  // IDS_MOVE_*. See include/cef_pack_strings.h for definitions.
+  /// Performs the action associated with the specified command id.
   ///
   /*--cef()--*/
-  virtual void ExecuteCommand(int command_id) = 0;
+  virtual void ExecuteCommand(cef_text_field_commands_t command_id) = 0;
 
   ///
-  // Clears Edit history.
+  /// Clears Edit history.
   ///
   /*--cef()--*/
   virtual void ClearEditHistory() = 0;
 
   ///
-  // Sets the placeholder text that will be displayed when the Textfield is
-  // empty.
+  /// Sets the placeholder text that will be displayed when the Textfield is
+  /// empty.
   ///
   /*--cef()--*/
   virtual void SetPlaceholderText(const CefString& text) = 0;
 
   ///
-  // Returns the placeholder text that will be displayed when the Textfield is
-  // empty.
+  /// Returns the placeholder text that will be displayed when the Textfield is
+  /// empty.
   ///
   /*--cef()--*/
   virtual CefString GetPlaceholderText() = 0;
 
   ///
-  // Sets the placeholder text color.
+  /// Sets the placeholder text color.
   ///
   /*--cef()--*/
   virtual void SetPlaceholderTextColor(cef_color_t color) = 0;
 
   ///
-  // Set the accessible name that will be exposed to assistive technology (AT).
+  /// Set the accessible name that will be exposed to assistive technology (AT).
   ///
   /*--cef()--*/
   virtual void SetAccessibleName(const CefString& name) = 0;
diff --git a/src/include/views/cef_textfield_delegate.h b/src/include/views/cef_textfield_delegate.h
index c3fddafd3..e3e845305 100644
--- a/src/include/views/cef_textfield_delegate.h
+++ b/src/include/views/cef_textfield_delegate.h
@@ -43,17 +43,17 @@
 class CefTextfield;
 
 ///
-// Implement this interface to handle Textfield events. The methods of this
-// class will be called on the browser process UI thread unless otherwise
-// indicated.
+/// Implement this interface to handle Textfield events. The methods of this
+/// class will be called on the browser process UI thread unless otherwise
+/// indicated.
 ///
 /*--cef(source=client)--*/
 class CefTextfieldDelegate : public CefViewDelegate {
  public:
   ///
-  // Called when |textfield| recieves a keyboard event. |event| contains
-  // information about the keyboard event. Return true if the keyboard event was
-  // handled or false otherwise for default handling.
+  /// Called when |textfield| receives a keyboard event. |event| contains
+  /// information about the keyboard event. Return true if the keyboard event
+  /// was handled or false otherwise for default handling.
   ///
   /*--cef()--*/
   virtual bool OnKeyEvent(CefRefPtr<CefTextfield> textfield,
@@ -62,7 +62,7 @@ class CefTextfieldDelegate : public CefViewDelegate {
   }
 
   ///
-  // Called after performing a user action that may change |textfield|.
+  /// Called after performing a user action that may change |textfield|.
   ///
   /*--cef()--*/
   virtual void OnAfterUserAction(CefRefPtr<CefTextfield> textfield) {}
diff --git a/src/include/views/cef_view.h b/src/include/views/cef_view.h
index eed14f317..9bfd1f47b 100644
--- a/src/include/views/cef_view.h
+++ b/src/include/views/cef_view.h
@@ -48,350 +48,376 @@ class CefTextfield;
 class CefWindow;
 
 ///
-// A View is a rectangle within the views View hierarchy. It is the base class
-// for all Views. All size and position values are in density independent pixels
-// (DIP) unless otherwise indicated. Methods must be called on the browser
-// process UI thread unless otherwise indicated.
+/// A View is a rectangle within the views View hierarchy. It is the base class
+/// for all Views. All size and position values are in density independent
+/// pixels (DIP) unless otherwise indicated. Methods must be called on the
+/// browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefView : public CefBaseRefCounted {
  public:
   ///
-  // Returns this View as a BrowserView or NULL if this is not a BrowserView.
+  /// Returns this View as a BrowserView or NULL if this is not a BrowserView.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefBrowserView> AsBrowserView() = 0;
 
   ///
-  // Returns this View as a Button or NULL if this is not a Button.
+  /// Returns this View as a Button or NULL if this is not a Button.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefButton> AsButton() = 0;
 
   ///
-  // Returns this View as a Panel or NULL if this is not a Panel.
+  /// Returns this View as a Panel or NULL if this is not a Panel.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefPanel> AsPanel() = 0;
 
   ///
-  // Returns this View as a ScrollView or NULL if this is not a ScrollView.
+  /// Returns this View as a ScrollView or NULL if this is not a ScrollView.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefScrollView> AsScrollView() = 0;
 
   ///
-  // Returns this View as a Textfield or NULL if this is not a Textfield.
+  /// Returns this View as a Textfield or NULL if this is not a Textfield.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefTextfield> AsTextfield() = 0;
 
   ///
-  // Returns the type of this View as a string. Used primarily for testing
-  // purposes.
+  /// Returns the type of this View as a string. Used primarily for testing
+  /// purposes.
   ///
   /*--cef()--*/
   virtual CefString GetTypeString() = 0;
 
   ///
-  // Returns a string representation of this View which includes the type and
-  // various type-specific identifying attributes. If |include_children| is true
-  // any child Views will also be included. Used primarily for testing purposes.
+  /// Returns a string representation of this View which includes the type and
+  /// various type-specific identifying attributes. If |include_children| is
+  /// true any child Views will also be included. Used primarily for testing
+  /// purposes.
   ///
   /*--cef()--*/
   virtual CefString ToString(bool include_children) = 0;
 
   ///
-  // Returns true if this View is valid.
+  /// Returns true if this View is valid.
   ///
   /*--cef()--*/
   virtual bool IsValid() = 0;
 
   ///
-  // Returns true if this View is currently attached to another View. A View can
-  // only be attached to one View at a time.
+  /// Returns true if this View is currently attached to another View. A View
+  /// can only be attached to one View at a time.
   ///
   /*--cef()--*/
   virtual bool IsAttached() = 0;
 
   ///
-  // Returns true if this View is the same as |that| View.
+  /// Returns true if this View is the same as |that| View.
   ///
   /*--cef()--*/
   virtual bool IsSame(CefRefPtr<CefView> that) = 0;
 
   ///
-  // Returns the delegate associated with this View, if any.
+  /// Returns the delegate associated with this View, if any.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefViewDelegate> GetDelegate() = 0;
 
   ///
-  // Returns the top-level Window hosting this View, if any.
+  /// Returns the top-level Window hosting this View, if any.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefWindow> GetWindow() = 0;
 
   ///
-  // Returns the ID for this View.
+  /// Returns the ID for this View.
   ///
   /*--cef()--*/
   virtual int GetID() = 0;
 
   ///
-  // Sets the ID for this View. ID should be unique within the subtree that you
-  // intend to search for it. 0 is the default ID for views.
+  /// Sets the ID for this View. ID should be unique within the subtree that you
+  /// intend to search for it. 0 is the default ID for views.
   ///
   /*--cef()--*/
   virtual void SetID(int id) = 0;
 
   ///
-  // Returns the group id of this View, or -1 if not set.
+  /// Returns the group id of this View, or -1 if not set.
   ///
   /*--cef()--*/
   virtual int GetGroupID() = 0;
 
   ///
-  // A group id is used to tag Views which are part of the same logical group.
-  // Focus can be moved between views with the same group using the arrow keys.
-  // The group id is immutable once it's set.
+  /// A group id is used to tag Views which are part of the same logical group.
+  /// Focus can be moved between views with the same group using the arrow keys.
+  /// The group id is immutable once it's set.
   ///
   /*--cef()--*/
   virtual void SetGroupID(int group_id) = 0;
 
   ///
-  // Returns the View that contains this View, if any.
+  /// Returns the View that contains this View, if any.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefView> GetParentView() = 0;
 
   ///
-  // Recursively descends the view tree starting at this View, and returns the
-  // first child that it encounters with the given ID. Returns NULL if no
-  // matching child view is found.
+  /// Recursively descends the view tree starting at this View, and returns the
+  /// first child that it encounters with the given ID. Returns NULL if no
+  /// matching child view is found.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefView> GetViewForID(int id) = 0;
 
   ///
-  // Sets the bounds (size and position) of this View. Position is in parent
-  // coordinates.
+  /// Sets the bounds (size and position) of this View. |bounds| is in parent
+  /// coordinates, or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SetBounds(const CefRect& bounds) = 0;
 
   ///
-  // Returns the bounds (size and position) of this View. Position is in parent
-  // coordinates.
+  /// Returns the bounds (size and position) of this View in parent coordinates,
+  /// or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefRect GetBounds() = 0;
 
   ///
-  // Returns the bounds (size and position) of this View. Position is in screen
-  // coordinates.
+  /// Returns the bounds (size and position) of this View in DIP screen
+  /// coordinates.
   ///
   /*--cef()--*/
   virtual CefRect GetBoundsInScreen() = 0;
 
   ///
-  // Sets the size of this View without changing the position.
+  /// Sets the size of this View without changing the position. |size| in
+  /// parent coordinates, or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SetSize(const CefSize& size) = 0;
 
   ///
-  // Returns the size of this View.
+  /// Returns the size of this View in parent coordinates, or DIP screen
+  /// coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefSize GetSize() = 0;
 
   ///
-  // Sets the position of this View without changing the size. |position| is in
-  // parent coordinates.
+  /// Sets the position of this View without changing the size. |position| is in
+  /// parent coordinates, or DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SetPosition(const CefPoint& position) = 0;
 
   ///
-  // Returns the position of this View. Position is in parent coordinates.
+  /// Returns the position of this View. Position is in parent coordinates, or
+  /// DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefPoint GetPosition() = 0;
 
   ///
-  // Returns the size this View would like to be if enough space is available.
+  /// Sets the insets for this View. |insets| is in parent coordinates, or DIP
+  /// screen coordinates if there is no parent.
+  ///
+  /*--cef()--*/
+  virtual void SetInsets(const CefInsets& insets) = 0;
+
+  ///
+  /// Returns the insets for this View in parent coordinates, or DIP screen
+  /// coordinates if there is no parent.
+  ///
+  /*--cef()--*/
+  virtual CefInsets GetInsets() = 0;
+
+  ///
+  /// Returns the size this View would like to be if enough space is available.
+  /// Size is in parent coordinates, or DIP screen coordinates if there is no
+  /// parent.
   ///
   /*--cef()--*/
   virtual CefSize GetPreferredSize() = 0;
 
   ///
-  // Size this View to its preferred size.
+  /// Size this View to its preferred size. Size is in parent coordinates, or
+  /// DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual void SizeToPreferredSize() = 0;
 
   ///
-  // Returns the minimum size for this View.
+  /// Returns the minimum size for this View. Size is in parent coordinates, or
+  /// DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefSize GetMinimumSize() = 0;
 
   ///
-  // Returns the maximum size for this View.
+  /// Returns the maximum size for this View. Size is in parent coordinates, or
+  /// DIP screen coordinates if there is no parent.
   ///
   /*--cef()--*/
   virtual CefSize GetMaximumSize() = 0;
 
   ///
-  // Returns the height necessary to display this View with the provided width.
+  /// Returns the height necessary to display this View with the provided width.
   ///
   /*--cef()--*/
   virtual int GetHeightForWidth(int width) = 0;
 
   ///
-  // Indicate that this View and all parent Views require a re-layout. This
-  // ensures the next call to Layout() will propagate to this View even if the
-  // bounds of parent Views do not change.
+  /// Indicate that this View and all parent Views require a re-layout. This
+  /// ensures the next call to Layout() will propagate to this View even if the
+  /// bounds of parent Views do not change.
   ///
   /*--cef()--*/
   virtual void InvalidateLayout() = 0;
 
   ///
-  // Sets whether this View is visible. Windows are hidden by default and other
-  // views are visible by default. This View and any parent views must be set as
-  // visible for this View to be drawn in a Window. If this View is set as
-  // hidden then it and any child views will not be drawn and, if any of those
-  // views currently have focus, then focus will also be cleared. Painting is
-  // scheduled as needed. If this View is a Window then calling this method is
-  // equivalent to calling the Window Show() and Hide() methods.
+  /// Sets whether this View is visible. Windows are hidden by default and other
+  /// views are visible by default. This View and any parent views must be set
+  /// as visible for this View to be drawn in a Window. If this View is set as
+  /// hidden then it and any child views will not be drawn and, if any of those
+  /// views currently have focus, then focus will also be cleared. Painting is
+  /// scheduled as needed. If this View is a Window then calling this method is
+  /// equivalent to calling the Window Show() and Hide() methods.
   ///
   /*--cef()--*/
   virtual void SetVisible(bool visible) = 0;
 
   ///
-  // Returns whether this View is visible. A view may be visible but still not
-  // drawn in a Window if any parent views are hidden. If this View is a Window
-  // then a return value of true indicates that this Window is currently visible
-  // to the user on-screen. If this View is not a Window then call IsDrawn() to
-  // determine whether this View and all parent views are visible and will be
-  // drawn.
+  /// Returns whether this View is visible. A view may be visible but still not
+  /// drawn in a Window if any parent views are hidden. If this View is a Window
+  /// then a return value of true indicates that this Window is currently
+  /// visible to the user on-screen. If this View is not a Window then call
+  /// IsDrawn() to determine whether this View and all parent views are visible
+  /// and will be drawn.
   ///
   /*--cef()--*/
   virtual bool IsVisible() = 0;
 
   ///
-  // Returns whether this View is visible and drawn in a Window. A view is drawn
-  // if it and all parent views are visible. If this View is a Window then
-  // calling this method is equivalent to calling IsVisible(). Otherwise, to
-  // determine if the containing Window is visible to the user on-screen call
-  // IsVisible() on the Window.
+  /// Returns whether this View is visible and drawn in a Window. A view is
+  /// drawn if it and all parent views are visible. If this View is a Window
+  /// then calling this method is equivalent to calling IsVisible(). Otherwise,
+  /// to determine if the containing Window is visible to the user on-screen
+  /// call IsVisible() on the Window.
   ///
   /*--cef()--*/
   virtual bool IsDrawn() = 0;
 
   ///
-  // Set whether this View is enabled. A disabled View does not receive keyboard
-  // or mouse inputs. If |enabled| differs from the current value the View will
-  // be repainted. Also, clears focus if the focused View is disabled.
+  /// Set whether this View is enabled. A disabled View does not receive
+  /// keyboard or mouse inputs. If |enabled| differs from the current value the
+  /// View will be repainted. Also, clears focus if the focused View is
+  /// disabled.
   ///
   /*--cef()--*/
   virtual void SetEnabled(bool enabled) = 0;
 
   ///
-  // Returns whether this View is enabled.
+  /// Returns whether this View is enabled.
   ///
   /*--cef()--*/
   virtual bool IsEnabled() = 0;
 
   ///
-  // Sets whether this View is capable of taking focus. It will clear focus if
-  // the focused View is set to be non-focusable. This is false by default so
-  // that a View used as a container does not get the focus.
+  /// Sets whether this View is capable of taking focus. It will clear focus if
+  /// the focused View is set to be non-focusable. This is false by default so
+  /// that a View used as a container does not get the focus.
   ///
   /*--cef()--*/
   virtual void SetFocusable(bool focusable) = 0;
 
   ///
-  // Returns true if this View is focusable, enabled and drawn.
+  /// Returns true if this View is focusable, enabled and drawn.
   ///
   /*--cef()--*/
   virtual bool IsFocusable() = 0;
 
   ///
-  // Return whether this View is focusable when the user requires full keyboard
-  // access, even though it may not be normally focusable.
+  /// Return whether this View is focusable when the user requires full keyboard
+  /// access, even though it may not be normally focusable.
   ///
   /*--cef()--*/
   virtual bool IsAccessibilityFocusable() = 0;
 
   ///
-  // Request keyboard focus. If this View is focusable it will become the
-  // focused View.
+  /// Request keyboard focus. If this View is focusable it will become the
+  /// focused View.
   ///
   /*--cef()--*/
   virtual void RequestFocus() = 0;
 
   ///
-  // Sets the background color for this View.
+  /// Sets the background color for this View.
   ///
   /*--cef()--*/
   virtual void SetBackgroundColor(cef_color_t color) = 0;
 
   ///
-  // Returns the background color for this View.
+  /// Returns the background color for this View.
   ///
   /*--cef()--*/
   virtual cef_color_t GetBackgroundColor() = 0;
 
   ///
-  // Convert |point| from this View's coordinate system to that of the screen.
-  // This View must belong to a Window when calling this method. Returns true
-  // if the conversion is successful or false otherwise. Use
-  // CefDisplay::ConvertPointToPixels() after calling this method if further
-  // conversion to display-specific pixel coordinates is desired.
+  /// Convert |point| from this View's coordinate system to DIP screen
+  /// coordinates. This View must belong to a Window when calling this method.
+  /// Returns true if the conversion is successful or false otherwise. Use
+  /// CefDisplay::ConvertPointToPixels() after calling this method if further
+  /// conversion to display-specific pixel coordinates is desired.
   ///
   /*--cef()--*/
   virtual bool ConvertPointToScreen(CefPoint& point) = 0;
 
   ///
-  // Convert |point| to this View's coordinate system from that of the screen.
-  // This View must belong to a Window when calling this method. Returns true if
-  // the conversion is successful or false otherwise. Use
-  // CefDisplay::ConvertPointFromPixels() before calling this method if
-  // conversion from display-specific pixel coordinates is necessary.
+  /// Convert |point| to this View's coordinate system from DIP screen
+  /// coordinates. This View must belong to a Window when calling this method.
+  /// Returns true if the conversion is successful or false otherwise. Use
+  /// CefDisplay::ConvertPointFromPixels() before calling this method if
+  /// conversion from display-specific pixel coordinates is necessary.
   ///
   /*--cef()--*/
   virtual bool ConvertPointFromScreen(CefPoint& point) = 0;
 
   ///
-  // Convert |point| from this View's coordinate system to that of the Window.
-  // This View must belong to a Window when calling this method. Returns true if
-  // the conversion is successful or false otherwise.
+  /// Convert |point| from this View's coordinate system to that of the Window.
+  /// This View must belong to a Window when calling this method. Returns true
+  /// if the conversion is successful or false otherwise.
   ///
   /*--cef()--*/
   virtual bool ConvertPointToWindow(CefPoint& point) = 0;
 
   ///
-  // Convert |point| to this View's coordinate system from that of the Window.
-  // This View must belong to a Window when calling this method. Returns true if
-  // the conversion is successful or false otherwise.
+  /// Convert |point| to this View's coordinate system from that of the Window.
+  /// This View must belong to a Window when calling this method. Returns true
+  /// if the conversion is successful or false otherwise.
   ///
   /*--cef()--*/
   virtual bool ConvertPointFromWindow(CefPoint& point) = 0;
 
   ///
-  // Convert |point| from this View's coordinate system to that of |view|.
-  // |view| needs to be in the same Window but not necessarily the same view
-  // hierarchy. Returns true if the conversion is successful or false otherwise.
+  /// Convert |point| from this View's coordinate system to that of |view|.
+  /// |view| needs to be in the same Window but not necessarily the same view
+  /// hierarchy. Returns true if the conversion is successful or false
+  /// otherwise.
   ///
   /*--cef()--*/
   virtual bool ConvertPointToView(CefRefPtr<CefView> view, CefPoint& point) = 0;
 
   ///
-  // Convert |point| to this View's coordinate system from that |view|. |view|
-  // needs to be in the same Window but not necessarily the same view hierarchy.
-  // Returns true if the conversion is successful or false otherwise.
+  /// Convert |point| to this View's coordinate system from that |view|. |view|
+  /// needs to be in the same Window but not necessarily the same view
+  /// hierarchy. Returns true if the conversion is successful or false
+  /// otherwise.
   ///
   /*--cef()--*/
   virtual bool ConvertPointFromView(CefRefPtr<CefView> view,
diff --git a/src/include/views/cef_view_delegate.h b/src/include/views/cef_view_delegate.h
index 438896c28..23878323e 100644
--- a/src/include/views/cef_view_delegate.h
+++ b/src/include/views/cef_view_delegate.h
@@ -43,15 +43,17 @@
 class CefView;
 
 ///
-// Implement this interface to handle view events. The methods of this class
-// will be called on the browser process UI thread unless otherwise indicated.
+/// Implement this interface to handle view events. All size and position values
+/// are in density independent pixels (DIP) unless otherwise indicated. The
+/// methods of this class will be called on the browser process UI thread unless
+/// otherwise indicated.
 ///
 /*--cef(source=client)--*/
 class CefViewDelegate : public virtual CefBaseRefCounted {
  public:
   ///
-  // Return the preferred size for |view|. The Layout will use this information
-  // to determine the display size.
+  /// Return the preferred size for |view|. The Layout will use this information
+  /// to determine the display size.
   ///
   /*--cef()--*/
   virtual CefSize GetPreferredSize(CefRefPtr<CefView> view) {
@@ -59,22 +61,22 @@ class CefViewDelegate : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Return the minimum size for |view|.
+  /// Return the minimum size for |view|.
   ///
   /*--cef()--*/
   virtual CefSize GetMinimumSize(CefRefPtr<CefView> view) { return CefSize(); }
 
   ///
-  // Return the maximum size for |view|.
+  /// Return the maximum size for |view|.
   ///
   /*--cef()--*/
   virtual CefSize GetMaximumSize(CefRefPtr<CefView> view) { return CefSize(); }
 
   ///
-  // Return the height necessary to display |view| with the provided |width|.
-  // If not specified the result of GetPreferredSize().height will be used by
-  // default. Override if |view|'s preferred height depends upon the width
-  // (for example, with Labels).
+  /// Return the height necessary to display |view| with the provided |width|.
+  /// If not specified the result of GetPreferredSize().height will be used by
+  /// default. Override if |view|'s preferred height depends upon the width
+  /// (for example, with Labels).
   ///
   /*--cef()--*/
   virtual int GetHeightForWidth(CefRefPtr<CefView> view, int width) {
@@ -82,11 +84,11 @@ class CefViewDelegate : public virtual CefBaseRefCounted {
   }
 
   ///
-  // Called when the parent of |view| has changed. If |view| is being added to
-  // |parent| then |added| will be true. If |view| is being removed from
-  // |parent| then |added| will be false. If |view| is being reparented the
-  // remove notification will be sent before the add notification. Do not modify
-  // the view hierarchy in this callback.
+  /// Called when the parent of |view| has changed. If |view| is being added to
+  /// |parent| then |added| will be true. If |view| is being removed from
+  /// |parent| then |added| will be false. If |view| is being reparented the
+  /// remove notification will be sent before the add notification. Do not
+  /// modify the view hierarchy in this callback.
   ///
   /*--cef()--*/
   virtual void OnParentViewChanged(CefRefPtr<CefView> view,
@@ -94,11 +96,11 @@ class CefViewDelegate : public virtual CefBaseRefCounted {
                                    CefRefPtr<CefView> parent) {}
 
   ///
-  // Called when a child of |view| has changed. If |child| is being added to
-  // |view| then |added| will be true. If |child| is being removed from |view|
-  // then |added| will be false. If |child| is being reparented the remove
-  // notification will be sent to the old parent before the add notification is
-  // sent to the new parent. Do not modify the view hierarchy in this callback.
+  /// Called when a child of |view| has changed. If |child| is being added to
+  /// |view| then |added| will be true. If |child| is being removed from |view|
+  /// then |added| will be false. If |child| is being reparented the remove
+  /// notification will be sent to the old parent before the add notification is
+  /// sent to the new parent. Do not modify the view hierarchy in this callback.
   ///
   /*--cef()--*/
   virtual void OnChildViewChanged(CefRefPtr<CefView> view,
@@ -106,13 +108,26 @@ class CefViewDelegate : public virtual CefBaseRefCounted {
                                   CefRefPtr<CefView> child) {}
 
   ///
-  // Called when |view| gains focus.
+  /// Called when |view| is added or removed from the CefWindow.
+  ///
+  /*--cef()--*/
+  virtual void OnWindowChanged(CefRefPtr<CefView> view, bool added) {}
+
+  ///
+  /// Called when the layout of |view| has changed.
+  ///
+  /*--cef()--*/
+  virtual void OnLayoutChanged(CefRefPtr<CefView> view,
+                               const CefRect& new_bounds) {}
+
+  ///
+  /// Called when |view| gains focus.
   ///
   /*--cef()--*/
   virtual void OnFocus(CefRefPtr<CefView> view) {}
 
   ///
-  // Called when |view| loses focus.
+  /// Called when |view| loses focus.
   ///
   /*--cef()--*/
   virtual void OnBlur(CefRefPtr<CefView> view) {}
diff --git a/src/include/views/cef_window.h b/src/include/views/cef_window.h
index 2dce0685c..6d979b1bf 100644
--- a/src/include/views/cef_window.h
+++ b/src/include/views/cef_window.h
@@ -41,180 +41,235 @@
 #include "include/cef_image.h"
 #include "include/cef_menu_model.h"
 #include "include/views/cef_display.h"
+#include "include/views/cef_overlay_controller.h"
 #include "include/views/cef_panel.h"
 #include "include/views/cef_window_delegate.h"
 
+class CefBrowserView;
+
 ///
-// A Window is a top-level Window/widget in the Views hierarchy. By default it
-// will have a non-client area with title bar, icon and buttons that supports
-// moving and resizing. All size and position values are in density independent
-// pixels (DIP) unless otherwise indicated. Methods must be called on the
-// browser process UI thread unless otherwise indicated.
+/// A Window is a top-level Window/widget in the Views hierarchy. By default it
+/// will have a non-client area with title bar, icon and buttons that supports
+/// moving and resizing. All size and position values are in density independent
+/// pixels (DIP) unless otherwise indicated. Methods must be called on the
+/// browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=library)--*/
 class CefWindow : public CefPanel {
  public:
   ///
-  // Create a new Window.
+  /// Create a new Window.
   ///
   /*--cef(optional_param=delegate)--*/
   static CefRefPtr<CefWindow> CreateTopLevelWindow(
       CefRefPtr<CefWindowDelegate> delegate);
 
   ///
-  // Show the Window.
+  /// Show the Window.
   ///
   /*--cef()--*/
   virtual void Show() = 0;
 
   ///
-  // Hide the Window.
+  /// Show the Window as a browser modal dialog relative to |browser_view|. A
+  /// parent Window must be returned via CefWindowDelegate::GetParentWindow()
+  /// and |browser_view| must belong to that parent Window. While this Window is
+  /// visible, |browser_view| will be disabled while other controls in the
+  /// parent Window remain enabled. Navigating or destroying the |browser_view|
+  /// will close this Window automatically. Alternately, use Show() and return
+  /// true from CefWindowDelegate::IsWindowModalDialog() for a window modal
+  /// dialog where all controls in the parent Window are disabled.
+  ///
+  /*--cef()--*/
+  virtual void ShowAsBrowserModalDialog(
+      CefRefPtr<CefBrowserView> browser_view) = 0;
+
+  ///
+  /// Hide the Window.
   ///
   /*--cef()--*/
   virtual void Hide() = 0;
 
   ///
-  // Sizes the Window to |size| and centers it in the current display.
+  /// Sizes the Window to |size| and centers it in the current display.
   ///
   /*--cef()--*/
   virtual void CenterWindow(const CefSize& size) = 0;
 
   ///
-  // Close the Window.
+  /// Close the Window.
   ///
   /*--cef()--*/
   virtual void Close() = 0;
 
   ///
-  // Returns true if the Window has been closed.
+  /// Returns true if the Window has been closed.
   ///
   /*--cef()--*/
   virtual bool IsClosed() = 0;
 
   ///
-  // Activate the Window, assuming it already exists and is visible.
+  /// Activate the Window, assuming it already exists and is visible.
   ///
   /*--cef()--*/
   virtual void Activate() = 0;
 
   ///
-  // Deactivate the Window, making the next Window in the Z order the active
-  // Window.
+  /// Deactivate the Window, making the next Window in the Z order the active
+  /// Window.
   ///
   /*--cef()--*/
   virtual void Deactivate() = 0;
 
   ///
-  // Returns whether the Window is the currently active Window.
+  /// Returns whether the Window is the currently active Window.
   ///
   /*--cef()--*/
   virtual bool IsActive() = 0;
 
   ///
-  // Bring this Window to the top of other Windows in the Windowing system.
+  /// Bring this Window to the top of other Windows in the Windowing system.
   ///
   /*--cef()--*/
   virtual void BringToTop() = 0;
 
   ///
-  // Set the Window to be on top of other Windows in the Windowing system.
+  /// Set the Window to be on top of other Windows in the Windowing system.
   ///
   /*--cef()--*/
   virtual void SetAlwaysOnTop(bool on_top) = 0;
 
   ///
-  // Returns whether the Window has been set to be on top of other Windows in
-  // the Windowing system.
+  /// Returns whether the Window has been set to be on top of other Windows in
+  /// the Windowing system.
   ///
   /*--cef()--*/
   virtual bool IsAlwaysOnTop() = 0;
 
   ///
-  // Maximize the Window.
+  /// Maximize the Window.
   ///
   /*--cef()--*/
   virtual void Maximize() = 0;
 
   ///
-  // Minimize the Window.
+  /// Minimize the Window.
   ///
   /*--cef()--*/
   virtual void Minimize() = 0;
 
   ///
-  // Restore the Window.
+  /// Restore the Window.
   ///
   /*--cef()--*/
   virtual void Restore() = 0;
 
   ///
-  // Set fullscreen Window state.
+  /// Set fullscreen Window state. The
+  /// CefWindowDelegate::OnWindowFullscreenTransition method will be called
+  /// during the fullscreen transition for notification purposes.
   ///
   /*--cef()--*/
   virtual void SetFullscreen(bool fullscreen) = 0;
 
   ///
-  // Returns true if the Window is maximized.
+  /// Returns true if the Window is maximized.
   ///
   /*--cef()--*/
   virtual bool IsMaximized() = 0;
 
   ///
-  // Returns true if the Window is minimized.
+  /// Returns true if the Window is minimized.
   ///
   /*--cef()--*/
   virtual bool IsMinimized() = 0;
 
   ///
-  // Returns true if the Window is fullscreen.
+  /// Returns true if the Window is fullscreen.
   ///
   /*--cef()--*/
   virtual bool IsFullscreen() = 0;
 
   ///
-  // Set the Window title.
+  /// Set the Window title.
   ///
   /*--cef(optional_param=title)--*/
   virtual void SetTitle(const CefString& title) = 0;
 
   ///
-  // Get the Window title.
+  /// Get the Window title.
   ///
   /*--cef()--*/
   virtual CefString GetTitle() = 0;
 
   ///
-  // Set the Window icon. This should be a 16x16 icon suitable for use in the
-  // Windows's title bar.
+  /// Set the Window icon. This should be a 16x16 icon suitable for use in the
+  /// Windows's title bar.
   ///
   /*--cef()--*/
   virtual void SetWindowIcon(CefRefPtr<CefImage> image) = 0;
 
   ///
-  // Get the Window icon.
+  /// Get the Window icon.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefImage> GetWindowIcon() = 0;
 
   ///
-  // Set the Window App icon. This should be a larger icon for use in the host
-  // environment app switching UI. On Windows, this is the ICON_BIG used in
-  // Alt-Tab list and Windows taskbar. The Window icon will be used by default
-  // if no Window App icon is specified.
+  /// Set the Window App icon. This should be a larger icon for use in the host
+  /// environment app switching UI. On Windows, this is the ICON_BIG used in
+  /// Alt-Tab list and Windows taskbar. The Window icon will be used by default
+  /// if no Window App icon is specified.
   ///
   /*--cef()--*/
   virtual void SetWindowAppIcon(CefRefPtr<CefImage> image) = 0;
 
   ///
-  // Get the Window App icon.
+  /// Get the Window App icon.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefImage> GetWindowAppIcon() = 0;
 
   ///
-  // Show a menu with contents |menu_model|. |screen_point| specifies the menu
-  // position in screen coordinates. |anchor_position| specifies how the menu
-  // will be anchored relative to |screen_point|.
+  /// Add a View that will be overlayed on the Window contents with absolute
+  /// positioning and high z-order. Positioning is controlled by |docking_mode|
+  /// as described below. Setting |can_activate| to true will allow the overlay
+  /// view to receive input focus. The returned CefOverlayController object is
+  /// used to control the overlay. Overlays are hidden by default.
+  ///
+  /// With CEF_DOCKING_MODE_CUSTOM:
+  ///   1. The overlay is initially hidden, sized to |view|'s preferred size,
+  ///      and positioned in the top-left corner.
+  ///   2. Optionally change the overlay position and/or size by calling
+  ///      CefOverlayController methods.
+  ///   3. Call CefOverlayController::SetVisible(true) to show the overlay.
+  ///   4. The overlay will be automatically re-sized if |view|'s layout
+  ///      changes. Optionally change the overlay position and/or size when
+  ///      OnLayoutChanged is called on the Window's delegate to indicate a
+  ///      change in Window bounds.
+  ///
+  /// With other docking modes:
+  ///   1. The overlay is initially hidden, sized to |view|'s preferred size,
+  ///      and positioned based on |docking_mode|.
+  ///   2. Call CefOverlayController::SetVisible(true) to show the overlay.
+  ///   3. The overlay will be automatically re-sized if |view|'s layout changes
+  ///      and re-positioned as appropriate when the Window resizes.
+  ///
+  /// Overlays created by this method will receive a higher z-order then any
+  /// child Views added previously. It is therefore recommended to call this
+  /// method last after all other child Views have been added so that the
+  /// overlay displays as the top-most child of the Window.
+  ///
+  /*--cef()--*/
+  virtual CefRefPtr<CefOverlayController> AddOverlayView(
+      CefRefPtr<CefView> view,
+      cef_docking_mode_t docking_mode,
+      bool can_activate) = 0;
+
+  ///
+  /// Show a menu with contents |menu_model|. |screen_point| specifies the menu
+  /// position in screen coordinates. |anchor_position| specifies how the menu
+  /// will be anchored relative to |screen_point|.
   ///
   /*--cef()--*/
   virtual void ShowMenu(CefRefPtr<CefMenuModel> menu_model,
@@ -222,93 +277,103 @@ class CefWindow : public CefPanel {
                         cef_menu_anchor_position_t anchor_position) = 0;
 
   ///
-  // Cancel the menu that is currently showing, if any.
+  /// Cancel the menu that is currently showing, if any.
   ///
   /*--cef()--*/
   virtual void CancelMenu() = 0;
 
   ///
-  // Returns the Display that most closely intersects the bounds of this Window.
-  // May return NULL if this Window is not currently displayed.
+  /// Returns the Display that most closely intersects the bounds of this
+  /// Window. May return NULL if this Window is not currently displayed.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefDisplay> GetDisplay() = 0;
 
   ///
-  // Returns the bounds (size and position) of this Window's client area.
-  // Position is in screen coordinates.
+  /// Returns the bounds (size and position) of this Window's client area.
+  /// Position is in screen coordinates.
   ///
   /*--cef()--*/
   virtual CefRect GetClientAreaBoundsInScreen() = 0;
 
   ///
-  // Set the regions where mouse events will be intercepted by this Window to
-  // support drag operations. Call this method with an empty vector to clear the
-  // draggable regions. The draggable region bounds should be in window
-  // coordinates.
+  /// Set the regions where mouse events will be intercepted by this Window to
+  /// support drag operations. Call this method with an empty vector to clear
+  /// the draggable regions. The draggable region bounds should be in window
+  /// coordinates.
   ///
   /*--cef(optional_param=regions)--*/
   virtual void SetDraggableRegions(
       const std::vector<CefDraggableRegion>& regions) = 0;
 
   ///
-  // Retrieve the platform window handle for this Window.
+  /// Retrieve the platform window handle for this Window.
   ///
   /*--cef()--*/
   virtual CefWindowHandle GetWindowHandle() = 0;
 
   ///
-  // Simulate a key press. |key_code| is the VKEY_* value from Chromium's
-  // ui/events/keycodes/keyboard_codes.h header (VK_* values on Windows).
-  // |event_flags| is some combination of EVENTFLAG_SHIFT_DOWN,
-  // EVENTFLAG_CONTROL_DOWN and/or EVENTFLAG_ALT_DOWN. This method is exposed
-  // primarily for testing purposes.
+  /// Simulate a key press. |key_code| is the VKEY_* value from Chromium's
+  /// ui/events/keycodes/keyboard_codes.h header (VK_* values on Windows).
+  /// |event_flags| is some combination of EVENTFLAG_SHIFT_DOWN,
+  /// EVENTFLAG_CONTROL_DOWN and/or EVENTFLAG_ALT_DOWN. This method is exposed
+  /// primarily for testing purposes.
   ///
   /*--cef()--*/
-  virtual void SendKeyPress(int key_code, uint32 event_flags) = 0;
+  virtual void SendKeyPress(int key_code, uint32_t event_flags) = 0;
 
   ///
-  // Simulate a mouse move. The mouse cursor will be moved to the specified
-  // (screen_x, screen_y) position. This method is exposed primarily for testing
-  // purposes.
+  /// Simulate a mouse move. The mouse cursor will be moved to the specified
+  /// (screen_x, screen_y) position. This method is exposed primarily for
+  /// testing purposes.
   ///
   /*--cef()--*/
   virtual void SendMouseMove(int screen_x, int screen_y) = 0;
 
   ///
-  // Simulate mouse down and/or mouse up events. |button| is the mouse button
-  // type. If |mouse_down| is true a mouse down event will be sent. If
-  // |mouse_up| is true a mouse up event will be sent. If both are true a mouse
-  // down event will be sent followed by a mouse up event (equivalent to
-  // clicking the mouse button). The events will be sent using the current
-  // cursor position so make sure to call SendMouseMove() first to position the
-  // mouse. This method is exposed primarily for testing purposes.
+  /// Simulate mouse down and/or mouse up events. |button| is the mouse button
+  /// type. If |mouse_down| is true a mouse down event will be sent. If
+  /// |mouse_up| is true a mouse up event will be sent. If both are true a mouse
+  /// down event will be sent followed by a mouse up event (equivalent to
+  /// clicking the mouse button). The events will be sent using the current
+  /// cursor position so make sure to call SendMouseMove() first to position the
+  /// mouse. This method is exposed primarily for testing purposes.
   ///
   /*--cef()--*/
   virtual void SendMouseEvents(cef_mouse_button_type_t button,
                                bool mouse_down,
                                bool mouse_up) = 0;
+
+  ///
+  /// Set the keyboard accelerator for the specified |command_id|. |key_code|
+  /// can be any virtual key or character value. Required modifier keys are
+  /// specified by |shift_pressed|, |ctrl_pressed| and/or |alt_pressed|.
+  /// CefWindowDelegate::OnAccelerator will be called if the keyboard
+  /// combination is triggered while this window has focus.
   ///
-  // Set the keyboard accelerator for the specified |command_id|. |key_code| can
-  // be any virtual key or character value. CefWindowDelegate::OnAccelerator
-  // will be called if the keyboard combination is triggered while this window
-  // has focus.
+  /// The |high_priority| value will be considered if a child CefBrowserView has
+  /// focus when the keyboard combination is triggered. If |high_priority| is
+  /// true then the key event will not be forwarded to the web content
+  /// (`keydown` event handler) or CefKeyboardHandler first. If |high_priority|
+  /// is false then the behavior will depend on the
+  /// CefBrowserView::SetPreferAccelerators configuration.
   ///
   /*--cef()--*/
   virtual void SetAccelerator(int command_id,
                               int key_code,
                               bool shift_pressed,
                               bool ctrl_pressed,
-                              bool alt_pressed) = 0;
+                              bool alt_pressed,
+                              bool high_priority) = 0;
 
   ///
-  // Remove the keyboard accelerator for the specified |command_id|.
+  /// Remove the keyboard accelerator for the specified |command_id|.
   ///
   /*--cef()--*/
   virtual void RemoveAccelerator(int command_id) = 0;
 
   ///
-  // Remove all keyboard accelerators.
+  /// Remove all keyboard accelerators.
   ///
   /*--cef()--*/
   virtual void RemoveAllAccelerators() = 0;
diff --git a/src/include/views/cef_window_delegate.h b/src/include/views/cef_window_delegate.h
index 65e0f0b51..6c0f239a4 100644
--- a/src/include/views/cef_window_delegate.h
+++ b/src/include/views/cef_window_delegate.h
@@ -43,78 +43,169 @@
 class CefWindow;
 
 ///
-// Implement this interface to handle window events. The methods of this class
-// will be called on the browser process UI thread unless otherwise indicated.
+/// Implement this interface to handle window events. The methods of this class
+/// will be called on the browser process UI thread unless otherwise indicated.
 ///
 /*--cef(source=client)--*/
 class CefWindowDelegate : public CefPanelDelegate {
  public:
   ///
-  // Called when |window| is created.
+  /// Called when |window| is created.
   ///
   /*--cef()--*/
   virtual void OnWindowCreated(CefRefPtr<CefWindow> window) {}
 
   ///
-  // Called when |window| is destroyed. Release all references to |window| and
-  // do not attempt to execute any methods on |window| after this callback
-  // returns.
+  /// Called when |window| is closing.
+  ///
+  /*--cef()--*/
+  virtual void OnWindowClosing(CefRefPtr<CefWindow> window) {}
+
+  ///
+  /// Called when |window| is destroyed. Release all references to |window| and
+  /// do not attempt to execute any methods on |window| after this callback
+  /// returns.
   ///
   /*--cef()--*/
   virtual void OnWindowDestroyed(CefRefPtr<CefWindow> window) {}
 
   ///
-  // Return the parent for |window| or NULL if the |window| does not have a
-  // parent. Windows with parents will not get a taskbar button. Set |is_menu|
-  // to true if |window| will be displayed as a menu, in which case it will not
-  // be clipped to the parent window bounds. Set |can_activate_menu| to false
-  // if |is_menu| is true and |window| should not be activated (given keyboard
-  // focus) when displayed.
+  /// Called when |window| is activated or deactivated.
+  ///
+  /*--cef()--*/
+  virtual void OnWindowActivationChanged(CefRefPtr<CefWindow> window,
+                                         bool active) {}
+
+  ///
+  /// Called when |window| bounds have changed. |new_bounds| will be in DIP
+  /// screen coordinates.
+  ///
+  /*--cef()--*/
+  virtual void OnWindowBoundsChanged(CefRefPtr<CefWindow> window,
+                                     const CefRect& new_bounds) {}
+
+  ///
+  /// Called when |window| is transitioning to or from fullscreen mode. On MacOS
+  /// the transition occurs asynchronously with |is_competed| set to false when
+  /// the transition starts and true after the transition completes. On other
+  /// platforms the transition occurs synchronously with |is_completed| set to
+  /// true after the transition completes. With the Alloy runtime you must also
+  /// implement CefDisplayHandler::OnFullscreenModeChange to handle fullscreen
+  /// transitions initiated by browser content.
+  ///
+  /*--cef()--*/
+  virtual void OnWindowFullscreenTransition(CefRefPtr<CefWindow> window,
+                                            bool is_completed) {}
+
+  ///
+  /// Return the parent for |window| or NULL if the |window| does not have a
+  /// parent. Windows with parents will not get a taskbar button. Set |is_menu|
+  /// to true if |window| will be displayed as a menu, in which case it will not
+  /// be clipped to the parent window bounds. Set |can_activate_menu| to false
+  /// if |is_menu| is true and |window| should not be activated (given keyboard
+  /// focus) when displayed.
   ///
   /*--cef()--*/
   virtual CefRefPtr<CefWindow> GetParentWindow(CefRefPtr<CefWindow> window,
                                                bool* is_menu,
                                                bool* can_activate_menu) {
-    return NULL;
+    return nullptr;
+  }
+
+  ///
+  /// Return true if |window| should be created as a window modal dialog. Only
+  /// called when a Window is returned via GetParentWindow() with |is_menu| set
+  /// to false. All controls in the parent Window will be disabled while
+  /// |window| is visible. This functionality is not supported by all Linux
+  /// window managers. Alternately, use CefWindow::ShowAsBrowserModalDialog()
+  /// for a browser modal dialog that works on all platforms.
+  ///
+  /*--cef()--*/
+  virtual bool IsWindowModalDialog(CefRefPtr<CefWindow> window) {
+    return false;
   }
 
   ///
-  // Return true if |window| should be created without a frame or title bar. The
-  // window will be resizable if CanResize() returns true. Use
-  // CefWindow::SetDraggableRegions() to specify draggable regions.
+  /// Return the initial bounds for |window| in density independent pixel (DIP)
+  /// coordinates. If this method returns an empty CefRect then
+  /// GetPreferredSize() will be called to retrieve the size, and the window
+  /// will be placed on the screen with origin (0,0). This method can be used in
+  /// combination with CefView::GetBoundsInScreen() to restore the previous
+  /// window bounds.
+  ///
+  /*--cef()--*/
+  virtual CefRect GetInitialBounds(CefRefPtr<CefWindow> window) {
+    return CefRect();
+  }
+
+  ///
+  /// Return the initial show state for |window|.
+  ///
+  /*--cef(default_retval=CEF_SHOW_STATE_NORMAL)--*/
+  virtual cef_show_state_t GetInitialShowState(CefRefPtr<CefWindow> window) {
+    return CEF_SHOW_STATE_NORMAL;
+  }
+
+  ///
+  /// Return true if |window| should be created without a frame or title bar.
+  /// The window will be resizable if CanResize() returns true. Use
+  /// CefWindow::SetDraggableRegions() to specify draggable regions.
   ///
   /*--cef()--*/
   virtual bool IsFrameless(CefRefPtr<CefWindow> window) { return false; }
 
   ///
-  // Return true if |window| can be resized.
+  /// Return true if |window| should be created with standard window buttons
+  /// like close, minimize and zoom. This method is only supported on macOS.
+  ///
+  /*--cef()--*/
+  virtual bool WithStandardWindowButtons(CefRefPtr<CefWindow> window) {
+    return !IsFrameless(window);
+  }
+
+  ///
+  /// Return whether the titlebar height should be overridden,
+  /// and sets the height of the titlebar in |titlebar_height|.
+  /// On macOS, it can also be used to adjust the vertical position
+  /// of the traffic light buttons in frameless windows.
+  /// The buttons will be positioned halfway down the titlebar
+  /// at a height of |titlebar_height| / 2.
+  ///
+  /*--cef()--*/
+  virtual bool GetTitlebarHeight(CefRefPtr<CefWindow> window,
+                                 float* titlebar_height) {
+    return false;
+  }
+
+  ///
+  /// Return true if |window| can be resized.
   ///
   /*--cef()--*/
   virtual bool CanResize(CefRefPtr<CefWindow> window) { return true; }
 
   ///
-  // Return true if |window| can be maximized.
+  /// Return true if |window| can be maximized.
   ///
   /*--cef()--*/
   virtual bool CanMaximize(CefRefPtr<CefWindow> window) { return true; }
 
   ///
-  // Return true if |window| can be minimized.
+  /// Return true if |window| can be minimized.
   ///
   /*--cef()--*/
   virtual bool CanMinimize(CefRefPtr<CefWindow> window) { return true; }
 
   ///
-  // Return true if |window| can be closed. This will be called for user-
-  // initiated window close actions and when CefWindow::Close() is called.
+  /// Return true if |window| can be closed. This will be called for user-
+  /// initiated window close actions and when CefWindow::Close() is called.
   ///
   /*--cef()--*/
   virtual bool CanClose(CefRefPtr<CefWindow> window) { return true; }
 
   ///
-  // Called when a keyboard accelerator registered with
-  // CefWindow::SetAccelerator is triggered. Return true if the accelerator was
-  // handled or false otherwise.
+  /// Called when a keyboard accelerator registered with
+  /// CefWindow::SetAccelerator is triggered. Return true if the accelerator was
+  /// handled or false otherwise.
   ///
   /*--cef()--*/
   virtual bool OnAccelerator(CefRefPtr<CefWindow> window, int command_id) {
@@ -122,9 +213,9 @@ class CefWindowDelegate : public CefPanelDelegate {
   }
 
   ///
-  // Called after all other controls in the window have had a chance to
-  // handle the event. |event| contains information about the keyboard event.
-  // Return true if the keyboard event was handled or false otherwise.
+  /// Called after all other controls in the window have had a chance to
+  /// handle the event. |event| contains information about the keyboard event.
+  /// Return true if the keyboard event was handled or false otherwise.
   ///
   /*--cef()--*/
   virtual bool OnKeyEvent(CefRefPtr<CefWindow> window,
diff --git a/src/include/wrapper/cef_byte_read_handler.h b/src/include/wrapper/cef_byte_read_handler.h
index bf593d0ab..bb1f84fb4 100644
--- a/src/include/wrapper/cef_byte_read_handler.h
+++ b/src/include/wrapper/cef_byte_read_handler.h
@@ -38,42 +38,43 @@
 #pragma once
 
 #include "include/base/cef_lock.h"
-#include "include/base/cef_macros.h"
 #include "include/cef_base.h"
 #include "include/cef_stream.h"
 
 ///
-// Thread safe implementation of the CefReadHandler class for reading an
-// in-memory array of bytes.
+/// Thread safe implementation of the CefReadHandler class for reading an
+/// in-memory array of bytes.
 ///
 class CefByteReadHandler : public CefReadHandler {
  public:
   ///
-  // Create a new object for reading an array of bytes. An optional |source|
-  // reference can be kept to keep the underlying data source from being
-  // released while the reader exists.
+  /// Create a new object for reading an array of bytes. An optional |source|
+  /// reference can be kept to keep the underlying data source from being
+  /// released while the reader exists.
   ///
   CefByteReadHandler(const unsigned char* bytes,
                      size_t size,
                      CefRefPtr<CefBaseRefCounted> source);
 
+  CefByteReadHandler(const CefByteReadHandler&) = delete;
+  CefByteReadHandler& operator=(const CefByteReadHandler&) = delete;
+
   // CefReadHandler methods.
-  virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE;
-  virtual int Seek(int64 offset, int whence) OVERRIDE;
-  virtual int64 Tell() OVERRIDE;
-  virtual int Eof() OVERRIDE;
-  virtual bool MayBlock() OVERRIDE { return false; }
+  size_t Read(void* ptr, size_t size, size_t n) override;
+  int Seek(int64_t offset, int whence) override;
+  int64_t Tell() override;
+  int Eof() override;
+  bool MayBlock() override { return false; }
 
  private:
   const unsigned char* bytes_;
-  int64 size_;
-  int64 offset_;
+  int64_t size_;
+  int64_t offset_ = 0;
   CefRefPtr<CefBaseRefCounted> source_;
 
   base::Lock lock_;
 
   IMPLEMENT_REFCOUNTING(CefByteReadHandler);
-  DISALLOW_COPY_AND_ASSIGN(CefByteReadHandler);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_BYTE_READ_HANDLER_H_
diff --git a/src/include/wrapper/cef_closure_task.h b/src/include/wrapper/cef_closure_task.h
index 71f54b5cc..95dde6a81 100644
--- a/src/include/wrapper/cef_closure_task.h
+++ b/src/include/wrapper/cef_closure_task.h
@@ -38,65 +38,80 @@
 #pragma once
 
 #include "include/base/cef_callback_forward.h"
-#include "include/base/cef_macros.h"
 #include "include/cef_task.h"
 
 ///
-// Helpers for asynchronously executing a base::Closure (bound function or
-// method) on a CEF thread. Creation of base::Closures can be facilitated using
-// base::Bind. See include/base/cef_callback.h for complete usage instructions.
-//
-// TO use these helpers you should include this header and the header that
-// defines base::Bind.
-//
-// #include "include/base/cef_bind.h"
-// #include "include/wrapper/cef_closure_task.h"
-//
-// Example of executing a bound function:
-//
-// // Define a function.
-// void MyFunc(int arg) { /* do something with |arg| on the UI thread */ }
-//
-// // Post a task that will execute MyFunc on the UI thread and pass an |arg|
-// // value of 5.
-// CefPostTask(TID_UI, base::Bind(&MyFunc, 5));
-//
-// Example of executing a bound method:
-//
-// // Define a class.
-// class MyClass : public CefBaseRefCounted {
-//  public:
-//   MyClass() {}
-//   void MyMethod(int arg) { /* do something with |arg| on the UI thread */ }
-//  private:
-//   IMPLEMENT_REFCOUNTING(MyClass);
-// };
-//
-// // Create an instance of MyClass.
-// CefRefPtr<MyClass> instance = new MyClass();
-//
-// // Post a task that will execute MyClass::MyMethod on the UI thread and pass
-// // an |arg| value of 5. |instance| will be kept alive until after the task
-// // completes.
-// CefPostTask(TID_UI, base::Bind(&MyClass::MyMethod, instance, 5));
+/// \file
+/// Helpers for asynchronously executing a base::[Once|Repeating]Closure (bound
+/// function or method) on a CEF thread. Creation of a
+/// base::[Once|Repeating]Closure can be facilitated using
+/// base::Bind[Once|Repeating]. See include/base/cef_callback.h for complete
+/// usage instructions.
+///
+/// To use these helpers you should include this header and the header that
+/// defines base::Bind[Once|Repeating].
+///
+/// <pre>
+///   #include "include/base/cef_callback.h"
+///   #include "include/wrapper/cef_closure_task.h"
+/// </pre>
+///
+/// Example of executing a bound function:
+///
+/// <pre>
+///   // Define a function.
+///   void MyFunc(int arg) { /* do something with |arg| on the UI thread */ }
+///
+///   // Post a task that will execute MyFunc on the UI thread and pass an |arg|
+///   // value of 5.
+///   CefPostTask(TID_UI, base::BindOnce(&MyFunc, 5));
+/// </pre>
+///
+/// Example of executing a bound method:
+///
+/// <pre>
+///   // Define a class.
+///   class MyClass : public CefBaseRefCounted {
+///    public:
+///     MyClass() {}
+///     void MyMethod(int arg) { /* do something with |arg| on the UI thread */
+///     }
+///    private:
+///     IMPLEMENT_REFCOUNTING(MyClass);
+///   };
+///
+///   // Create an instance of MyClass.
+///   CefRefPtr<MyClass> instance = new MyClass();
+///
+///   // Post a task that will execute MyClass::MyMethod on the UI thread and
+///   // pass an |arg| value of 5. |instance| will be kept alive until after the
+///   // task completes.
+///   CefPostTask(TID_UI, base::BindOnce(&MyClass::MyMethod, instance, 5));
+/// </pre>
 ///
 
 ///
-// Create a CefTask that wraps a base::Closure. Can be used in combination with
-// CefTaskRunner.
+/// Create a CefTask that wraps a base::[Once|Repeating]Closure. Can be used in
+/// combination with CefTaskRunner.
 ///
-CefRefPtr<CefTask> CefCreateClosureTask(const base::Closure& closure);
+CefRefPtr<CefTask> CefCreateClosureTask(base::OnceClosure closure);
+CefRefPtr<CefTask> CefCreateClosureTask(const base::RepeatingClosure& closure);
 
 ///
-// Post a Closure for execution on the specified thread.
+/// Post a base::[Once|Repeating]Closure for execution on the specified thread.
 ///
-bool CefPostTask(CefThreadId threadId, const base::Closure& closure);
+bool CefPostTask(CefThreadId threadId, base::OnceClosure closure);
+bool CefPostTask(CefThreadId threadId, const base::RepeatingClosure& closure);
 
 ///
-// Post a Closure for delayed execution on the specified thread.
+/// Post a base::[Once|Repeating]Closure for delayed execution on the specified
+/// thread.
 ///
 bool CefPostDelayedTask(CefThreadId threadId,
-                        const base::Closure& closure,
-                        int64 delay_ms);
+                        base::OnceClosure closure,
+                        int64_t delay_ms);
+bool CefPostDelayedTask(CefThreadId threadId,
+                        const base::RepeatingClosure& closure,
+                        int64_t delay_ms);
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_CLOSURE_TASK_H_
diff --git a/src/include/wrapper/cef_helpers.h b/src/include/wrapper/cef_helpers.h
index 0c5820dbb..380488004 100644
--- a/src/include/wrapper/cef_helpers.h
+++ b/src/include/wrapper/cef_helpers.h
@@ -43,34 +43,41 @@
 
 #include "include/base/cef_bind.h"
 #include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
 #include "include/cef_task.h"
 
 #define CEF_REQUIRE_UI_THREAD() DCHECK(CefCurrentlyOn(TID_UI));
 #define CEF_REQUIRE_IO_THREAD() DCHECK(CefCurrentlyOn(TID_IO));
-#define CEF_REQUIRE_FILE_THREAD() DCHECK(CefCurrentlyOn(TID_FILE));
+#define CEF_REQUIRE_FILE_BACKGROUND_THREAD() \
+  DCHECK(CefCurrentlyOn(TID_FILE_BACKGROUND));
+#define CEF_REQUIRE_FILE_USER_VISIBLE_THREAD() \
+  DCHECK(CefCurrentlyOn(TID_FILE_USER_VISIBLE));
+#define CEF_REQUIRE_FILE_USER_BLOCKING_THREAD() \
+  DCHECK(CefCurrentlyOn(TID_FILE_USER_BLOCKING));
 #define CEF_REQUIRE_RENDERER_THREAD() DCHECK(CefCurrentlyOn(TID_RENDERER));
 
-// Use this struct in conjuction with refcounted types to ensure that an
-// object is deleted on the specified thread. For example:
-//
-// class Foo : public base::RefCountedThreadSafe<Foo, CefDeleteOnUIThread> {
-//  public:
-//   Foo();
-//   void DoSomething();
-//
-//  private:
-//   // Allow deletion via scoped_refptr only.
-//   friend struct CefDeleteOnThread<TID_UI>;
-//   friend class base::RefCountedThreadSafe<Foo, CefDeleteOnUIThread>;
-//
-//   virtual ~Foo() {}
-// };
-//
-// base::scoped_refptr<Foo> foo = new Foo();
-// foo->DoSomething();
-// foo = NULL;  // Deletion of |foo| will occur on the UI thread.
-//
+///
+/// Use this struct in conjuction with refcounted types to ensure that an
+/// object is deleted on the specified thread. For example:
+///
+/// <pre>
+///   class Foo : public base::RefCountedThreadSafe<Foo, CefDeleteOnUIThread> {
+///    public:
+///     Foo();
+///     void DoSomething();
+///
+///    private:
+///     // Allow deletion via scoped_refptr only.
+///     friend struct CefDeleteOnThread<TID_UI>;
+///     friend class base::RefCountedThreadSafe<Foo, CefDeleteOnUIThread>;
+///
+///     virtual ~Foo() {}
+///   };
+///
+///   base::scoped_refptr<Foo> foo = new Foo();
+///   foo->DoSomething();
+///   foo = NULL;  /// Deletion of |foo| will occur on the UI thread.
+/// </pre>
+///
 template <CefThreadId thread>
 struct CefDeleteOnThread {
   template <typename T>
@@ -79,30 +86,70 @@ struct CefDeleteOnThread {
       delete x;
     } else {
       CefPostTask(thread,
-                  base::Bind(&CefDeleteOnThread<thread>::Destruct<T>, x));
+                  base::BindOnce(&CefDeleteOnThread<thread>::Destruct<T>,
+                                 base::Unretained(x)));
     }
   }
 };
 
 struct CefDeleteOnUIThread : public CefDeleteOnThread<TID_UI> {};
 struct CefDeleteOnIOThread : public CefDeleteOnThread<TID_IO> {};
-struct CefDeleteOnFileThread : public CefDeleteOnThread<TID_FILE> {};
+struct CefDeleteOnFileBackgroundThread
+    : public CefDeleteOnThread<TID_FILE_BACKGROUND> {};
+struct CefDeleteOnFileUserVisibleThread
+    : public CefDeleteOnThread<TID_FILE_USER_VISIBLE> {};
+struct CefDeleteOnFileUserBlockingThread
+    : public CefDeleteOnThread<TID_FILE_USER_BLOCKING> {};
 struct CefDeleteOnRendererThread : public CefDeleteOnThread<TID_RENDERER> {};
 
+// Same as IMPLEMENT_REFCOUNTING() but using the specified Destructor.
+#define IMPLEMENT_REFCOUNTING_EX(ClassName, Destructor) \
+ public:                                                \
+  void AddRef() const override {                        \
+    ref_count_.AddRef();                                \
+  }                                                     \
+  bool Release() const override {                       \
+    if (ref_count_.Release()) {                         \
+      Destructor::Destruct(this);                       \
+      return true;                                      \
+    }                                                   \
+    return false;                                       \
+  }                                                     \
+  bool HasOneRef() const override {                     \
+    return ref_count_.HasOneRef();                      \
+  }                                                     \
+  bool HasAtLeastOneRef() const override {              \
+    return ref_count_.HasAtLeastOneRef();               \
+  }                                                     \
+                                                        \
+ private:                                               \
+  CefRefCount ref_count_
+
+#define IMPLEMENT_REFCOUNTING_DELETE_ON_UIT(ClassName) \
+  IMPLEMENT_REFCOUNTING_EX(ClassName, CefDeleteOnUIThread)
+
+#define IMPLEMENT_REFCOUNTING_DELETE_ON_IOT(ClassName) \
+  IMPLEMENT_REFCOUNTING_EX(ClassName, CefDeleteOnIOThread)
+
 ///
-// Helper class to manage a scoped copy of |argv|.
+/// Helper class to manage a scoped copy of |argv|.
 ///
 class CefScopedArgArray {
  public:
   CefScopedArgArray(int argc, char* argv[]) {
     // argv should have (argc + 1) elements, the last one always being NULL.
     array_ = new char*[argc + 1];
+    values_.resize(argc);
     for (int i = 0; i < argc; ++i) {
-      values_.push_back(argv[i]);
+      values_[i] = argv[i];
       array_[i] = const_cast<char*>(values_[i].c_str());
     }
-    array_[argc] = NULL;
+    array_[argc] = nullptr;
   }
+
+  CefScopedArgArray(const CefScopedArgArray&) = delete;
+  CefScopedArgArray& operator=(const CefScopedArgArray&) = delete;
+
   ~CefScopedArgArray() { delete[] array_; }
 
   char** array() const { return array_; }
@@ -113,8 +160,6 @@ class CefScopedArgArray {
   // Keep values in a vector separate from |array_| because various users may
   // modify |array_| and we still want to clean up memory properly.
   std::vector<std::string> values_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefScopedArgArray);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_HELPERS_H_
diff --git a/src/include/wrapper/cef_message_router.h b/src/include/wrapper/cef_message_router.h
index 9765be76a..6c1a96a11 100644
--- a/src/include/wrapper/cef_message_router.h
+++ b/src/include/wrapper/cef_message_router.h
@@ -46,7 +46,7 @@
 // The below classes implement support for routing aynchronous messages between
 // JavaScript running in the renderer process and C++ running in the browser
 // process. An application interacts with the router by passing it data from
-// standard CEF C++ callbacks (OnBeforeBrowse, OnProcessMessageRecieved,
+// standard CEF C++ callbacks (OnBeforeBrowse, OnProcessMessageReceived,
 // OnContextCreated, etc). The renderer-side router supports generic JavaScript
 // callback registration and execution while the browser-side router supports
 // application-specific logic via one or more application-provided Handler
@@ -78,7 +78,7 @@
 // with an error code of -1.
 //
 // Queries can be either persistent or non-persistent. If the query is
-// persistent than the callbacks will remain registered until one of the
+// persistent then the callbacks will remain registered until one of the
 // following conditions are met:
 //
 // A. The query is canceled in JavaScript using the |window.cefQueryCancel|
@@ -177,7 +177,7 @@
 // 8. Handle the query in your Handler::OnQuery implementation and execute the
 //    appropriate callback either immediately or asynchronously.
 //
-//    void MyHandler::OnQuery(int64 query_id,
+//    void MyHandler::OnQuery(int64_t query_id,
 //                            CefRefPtr<CefBrowser> browser,
 //                            CefRefPtr<CefFrame> frame,
 //                            const CefString& request,
@@ -193,73 +193,122 @@
 // 9. Notice that the onSuccess callback is executed in JavaScript.
 
 ///
-// Used to configure the query router. The same values must be passed to both
-// CefMessageRouterBrowserSide and CefMessageRouterRendererSide. If using
-// multiple router pairs make sure to choose values that do not conflict.
+/// Used to configure the query router. The same values must be passed to both
+/// CefMessageRouterBrowserSide and CefMessageRouterRendererSide. If using
+/// multiple router pairs make sure to choose values that do not conflict.
 ///
 struct CefMessageRouterConfig {
   CefMessageRouterConfig();
 
-  // Name of the JavaScript function that will be added to the 'window' object
-  // for sending a query. The default value is "cefQuery".
+  ///
+  /// Name of the JavaScript function that will be added to the 'window' object
+  /// for sending a query. The default value is "cefQuery".
+  ///
   CefString js_query_function;
 
-  // Name of the JavaScript function that will be added to the 'window' object
-  // for canceling a pending query. The default value is "cefQueryCancel".
+  ///
+  /// Name of the JavaScript function that will be added to the 'window' object
+  /// for canceling a pending query. The default value is "cefQueryCancel".
+  ///
   CefString js_cancel_function;
+
+  ///
+  /// Messages of size (in bytes) larger than this threshold will be sent via
+  /// shared memory region.
+  ///
+  size_t message_size_threshold;
 };
 
 ///
-// Implements the browser side of query routing. The methods of this class may
-// be called on any browser process thread unless otherwise indicated.
+/// This class acts as a container for managing binary data. It retains
+/// references to the underlying backing store, ensuring it is valid as long as
+/// the CefBinaryBuffer exists. This allows efficient, zero-copy access to data
+/// received from another process.
+///
+/// This class is not designed to be thread-safe, and it is the user's
+/// responsibility to synchronize access from multiple threads to ensure data
+/// integrity.
+///
+class CefBinaryBuffer : public CefBaseRefCounted {
+ public:
+  ///
+  /// Returns the read-only pointer to the memory. Returns nullptr if
+  /// |GetSize()| returns zero. The returned pointer is only valid for the life
+  /// span of this object.
+  ///
+  virtual const void* GetData() const = 0;
+
+  ///
+  /// Returns the writable pointer to the memory. Returns nullptr if
+  /// |GetSize()| returns zero. The returned pointer is only valid for the life
+  /// span of this object.
+  ///
+  virtual void* GetData() = 0;
+
+  ///
+  /// Returns the size of the data.
+  ///
+  virtual size_t GetSize() const = 0;
+};
+
+///
+/// Implements the browser side of query routing. The methods of this class may
+/// be called on any browser process thread unless otherwise indicated.
 ///
 class CefMessageRouterBrowserSide
     : public base::RefCountedThreadSafe<CefMessageRouterBrowserSide> {
  public:
   ///
-  // Callback associated with a single pending asynchronous query. Execute the
-  // Success or Failure method to send an asynchronous response to the
-  // associated JavaScript handler. It is a runtime error to destroy a Callback
-  // object associated with an uncanceled query without first executing one of
-  // the callback methods. The methods of this class may be called on any
-  // browser process thread.
+  /// Callback associated with a single pending asynchronous query. Execute the
+  /// Success or Failure method to send an asynchronous response to the
+  /// associated JavaScript handler. It is a runtime error to destroy a Callback
+  /// object associated with an uncanceled query without first executing one of
+  /// the callback methods. The methods of this class may be called on any
+  /// browser process thread.
   ///
   class Callback : public CefBaseRefCounted {
    public:
     ///
-    // Notify the associated JavaScript onSuccess callback that the query has
-    // completed successfully with the specified |response|.
+    /// Notify the associated JavaScript onSuccess callback that the query has
+    /// completed successfully with the specified string |response|.
     ///
     virtual void Success(const CefString& response) = 0;
 
     ///
-    // Notify the associated JavaScript onFailure callback that the query has
-    // failed with the specified |error_code| and |error_message|.
+    /// Notify the associated JavaScript onSuccess callback that the query has
+    /// completed successfully with binary data. A |data| pointer to the binary
+    /// data can be nullptr only if the |size| is 0.
+    ///
+    virtual void Success(const void* data, size_t size) = 0;
+
+    ///
+    /// Notify the associated JavaScript onFailure callback that the query has
+    /// failed with the specified |error_code| and |error_message|.
     ///
     virtual void Failure(int error_code, const CefString& error_message) = 0;
   };
 
   ///
-  // Implement this interface to handle queries. All methods will be executed on
-  // the browser process UI thread.
+  /// Implement this interface to handle queries. All methods will be executed
+  /// on the browser process UI thread.
   ///
   class Handler {
    public:
-    typedef CefMessageRouterBrowserSide::Callback Callback;
+    using Callback = CefMessageRouterBrowserSide::Callback;
 
     ///
-    // Executed when a new query is received. |query_id| uniquely identifies the
-    // query for the life span of the router. Return true to handle the query
-    // or false to propagate the query to other registered handlers, if any. If
-    // no handlers return true from this method then the query will be
-    // automatically canceled with an error code of -1 delivered to the
-    // JavaScript onFailure callback. If this method returns true then a
-    // Callback method must be executed either in this method or asynchronously
-    // to complete the query.
+    /// Executed when a new query is received. |query_id| uniquely identifies
+    /// the query for the life span of the router. Return true to handle the
+    /// query or false to propagate the query to other registered handlers, if
+    /// any. If no handlers return true from this method then the query will be
+    /// automatically canceled with an error code of -1 delivered to the
+    /// JavaScript onFailure callback. If this method returns true then a
+    /// Callback method must be executed either in this method or asynchronously
+    /// to complete the query.
     ///
     virtual bool OnQuery(CefRefPtr<CefBrowser> browser,
                          CefRefPtr<CefFrame> frame,
-                         int64 query_id,
+                         int64_t query_id,
                          const CefString& request,
                          bool persistent,
                          CefRefPtr<Callback> callback) {
@@ -267,124 +316,144 @@ class CefMessageRouterBrowserSide
     }
 
     ///
-    // Executed when a query has been canceled either explicitly using the
-    // JavaScript cancel function or implicitly due to browser destruction,
-    // navigation or renderer process termination. It will only be called for
-    // the single handler that returned true from OnQuery for the same
-    // |query_id|. No references to the associated Callback object should be
-    // kept after this method is called, nor should any Callback methods be
-    // executed.
+    /// Executed when a new query is received. |query_id| uniquely identifies
+    /// the query for the life span of the router. Return true to handle the
+    /// query or false to propagate the query to other registered handlers, if
+    /// any. If no handlers return true from this method then the query will be
+    /// automatically canceled with an error code of -1 delivered to the
+    /// JavaScript onFailure callback. If this method returns true then a
+    /// Callback method must be executed either in this method or asynchronously
+    /// to complete the query.
+    ///
+    virtual bool OnQuery(CefRefPtr<CefBrowser> browser,
+                         CefRefPtr<CefFrame> frame,
+                         int64_t query_id,
+                         CefRefPtr<const CefBinaryBuffer> request,
+                         bool persistent,
+                         CefRefPtr<Callback> callback) {
+      return false;
+    }
+
+    ///
+    /// Executed when a query has been canceled either explicitly using the
+    /// JavaScript cancel function or implicitly due to browser destruction,
+    /// navigation or renderer process termination. It will only be called for
+    /// the single handler that returned true from OnQuery for the same
+    /// |query_id|. No references to the associated Callback object should be
+    /// kept after this method is called, nor should any Callback methods be
+    /// executed.
     ///
     virtual void OnQueryCanceled(CefRefPtr<CefBrowser> browser,
                                  CefRefPtr<CefFrame> frame,
-                                 int64 query_id) {}
+                                 int64_t query_id) {}
 
-    virtual ~Handler() {}
+    virtual ~Handler() = default;
   };
 
   ///
-  // Create a new router with the specified configuration.
+  /// Create a new router with the specified configuration.
   ///
   static CefRefPtr<CefMessageRouterBrowserSide> Create(
       const CefMessageRouterConfig& config);
 
   ///
-  // Add a new query handler. If |first| is true it will be added as the first
-  // handler, otherwise it will be added as the last handler. Returns true if
-  // the handler is added successfully or false if the handler has already been
-  // added. Must be called on the browser process UI thread. The Handler object
-  // must either outlive the router or be removed before deletion.
+  /// Add a new query handler. If |first| is true it will be added as the first
+  /// handler, otherwise it will be added as the last handler. Returns true if
+  /// the handler is added successfully or false if the handler has already been
+  /// added. Must be called on the browser process UI thread. The Handler object
+  /// must either outlive the router or be removed before deletion.
   ///
   virtual bool AddHandler(Handler* handler, bool first) = 0;
 
   ///
-  // Remove an existing query handler. Any pending queries associated with the
-  // handler will be canceled. Handler::OnQueryCanceled will be called and the
-  // associated JavaScript onFailure callback will be executed with an error
-  // code of -1. Returns true if the handler is removed successfully or false
-  // if the handler is not found. Must be called on the browser process UI
-  // thread.
+  /// Remove an existing query handler. Any pending queries associated with the
+  /// handler will be canceled. Handler::OnQueryCanceled will be called and the
+  /// associated JavaScript onFailure callback will be executed with an error
+  /// code of -1. Returns true if the handler is removed successfully or false
+  /// if the handler is not found. Must be called on the browser process UI
+  /// thread.
   ///
   virtual bool RemoveHandler(Handler* handler) = 0;
 
   ///
-  // Cancel all pending queries associated with either |browser| or |handler|.
-  // If both |browser| and |handler| are NULL all pending queries will be
-  // canceled. Handler::OnQueryCanceled will be called and the associated
-  // JavaScript onFailure callback will be executed in all cases with an error
-  // code of -1.
+  /// Cancel all pending queries associated with either |browser| or |handler|.
+  /// If both |browser| and |handler| are NULL all pending queries will be
+  /// canceled. Handler::OnQueryCanceled will be called and the associated
+  /// JavaScript onFailure callback will be executed in all cases with an error
+  /// code of -1.
   ///
   virtual void CancelPending(CefRefPtr<CefBrowser> browser,
                              Handler* handler) = 0;
 
   ///
-  // Returns the number of queries currently pending for the specified |browser|
-  // and/or |handler|. Either or both values may be empty. Must be called on the
-  // browser process UI thread.
+  /// Returns the number of queries currently pending for the specified
+  /// |browser| and/or |handler|. Either or both values may be empty. Must be
+  /// called on the browser process UI thread.
   ///
   virtual int GetPendingCount(CefRefPtr<CefBrowser> browser,
                               Handler* handler) = 0;
 
-  // The below methods should be called from other CEF handlers. They must be
-  // called exactly as documented for the router to function correctly.
+  /// The below methods should be called from other CEF handlers. They must be
+  /// called exactly as documented for the router to function correctly.
 
   ///
-  // Call from CefLifeSpanHandler::OnBeforeClose. Any pending queries associated
-  // with |browser| will be canceled and Handler::OnQueryCanceled will be
-  // called. No JavaScript callbacks will be executed since this indicates
-  // destruction of the browser.
+  /// Call from CefLifeSpanHandler::OnBeforeClose. Any pending queries
+  /// associated with |browser| will be canceled and Handler::OnQueryCanceled
+  /// will be called. No JavaScript callbacks will be executed since this
+  /// indicates destruction of the browser.
   ///
   virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
-  // Call from CefRequestHandler::OnRenderProcessTerminated. Any pending queries
-  // associated with |browser| will be canceled and Handler::OnQueryCanceled
-  // will be called. No JavaScript callbacks will be executed since this
-  // indicates destruction of the context.
+  /// Call from CefRequestHandler::OnRenderProcessTerminated. Any pending
+  /// queries associated with |browser| will be canceled and
+  /// Handler::OnQueryCanceled will be called. No JavaScript callbacks will be
+  /// executed since this indicates destruction of the context.
   ///
   virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser) = 0;
 
   ///
-  // Call from CefRequestHandler::OnBeforeBrowse only if the navigation is
-  // allowed to proceed. If |frame| is the main frame then any pending queries
-  // associated with |browser| will be canceled and Handler::OnQueryCanceled
-  // will be called. No JavaScript callbacks will be executed since this
-  // indicates destruction of the context.
+  /// Call from CefRequestHandler::OnBeforeBrowse only if the navigation is
+  /// allowed to proceed. If |frame| is the main frame then any pending queries
+  /// associated with |browser| will be canceled and Handler::OnQueryCanceled
+  /// will be called. No JavaScript callbacks will be executed since this
+  /// indicates destruction of the context.
   ///
   virtual void OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
                               CefRefPtr<CefFrame> frame) = 0;
 
   ///
-  // Call from CefClient::OnProcessMessageReceived. Returns true if the message
-  // is handled by this router or false otherwise.
+  /// Call from CefClient::OnProcessMessageReceived. Returns true if the message
+  /// is handled by this router or false otherwise.
   ///
   virtual bool OnProcessMessageReceived(
       CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
       CefProcessId source_process,
       CefRefPtr<CefProcessMessage> message) = 0;
 
  protected:
   // Protect against accidental deletion of this object.
   friend class base::RefCountedThreadSafe<CefMessageRouterBrowserSide>;
-  virtual ~CefMessageRouterBrowserSide() {}
+  virtual ~CefMessageRouterBrowserSide() = default;
 };
 
 ///
-// Implements the renderer side of query routing. The methods of this class must
-// be called on the render process main thread.
+/// Implements the renderer side of query routing. The methods of this class
+/// must be called on the render process main thread.
 ///
 class CefMessageRouterRendererSide
     : public base::RefCountedThreadSafe<CefMessageRouterRendererSide> {
  public:
   ///
-  // Create a new router with the specified configuration.
+  /// Create a new router with the specified configuration.
   ///
   static CefRefPtr<CefMessageRouterRendererSide> Create(
       const CefMessageRouterConfig& config);
 
   ///
-  // Returns the number of queries currently pending for the specified |browser|
-  // and/or |context|. Either or both values may be empty.
+  /// Returns the number of queries currently pending for the specified
+  /// |browser| and/or |context|. Either or both values may be empty.
   ///
   virtual int GetPendingCount(CefRefPtr<CefBrowser> browser,
                               CefRefPtr<CefV8Context> context) = 0;
@@ -393,35 +462,36 @@ class CefMessageRouterRendererSide
   // called exactly as documented for the router to function correctly.
 
   ///
-  // Call from CefRenderProcessHandler::OnContextCreated. Registers the
-  // JavaScripts functions with the new context.
+  /// Call from CefRenderProcessHandler::OnContextCreated. Registers the
+  /// JavaScripts functions with the new context.
   ///
   virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefFrame> frame,
                                 CefRefPtr<CefV8Context> context) = 0;
 
   ///
-  // Call from CefRenderProcessHandler::OnContextReleased. Any pending queries
-  // associated with the released context will be canceled and
-  // Handler::OnQueryCanceled will be called in the browser process.
+  /// Call from CefRenderProcessHandler::OnContextReleased. Any pending queries
+  /// associated with the released context will be canceled and
+  /// Handler::OnQueryCanceled will be called in the browser process.
   ///
   virtual void OnContextReleased(CefRefPtr<CefBrowser> browser,
                                  CefRefPtr<CefFrame> frame,
                                  CefRefPtr<CefV8Context> context) = 0;
 
   ///
-  // Call from CefRenderProcessHandler::OnProcessMessageReceived. Returns true
-  // if the message is handled by this router or false otherwise.
+  /// Call from CefRenderProcessHandler::OnProcessMessageReceived. Returns true
+  /// if the message is handled by this router or false otherwise.
   ///
   virtual bool OnProcessMessageReceived(
       CefRefPtr<CefBrowser> browser,
+      CefRefPtr<CefFrame> frame,
       CefProcessId source_process,
       CefRefPtr<CefProcessMessage> message) = 0;
 
  protected:
   // Protect against accidental deletion of this object.
   friend class base::RefCountedThreadSafe<CefMessageRouterRendererSide>;
-  virtual ~CefMessageRouterRendererSide() {}
+  virtual ~CefMessageRouterRendererSide() = default;
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_MESSAGE_ROUTER_H_
diff --git a/src/include/wrapper/cef_resource_manager.h b/src/include/wrapper/cef_resource_manager.h
index 91190b778..5cb01feab 100644
--- a/src/include/wrapper/cef_resource_manager.h
+++ b/src/include/wrapper/cef_resource_manager.h
@@ -38,41 +38,43 @@
 #pragma once
 
 #include <list>
+#include <memory>
 
-#include "include/base/cef_macros.h"
+#include "include/base/cef_callback.h"
 #include "include/base/cef_ref_counted.h"
-#include "include/base/cef_scoped_ptr.h"
 #include "include/base/cef_weak_ptr.h"
 #include "include/cef_request_handler.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "include/wrapper/cef_helpers.h"
 
 ///
-// Class for managing multiple resource providers. For each resource request
-// providers will be called in order and have the option to (a) handle the
-// request by returning a CefResourceHandler, (b) pass the request to the next
-// provider in order, or (c) stop handling the request. See comments on the
-// Request object for additional usage information. The methods of this class
-// may be called on any browser process thread unless otherwise indicated.
+/// Class for managing multiple resource providers. For each resource request
+/// providers will be called in order and have the option to (a) handle the
+/// request by returning a CefResourceHandler, (b) pass the request to the next
+/// provider in order, or (c) stop handling the request. See comments on the
+/// Request object for additional usage information. The methods of this class
+/// may be called on any browser process thread unless otherwise indicated.
 ///
 class CefResourceManager
     : public base::RefCountedThreadSafe<CefResourceManager,
                                         CefDeleteOnIOThread> {
  public:
   ///
-  // Provides an opportunity to modify |url| before it is passed to a provider.
-  // For example, the implementation could rewrite |url| to include a default
-  // file extension. |url| will be fully qualified and may contain query or
-  // fragment components.
+  /// Provides an opportunity to modify |url| before it is passed to a provider.
+  /// For example, the implementation could rewrite |url| to include a default
+  /// file extension. |url| will be fully qualified and may contain query or
+  /// fragment components.
   ///
-  typedef base::Callback<std::string(const std::string& /*url*/)> UrlFilter;
+  using UrlFilter =
+      base::RepeatingCallback<std::string(const std::string& /*url*/)>;
 
   ///
-  // Used to resolve mime types for URLs, usually based on the file extension.
-  // |url| will be fully qualified and may contain query or fragment components.
+  /// Used to resolve mime types for URLs, usually based on the file extension.
+  /// |url| will be fully qualified and may contain query or fragment
+  /// components.
   ///
-  typedef base::Callback<std::string(const std::string& /*url*/)>
-      MimeTypeResolver;
+  using MimeTypeResolver =
+      base::RepeatingCallback<std::string(const std::string& /*url*/)>;
 
  private:
   // Values that stay with a request as it moves between providers.
@@ -90,64 +92,67 @@ class CefResourceManager
 
  public:
   ///
-  // Object representing a request. Each request object is used for a single
-  // call to Provider::OnRequest and will become detached (meaning the callbacks
-  // will no longer trigger) after Request::Continue or Request::Stop is called.
-  // A request passed to Provider::OnRequestCanceled will already have been
-  // detached. The methods of this class may be called on any browser process
-  // thread.
+  /// Object representing a request. Each request object is used for a single
+  /// call to Provider::OnRequest and will become detached (meaning the
+  /// callbacks will no longer trigger) after Request::Continue or Request::Stop
+  /// is called. A request passed to Provider::OnRequestCanceled will already
+  /// have been detached. The methods of this class may be called on any browser
+  /// process thread.
   ///
   class Request : public base::RefCountedThreadSafe<Request> {
    public:
+    Request(const Request&) = delete;
+    Request& operator=(const Request&) = delete;
+
     ///
-    // Returns the URL associated with this request. The returned value will be
-    // fully qualified but will not contain query or fragment components. It
-    // will already have been passed through the URL filter.
+    /// Returns the URL associated with this request. The returned value will be
+    /// fully qualified but will not contain query or fragment components. It
+    /// will already have been passed through the URL filter.
     ///
     std::string url() const { return params_.url_; }
 
     ///
-    // Returns the CefBrowser associated with this request.
+    /// Returns the CefBrowser associated with this request.
     ///
     CefRefPtr<CefBrowser> browser() const { return params_.browser_; }
 
     ///
-    // Returns the CefFrame associated with this request.
+    /// Returns the CefFrame associated with this request.
     ///
     CefRefPtr<CefFrame> frame() const { return params_.frame_; }
 
     ///
-    // Returns the CefRequest associated with this request.
+    /// Returns the CefRequest associated with this request.
     ///
     CefRefPtr<CefRequest> request() const { return params_.request_; }
 
     ///
-    // Returns the current URL filter.
+    /// Returns the current URL filter.
     ///
     const CefResourceManager::UrlFilter& url_filter() const {
       return params_.url_filter_;
     }
 
     ///
-    // Returns the current mime type resolver.
+    /// Returns the current mime type resolver.
     ///
     const CefResourceManager::MimeTypeResolver& mime_type_resolver() const {
       return params_.mime_type_resolver_;
     }
 
     ///
-    // Continue handling the request. If |handler| is non-NULL then no
-    // additional providers will be called and the |handler| value will be
-    // returned via CefResourceManager::GetResourceHandler. If |handler| is NULL
-    // then the next provider in order, if any, will be called. If there are no
-    // additional providers then NULL will be returned via CefResourceManager::
-    // GetResourceHandler.
+    /// Continue handling the request. If |handler| is non-NULL then no
+    /// additional providers will be called and the |handler| value will be
+    /// returned via CefResourceManager::GetResourceHandler. If |handler| is
+    /// NULL then the next provider in order, if any, will be called. If there
+    /// are no additional providers then NULL will be returned via
+    /// CefResourceManager:: GetResourceHandler.
     ///
     void Continue(CefRefPtr<CefResourceHandler> handler);
 
     ///
-    // Stop handling the request. No additional providers will be called and
-    // NULL will be returned via CefResourceManager::GetResourceHandler.
+    /// Stop handling the request. No additional providers will be called and
+    /// NULL will be returned via CefResourceManager::GetResourceHandler.
     ///
     void Stop();
 
@@ -159,60 +164,61 @@ class CefResourceManager
 
     // The below methods are called on the browser process IO thread.
 
-    explicit Request(scoped_ptr<RequestState> state);
+    explicit Request(std::unique_ptr<RequestState> state);
 
-    scoped_ptr<RequestState> SendRequest();
+    std::unique_ptr<RequestState> SendRequest();
     bool HasState();
 
-    static void ContinueOnIOThread(scoped_ptr<RequestState> state,
+    static void ContinueOnIOThread(std::unique_ptr<RequestState> state,
                                    CefRefPtr<CefResourceHandler> handler);
-    static void StopOnIOThread(scoped_ptr<RequestState> state);
+    static void StopOnIOThread(std::unique_ptr<RequestState> state);
 
     // Will be non-NULL while the request is pending. Only accessed on the
     // browser process IO thread.
-    scoped_ptr<RequestState> state_;
+    std::unique_ptr<RequestState> state_;
 
     // Params that stay with this request object. Safe to access on any thread.
     RequestParams params_;
-
-    DISALLOW_COPY_AND_ASSIGN(Request);
   };
 
-  typedef std::list<scoped_refptr<Request>> RequestList;
+  using RequestList = std::list<scoped_refptr<Request>>;
 
   ///
-  // Interface implemented by resource providers. A provider may be created on
-  // any thread but the methods will be called on, and the object will be
-  // destroyed on, the browser process IO thread.
+  /// Interface implemented by resource providers. A provider may be created on
+  /// any thread but the methods will be called on, and the object will be
+  /// destroyed on, the browser process IO thread.
   ///
   class Provider {
    public:
     ///
-    // Called to handle a request. If the provider knows immediately that it
-    // will not handle the request return false. Otherwise, return true and call
-    // Request::Continue or Request::Stop either in this method or
-    // asynchronously to indicate completion. See comments on Request for
-    // additional usage information.
+    /// Called to handle a request. If the provider knows immediately that it
+    /// will not handle the request return false. Otherwise, return true and
+    /// call Request::Continue or Request::Stop either in this method or
+    /// asynchronously to indicate completion. See comments on Request for
+    /// additional usage information.
     ///
     virtual bool OnRequest(scoped_refptr<Request> request) = 0;
 
     ///
-    // Called when a request has been canceled. It is still safe to dereference
-    // |request| but any calls to Request::Continue or Request::Stop will be
-    // ignored.
+    /// Called when a request has been canceled. It is still safe to dereference
+    /// |request| but any calls to Request::Continue or Request::Stop will be
+    /// ignored.
     ///
     virtual void OnRequestCanceled(scoped_refptr<Request> request) {}
 
-    virtual ~Provider() {}
+    virtual ~Provider() = default;
   };
 
   CefResourceManager();
 
+  CefResourceManager(const CefResourceManager&) = delete;
+  CefResourceManager& operator=(const CefResourceManager&) = delete;
+
   ///
-  // Add a provider that maps requests for |url| to |content|. |url| should be
-  // fully qualified but not include a query or fragment component. If
-  // |mime_type| is empty the MimeTypeResolver will be used. See comments on
-  // AddProvider for usage of the |order| and |identifier| parameters.
+  /// Add a provider that maps requests for |url| to |content|. |url| should be
+  /// fully qualified but not include a query or fragment component. If
+  /// |mime_type| is empty the MimeTypeResolver will be used. See comments on
+  /// AddProvider for usage of the |order| and |identifier| parameters.
   ///
   void AddContentProvider(const std::string& url,
                           const std::string& content,
@@ -221,11 +227,11 @@ class CefResourceManager
                           const std::string& identifier);
 
   ///
-  // Add a provider that maps requests that start with |url_path| to files under
-  // |directory_path|. |url_path| should include an origin and optional path
-  // component only. Files will be loaded when a matching URL is requested.
-  // See comments on AddProvider for usage of the |order| and |identifier|
-  // parameters.
+  /// Add a provider that maps requests that start with |url_path| to files
+  /// under |directory_path|. |url_path| should include an origin and optional
+  /// path component only. Files will be loaded when a matching URL is
+  /// requested. See comments on AddProvider for usage of the |order| and
+  /// |identifier| parameters.
   ///
   void AddDirectoryProvider(const std::string& url_path,
                             const std::string& directory_path,
@@ -233,11 +239,11 @@ class CefResourceManager
                             const std::string& identifier);
 
   ///
-  // Add a provider that maps requests that start with |url_path| to files
-  // stored in the archive file at |archive_path|. |url_path| should include an
-  // origin and optional path component only. The archive file will be loaded
-  // when a matching URL is requested for the first time. See comments on
-  // AddProvider for usage of the |order| and |identifier| parameters.
+  /// Add a provider that maps requests that start with |url_path| to files
+  /// stored in the archive file at |archive_path|. |url_path| should include an
+  /// origin and optional path component only. The archive file will be loaded
+  /// when a matching URL is requested for the first time. See comments on
+  /// AddProvider for usage of the |order| and |identifier| parameters.
   ///
   void AddArchiveProvider(const std::string& url_path,
                           const std::string& archive_path,
@@ -246,59 +252,58 @@ class CefResourceManager
                           const std::string& identifier);
 
   ///
-  // Add a provider. This object takes ownership of |provider|. Providers will
-  // be called in ascending order based on the |order| value. Multiple providers
-  // sharing the same |order| value will be called in the order that they were
-  // added. The |identifier| value, which does not need to be unique, can be
-  // used to remove the provider at a later time.
+  /// Add a provider. This object takes ownership of |provider|. Providers will
+  /// be called in ascending order based on the |order| value. Multiple
+  /// providers sharing the same |order| value will be called in the order that
+  /// they were added. The |identifier| value, which does not need to be unique,
+  /// can be used to remove the provider at a later time.
   ///
   void AddProvider(Provider* provider,
                    int order,
                    const std::string& identifier);
 
   ///
-  // Remove all providers with the specified |identifier| value. If any removed
-  // providers have pending requests the Provider::OnRequestCancel method will
-  // be called. The removed providers may be deleted immediately or at a later
-  // time.
+  /// Remove all providers with the specified |identifier| value. If any removed
+  /// providers have pending requests the Provider::OnRequestCancel method will
+  /// be called. The removed providers may be deleted immediately or at a later
+  /// time.
   ///
   void RemoveProviders(const std::string& identifier);
 
   ///
-  // Remove all providers. If any removed providers have pending requests the
-  // Provider::OnRequestCancel method will be called. The removed providers may
-  // be deleted immediately or at a later time.
+  /// Remove all providers. If any removed providers have pending requests the
+  /// Provider::OnRequestCancel method will be called. The removed providers may
+  /// be deleted immediately or at a later time.
   ///
   void RemoveAllProviders();
 
   ///
-  // Set the url filter. If not set the default no-op filter will be used.
-  // Changes to this value will not affect currently pending requests.
+  /// Set the url filter. If not set the default no-op filter will be used.
+  /// Changes to this value will not affect currently pending requests.
   ///
   void SetUrlFilter(const UrlFilter& filter);
 
   ///
-  // Set the mime type resolver. If not set the default resolver will be used.
-  // Changes to this value will not affect currently pending requests.
+  /// Set the mime type resolver. If not set the default resolver will be used.
+  /// Changes to this value will not affect currently pending requests.
   ///
   void SetMimeTypeResolver(const MimeTypeResolver& resolver);
 
-  // The below methods should be called from other CEF handlers. They must be
-  // called exactly as documented for the manager to function correctly.
+  /// The below methods should be called from other CEF handlers. They must be
+  /// called exactly as documented for the manager to function correctly.
 
   ///
-  // Called from CefRequestHandler::OnBeforeResourceLoad on the browser process
-  // IO thread.
+  /// Called from CefRequestHandler::OnBeforeResourceLoad on the browser process
+  /// IO thread.
   ///
-  cef_return_value_t OnBeforeResourceLoad(
-      CefRefPtr<CefBrowser> browser,
-      CefRefPtr<CefFrame> frame,
-      CefRefPtr<CefRequest> request,
-      CefRefPtr<CefRequestCallback> callback);
+  cef_return_value_t OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
+                                          CefRefPtr<CefFrame> frame,
+                                          CefRefPtr<CefRequest> request,
+                                          CefRefPtr<CefCallback> callback);
 
   ///
-  // Called from CefRequestHandler::GetResourceHandler on the browser process
-  // IO thread.
+  /// Called from CefRequestHandler::GetResourceHandler on the browser process
+  /// IO thread.
   ///
   CefRefPtr<CefResourceHandler> GetResourceHandler(
       CefRefPtr<CefBrowser> browser,
@@ -315,7 +320,7 @@ class CefResourceManager
 
   // Provider and associated information.
   struct ProviderEntry;
-  typedef std::list<ProviderEntry*> ProviderEntryList;
+  using ProviderEntryList = std::list<ProviderEntry*>;
 
   // Values associated with the pending request only. Ownership will be passed
   // between requests and the resource manager as request handling proceeds.
@@ -325,7 +330,7 @@ class CefResourceManager
     base::WeakPtr<CefResourceManager> manager_;
 
     // Callback to execute once request handling is complete.
-    CefRefPtr<CefRequestCallback> callback_;
+    CefRefPtr<CefCallback> callback_;
 
     // Position of the currently associated ProviderEntry in the |providers_|
     // list.
@@ -341,10 +346,10 @@ class CefResourceManager
 
   // Methods that manage request state between requests. Called on the browser
   // process IO thread.
-  bool SendRequest(scoped_ptr<RequestState> state);
-  void ContinueRequest(scoped_ptr<RequestState> state,
+  bool SendRequest(std::unique_ptr<RequestState> state);
+  void ContinueRequest(std::unique_ptr<RequestState> state,
                        CefRefPtr<CefResourceHandler> handler);
-  void StopRequest(scoped_ptr<RequestState> state);
+  void StopRequest(std::unique_ptr<RequestState> state);
   bool IncrementProvider(RequestState* state);
   void DetachRequestFromProvider(RequestState* state);
   void GetNextValidProvider(ProviderEntryList::iterator& iterator);
@@ -356,16 +361,14 @@ class CefResourceManager
   ProviderEntryList providers_;
 
   // Map of response ID to pending CefResourceHandler object.
-  typedef std::map<uint64, CefRefPtr<CefResourceHandler>> PendingHandlersMap;
+  using PendingHandlersMap = std::map<uint64_t, CefRefPtr<CefResourceHandler>>;
   PendingHandlersMap pending_handlers_;
 
   UrlFilter url_filter_;
   MimeTypeResolver mime_type_resolver_;
 
   // Must be the last member. Created and accessed on the IO thread.
-  scoped_ptr<base::WeakPtrFactory<CefResourceManager>> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefResourceManager);
+  std::unique_ptr<base::WeakPtrFactory<CefResourceManager>> weak_ptr_factory_;
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_RESOURCE_MANAGER_H_
diff --git a/src/include/wrapper/cef_scoped_temp_dir.h b/src/include/wrapper/cef_scoped_temp_dir.h
index f40fa7d67..6bd8cea07 100644
--- a/src/include/wrapper/cef_scoped_temp_dir.h
+++ b/src/include/wrapper/cef_scoped_temp_dir.h
@@ -39,80 +39,80 @@
 #pragma once
 
 #include "include/base/cef_build.h"
-#include "include/base/cef_macros.h"
 #include "include/cef_base.h"
 
 ///
-// An object representing a temporary / scratch directory that should be cleaned
-// up (recursively) when this object goes out of scope.  Note that since
-// deletion occurs during the destructor, no further error handling is possible
-// if the directory fails to be deleted.  As a result, deletion is not
-// guaranteed by this class.
-//
-// Multiple calls to the methods which establish a temporary directory
-// (CreateUniqueTempDir, CreateUniqueTempDirUnderPath, and Set) must have
-// intervening calls to Delete or Take, or the calls will fail.
+/// An object representing a temporary / scratch directory that should be
+/// cleaned up (recursively) when this object goes out of scope.  Note that
+/// since deletion occurs during the destructor, no further error handling is
+/// possible if the directory fails to be deleted.  As a result, deletion is not
+/// guaranteed by this class.
+///
+/// Multiple calls to the methods which establish a temporary directory
+/// (CreateUniqueTempDir, CreateUniqueTempDirUnderPath, and Set) must have
+/// intervening calls to Delete or Take, or the calls will fail.
 ///
 class CefScopedTempDir {
  public:
   ///
-  // No directory is owned/created initially.
+  /// No directory is owned/created initially.
   ///
   CefScopedTempDir();
 
+  CefScopedTempDir(const CefScopedTempDir&) = delete;
+  CefScopedTempDir& operator=(const CefScopedTempDir&) = delete;
+
   ///
-  // Recursively delete path.
+  /// Recursively delete path.
   ///
   ~CefScopedTempDir();
 
   ///
-  // Creates a unique directory in TempPath, and takes ownership of it.
-  // See file_util::CreateNewTemporaryDirectory.
+  /// Creates a unique directory in TempPath, and takes ownership of it.
+  /// See file_util::CreateNewTemporaryDirectory.
   ///
-  bool CreateUniqueTempDir() WARN_UNUSED_RESULT;
+  [[nodiscard]] bool CreateUniqueTempDir();
 
   ///
-  // Creates a unique directory under a given path, and takes ownership of it.
+  /// Creates a unique directory under a given path, and takes ownership of it.
   ///
-  bool CreateUniqueTempDirUnderPath(const CefString& path) WARN_UNUSED_RESULT;
+  [[nodiscard]] bool CreateUniqueTempDirUnderPath(const CefString& path);
 
   ///
-  // Takes ownership of directory at |path|, creating it if necessary.
-  // Don't call multiple times unless Take() has been called first.
+  /// Takes ownership of directory at |path|, creating it if necessary.
+  /// Don't call multiple times unless Take() has been called first.
   ///
-  bool Set(const CefString& path) WARN_UNUSED_RESULT;
+  [[nodiscard]] bool Set(const CefString& path);
 
   ///
-  // Deletes the temporary directory wrapped by this object.
+  /// Deletes the temporary directory wrapped by this object.
   ///
-  bool Delete() WARN_UNUSED_RESULT;
+  [[nodiscard]] bool Delete();
 
   ///
-  // Caller takes ownership of the temporary directory so it won't be destroyed
-  // when this object goes out of scope.
+  /// Caller takes ownership of the temporary directory so it won't be destroyed
+  /// when this object goes out of scope.
   ///
   CefString Take();
 
   ///
-  // Returns the path to the created directory. Call one of the
-  // CreateUniqueTempDir* methods before getting the path.
+  /// Returns the path to the created directory. Call one of the
+  /// CreateUniqueTempDir* methods before getting the path.
   ///
   const CefString& GetPath() const;
 
   ///
-  // Returns true if path_ is empty.
+  /// Returns true if path_ is empty.
   ///
   bool IsEmpty() const;
 
   ///
-  // Returns true if path_ is non-empty and exists.
+  /// Returns true if path_ is non-empty and exists.
   ///
   bool IsValid() const;
 
  private:
   CefString path_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefScopedTempDir);
 };
 
 #endif  // CEF_INCLUDE_SCOPED_TEMP_DIR_H_
diff --git a/src/include/wrapper/cef_stream_resource_handler.h b/src/include/wrapper/cef_stream_resource_handler.h
index 8e549ddf2..06690fc1c 100644
--- a/src/include/wrapper/cef_stream_resource_handler.h
+++ b/src/include/wrapper/cef_stream_resource_handler.h
@@ -37,27 +37,22 @@
 #define CEF_INCLUDE_WRAPPER_CEF_STREAM_RESOURCE_HANDLER_H_
 #pragma once
 
-#include "include/base/cef_logging.h"
-#include "include/base/cef_macros.h"
-#include "include/base/cef_scoped_ptr.h"
-#include "include/cef_base.h"
 #include "include/cef_resource_handler.h"
 #include "include/cef_response.h"
-
-class CefStreamReader;
+#include "include/cef_stream.h"
 
 ///
-// Implementation of the CefResourceHandler class for reading from a CefStream.
+/// Implementation of the CefResourceHandler class for reading from a CefStream.
 ///
 class CefStreamResourceHandler : public CefResourceHandler {
  public:
   ///
-  // Create a new object with default response values.
+  /// Create a new object with default response values.
   ///
   CefStreamResourceHandler(const CefString& mime_type,
                            CefRefPtr<CefStreamReader> stream);
   ///
-  // Create a new object with explicit response values.
+  /// Create a new object with explicit response values.
   ///
   CefStreamResourceHandler(int status_code,
                            const CefString& status_text,
@@ -65,40 +60,30 @@ class CefStreamResourceHandler : public CefResourceHandler {
                            CefResponse::HeaderMap header_map,
                            CefRefPtr<CefStreamReader> stream);
 
-  virtual ~CefStreamResourceHandler();
+  CefStreamResourceHandler(const CefStreamResourceHandler&) = delete;
+  CefStreamResourceHandler& operator=(const CefStreamResourceHandler&) = delete;
 
   // CefResourceHandler methods.
-  virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
-                              CefRefPtr<CefCallback> callback) OVERRIDE;
-  virtual void GetResponseHeaders(CefRefPtr<CefResponse> response,
-                                  int64& response_length,
-                                  CefString& redirectUrl) OVERRIDE;
-  virtual bool ReadResponse(void* data_out,
-                            int bytes_to_read,
-                            int& bytes_read,
-                            CefRefPtr<CefCallback> callback) OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+  bool Open(CefRefPtr<CefRequest> request,
+            bool& handle_request,
+            CefRefPtr<CefCallback> callback) override;
+  void GetResponseHeaders(CefRefPtr<CefResponse> response,
+                          int64_t& response_length,
+                          CefString& redirectUrl) override;
+  bool Read(void* data_out,
+            int bytes_to_read,
+            int& bytes_read,
+            CefRefPtr<CefResourceReadCallback> callback) override;
+  void Cancel() override;
 
  private:
-  void ReadOnFileThread(int bytes_to_read, CefRefPtr<CefCallback> callback);
-
   const int status_code_;
   const CefString status_text_;
   const CefString mime_type_;
   const CefResponse::HeaderMap header_map_;
   const CefRefPtr<CefStreamReader> stream_;
-  bool read_on_file_thread_;
-
-  class Buffer;
-  scoped_ptr<Buffer> buffer_;
-#if DCHECK_IS_ON()
-  // Used in debug builds to verify that |buffer_| isn't being accessed on
-  // multiple threads at the same time.
-  bool buffer_owned_by_file_thread_;
-#endif
 
   IMPLEMENT_REFCOUNTING(CefStreamResourceHandler);
-  DISALLOW_COPY_AND_ASSIGN(CefStreamResourceHandler);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_STREAM_RESOURCE_HANDLER_H_
diff --git a/src/include/wrapper/cef_xml_object.h b/src/include/wrapper/cef_xml_object.h
index 9315adcba..61731cc13 100644
--- a/src/include/wrapper/cef_xml_object.h
+++ b/src/include/wrapper/cef_xml_object.h
@@ -41,7 +41,6 @@
 #include <vector>
 
 #include "include/base/cef_lock.h"
-#include "include/base/cef_macros.h"
 #include "include/base/cef_ref_counted.h"
 #include "include/cef_base.h"
 #include "include/cef_xml_reader.h"
@@ -49,42 +48,43 @@
 class CefStreamReader;
 
 ///
-// Thread safe class for representing XML data as a structured object. This
-// class should not be used with large XML documents because all data will be
-// resident in memory at the same time. This implementation supports a
-// restricted set of XML features:
-// <pre>
-// (1) Processing instructions, whitespace and comments are ignored.
-// (2) Elements and attributes must always be referenced using the fully
-//     qualified name (ie, namespace:localname).
-// (3) Empty elements (<a/>) and elements with zero-length values (<a></a>)
-//     are considered the same.
-// (4) Element nodes are considered part of a value if:
-//     (a) The element node follows a non-element node at the same depth
-//         (see 5), or
-//     (b) The element node does not have a namespace and the parent node does.
-// (5) Mixed node types at the same depth are combined into a single element
-//     value as follows:
-//     (a) All node values are concatenated to form a single string value.
-//     (b) Entity reference nodes are resolved to the corresponding entity
-//         value.
-//     (c) Element nodes are represented by their outer XML string.
-// </pre>
+/// Thread safe class for representing XML data as a structured object. This
+/// class should not be used with large XML documents because all data will be
+/// resident in memory at the same time. This implementation supports a
+/// restricted set of XML features:
+///
+/// 1. Processing instructions, whitespace and comments are ignored.
+/// 2. Elements and attributes must always be referenced using the fully
+///    qualified name (ie, namespace:localname).
+/// 3. Empty elements ("<a/>") and elements with zero-length values ("<a></a>")
+///    are considered the same.
+/// 4. Element nodes are considered part of a value if:
+///    1. The element node follows a non-element node at the same depth
+///       (see 5), or
+///    2. The element node does not have a namespace and the parent node does.
+/// 5. Mixed node types at the same depth are combined into a single element
+///    value as follows:
+///    1. All node values are concatenated to form a single string value.
+///    2. Entity reference nodes are resolved to the corresponding entity value.
+///    3. Element nodes are represented by their outer XML string.
 ///
 class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
  public:
-  typedef std::vector<CefRefPtr<CefXmlObject>> ObjectVector;
-  typedef std::map<CefString, CefString> AttributeMap;
+  using ObjectVector = std::vector<CefRefPtr<CefXmlObject>>;
+  using AttributeMap = std::map<CefString, CefString>;
 
   ///
-  // Create a new object with the specified name. An object name must always be
-  // at least one character long.
+  /// Create a new object with the specified name. An object name must always be
+  /// at least one character long.
   ///
   explicit CefXmlObject(const CefString& name);
 
+  CefXmlObject(const CefXmlObject&) = delete;
+  CefXmlObject& operator=(const CefXmlObject&) = delete;
+
   ///
-  // Load the contents of the specified XML stream into this object.  The
-  // existing children and attributes, if any, will first be cleared.
+  /// Load the contents of the specified XML stream into this object.  The
+  /// existing children and attributes, if any, will first be cleared.
   ///
   bool Load(CefRefPtr<CefStreamReader> stream,
             CefXmlReader::EncodingType encodingType,
@@ -92,56 +92,56 @@ class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
             CefString* loadError);
 
   ///
-  // Set the name, children and attributes of this object to a duplicate of the
-  // specified object's contents. The existing children and attributes, if any,
-  // will first be cleared.
+  /// Set the name, children and attributes of this object to a duplicate of the
+  /// specified object's contents. The existing children and attributes, if any,
+  /// will first be cleared.
   ///
   void Set(CefRefPtr<CefXmlObject> object);
 
   ///
-  // Append a duplicate of the children and attributes of the specified object
-  // to this object. If |overwriteAttributes| is true then any attributes in
-  // this object that also exist in the specified object will be overwritten
-  // with the new values. The name of this object is not changed.
+  /// Append a duplicate of the children and attributes of the specified object
+  /// to this object. If |overwriteAttributes| is true then any attributes in
+  /// this object that also exist in the specified object will be overwritten
+  /// with the new values. The name of this object is not changed.
   ///
   void Append(CefRefPtr<CefXmlObject> object, bool overwriteAttributes);
 
   ///
-  // Return a new object with the same name, children and attributes as this
-  // object. The parent of the new object will be NULL.
+  /// Return a new object with the same name, children and attributes as this
+  /// object. The parent of the new object will be NULL.
   ///
   CefRefPtr<CefXmlObject> Duplicate();
 
   ///
-  // Clears this object's children and attributes. The name and parenting of
-  // this object are not changed.
+  /// Clears this object's children and attributes. The name and parenting of
+  /// this object are not changed.
   ///
   void Clear();
 
   ///
-  // Access the object's name. An object name must always be at least one
-  // character long.
+  /// Access the object's name. An object name must always be at least one
+  /// character long.
   ///
   CefString GetName();
   bool SetName(const CefString& name);
 
   ///
-  // Access the object's parent. The parent can be NULL if this object has not
-  // been added as the child on another object.
+  /// Access the object's parent. The parent can be NULL if this object has not
+  /// been added as the child on another object.
   ///
   bool HasParent();
   CefRefPtr<CefXmlObject> GetParent();
 
   ///
-  // Access the object's value. An object cannot have a value if it also has
-  // children. Attempting to set the value while children exist will fail.
+  /// Access the object's value. An object cannot have a value if it also has
+  /// children. Attempting to set the value while children exist will fail.
   ///
   bool HasValue();
   CefString GetValue();
   bool SetValue(const CefString& value);
 
   ///
-  // Access the object's attributes. Attributes must have unique names.
+  /// Access the object's attributes. Attributes must have unique names.
   ///
   bool HasAttributes();
   size_t GetAttributeCount();
@@ -152,11 +152,11 @@ class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
   void ClearAttributes();
 
   ///
-  // Access the object's children. Each object can only have one parent so
-  // attempting to add an object that already has a parent will fail. Removing a
-  // child will set the child's parent to NULL. Adding a child will set the
-  // child's parent to this object. This object's value, if any, will be cleared
-  // if a child is added.
+  /// Access the object's children. Each object can only have one parent so
+  /// attempting to add an object that already has a parent will fail. Removing
+  /// a child will set the child's parent to NULL. Adding a child will set the
+  /// child's parent to this object. This object's value, if any, will be
+  /// cleared if a child is added.
   ///
   bool HasChildren();
   size_t GetChildCount();
@@ -167,12 +167,12 @@ class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
   void ClearChildren();
 
   ///
-  // Find the first child with the specified name.
+  /// Find the first child with the specified name.
   ///
   CefRefPtr<CefXmlObject> FindChild(const CefString& name);
 
   ///
-  // Find all children with the specified name.
+  /// Find all children with the specified name.
   ///
   size_t FindChildren(const CefString& name, ObjectVector& children);
 
@@ -184,14 +184,12 @@ class CefXmlObject : public base::RefCountedThreadSafe<CefXmlObject> {
   void SetParent(CefXmlObject* parent);
 
   CefString name_;
-  CefXmlObject* parent_;
+  CefXmlObject* parent_ = nullptr;
   CefString value_;
   AttributeMap attributes_;
   ObjectVector children_;
 
   base::Lock lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefXmlObject);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_XML_OBJECT_H_
diff --git a/src/include/wrapper/cef_zip_archive.h b/src/include/wrapper/cef_zip_archive.h
index 9eb28125f..4f8d351dc 100644
--- a/src/include/wrapper/cef_zip_archive.h
+++ b/src/include/wrapper/cef_zip_archive.h
@@ -40,91 +40,93 @@
 #include <map>
 
 #include "include/base/cef_lock.h"
-#include "include/base/cef_macros.h"
 #include "include/base/cef_ref_counted.h"
 #include "include/cef_base.h"
 
 class CefStreamReader;
 
 ///
-// Thread-safe class for accessing zip archive file contents. This class should
-// not be used with large archive files because all data will be resident in
-// memory at the same time. This implementation supports a restricted set of zip
-// archive features:
-// (1) All file names are stored and compared in lower case.
-// (2) File ordering from the original zip archive is not maintained. This
-//     means that files from the same folder may not be located together in the
-//     file content map.
+/// Thread-safe class for accessing zip archive file contents. This class should
+/// not be used with large archive files because all data will be resident in
+/// memory at the same time. This implementation supports a restricted set of
+/// zip archive features:
+/// 1. All file names are stored and compared in lower case.
+/// 2. File ordering from the original zip archive is not maintained. This means
+///    that files from the same folder may not be located together in the file
+///    content map.
 ///
 class CefZipArchive : public base::RefCountedThreadSafe<CefZipArchive> {
  public:
   ///
-  // Class representing a file in the archive. Accessing the file data from
-  // multiple threads is safe provided a reference to the File object is kept.
+  /// Class representing a file in the archive. Accessing the file data from
+  /// multiple threads is safe provided a reference to the File object is kept.
   ///
   class File : public CefBaseRefCounted {
    public:
     ///
-    // Returns the read-only data contained in the file.
+    /// Returns the read-only data contained in the file.
     ///
     virtual const unsigned char* GetData() const = 0;
 
     ///
-    // Returns the size of the data in the file.
+    /// Returns the size of the data in the file.
     ///
     virtual size_t GetDataSize() const = 0;
 
     ///
-    // Returns a CefStreamReader object for streaming the contents of the file.
+    /// Returns a CefStreamReader object for streaming the contents of the file.
     ///
     virtual CefRefPtr<CefStreamReader> GetStreamReader() const = 0;
   };
 
-  typedef std::map<CefString, CefRefPtr<File>> FileMap;
+  using FileMap = std::map<CefString, CefRefPtr<File>>;
 
   ///
-  // Create a new object.
+  /// Create a new object.
   ///
   CefZipArchive();
 
+  CefZipArchive(const CefZipArchive&) = delete;
+  CefZipArchive& operator=(const CefZipArchive&) = delete;
+
   ///
-  // Load the contents of the specified zip archive stream into this object.
-  // If the zip archive requires a password then provide it via |password|.
-  // If |overwriteExisting| is true then any files in this object that also
-  // exist in the specified archive will be replaced with the new files.
-  // Returns the number of files successfully loaded.
+  /// Load the contents of the specified zip archive stream into this object.
+  /// If the zip archive requires a password then provide it via |password|.
+  /// If |overwriteExisting| is true then any files in this object that also
+  /// exist in the specified archive will be replaced with the new files.
+  /// Returns the number of files successfully loaded.
   ///
   size_t Load(CefRefPtr<CefStreamReader> stream,
               const CefString& password,
               bool overwriteExisting);
 
   ///
-  // Clears the contents of this object.
+  /// Clears the contents of this object.
   ///
   void Clear();
 
   ///
-  // Returns the number of files in the archive.
+  /// Returns the number of files in the archive.
   ///
   size_t GetFileCount() const;
 
   ///
-  // Returns true if the specified file exists and has contents.
+  /// Returns true if the specified file exists and has contents.
   ///
   bool HasFile(const CefString& fileName) const;
 
   ///
-  // Returns the specified file.
+  /// Returns the specified file.
   ///
   CefRefPtr<File> GetFile(const CefString& fileName) const;
 
   ///
-  // Removes the specified file.
+  /// Removes the specified file.
   ///
   bool RemoveFile(const CefString& fileName);
 
   ///
-  // Returns the map of all files.
+  /// Returns the map of all files.
   ///
   size_t GetFiles(FileMap& map) const;
 
@@ -136,8 +138,6 @@ class CefZipArchive : public base::RefCountedThreadSafe<CefZipArchive> {
   FileMap contents_;
 
   mutable base::Lock lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(CefZipArchive);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_ZIP_ARCHIVE_H_
diff --git a/src/javascript_bindings.pyx b/src/javascript_bindings.pyx
index 31620a6dc..c0546344f 100644
--- a/src/javascript_bindings.pyx
+++ b/src/javascript_bindings.pyx
@@ -104,8 +104,10 @@ cdef class JavascriptBindings:
                 for methodName in self.objects[objectName]:
                     methods[methodName] = None
                 objects[objectName] = methods
-            pyBrowser.SendProcessMessage(cef_types.PID_RENDERER,
-                    0, "DoJavascriptBindings", [{
+            mainFrame = pyBrowser.GetMainFrame()
+            if mainFrame.IsValid():
+                mainFrame.SendProcessMessage(cef_types.PID_RENDERER,
+                    mainFrame.frameId, "DoJavascriptBindings", [{
                             "functions": functions,
                             "properties": properties,
                             "objects": objects,
diff --git a/src/javascript_callback.pyx b/src/javascript_callback.pyx
index be474be77..b556fcb56 100644
--- a/src/javascript_callback.pyx
+++ b/src/javascript_callback.pyx
@@ -6,16 +6,16 @@ include "cefpython.pyx"
 include "browser.pyx"
 
 cdef JavascriptCallback CreateJavascriptCallback(int callbackId,
-        CefRefPtr[CefBrowser] cefBrowser, object frameId,
+        CefRefPtr[CefBrowser] cefBrowser, py_string frameId,
         py_string functionName):
-    # frameId is int64
+    Debug("Created javascript callback, callbackId=%s, functionName=%s" % \
+            (callbackId, functionName))
     cdef JavascriptCallback jsCallback = JavascriptCallback()
     jsCallback.callbackId = callbackId
     cdef PyBrowser browser = GetPyBrowser(cefBrowser)
     jsCallback.frame = browser.GetFrameByIdentifier(frameId)
     jsCallback.functionName = functionName
-    Debug("Created javascript callback, callbackId=%s, functionName=%s" % \
-            (callbackId, functionName))
+
     return jsCallback
 
 cdef class JavascriptCallback:
@@ -30,7 +30,7 @@ cdef class JavascriptCallback:
         if self.frame:
             browser = self.frame.GetBrowser()
             if browser:
-                browser.SendProcessMessage(
+                browser.GetMainFrame().SendProcessMessage(
                         cef_types.PID_RENDERER,
                         self.frame.GetIdentifier(),
                         "ExecuteJavascriptCallback",
diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx
index e2d55dabd..3ce76b396 100644
--- a/src/process_message_utils.pyx
+++ b/src/process_message_utils.pyx
@@ -11,6 +11,7 @@
 
 include "cefpython.pyx"
 include "utils.pyx"
+from libc.stdint cimport int64_t, uint32_t
 
 # -----------------------------------------------------------------------------
 # CEF values to Python values
@@ -41,8 +42,8 @@ cdef object CefValueToPyValue(CefRefPtr[CefValue] cefValue):
     assert cefValue.get().IsValid(), "cefValue is invalid"
     cdef cef_types.cef_value_type_t valueType = cefValue.get().GetType()
     cdef CefRefPtr[CefBinaryValue] binaryValue
-    cdef uint32 uint32_value = 0
-    cdef int64 int64_value = 0
+    cdef uint32_t uint32_value = 0
+    cdef int64_t int64_value = 0
 
     if valueType == cef_types.VTYPE_NULL:
         return None
@@ -56,12 +57,12 @@ cdef object CefValueToPyValue(CefRefPtr[CefValue] cefValue):
         return CefToPyString(cefValue.get().GetString())
     elif valueType == cef_types.VTYPE_DICTIONARY:
         return CefDictionaryValueToPyDict(
-                <CefRefPtr[CefBrowser]>NULL,
+                <CefRefPtr[CefBrowser]>nullptr,
                 cefValue.get().GetDictionary(),
                 1)
     elif valueType == cef_types.VTYPE_LIST:
         return CefListValueToPyList(
-                <CefRefPtr[CefBrowser]>NULL,
+                <CefRefPtr[CefBrowser]>nullptr,
                 cefValue.get().GetList(),
                 1)
     elif valueType == cef_types.VTYPE_BINARY:
@@ -97,8 +98,8 @@ cdef list CefListValueToPyList(
     cdef cef_types.cef_value_type_t valueType
     cdef list ret = []
     cdef CefRefPtr[CefBinaryValue] binaryValue
-    cdef uint32 uint32_value = 0
-    cdef int64 int64_value = 0
+    cdef uint32_t uint32_value = 0
+    cdef int64_t int64_value = 0
     cdef object originallyString
     for index in range(0, size):
         valueType = cefListValue.get().GetType(index)
@@ -162,8 +163,8 @@ cdef dict CefDictionaryValueToPyDict(
     cdef CefString cefKey
     cdef py_string pyKey
     cdef CefRefPtr[CefBinaryValue] binaryValue
-    cdef uint32 uint32_value = 0
-    cdef int64 int64_value = 0
+    cdef uint32_t uint32_value = 0
+    cdef int64_t int64_value = 0
     cdef object originallyString
     while iterator != keyList.end():
         # noinspection PyUnresolvedReferences
@@ -238,9 +239,12 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue(
             ret.get().SetNull(index)
         elif valueType == bool:
             ret.get().SetBool(index, bool(value))
-        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
-            # Int32 range is -2147483648..2147483647
-            if INT_MIN <= value <= INT_MAX:
+        elif valueType in (int, long):
+            # Int32 range is -2147483648..2147483647, we've increased the
+            # minimum size by one as Cython was throwing a warning:
+            # "unary minus operator applied to unsigned type, result still
+            # unsigned".
+            if -2147483647 <= value <= 2147483647:
                 ret.get().SetInt(index, int(value))
             else:
                 # Long values become strings.
@@ -292,9 +296,12 @@ cdef void PyListToExistingCefListValue(
             cefListValue.get().SetNull(index)
         elif valueType == bool:
             cefListValue.get().SetBool(index, bool(value))
-        elif valueType == int or valueType == long:  # In Py3 int and long types are the same type.
-            # Int32 range is -2147483648..2147483647
-            if INT_MIN <= value <= INT_MAX:
+        elif valueType in (int, long):
+            # Int32 range is -2147483648..2147483647, we've increased the
+            # minimum size by one as Cython was throwing a warning:
+            # "unary minus operator applied to unsigned type, result still
+            # unsigned".
+            if -2147483647 <= value <= 2147483647:
                 cefListValue.get().SetInt(index, int(value))
             else:
                 # Long values become strings.
diff --git a/src/request.pyx b/src/request.pyx
index c0d2793c0..978ddbb93 100644
--- a/src/request.pyx
+++ b/src/request.pyx
@@ -59,7 +59,7 @@ cdef class PyRequest:
     cdef CefRefPtr[CefRequest] cefRequest
 
     cdef CefRefPtr[CefRequest] GetCefRequest(self) except *:
-        if <void*>self.cefRequest != NULL and self.cefRequest.get():
+        if self.cefRequest and self.cefRequest.get():
             return self.cefRequest
         raise Exception("PyRequest.GetCefRequest() failed: "
                         "CefRequest was destroyed")
@@ -203,7 +203,7 @@ cdef class PyRequest:
 
     cpdef py_void SetHeaderMap(self, dict headerMap):
         assert len(headerMap) > 0, "headerMap param is empty"
-        cpdef list headerMultimap = []
+        cdef list headerMultimap = []
         cdef object key
         for key in headerMap:
             headerMultimap.append((str(key), str(headerMap[key])))
diff --git a/src/response.pyx b/src/response.pyx
index 88e35c8a9..b54ae9407 100644
--- a/src/response.pyx
+++ b/src/response.pyx
@@ -14,7 +14,7 @@ cdef class PyResponse:
 
     cdef CefRefPtr[CefResponse] GetCefResponse(self
             ) except *:
-        if <void*>self.cefResponse != NULL and self.cefResponse.get():
+        if self.cefResponse and self.cefResponse.get():
             return self.cefResponse
         raise Exception("CefResponse was destroyed, you cannot use this object anymore")
 
@@ -48,12 +48,12 @@ cdef class PyResponse:
         PyToCefString(mimeType, cefMimeType)
         self.GetCefResponse().get().SetMimeType(cefMimeType)
 
-    cpdef str GetHeader(self, py_string name):
+    cpdef str GetHeaderByName(self, py_string name):
         assert type(name) in (str, unicode, bytes), (
-                "Response.GetHeader() failed: name param is not a string")
+                "Response.GetHeaderByName() failed: name param is not a string")
         cdef CefString cefName
         PyToCefString(name, cefName)
-        return CefToPyString(self.GetCefResponse().get().GetHeader(cefName))
+        return CefToPyString(self.GetCefResponse().get().GetHeaderByName(cefName))
 
     cpdef dict GetHeaderMap(self):
         cdef list headerMultimap = self.GetHeaderMultimap()
@@ -86,7 +86,7 @@ cdef class PyResponse:
 
     cpdef py_void SetHeaderMap(self, dict headerMap):
         assert len(headerMap) > 0, "headerMap param is empty"
-        cpdef list headerMultimap = []
+        cdef list headerMultimap = []
         cdef object key
         for key in headerMap:
             headerMultimap.append((str(key), str(headerMap[key])))
diff --git a/src/settings.pyx b/src/settings.pyx
index d7052eae4..52000945f 100644
--- a/src/settings.pyx
+++ b/src/settings.pyx
@@ -9,6 +9,7 @@
 include "cefpython.pyx"
 
 cimport cef_types
+from libc.stdint cimport uint32_t
 
 LOGSEVERITY_DEFAULT = cef_types.LOGSEVERITY_DEFAULT
 LOGSEVERITY_VERBOSE = cef_types.LOGSEVERITY_VERBOSE
@@ -45,10 +46,6 @@ cdef void SetApplicationSettings(
                 or key == "app_user_model_id":
             # CEF Python only options. These are not to be found in CEF.
             continue
-        elif key == "accept_language_list":
-            cefString = new CefString(&cefAppSettings.accept_language_list)
-            PyToCefStringPointer(appSettings[key], cefString)
-            del cefString
         elif key == "cache_path":
             cefString = new CefString(&cefAppSettings.cache_path)
             PyToCefStringPointer(appSettings[key], cefString)
@@ -59,10 +56,6 @@ cdef void SetApplicationSettings(
             cefString = new CefString(&cefAppSettings.user_agent)
             PyToCefStringPointer(appSettings[key], cefString)
             del cefString
-        elif key == "product_version":
-            cefString = new CefString(&cefAppSettings.product_version)
-            PyToCefStringPointer(appSettings[key], cefString)
-            del cefString
         elif key == "log_file":
             cefString = new CefString(&cefAppSettings.log_file)
             PyToCefStringPointer(appSettings[key], cefString)
@@ -75,9 +68,6 @@ cdef void SetApplicationSettings(
             cefAppSettings.log_severity = <cef_types.cef_log_severity_t><int>int(appSettings[key])
         elif key == "multi_threaded_message_loop":
             cefAppSettings.multi_threaded_message_loop = int(appSettings[key])
-        elif key == "net_security_expiration_enabled":
-            cefAppSettings.enable_net_security_expiration =\
-                    int(appSettings[key])
         elif key == "release_dcheck_enabled":
             # Keep for BC, just log info - no error
             Debug("DEPRECATED: 'release_dcheck_enabled' setting")
@@ -97,8 +87,6 @@ cdef void SetApplicationSettings(
             cefAppSettings.pack_loading_disabled = int(appSettings[key])
         elif key == "uncaught_exception_stack_size":
             cefAppSettings.uncaught_exception_stack_size = <int>int(appSettings[key])
-        elif key == "single_process":
-            cefAppSettings.single_process = int(appSettings[key])
         elif key == "browser_subprocess_path":
             cefString = new CefString(&cefAppSettings.browser_subprocess_path)
             PyToCefStringPointer(appSettings[key], cefString)
@@ -107,18 +95,12 @@ cdef void SetApplicationSettings(
             cefAppSettings.command_line_args_disabled = int(appSettings[key])
         elif key == "remote_debugging_port":
             cefAppSettings.remote_debugging_port = int(appSettings[key])
-        elif key == "ignore_certificate_errors":
-            cefAppSettings.ignore_certificate_errors = int(appSettings[key])
         elif key == "background_color":
             cefAppSettings.background_color = \
-                    <cef_types.uint32>int(appSettings[key])
+                    <uint32_t>int(appSettings[key])
         elif key == "persist_user_preferences":
             cefAppSettings.persist_user_preferences = \
                     int(appSettings[key])
-        elif key == "user_data_path":
-            cefString = new CefString(&cefAppSettings.user_data_path)
-            PyToCefStringPointer(appSettings[key], cefString)
-            del cefString
         elif key == "windowless_rendering_enabled":
             cefAppSettings.windowless_rendering_enabled = \
                     int(appSettings[key])
@@ -142,13 +124,9 @@ cdef void SetBrowserSettings(
         if key == "inherit_client_handlers_for_popups":
             # CEF Python only options. These are not to be found in CEF.
             continue
-        elif key == "accept_language_list":
-            cefString = new CefString(&cefBrowserSettings.accept_language_list)
-            PyToCefStringPointer(browserSettings[key], cefString)
-            del cefString
         elif key == "background_color":
             cefBrowserSettings.background_color = \
-                    <cef_types.uint32>int(browserSettings[key])
+                    <uint32_t>int(browserSettings[key])
         elif key == "standard_font_family":
             cefString = new CefString(&cefBrowserSettings.standard_font_family)
             PyToCefStringPointer(browserSettings[key], cefString)
@@ -227,30 +205,6 @@ cdef void SetBrowserSettings(
         elif key == "java_disabled":
             # Keep the key for BC
             Debug("DEPRECATED: 'java_disabled' setting")
-        elif key == "plugins_disabled":
-            if browserSettings[key]:
-                cefBrowserSettings.plugins = cef_types.STATE_DISABLED
-            else:
-                cefBrowserSettings.plugins = cef_types.STATE_ENABLED
-        elif key == "universal_access_from_file_urls_allowed":
-            if browserSettings[key]:
-                cefBrowserSettings.universal_access_from_file_urls = (
-                        cef_types.STATE_ENABLED)
-            else:
-                cefBrowserSettings.universal_access_from_file_urls = (
-                        cef_types.STATE_DISABLED)
-        elif key == "file_access_from_file_urls_allowed":
-            if browserSettings[key]:
-                cefBrowserSettings.file_access_from_file_urls = (
-                        cef_types.STATE_ENABLED)
-            else:
-                cefBrowserSettings.file_access_from_file_urls = (
-                        cef_types.STATE_DISABLED)
-        elif key == "web_security_disabled":
-            if browserSettings[key]:
-                cefBrowserSettings.web_security = cef_types.STATE_DISABLED
-            else:
-                cefBrowserSettings.web_security = cef_types.STATE_ENABLED
         elif key == "image_load_disabled":
             if browserSettings[key]:
                 cefBrowserSettings.image_loading = cef_types.STATE_DISABLED
@@ -287,13 +241,6 @@ cdef void SetBrowserSettings(
                 cefBrowserSettings.databases = cef_types.STATE_DISABLED
             else:
                 cefBrowserSettings.databases = cef_types.STATE_ENABLED
-        elif key == "application_cache_disabled":
-            if browserSettings[key]:
-                cefBrowserSettings.application_cache = (
-                        cef_types.STATE_DISABLED)
-            else:
-                cefBrowserSettings.application_cache = (
-                        cef_types.STATE_ENABLED)
         elif key == "webgl_disabled":
             if browserSettings[key]:
                 cefBrowserSettings.webgl = cef_types.STATE_DISABLED
diff --git a/src/subprocess/cefpython_app.cpp b/src/subprocess/cefpython_app.cpp
index 786a919d5..38bd30aca 100644
--- a/src/subprocess/cefpython_app.cpp
+++ b/src/subprocess/cefpython_app.cpp
@@ -31,6 +31,7 @@
 #include "include/wrapper/cef_closure_task.h"
 #include "include/base/cef_bind.h"
 #include "include/base/cef_logging.h"
+#include "include/base/cef_callback.h"
 #include <vector>
 #include <algorithm>
 #include "v8utils.h"
@@ -149,7 +150,7 @@ void CefPythonApp::OnRegisterCustomSchemes(
 }
 
 CefRefPtr<CefResourceBundleHandler> CefPythonApp::GetResourceBundleHandler() {
-    return NULL;
+    return nullptr;
 }
 
 CefRefPtr<CefBrowserProcessHandler> CefPythonApp::GetBrowserProcessHandler() {
@@ -199,24 +200,6 @@ void CefPythonApp::OnBeforeChildProcessLaunch(
     LOG(INFO) << logMessage.c_str();
 }
 
-void CefPythonApp::OnRenderProcessThreadCreated(
-        CefRefPtr<CefListValue> extra_info) {
-#ifdef BROWSER_PROCESS
-    // If you have an existing CefListValue that you would like
-    // to provide, do this:
-    // | extra_info = mylist.get()
-    // The equivalent in Cython is:
-    // | extra_info.Assign(mylist.get())
-    REQUIRE_IO_THREAD();
-    // Eg.:
-    // | extra_info->SetBool(0, false);
-    // | extra_info->SetString(1, "test");
-    // This is included only in the Browser process, when building
-    // the libcefpythonapp library.
-    BrowserProcessHandler_OnRenderProcessThreadCreated(extra_info);
-#endif // BROWSER_PROCESS
-}
-
 CefRefPtr<CefPrintHandler> CefPythonApp::GetPrintHandler() {
 #ifdef BROWSER_PROCESS
 #if defined(OS_LINUX)
@@ -236,7 +219,7 @@ CefRefPtr<CefPrintHandler> CefPythonApp::GetPrintHandler() {
     return print_handler_;
 }
 
-void CefPythonApp::OnScheduleMessagePumpWork(int64 delay_ms) {
+void CefPythonApp::OnScheduleMessagePumpWork(int64_t delay_ms) {
 #ifdef BROWSER_PROCESS
     MainMessageLoopExternalPump* message_pump =\
             MainMessageLoopExternalPump::Get();
@@ -250,13 +233,10 @@ void CefPythonApp::OnScheduleMessagePumpWork(int64 delay_ms) {
 // CefRenderProcessHandler
 // -----------------------------------------------------------------------------
 
-void CefPythonApp::OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info) {
-}
-
 void CefPythonApp::OnWebKitInitialized() {
 }
 
-void CefPythonApp::OnBrowserCreated(CefRefPtr<CefBrowser> browser) {
+void CefPythonApp::OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extra_info) {
 }
 
 void CefPythonApp::OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) {
@@ -271,30 +251,10 @@ void CefPythonApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
     CefRefPtr<CefProcessMessage> message = CefProcessMessage::Create(
             "OnContextCreated");
     CefRefPtr<CefListValue> arguments = message->GetArgumentList();
-    /*
-    Sending int64 type using process messaging would require
-    converting it to a string or a binary, or you could send
-    two ints, see this topic:
-    http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=10869
-    */
-    /*
-    // Example of converting int64 to string. Still need an
-    // example of converting it back from string.
-    std::string logMessage = "[Renderer process] OnContextCreated(): frameId=";
-    stringstream stream;
-    int64 value = frame->GetIdentifier();
-    stream << value;
-    logMessage.append(stream.str());
-    LOG(INFO) << logMessage.c_str();
-    */
-    // TODO: losing int64 precision, the solution is to convert
-    //       it to string and then in the Browser process back
-    //       from string to int64. But it is rather unlikely
-    //       that number of frames will exceed int range, so
-    //       casting it to int for now.
-    arguments->SetInt(0, (int)(frame->GetIdentifier()));
-    browser->SendProcessMessage(PID_BROWSER, message);
+    arguments->SetString(0, frame->GetIdentifier());
+    frame->SendProcessMessage(PID_BROWSER, message);
     CefRefPtr<CefDictionaryValue> jsBindings = GetJavascriptBindings(browser);
+
     if (jsBindings.get()) {
         // Javascript bindings are most probably not yet set for
         // the main frame, they will be set a moment later due to
@@ -324,16 +284,11 @@ void CefPythonApp::OnContextReleased(CefRefPtr<CefBrowser> browser,
     message = CefProcessMessage::Create("OnContextReleased");
     arguments = message->GetArgumentList();
     arguments->SetInt(0, browser->GetIdentifier());
-    // TODO: losing int64 precision, the solution is to convert
-    //       it to string and then in the Browser process back
-    //       from string to int64. But it is rather unlikely
-    //       that number of frames will exceed int range, so
-    //       casting it to int for now.
-    arguments->SetInt(1, (int)(frame->GetIdentifier()));
+    arguments->SetString(1, frame->GetIdentifier());
     // Should we send the message using current "browser"
     // when this is not the main frame? It could fail, so
     // it is more reliable to always use the main browser.
-    browser->SendProcessMessage(PID_BROWSER, message);
+    frame->SendProcessMessage(PID_BROWSER, message);
     // ------------------------------------------------------------------------
     // 2. Remove python callbacks for a frame.
     // ------------------------------------------------------------------------
@@ -360,9 +315,10 @@ void CefPythonApp::OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
 }
 
 bool CefPythonApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+                                        CefRefPtr<CefFrame> frame,
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message) {
-    std::string messageName = message->GetName().ToString();
+    const std::string& messageName = message->GetName();
     std::string logMessage = "[Renderer process] OnProcessMessageReceived(): ";
     logMessage.append(messageName.c_str());
     LOG(INFO) << logMessage.c_str();
@@ -414,7 +370,7 @@ CefRefPtr<CefDictionaryValue> CefPythonApp::GetJavascriptBindings(
     if (javascriptBindings_.find(browserId) != javascriptBindings_.end()) {
         return javascriptBindings_[browserId];
     }
-    return NULL;
+    return nullptr;
 }
 
 void CefPythonApp::RemoveJavascriptBindings(CefRefPtr<CefBrowser> browser) {
@@ -485,7 +441,7 @@ void CefPythonApp::DoJavascriptBindingsForBrowser(
                       " bindings not set";
         return;
     }
-    std::vector<int64> frameIds;
+    std::vector<CefString> frameIds;
     std::vector<CefString> frameNames;
     if (jsBindings->HasKey("bindToFrames")
             && jsBindings->GetType("bindToFrames") == VTYPE_BOOL
@@ -496,7 +452,7 @@ void CefPythonApp::DoJavascriptBindingsForBrowser(
         browser->GetFrameNames(frameNames);
         for (std::vector<CefString>::iterator it = frameNames.begin(); \
                 it != frameNames.end(); ++it) {
-            CefRefPtr<CefFrame> frame = browser->GetFrame(*it);
+            CefRefPtr<CefFrame> frame = browser->GetFrameByName(*it);
             if (frame.get()) {
                 frameIds.push_back(frame->GetIdentifier());
                 // | printf("GetFrameNames(): frameId = %lu\n",
@@ -507,7 +463,7 @@ void CefPythonApp::DoJavascriptBindingsForBrowser(
     // BUG in CEF:
     //   GetFrameNames() does not return the main frame (as of revision 1448).
     //   Make it work for the future when this bug gets fixed.
-    std::vector<int64>::iterator find_it = std::find(
+    std::vector<CefString>::iterator find_it = std::find(
             frameIds.begin(), frameIds.end(),
             browser->GetMainFrame()->GetIdentifier());
     if (find_it == frameIds.end()) {
@@ -521,36 +477,38 @@ void CefPythonApp::DoJavascriptBindingsForBrowser(
                       " frameIds.size() == 0";
         return;
     }
-    for (std::vector<int64>::iterator it = frameIds.begin(); \
+    for (std::vector<CefString>::iterator it = frameIds.begin(); \
             it != frameIds.end(); ++it) {
-        if (*it <= 0) {
+        if (it->empty()) {
             // GetFrameIdentifiers() bug that returned a vector
             // filled with zeros. This problem was fixed by using'
             // GetFrameNames() so this block of code should not
             // be executed anymore.
             LOG(ERROR) << "[Renderer process] DoJavascriptBindingsForBrowser():"
-                          " frameId <= 0";
+                          " frameId empty";
             // printf("[CEF Python] Renderer: frameId = %lli\n", *it);
             continue;
         }
-        CefRefPtr<CefFrame> frame = browser->GetFrame(*it);
+        CefRefPtr<CefFrame> frame = browser->GetFrameByIdentifier(*it);
         if (!frame.get()) {
             LOG(ERROR) << "[Renderer process] DoJavascriptBindingsForBrowser():"
-                          " GetFrame() failed";
+                          " GetFrameByIdentifier() failed";
             continue;
         }
         CefRefPtr<CefV8Context> context = frame->GetV8Context();
         CefRefPtr<CefTaskRunner> taskRunner = context->GetTaskRunner();
-        taskRunner->PostTask(CefCreateClosureTask(base::Bind(
-                &CefPythonApp::DoJavascriptBindingsForFrame, this,
-                browser, frame, context
-        )));
+        taskRunner->PostTask(
+            CefCreateClosureTask(
+                base::BindOnce(
+                    &CefPythonApp::DoJavascriptBindingsForFrame, this,
+                    browser, frame, context)));
     }
 }
 
 void CefPythonApp::DoJavascriptBindingsForFrame(CefRefPtr<CefBrowser> browser,
                         CefRefPtr<CefFrame> frame,
                         CefRefPtr<CefV8Context> context) {
+    LOG(INFO) << "[Renderer process] in DoJavascriptBindingsForFrame()";
     CefRefPtr<CefDictionaryValue> jsBindings = GetJavascriptBindings(browser);
     if (!jsBindings.get()) {
         // Bindings may not yet be set, it's okay.
@@ -659,7 +617,7 @@ void CefPythonApp::DoJavascriptBindingsForFrame(CefRefPtr<CefBrowser> browser,
     for (std::vector<CefString>::iterator it = objectsVector.begin(); \
             it != objectsVector.end(); ++it) {
         CefString objectName = *it;
-        CefRefPtr<CefV8Value> v8Object = CefV8Value::CreateObject(NULL, NULL);
+        CefRefPtr<CefV8Value> v8Object = CefV8Value::CreateObject(nullptr, nullptr);
         v8Window->SetValue(objectName, v8Object, V8_PROPERTY_ATTRIBUTE_NONE);
         // METHODS.
         if (!(objects->GetType(objectName) == VTYPE_DICTIONARY)) {
diff --git a/src/subprocess/cefpython_app.h b/src/subprocess/cefpython_app.h
index 6b2048a4f..b713c03ff 100644
--- a/src/subprocess/cefpython_app.h
+++ b/src/subprocess/cefpython_app.h
@@ -50,25 +50,19 @@ class CefPythonApp :
   void OnBeforeChildProcessLaunch(
       CefRefPtr<CefCommandLine> command_line) override;
 
-  void OnRenderProcessThreadCreated(
-      CefRefPtr<CefListValue> extra_info) override;
+  CefRefPtr<CefPrintHandler> GetPrintHandler();
 
-  CefRefPtr<CefPrintHandler> GetPrintHandler() override;
-
-  void OnScheduleMessagePumpWork(int64 delay_ms) override;
+  void OnScheduleMessagePumpWork(int64_t delay_ms) override;
 
 
   // ---------------------------------------------------------------------------
   // CefRenderProcessHandler
   // ---------------------------------------------------------------------------
 
-  void OnRenderThreadCreated(CefRefPtr<CefListValue> extra_info)
-        override;
-
   void OnWebKitInitialized()
         override;
 
-  void OnBrowserCreated(CefRefPtr<CefBrowser> browser)
+  void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extra_info)
         override;
 
   void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser)
@@ -97,6 +91,7 @@ class CefPythonApp :
         override;
 
   bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+                                        CefRefPtr<CefFrame> frame,
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message)
         override;
diff --git a/src/subprocess/javascript_callback.cpp b/src/subprocess/javascript_callback.cpp
index 9aeaf80ca..5bf114277 100644
--- a/src/subprocess/javascript_callback.cpp
+++ b/src/subprocess/javascript_callback.cpp
@@ -28,17 +28,17 @@ CefString PutJavascriptCallback(
         CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Value> jsCallback) {
     // Returns a "####cefpython####" string followed by json encoded data.
     // {"what":"javascript-callback","callbackId":123,
-    //  "frameId":123,"functionName":"xx"}
+    //  "frameId":"123","functionName":"xx"}
     int callbackId = ++g_jsCallbackMaxId;
-    int64 frameId = frame->GetIdentifier();
+    CefString frameId = frame->GetIdentifier();
     CefString functionName = jsCallback->GetFunctionName();
     std::string strCallbackId = "####cefpython####";
     strCallbackId.append("{");
     // JSON format allows only for double quotes.
     strCallbackId.append("\"what\":\"javascript-callback\"");
     strCallbackId.append(",\"callbackId\":").append(AnyToString(callbackId));
-    strCallbackId.append(",\"frameId\":").append(AnyToString(frameId));
-    strCallbackId.append(",\"functionName\":\"").append(functionName) \
+    strCallbackId.append(",\"frameId\":\"").append(AnyToString(frameId));
+    strCallbackId.append("\",\"functionName\":\"").append(functionName) \
             .append("\"");
     strCallbackId.append("}");
     g_jsCallbackMap.insert(std::make_pair(
@@ -69,7 +69,7 @@ bool ExecuteJavascriptCallback(int callbackId, CefRefPtr<CefListValue> args) {
     context->Enter();
     CefV8ValueList v8Arguments = CefListValueToCefV8ValueList(args);
     CefRefPtr<CefV8Value> v8ReturnValue = callback->ExecuteFunction(
-            NULL, v8Arguments);
+            nullptr, v8Arguments);
     if (v8ReturnValue.get()) {
         context->Exit();
         return true;
@@ -86,7 +86,7 @@ void RemoveJavascriptCallbacksForFrame(CefRefPtr<CefFrame> frame) {
         return;
     }
     JavascriptCallbackMap::iterator it = g_jsCallbackMap.begin();
-    int64 frameId = frame->GetIdentifier();
+    CefString frameId = frame->GetIdentifier();
     while (it != g_jsCallbackMap.end()) {
         if (it->second.first->GetIdentifier() == frameId) {
             // Pass current iterator and increment it after passing
diff --git a/src/subprocess/main.cpp b/src/subprocess/main.cpp
index 14d48fd52..5f469bfb1 100644
--- a/src/subprocess/main.cpp
+++ b/src/subprocess/main.cpp
@@ -21,9 +21,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
 	CefRefPtr<CefCommandLine> command_line = \
 	        CefCommandLine::CreateCommandLine();
     command_line->InitFromString(GetCommandLineW());
-    if (command_line->HasSwitch("enable-high-dpi-support")) {
-	    CefEnableHighDPISupport();
-	}
 
 	CefMainArgs mainArgs(hInstance);
 
diff --git a/src/subprocess/main_message_loop/main_message_loop.cpp b/src/subprocess/main_message_loop/main_message_loop.cpp
index dfad2a197..4f859176c 100644
--- a/src/subprocess/main_message_loop/main_message_loop.cpp
+++ b/src/subprocess/main_message_loop/main_message_loop.cpp
@@ -1,5 +1,3 @@
-// Copied from upstream cefclient with minor modifications.
-
 // Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
@@ -11,7 +9,7 @@
 
 namespace {
 
-MainMessageLoop* g_main_message_loop = NULL;
+MainMessageLoop* g_main_message_loop = nullptr;
 
 }  // namespace
 
@@ -21,7 +19,7 @@ MainMessageLoop::MainMessageLoop() {
 }
 
 MainMessageLoop::~MainMessageLoop() {
-  g_main_message_loop = NULL;
+  g_main_message_loop = nullptr;
 }
 
 // static
@@ -30,6 +28,10 @@ MainMessageLoop* MainMessageLoop::Get() {
   return g_main_message_loop;
 }
 
-void MainMessageLoop::PostClosure(const base::Closure& closure) {
-  PostTask(CefCreateClosureTask(closure));
+void MainMessageLoop::PostClosure(base::OnceClosure closure) {
+  PostTask(CefCreateClosureTask(std::move(closure)));
 }
+
+void MainMessageLoop::PostClosure(const base::RepeatingClosure& closure) {
+  PostTask(CefCreateClosureTask(closure));
+}
\ No newline at end of file
diff --git a/src/subprocess/main_message_loop/main_message_loop.h b/src/subprocess/main_message_loop/main_message_loop.h
index 50ef9f7b7..4d40d1b98 100644
--- a/src/subprocess/main_message_loop/main_message_loop.h
+++ b/src/subprocess/main_message_loop/main_message_loop.h
@@ -6,14 +6,17 @@
 #define CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_H_
 #pragma once
 
-#include "include/base/cef_bind.h"
-#include "include/base/cef_scoped_ptr.h"
+#include <memory>
+
+#include "include/base/cef_callback.h"
 #include "include/cef_task.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
+// namespace client {
+
 // Represents the message loop running on the main application thread in the
 // browser process. This will be the same as the CEF UI thread on Linux, OS X
 // and Windows when not using multi-threaded message loop mode. The methods of
@@ -45,11 +48,12 @@ class MainMessageLoop {
 #endif
 
   // Post a closure for execution on the main message loop.
-  void PostClosure(const base::Closure& closure);
+  void PostClosure(base::OnceClosure closure);
+  void PostClosure(const base::RepeatingClosure& closure);
 
  protected:
-  // Only allow deletion via scoped_ptr.
-  friend struct base::DefaultDeleter<MainMessageLoop>;
+  // Only allow deletion via std::unique_ptr.
+  friend std::default_delete<MainMessageLoop>;
 
   MainMessageLoop();
   virtual ~MainMessageLoop();
@@ -59,15 +63,14 @@ class MainMessageLoop {
 };
 
 #define CURRENTLY_ON_MAIN_THREAD() \
-    MainMessageLoop::Get()->RunsTasksOnCurrentThread()
+  MainMessageLoop::Get()->RunsTasksOnCurrentThread()
 
 #define REQUIRE_MAIN_THREAD() DCHECK(CURRENTLY_ON_MAIN_THREAD())
 
-#define MAIN_POST_TASK(task) \
-    MainMessageLoop::Get()->PostTask(task)
+#define MAIN_POST_TASK(task) MainMessageLoop::Get()->PostTask(task)
 
 #define MAIN_POST_CLOSURE(closure) \
-    MainMessageLoop::Get()->PostClosure(closure)
+  MainMessageLoop::Get()->PostClosure(closure)
 
 // Use this struct in conjuction with RefCountedThreadSafe to ensure that an
 // object is deleted on the main thread. For example:
@@ -87,18 +90,20 @@ class MainMessageLoop {
 //
 // base::scoped_refptr<Foo> foo = new Foo();
 // foo->DoSomething();
-// foo = NULL;  // Deletion of |foo| will occur on the main thread.
+// foo = nullptr;  // Deletion of |foo| will occur on the main thread.
 //
 struct DeleteOnMainThread {
-  template<typename T>
+  template <typename T>
   static void Destruct(const T* x) {
     if (CURRENTLY_ON_MAIN_THREAD()) {
       delete x;
     } else {
-      MainMessageLoop::Get()->PostClosure(
-          base::Bind(&DeleteOnMainThread::Destruct<T>, x));
+      MainMessageLoop::Get()->PostClosure(base::BindOnce(
+          &DeleteOnMainThread::Destruct<T>, base::Unretained(x)));
     }
   }
 };
 
-#endif  // CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_H_
+// }  // namespace client
+
+#endif  // CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_H_
\ No newline at end of file
diff --git a/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp b/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp
index 18b142898..0f2fa0535 100644
--- a/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp
+++ b/src/subprocess/main_message_loop/main_message_loop_external_pump.cpp
@@ -16,13 +16,13 @@ namespace {
 
 // Special timer delay placeholder value. Intentionally 32-bit for Windows and
 // OS X platform API compatibility.
-const int32 kTimerDelayPlaceholder = INT_MAX;
+const int32_t kTimerDelayPlaceholder = INT_MAX;
 
 // The maximum number of milliseconds we're willing to wait between calls to
 // DoWork().
-const int64 kMaxTimerDelay = 1000 / 30;  // 30fps
+const int64_t kMaxTimerDelay = 1000 / 30;  // 30fps
 
-::MainMessageLoopExternalPump* g_external_message_pump = NULL;
+::MainMessageLoopExternalPump* g_external_message_pump = nullptr;
 
 } // namespace
 
@@ -34,14 +34,14 @@ MainMessageLoopExternalPump::MainMessageLoopExternalPump()
 }
 
 MainMessageLoopExternalPump::~MainMessageLoopExternalPump() {
-  g_external_message_pump = NULL;
+  g_external_message_pump = nullptr;
 }
 
 MainMessageLoopExternalPump* MainMessageLoopExternalPump::Get() {
   return g_external_message_pump;
 }
 
-void MainMessageLoopExternalPump::OnScheduleWork(int64 delay_ms) {
+void MainMessageLoopExternalPump::OnScheduleWork(int64_t delay_ms) {
   REQUIRE_MAIN_THREAD();
   // LOG(INFO) << "MainMessageLoopExternalPump::OnScheduleWork";
   // LOG(INFO) << delay_ms << " ms";
diff --git a/src/subprocess/main_message_loop/main_message_loop_external_pump.h b/src/subprocess/main_message_loop/main_message_loop_external_pump.h
index d94bb0375..c462222f8 100644
--- a/src/subprocess/main_message_loop/main_message_loop_external_pump.h
+++ b/src/subprocess/main_message_loop/main_message_loop_external_pump.h
@@ -21,7 +21,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd {
  public:
   // Creates the singleton instance of this object. Must be called on the main
   // application thread.
-  static scoped_ptr<MainMessageLoopExternalPump> Create();
+  static std::unique_ptr<MainMessageLoopExternalPump> Create();
 
   // Returns the singleton instance of this object. Safe to call from any
   // thread.
@@ -30,11 +30,11 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd {
   // Called from CefBrowserProcessHandler::OnScheduleMessagePumpWork() on any
   // thread. The platform subclass must implement this method and schedule a
   // call to OnScheduleWork() on the main application thread.
-  virtual void OnScheduleMessagePumpWork(int64 delay_ms) = 0;
+  virtual void OnScheduleMessagePumpWork(int64_t delay_ms) = 0;
 
  protected:
-  // Only allow deletion via scoped_ptr.
-  friend struct base::DefaultDeleter<MainMessageLoopExternalPump>;
+  // Only allow deletion via std::unique_ptr.
+  friend std::default_delete<MainMessageLoopExternalPump>;
 
   // Construct and destruct this object on the main application thread.
   MainMessageLoopExternalPump();
@@ -42,7 +42,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd {
 
   // The platform subclass calls this method on the main application thread in
   // response to the OnScheduleMessagePumpWork() call.
-  void OnScheduleWork(int64 delay_ms);
+  void OnScheduleWork(int64_t delay_ms);
 
   // The platform subclass calls this method on the main application thread when
   // the pending work timer times out.
@@ -50,7 +50,7 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd {
 
   // Control the pending work timer in the platform subclass. Only called on
   // the main application thread.
-  virtual void SetTimer(int64 delay_ms) = 0;
+  virtual void SetTimer(int64_t delay_ms) = 0;
   virtual void KillTimer() = 0;
   virtual bool IsTimerPending() = 0;
 
diff --git a/src/subprocess/main_message_loop/main_message_loop_external_pump_win.cpp b/src/subprocess/main_message_loop/main_message_loop_external_pump_win.cpp
index 4ba8575b5..c7ebf33b5 100644
--- a/src/subprocess/main_message_loop/main_message_loop_external_pump_win.cpp
+++ b/src/subprocess/main_message_loop/main_message_loop_external_pump_win.cpp
@@ -24,17 +24,17 @@ class MainMessageLoopExternalPumpWin : public MainMessageLoopExternalPump {
   ~MainMessageLoopExternalPumpWin();
 
   // MainMessageLoopStd methods:
-  void Quit() OVERRIDE;
-  int Run() OVERRIDE;
+  void Quit() override;
+  int Run() override;
 
   // MainMessageLoopExternalPump methods:
-  void OnScheduleMessagePumpWork(int64 delay_ms) OVERRIDE;
+  void OnScheduleMessagePumpWork(int64_t delay_ms) override;
 
  protected:
   // MainMessageLoopExternalPump methods:
-  void SetTimer(int64 delay_ms) OVERRIDE;
-  void KillTimer() OVERRIDE;
-  bool IsTimerPending() OVERRIDE { return timer_pending_; }
+  void SetTimer(int64_t delay_ms) override;
+  void KillTimer() override;
+  bool IsTimerPending() override { return timer_pending_; }
 
  private:
   static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam,
@@ -49,8 +49,8 @@ class MainMessageLoopExternalPumpWin : public MainMessageLoopExternalPump {
 
 MainMessageLoopExternalPumpWin::MainMessageLoopExternalPumpWin()
   : timer_pending_(false),
-    main_thread_target_(NULL) {
-  HINSTANCE hInstance = GetModuleHandle(NULL);
+    main_thread_target_(nullptr) {
+  HINSTANCE hInstance = GetModuleHandle(nullptr);
   const char* const kClassName = "CEFMainTargetHWND";
 
   WNDCLASSEX wcex = {};
@@ -61,8 +61,8 @@ MainMessageLoopExternalPumpWin::MainMessageLoopExternalPumpWin()
   RegisterClassEx(&wcex);
 
   // Create the message handling window.
-  main_thread_target_ = CreateWindowA(kClassName, NULL, WS_OVERLAPPEDWINDOW,
-      0, 0, 0, 0, HWND_MESSAGE , NULL, hInstance, NULL);
+  main_thread_target_ = CreateWindowA(kClassName, nullptr, WS_OVERLAPPEDWINDOW,
+      0, 0, 0, 0, HWND_MESSAGE , nullptr, hInstance, nullptr);
   DCHECK(main_thread_target_);
   SetUserDataPtr(main_thread_target_, this);
 }
@@ -74,13 +74,13 @@ MainMessageLoopExternalPumpWin::~MainMessageLoopExternalPumpWin() {
 }
 
 void MainMessageLoopExternalPumpWin::Quit() {
-  PostMessage(NULL, WM_QUIT, 0, 0);
+  PostMessage(nullptr, WM_QUIT, 0, 0);
 }
 
 int MainMessageLoopExternalPumpWin::Run() {
   // Run the message loop.
   MSG msg;
-  while (GetMessage(&msg, NULL, 0, 0)) {
+  while (GetMessage(&msg, nullptr, 0, 0)) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);
   }
@@ -100,17 +100,17 @@ int MainMessageLoopExternalPumpWin::Run() {
   return 0;
 }
 
-void MainMessageLoopExternalPumpWin::OnScheduleMessagePumpWork(int64 delay_ms) {
+void MainMessageLoopExternalPumpWin::OnScheduleMessagePumpWork(int64_t delay_ms) {
   // This method may be called on any thread.
   PostMessage(main_thread_target_, kMsgHaveWork, 0,
               static_cast<LPARAM>(delay_ms));
 }
 
-void MainMessageLoopExternalPumpWin::SetTimer(int64 delay_ms) {
+void MainMessageLoopExternalPumpWin::SetTimer(int64_t delay_ms) {
   DCHECK(!timer_pending_);
   DCHECK_GT(delay_ms, 0);
   timer_pending_ = true;
-  ::SetTimer(main_thread_target_, 1, static_cast<UINT>(delay_ms), NULL);
+  ::SetTimer(main_thread_target_, 1, static_cast<UINT>(delay_ms), nullptr);
 }
 
 void MainMessageLoopExternalPumpWin::KillTimer() {
@@ -128,7 +128,7 @@ LRESULT CALLBACK MainMessageLoopExternalPumpWin::WndProc(
         GetUserDataPtr<MainMessageLoopExternalPumpWin*>(hwnd);
     if (msg == kMsgHaveWork) {
       // OnScheduleMessagePumpWork() request.
-      const int64 delay_ms = static_cast<int64>(lparam);
+      const int64_t delay_ms = static_cast<int64_t>(lparam);
       message_loop->OnScheduleWork(delay_ms);
     } else {
       // Timer timed out.
@@ -141,8 +141,7 @@ LRESULT CALLBACK MainMessageLoopExternalPumpWin::WndProc(
 } // namespace
 
 // static
-scoped_ptr<MainMessageLoopExternalPump>
+std::unique_ptr<MainMessageLoopExternalPump>
 MainMessageLoopExternalPump::Create() {
-  return scoped_ptr<MainMessageLoopExternalPump>(
-      new MainMessageLoopExternalPumpWin());
+  return std::unique_ptr<MainMessageLoopExternalPump>(new MainMessageLoopExternalPumpWin());
 }
diff --git a/src/subprocess/main_message_loop/main_message_loop_std.h b/src/subprocess/main_message_loop/main_message_loop_std.h
index b10b2581f..54053b969 100644
--- a/src/subprocess/main_message_loop/main_message_loop_std.h
+++ b/src/subprocess/main_message_loop/main_message_loop_std.h
@@ -17,13 +17,13 @@ class MainMessageLoopStd : public MainMessageLoop {
   MainMessageLoopStd();
 
   // MainMessageLoop methods.
-  int Run() OVERRIDE;
-  void Quit() OVERRIDE;
-  void PostTask(CefRefPtr<CefTask> task) OVERRIDE;
-  bool RunsTasksOnCurrentThread() const OVERRIDE;
+  int Run() override;
+  void Quit() override;
+  void PostTask(CefRefPtr<CefTask> task) override;
+  bool RunsTasksOnCurrentThread() const override;
 
 #if defined(OS_WIN)
-  void SetCurrentModelessDialog(HWND hWndDialog) OVERRIDE;
+  void SetCurrentModelessDialog(HWND hWndDialog) override;
 #endif
 
  private:
diff --git a/src/subprocess/v8function_handler.cpp b/src/subprocess/v8function_handler.cpp
index 0ce3a980b..f6bb17252 100644
--- a/src/subprocess/v8function_handler.cpp
+++ b/src/subprocess/v8function_handler.cpp
@@ -32,7 +32,7 @@ bool V8FunctionHandler::Execute(const CefString& functionName,
                 processMessage->GetArgumentList();
         messageArguments->SetInt(0, pythonCallbackId_);
         messageArguments->SetList(1, functionArguments);
-        browser->SendProcessMessage(PID_BROWSER, processMessage);
+        frame->SendProcessMessage(PID_BROWSER, processMessage);
         returnValue = CefV8Value::CreateNull();
         return true;
     } else {
@@ -50,16 +50,15 @@ bool V8FunctionHandler::Execute(const CefString& functionName,
         }
         CefRefPtr<CefListValue> functionArguments = V8ValueListToCefListValue(
                 v8Arguments);
-        // TODO: losing int64 precision here.
-        int frameId = (int)frame->GetIdentifier();
+        CefString frameId = frame->GetIdentifier();
         CefRefPtr<CefProcessMessage> processMessage = \
                 CefProcessMessage::Create("V8FunctionHandler::Execute");
         CefRefPtr<CefListValue> messageArguments = \
                 processMessage->GetArgumentList();
-        messageArguments->SetInt(0, frameId);
+        messageArguments->SetString(0, frameId);
         messageArguments->SetString(1, functionName);
         messageArguments->SetList(2, functionArguments);
-        browser->SendProcessMessage(PID_BROWSER, processMessage);
+        frame->SendProcessMessage(PID_BROWSER, processMessage);
         returnValue = CefV8Value::CreateNull();
         return true;
     }
diff --git a/src/subprocess/v8function_handler.h b/src/subprocess/v8function_handler.h
index 71a04b60b..66caebc6b 100644
--- a/src/subprocess/v8function_handler.h
+++ b/src/subprocess/v8function_handler.h
@@ -20,7 +20,7 @@ class V8FunctionHandler
                         CefRefPtr<CefV8Value> object,
                         const CefV8ValueList& arguments,
                         CefRefPtr<CefV8Value>& retval,
-                        CefString& exception) OVERRIDE;
+                        CefString& exception) override;
 protected:
     CefRefPtr<CefPythonApp> cefPythonApp_;
     int pythonCallbackId_;
diff --git a/src/subprocess/v8utils.cpp b/src/subprocess/v8utils.cpp
index 684f8c4ec..f92bfde36 100644
--- a/src/subprocess/v8utils.cpp
+++ b/src/subprocess/v8utils.cpp
@@ -49,7 +49,7 @@ void V8ValueAppendToCefListValue(CefRefPtr<CefV8Value> v8Value,
     } else if (v8Value->IsInt()) {
         listValue->SetInt((int)listValue->GetSize(), v8Value->GetIntValue());
     } else if (v8Value->IsUInt()) {
-        uint32 uint32_value = v8Value->GetUIntValue();
+        uint32_t uint32_value = v8Value->GetUIntValue();
         CefRefPtr<CefBinaryValue> binaryValue = CefBinaryValue::Create(
             &uint32_value, sizeof(uint32_value));
         listValue->SetBinary((int)listValue->GetSize(), binaryValue);
@@ -140,7 +140,7 @@ CefRefPtr<CefDictionaryValue> V8ObjectToCefDictionaryValue(
         } else if (v8Value->IsInt()) {
             ret->SetInt(key, v8Value->GetIntValue());
         } else if (v8Value->IsUInt()) {
-            uint32 uint32_value = v8Value->GetUIntValue();
+            uint32_t uint32_value = v8Value->GetUIntValue();
             CefRefPtr<CefBinaryValue> binaryValue = CefBinaryValue::Create(
                 &uint32_value, sizeof(uint32_value));
             ret->SetBinary(key, binaryValue);
@@ -270,7 +270,7 @@ CefRefPtr<CefV8Value> CefListValueToV8Value(
             if (binaryValue->GetSize() == sizeof(pyCallback)) {
                 binaryValue->GetData(&pyCallback, sizeof(pyCallback), 0);
                 v8FunctionHandler = new V8FunctionHandler(
-                        NULL, pyCallback.callbackId);
+                        nullptr, pyCallback.callbackId);
                 // You must provide a function name to
                 // CefV8Value::CreateFunction(), otherwise it fails.
                 callbackName.append(AnyToString(pyCallback.callbackId));
@@ -325,7 +325,7 @@ CefRefPtr<CefV8Value> CefDictionaryValueToV8Value(
                       " dictValue->GetKeys() failed";
         return CefV8Value::CreateNull();
     }
-    CefRefPtr<CefV8Value> ret = CefV8Value::CreateObject(NULL, NULL);
+    CefRefPtr<CefV8Value> ret = CefV8Value::CreateObject(nullptr, nullptr);
     CefRefPtr<CefBinaryValue> binaryValue;
     PythonCallback pyCallback;
     CefRefPtr<CefV8Handler> v8FunctionHandler;
@@ -360,7 +360,7 @@ CefRefPtr<CefV8Value> CefDictionaryValueToV8Value(
             if (binaryValue->GetSize() == sizeof(pyCallback)) {
                 binaryValue->GetData(&pyCallback, sizeof(pyCallback), 0);
                 v8FunctionHandler = new V8FunctionHandler(
-                        NULL, pyCallback.callbackId);
+                        nullptr, pyCallback.callbackId);
                 // You must provide a function name to
                 // CefV8Value::CreateFunction(), otherwise it fails.
                 callbackName.append(AnyToString(pyCallback.callbackId));
diff --git a/src/time_utils.pyx b/src/time_utils.pyx
index 9070ae5e3..8c9a4e9d6 100644
--- a/src/time_utils.pyx
+++ b/src/time_utils.pyx
@@ -4,6 +4,10 @@
 
 include "cefpython.pyx"
 
+cdef extern from "include/internal/cef_time.h":
+    cdef int cef_time_to_basetime(cef_time_t* _from, cef_basetime_t* _to)
+    cdef int cef_time_from_basetime(cef_basetime_t _from, cef_time_t* _to)
+
 cdef void DatetimeToCefTimeT(object pyDatetime, cef_time_t& timeT) except *:
     if not isinstance(pyDatetime, datetime.datetime):
         raise Exception("Expected object of type datetime.datetime")
@@ -36,3 +40,15 @@ cdef object CefTimeTToDatetime(cef_time_t timeT):
     # Milliseconds/microseconds are ignored.
     return datetime.datetime(year, month, day_of_month,
             timeT.hour, timeT.minute, second)
+
+cdef void DatetimeToCefBasetimeT(object pyDatetime, cef_basetime_t& timeT) except *:
+    if not isinstance(pyDatetime, datetime.datetime):
+        raise Exception("Expected object of type datetime.datetime")
+    cdef cef_time_t cefTime
+    DatetimeToCefTimeT(pyDatetime, cefTime)
+    cef_time_to_basetime(&cefTime, &timeT)
+
+cdef object CefBasetimeTToDatetime(cef_basetime_t timeT):
+    cdef cef_time_t cefTime
+    cef_time_from_basetime(timeT, &cefTime)
+    return CefTimeTToDatetime(cefTime)
\ No newline at end of file
diff --git a/src/utils.pyx b/src/utils.pyx
index 7d8553613..b47778b30 100644
--- a/src/utils.pyx
+++ b/src/utils.pyx
@@ -10,7 +10,6 @@ cimport cef_types
 
 TID_UI = cef_types.TID_UI
 TID_FILE_BACKGROUND = cef_types.TID_FILE_BACKGROUND
-TID_FILE = cef_types.TID_FILE
 TID_FILE_USER_VISIBLE = cef_types.TID_FILE_USER_VISIBLE
 TID_FILE_USER_BLOCKING = cef_types.TID_FILE_USER_BLOCKING
 TID_IO = cef_types.TID_IO
@@ -19,7 +18,6 @@ TID_RENDERER = cef_types.TID_RENDERER
 g_browserProcessThreads = [
     TID_UI,
     TID_FILE_BACKGROUND,
-    TID_FILE,
     TID_FILE_USER_VISIBLE,
     TID_FILE_USER_BLOCKING,
     TID_IO,
diff --git a/src/version/cef_version_win.h b/src/version/cef_version_win.h
index 50e9b4efd..f47adfc60 100644
--- a/src/version/cef_version_win.h
+++ b/src/version/cef_version_win.h
@@ -35,16 +35,16 @@
 #ifndef CEF_INCLUDE_CEF_VERSION_H_
 #define CEF_INCLUDE_CEF_VERSION_H_
 
-#define CEF_VERSION "3.3359.1774.gd49d25f"
+#define CEF_VERSION "123.0.7+g6a21509+chromium-123.0.6312.46"
 #define CEF_VERSION_MAJOR 3
-#define CEF_COMMIT_NUMBER 1774
-#define CEF_COMMIT_HASH "d49d25f881b68f418e243e12801cbbb7caebb563"
+#define CEF_COMMIT_NUMBER 6312
+#define CEF_COMMIT_HASH "6a2150951b57eff2d64289bd3746b577b8b74e0b"
 #define COPYRIGHT_YEAR 2018
 
-#define CHROME_VERSION_MAJOR 66
+#define CHROME_VERSION_MAJOR 123
 #define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 3359
-#define CHROME_VERSION_PATCH 181
+#define CHROME_VERSION_BUILD 6312
+#define CHROME_VERSION_PATCH 46
 
 #define DO_MAKE_STRING(p) #p
 #define MAKE_STRING(p) DO_MAKE_STRING(p)
diff --git a/src/web_plugin_info.pyx b/src/web_plugin_info.pyx
deleted file mode 100644
index 79e5a77aa..000000000
--- a/src/web_plugin_info.pyx
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2013 CEF Python, see the Authors file.
-# All rights reserved. Licensed under BSD 3-clause license.
-# Project website: https://github.com/cztomczak/cefpython
-
-include "cefpython.pyx"
-
-cdef PyWebPluginInfo CreatePyWebPluginInfo(
-        CefRefPtr[CefWebPluginInfo] cefPlugin):
-    cdef PyWebPluginInfo pyPlugin = PyWebPluginInfo()
-    pyPlugin.cefPlugin = cefPlugin
-    return pyPlugin
-
-cdef class PyWebPluginInfo:
-    cdef CefRefPtr[CefWebPluginInfo] cefPlugin
-
-    cpdef py_string GetName(self):
-        return CefToPyString(self.cefPlugin.get().GetName())
-
-    cpdef py_string GetPath(self):
-        return CefToPyString(self.cefPlugin.get().GetPath())
-
-    cpdef py_string GetVersion(self):
-        return CefToPyString(self.cefPlugin.get().GetVersion())
-
-    cpdef py_string GetDescription(self):
-        return CefToPyString(self.cefPlugin.get().GetDescription())
diff --git a/src/web_request.pyx b/src/web_request.pyx
index 8e51fca12..c6cd60175 100644
--- a/src/web_request.pyx
+++ b/src/web_request.pyx
@@ -3,6 +3,7 @@
 # Project website: https://github.com/cztomczak/cefpython
 
 include "cefpython.pyx"
+from libc.stdint cimport int64_t
 import weakref
 
 cdef object g_pyWebRequests = weakref.WeakValueDictionary()
@@ -83,7 +84,7 @@ cdef class PyWebRequest:
         self.cefWebRequest = <CefRefPtr[CefURLRequest]?>(CefURLRequest_Create(
                 pyRequest.cefRequest,
                 <CefRefPtr[CefURLRequestClient]?>cppWebRequestClient,
-                <CefRefPtr[CefRequestContext]?>NULL))
+                <CefRefPtr[CefRequestContext]?>nullptr))
 
     cdef object GetCallback(self, str funcName):
         if hasattr(self.pyWebRequestClient, funcName) and (
@@ -122,8 +123,8 @@ cdef class PyWebRequest:
 cdef public void WebRequestClient_OnUploadProgress(
         int webRequestId,
         CefRefPtr[CefURLRequest] cefWebRequest,
-        int64 current,
-        int64 total
+        int64_t current,
+        int64_t total
         ) except * with gil:
     cdef PyWebRequest webRequest
     cdef object userCallback
@@ -143,8 +144,8 @@ cdef public void WebRequestClient_OnUploadProgress(
 cdef public void WebRequestClient_OnDownloadProgress(
         int webRequestId,
         CefRefPtr[CefURLRequest] cefWebRequest,
-        int64 current,
-        int64 total
+        int64_t current,
+        int64_t total
         ) except * with gil:
     cdef PyWebRequest webRequest
     cdef object userCallback
diff --git a/src/window_info.pyx b/src/window_info.pyx
index 8bf766604..8d7e9858f 100644
--- a/src/window_info.pyx
+++ b/src/window_info.pyx
@@ -19,8 +19,9 @@ cdef void SetCefWindowInfo(
             pass
 
     IF UNAME_SYSNAME == "Windows":
-        cdef RECT windowRect
+        cdef CefRect windowRect
         cdef CefString windowName
+        cdef RECT rect
     ELIF UNAME_SYSNAME == "Linux":
         cdef CefRect windowRect
 
@@ -28,13 +29,14 @@ cdef void SetCefWindowInfo(
     if windowInfo.windowType == "child":
         IF UNAME_SYSNAME == "Windows":
             if windowInfo.windowRect:
-                windowRect.left = int(windowInfo.windowRect[0])
-                windowRect.top = int(windowInfo.windowRect[1])
-                windowRect.right = int(windowInfo.windowRect[2])
-                windowRect.bottom = int(windowInfo.windowRect[3])
+                rect.left = int(windowInfo.windowRect[0])
+                rect.top = int(windowInfo.windowRect[1])
+                rect.right = int(windowInfo.windowRect[2])
+                rect.bottom = int(windowInfo.windowRect[3])
             else:
                 GetClientRect(<CefWindowHandle>windowInfo.parentWindowHandle,
-                              &windowRect)
+                              &rect)
+            windowRect = CefRect(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top)
             cefWindowInfo.SetAsChild(
                     <CefWindowHandle>windowInfo.parentWindowHandle,
                     windowRect)
diff --git a/tools/automate-git.py b/tools/automate-git.py
index b819c7bd9..8c5a13b97 100644
--- a/tools/automate-git.py
+++ b/tools/automate-git.py
@@ -138,7 +138,7 @@
 import sys
 import tempfile
 import urllib
-import urllib2
+from urllib.request import urlopen, FancyURLopener
 import zipfile
 
 ##
@@ -258,7 +258,7 @@ def exec_cmd(cmd, path):
         stderr=subprocess.PIPE,
         shell=(sys.platform == 'win32'))
     out, err = process.communicate()
-  except IOError, (errno, strerror):
+  except IOError:
     raise
   except:
     raise
@@ -300,7 +300,7 @@ def download_and_extract(src, target):
 
   if src[:4] == 'http':
     # Attempt to download a URL.
-    opener = urllib.FancyURLopener({})
+    opener = FancyURLopener({})
     response = opener.open(src)
 
     temporary = True
@@ -462,7 +462,7 @@ def onerror(func, path, exc_info):
 def read_json_url(url):
   """ Read a JSON URL. """
   msg('Downloading %s' % url)
-  response = urllib2.urlopen(url)
+  response = urlopen(url)
   return json.loads(response.read())
 
 
@@ -940,6 +940,12 @@ def check_pattern_matches(output_file=None):
     dest='armbuild',
     default=False,
     help='Create an ARM build.')
+parser.add_option(
+    '--with-pgo-profiles',
+    action='store_true',
+    dest='withpgoprofiles',
+    default=False,
+    help='Download PGO profiles for the build.')
 
 # Test-related options.
 parser.add_option(
@@ -1051,7 +1057,7 @@ def check_pattern_matches(output_file=None):
 (options, args) = parser.parse_args()
 
 if options.downloaddir is None:
-  print "The --download-dir option is required."
+  print("The --download-dir option is required.")
   parser.print_help(sys.stderr)
   sys.exit()
 
@@ -1074,7 +1080,7 @@ def check_pattern_matches(output_file=None):
   if (options.nocefupdate and options.forceupdate):
     pass
   else:
-    print "Invalid combination of options."
+    print("Invalid combination of options.")
     parser.print_help(sys.stderr)
     sys.exit()
   # --
@@ -1083,17 +1089,17 @@ def check_pattern_matches(output_file=None):
      (options.minimaldistrib or options.minimaldistribonly or \
       options.clientdistrib or options.clientdistribonly)) or \
    (options.minimaldistribonly + options.clientdistribonly + options.sandboxdistribonly > 1):
-  print 'Invalid combination of options.'
+  print('Invalid combination of options.')
   parser.print_help(sys.stderr)
   sys.exit()
 
 if options.x64build and options.armbuild:
-  print 'Invalid combination of options.'
+  print('Invalid combination of options.')
   parser.print_help(sys.stderr)
   sys.exit()
 
 if (options.buildtests or options.runtests) and len(options.testtarget) == 0:
-  print "A test target must be specified via --test-target."
+  print("A test target must be specified via --test-target.")
   parser.print_help(sys.stderr)
   sys.exit()
 
@@ -1101,7 +1107,7 @@ def check_pattern_matches(output_file=None):
 if options.dryrun and options.dryrunplatform is not None:
   platform = options.dryrunplatform
   if not platform in ['windows', 'macosx', 'linux']:
-    print 'Invalid dry-run-platform value: %s' % (platform)
+    print('Invalid dry-run-platform value: %s' % (platform))
     sys.exit()
 elif sys.platform == 'win32':
   platform = 'windows'
@@ -1110,7 +1116,7 @@ def check_pattern_matches(output_file=None):
 elif sys.platform.startswith('linux'):
   platform = 'linux'
 else:
-  print 'Unknown operating system platform'
+  print('Unknown operating system platform')
   sys.exit()
 
 # Script extension.
@@ -1125,25 +1131,25 @@ def check_pattern_matches(output_file=None):
   else:
     client_app = 'cefclient'
   if options.buildtarget.find(client_app) == -1:
-    print 'A client distribution cannot be generated if --build-target '+\
-          'excludes %s.' % client_app
+    print('A client distribution cannot be generated if --build-target '+\
+          'excludes %s.' % client_app)
     parser.print_help(sys.stderr)
     sys.exit()
 
 if platform != 'windows' and (options.sandboxdistrib or
                               options.sandboxdistribonly):
-  print 'The sandbox distribution is only supported on Windows.'
+  print('The sandbox distribution is only supported on Windows.')
   sys.exit()
 
 # CEF branch.
 if options.branch != 'trunk' and not options.branch.isdigit():
-  print 'Invalid branch value: %s' % (options.branch)
+  print('Invalid branch value: %s' % (options.branch))
   sys.exit()
 
 cef_branch = options.branch
 
 if cef_branch != 'trunk' and int(cef_branch) <= 1453:
-  print 'The requested branch is too old to build using this tool.'
+  print('The requested branch is too old to build using this tool.')
   sys.exit()
 
 # True if the requested branch is 2272 or newer.
@@ -1166,28 +1172,28 @@ def check_pattern_matches(output_file=None):
 use_gn = bool(int(os.environ.get('CEF_USE_GN', '0')))
 if use_gn:
   if branch_is_2743_or_older:
-    print 'GN is not supported with branch 2743 and older (set CEF_USE_GN=0).'
+    print('GN is not supported with branch 2743 and older (set CEF_USE_GN=0).')
     sys.exit()
 
   if options.armbuild:
     if platform != 'linux':
-      print 'The ARM build option is only supported on Linux.'
+      print('The ARM build option is only supported on Linux.')
       sys.exit()
 
     if not branch_is_newer_than_2785:
-      print 'The ARM build option is not supported with branch 2785 and older.'
+      print('The ARM build option is not supported with branch 2785 and older.')
       sys.exit()
 else:
   if options.armbuild:
-    print 'The ARM build option is not supported by GYP.'
+    print('The ARM build option is not supported by GYP.')
     sys.exit()
 
   if options.x64build and platform != 'windows' and platform != 'macosx':
-    print 'The x64 build option is only used on Windows and Mac OS X.'
+    print('The x64 build option is only used on Windows and Mac OS X.')
     sys.exit()
 
   if platform == 'windows' and not 'GYP_MSVS_VERSION' in os.environ.keys():
-    print 'You must set the GYP_MSVS_VERSION environment variable on Windows.'
+    print('You must set the GYP_MSVS_VERSION environment variable on Windows.')
     sys.exit()
 
   # True if GYP_DEFINES=target_arch=x64 must be set.
@@ -1203,8 +1209,8 @@ def check_pattern_matches(output_file=None):
   deps_file = '.DEPS.git'
 
 if platform == 'macosx' and not options.x64build and branch_is_2272_or_newer:
-  print '32-bit Mac OS X builds are no longer supported with 2272 branch and '+\
-        'newer. Add --x64-build flag to generate a 64-bit build.'
+  print('32-bit Mac OS X builds are no longer supported with 2272 branch and '+\
+        'newer. Add --x64-build flag to generate a 64-bit build.')
   sys.exit()
 
 # Options that force the sources to change.
@@ -1214,7 +1220,7 @@ def check_pattern_matches(output_file=None):
 discard_local_changes = force_change or options.forcecefupdate
 
 if options.resave and (options.forcepatchupdate or discard_local_changes):
-  print '--resave cannot be combined with options that modify or discard patches.'
+  print('--resave cannot be combined with options that modify or discard patches.')
   parser.print_help(sys.stderr)
   sys.exit()
 
@@ -1401,25 +1407,28 @@ def check_pattern_matches(output_file=None):
   # Exclude unnecessary directories. Intentionally written without newlines.
   gclient_spec = \
       "solutions = [{"+\
-        "u'managed': False,"+\
-        "u'name': u'src', "+\
-        "u'url': u'" + chromium_url + "', "+\
-        "u'custom_deps': {"+\
-          "u'build': None, "+\
-          "u'build/scripts/command_wrapper/bin': None, "+\
-          "u'build/scripts/gsd_generate_index': None, "+\
-          "u'build/scripts/private/data/reliability': None, "+\
-          "u'build/scripts/tools/deps2git': None, "+\
-          "u'build/third_party/lighttpd': None, "+\
-          "u'commit-queue': None, "+\
-          "u'depot_tools': None, "+\
-          "u'src/chrome_frame/tools/test/reference_build/chrome': None, "+\
-          "u'src/chrome/tools/test/reference_build/chrome_linux': None, "+\
-          "u'src/chrome/tools/test/reference_build/chrome_mac': None, "+\
-          "u'src/chrome/tools/test/reference_build/chrome_win': None, "+\
+        "'managed': False,"+\
+        "'name': 'src', "+\
+        "'url': '" + chromium_url + "', "+\
+        "'custom_vars': {"+\
+          "'checkout_pgo_profiles': " + ('True' if options.withpgoprofiles else 'False') + ", "+\
+        "}, "+\
+        "'custom_deps': {"+\
+          "'build': None, "+\
+          "'build/scripts/command_wrapper/bin': None, "+\
+          "'build/scripts/gsd_generate_index': None, "+\
+          "'build/scripts/private/data/reliability': None, "+\
+          "'build/scripts/tools/deps2git': None, "+\
+          "'build/third_party/lighttpd': None, "+\
+          "'commit-queue': None, "+\
+          "'depot_tools': None, "+\
+          "'src/chrome_frame/tools/test/reference_build/chrome': None, "+\
+          "'src/chrome/tools/test/reference_build/chrome_linux': None, "+\
+          "'src/chrome/tools/test/reference_build/chrome_mac': None, "+\
+          "'src/chrome/tools/test/reference_build/chrome_win': None, "+\
         "}, "+\
-        "u'deps_file': u'" + deps_file + "', "+\
-        "u'safesync_url': u''"+\
+        "'deps_file': '" + deps_file + "', "+\
+        "'safesync_url': ''"+\
       "}]"
 
   msg('Writing file: %s' % gclient_file)
@@ -1431,7 +1440,7 @@ def check_pattern_matches(output_file=None):
 # Initial Chromium checkout.
 if not options.nochromiumupdate and not os.path.exists(chromium_src_dir):
   chromium_checkout_new = True
-  run("gclient sync --nohooks --with_branch_heads --disable-syntax-validation --jobs 16", \
+  run("gclient sync --nohooks --with_branch_heads --jobs 16", \
       chromium_dir, depot_tools_dir)
 else:
   chromium_checkout_new = False
@@ -1523,7 +1532,7 @@ def check_pattern_matches(output_file=None):
   os.environ['GYP_CHROMIUM_NO_ACTION'] = '1'
 
   # Update third-party dependencies including branch/tag information.
-  run("gclient sync %s--with_branch_heads --disable-syntax-validation --jobs 16" % \
+  run("gclient sync %s--with_branch_heads --jobs 16" % \
       ('--reset ' if discard_local_changes else ''), chromium_dir, depot_tools_dir)
 
   # Clear the GYP_CHROMIUM_NO_ACTION value.
diff --git a/tools/automate.py b/tools/automate.py
index 2ba882785..155a56c7d 100644
--- a/tools/automate.py
+++ b/tools/automate.py
@@ -14,7 +14,7 @@
 Option 2 is to use CEF binaries from Spotify Automated Builds using
 the --prebuilt-cef flag. In such case check the cefpython/src/version/
 directory to know which version of CEF to download from Spotify:
-http://opensource.spotify.com/cefbuilds/index.html
+https://cef-builds.spotifycdn.com/index.html
 Download and extract it so that for example you have such a directory:
 cefpython/build/cef_binary_3.2883.1553.g80bd606_windows32/ .
 
@@ -93,7 +93,6 @@
 import shutil
 import multiprocessing
 from collections import OrderedDict
-from setuptools.msvc import msvc9_query_vcvarsall
 
 # Constants
 CEF_UPSTREAM_GIT_URL = "https://bitbucket.org/chromiumembedded/cef.git"
@@ -147,11 +146,6 @@ def main():
     setup_options(docopt.docopt(__doc__))
 
     if Options.build_cef:
-        if not sys.version_info[:2] == (2, 7):
-            print("ERROR: To build CEF from sources you need Python 2.7.")
-            print("       Upstream automate-git.py works only with that")
-            print("       version of python.")
-            sys.exit(1)
         build_cef()
     elif Options.prebuilt_cef:
         prebuilt_cef()
@@ -525,6 +519,7 @@ def build_wrapper_library_windows(runtime_library, msvs, vcvars):
         if msvs == "2010":
             # When Using WinSDK 7.1 vcvarsall.bat doesn't work. Use
             # setuptools.msvc.msvc9_query_vcvarsall to query env vars.
+            from setuptools.msvc import msvc9_query_vcvarsall
             env.update(msvc9_query_vcvarsall(10.0, arch=VS_PLATFORM_ARG))
             # On Python 2.7 env values returned by both distutils
             # and setuptools are unicode, but Python expects env
@@ -985,7 +980,7 @@ def run_automate_git():
     """
     Example automate-git.py command:
         C:\chromium>call python automate-git.py --download-dir=./test/
-        --branch=2526 --no-debug-build --verbose-build
+        --branch=2526 --no-debug-build --verbose-build --with-pgo-profiles
     Run ninja build manually:
         cd chromium/src
         ninja -v -j2 -Cout\Release cefclient
@@ -1011,6 +1006,7 @@ def run_automate_git():
     if Options.force_chromium_update:
         args.append("--force-update")
     args.append("--no-distrib-archive")
+    args.append("--with-pgo-profiles")
     if platform.system() == "Linux":
         # Building cefclient target isn't supported on Linux when
         # using sysroot (cef/#1916). However building cefclient
diff --git a/tools/build.py b/tools/build.py
index f3960283e..2500c8b53 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -293,7 +293,10 @@ def setup_environ():
         print("[build.py] PYTHON_INCLUDE: {python_include}"
               .format(python_include=os.environ["PYTHON_INCLUDE"]))
 
-        os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror -Wno-deprecated-declarations"
+        os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror"
+        if LINUX:
+            # Don't warn about deprecated GDK/GTK functions.
+            os.environ["CEF_CCFLAGS"] += " -Wno-deprecated-declarations"
         if FAST_FLAG:
             os.environ["CEF_CCFLAGS"] += " -O0"
         else:
@@ -782,6 +785,7 @@ def build_cefpython_module():
                        enable_line_tracing=enable_line_tracing))
     if FAST_FLAG:
         command += " --fast"
+    print('cython:', command)
     ret = subprocess.call(command, shell=True)
 
     # if DEBUG_FLAG:
diff --git a/tools/build_cpp_projects.py b/tools/build_cpp_projects.py
index e8e152668..b93deed83 100644
--- a/tools/build_cpp_projects.py
+++ b/tools/build_cpp_projects.py
@@ -47,9 +47,11 @@
 # Compiler args
 COMPILER_ARGS = [
     "/EHsc",
+    "/std:c++17",
 ]
 subprocess_COMPILER_ARGS = [
     "/MT",
+    "/std:c++17",
 ]
 
 # Linker args
@@ -160,7 +162,7 @@ def build_cefpython_app_library():
 
 
 def build_subprocess_executable():
-    print("[buil_cpp_projects.py] Build executable: subprocess")
+    print("[build_cpp_projects.py] Build executable: subprocess")
     compiler = get_compiler(static=True)
     sources = get_sources(SUBPROCESS_DIR,
                           exclude_names=["print_handler_gtk.cpp"])
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
index 051914f57..05755750b 100644
--- a/tools/build_distrib.py
+++ b/tools/build_distrib.py
@@ -80,7 +80,7 @@
 ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9)]
+SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
@@ -275,7 +275,7 @@ def search_for_pythons(search_arch):
                           .format(executable=python))
                     sys.exit(1)
                 version_str = subprocess.check_output([python, "-c",
-                                                       version_code])
+                                                       version_code]).decode()
                 version_str = version_str.strip()
                 if sys.version_info >= (3, 0):
                     version_str = version_str.decode("utf-8")
@@ -288,7 +288,7 @@ def search_for_pythons(search_arch):
                 version_tuple3 = (int(major), int(minor), int(micro))
                 arch_code = ("import platform;"
                              "print(str(platform.architecture()[0]));")
-                arch = subprocess.check_output([python, "-c", arch_code])
+                arch = subprocess.check_output([python, "-c", arch_code]).decode()
                 arch = arch.strip()
                 if sys.version_info >= (3, 0):
                     arch = arch.decode("utf-8")
@@ -388,7 +388,7 @@ def uninstall_cefpython3_packages(pythons):
         command = ("\"{python}\" -m pip show cefpython3"
                    .format(python=python["executable"]))
         try:
-            output = subprocess.check_output(command, shell=True)
+            output = subprocess.check_output(command, shell=True).decode()
         except subprocess.CalledProcessError as exc:
             # pip show returns error code when package is not installed
             output = exc.output
@@ -623,7 +623,7 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
         return
     checked_any = False
     for python in all_pythons:
-        if python["version2"] in ((3, 5), (3, 6), (3, 7), (3, 8), (3, 9)):
+        if python["version2"] in ((3, 5), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10), (3, 11)):
             checked_any = True
             if not os.path.exists(os.path.join(setup_dir, "cefpython3",
                                                "msvcp140.dll")):
diff --git a/tools/common.py b/tools/common.py
index 303ccb856..58954fd0d 100644
--- a/tools/common.py
+++ b/tools/common.py
@@ -219,9 +219,7 @@
 
 VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64"
 
-# Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
-VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0"
-                 "\\VC\\vcvarsall.bat")
+VS2015_VCVARS = (r"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat")
 
 # Required for building old CEF branches < 2704
 VS2013_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 12.0"
@@ -273,7 +271,7 @@ def get_python_include_path():
     #    ~/.pyenv/versions/2.7.13/include/python2.7
     # 3) ~/.pyenv/versions/3.4.6/include/python2.7m
     # 4) /usr/include/python2.7
-    base_dir = os.path.dirname(sys.executable)
+    base_dir = sys.base_prefix
     try_dirs = ["{base_dir}/include",
                 "{base_dir}/../include/python{ver}",
                 "{base_dir}/../include/python{ver}*",
@@ -455,8 +453,8 @@ def get_cefpython_version():
 
 
 def get_version_from_file(header_file):
-    with open(header_file, "rU") as fp:
-        contents = fp.read()  # no need to decode() as "rU" specified
+    with open(header_file, "r") as fp:
+        contents = fp.read()
     ret = dict()
     matches = re.findall(r'^#define (\w+) "?([^\s"]+)"?', contents,
                          re.MULTILINE)
@@ -481,6 +479,10 @@ def get_msvs_for_python(vs_prefix=False):
         return "VS2015" if vs_prefix else "2015"
     elif sys.version_info[:2] == (3, 9):
         return "VS2015" if vs_prefix else "2015"
+    elif sys.version_info[:2] == (3, 10):
+        return "VS2015" if vs_prefix else "2015"
+    elif sys.version_info[:2] == (3, 11):
+        return "VS2015" if vs_prefix else "2015"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
index 436bcb2ce..5318cd26d 100644
--- a/tools/cython_setup.py
+++ b/tools/cython_setup.py
@@ -145,17 +145,9 @@ def get_winsdk_lib():
     print("[cython_setup.py] Detect Windows SDK library directory")
     ret = ""
     if WINDOWS:
-        if ARCH32:
+        if ARCH32 or ARCH64:
             winsdk_libs = [
-                # Windows 7 SDKs.
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib",
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib",
-            ]
-        elif ARCH64:
-            winsdk_libs = [
-                # Windows 7 SDKs.
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",
+                r"C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10",
             ]
         else:
             raise Exception("Unknown architecture")
@@ -200,7 +192,7 @@ def set_compiler_options(options):
         #
         # The above warning LNK4217 is caused by the warning below which occurs
         # when building the client_handler.lib static library:
-        extra_compile_args.extend(["/EHsc", "/wd4305"])
+        extra_compile_args.extend(["/EHsc", "/wd4305", "/std:c++17"])
         extra_link_args.extend(["/ignore:4217"])
 
     if LINUX or MAC:
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
index 624a26e7b..d57a01328 100644
--- a/tools/installer/cefpython3.__init__.py
+++ b/tools/installer/cefpython3.__init__.py
@@ -70,5 +70,11 @@
 elif sys.version_info[:2] == (3, 9):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py39 as cefpython
+elif sys.version_info[:2] == (3, 10):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py310 as cefpython
+elif sys.version_info[:2] == (3, 11):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py311 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
index d14ee2ce5..0c10afae4 100644
--- a/tools/installer/cefpython3.setup.py
+++ b/tools/installer/cefpython3.setup.py
@@ -150,6 +150,8 @@ def main():
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",
diff --git a/tools/make_installer.py b/tools/make_installer.py
index 012e66575..afef8983d 100644
--- a/tools/make_installer.py
+++ b/tools/make_installer.py
@@ -338,7 +338,7 @@ def create_empty_log_file(log_file):
 
 def copy_cpp_extension_dependencies_issue359(pkg_dir):
     """CEF Python module is written in Cython and is a Python C++
-    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
+    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9 / 3.10 / 3.11
     msvcp140.dll is required. See Issue #359. For Python 2.7
     msvcp90.dll is required. Etc. These dependencies are not included
     with Python binaries from Python.org."""
@@ -365,12 +365,14 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir):
     # in the package. Thus if included, msvcpxx.dll dependency is
     # required as well.
 
-    # Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
+    # Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9 / 3.10 / 3.11
     if os.path.exists(os.path.join(pkg_dir, "cefpython_py35.pyd")) \
             or os.path.exists(os.path.join(pkg_dir, "cefpython_py36.pyd")) \
             or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")) \
             or os.path.exists(os.path.join(pkg_dir, "cefpython_py38.pyd")) \
-            or os.path.exists(os.path.join(pkg_dir, "cefpython_py39.pyd")):
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py39.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py310.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py311.pyd")):
         search_paths = [
             # This is where Microsoft Visual C++ 2015 Update 3 installs
             # (14.00.24212).
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 4b0835794..826fb9350 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,4 +1,4 @@
-Cython == 0.29.21
+Cython == 0.29.36
 docopt >= 0.6.2
 setuptools
 wheel
diff --git a/unittests/_common.py b/unittests/_common.py
index fcd899172..59c1f9ec3 100644
--- a/unittests/_common.py
+++ b/unittests/_common.py
@@ -126,7 +126,7 @@ def close_popup(global_handler, browser):
     # Test developer tools popup
     main_browser = cef.GetBrowserByIdentifier(MAIN_BROWSER_ID)
     main_browser.ShowDevTools()
-    cef.PostDelayedTask(cef.TID_UI, 1500, close_devtools, global_handler)
+    cef.PostDelayedTask(cef.TID_UI, 800, close_devtools, global_handler)
     cef.PostDelayedTask(cef.TID_UI, 500, main_browser.SetFocus, True)
 
 
diff --git a/unittests/main_test.py b/unittests/main_test.py
index ce71af20f..525818f38 100644
--- a/unittests/main_test.py
+++ b/unittests/main_test.py
@@ -177,10 +177,6 @@ def test_main(self):
             self.assertGreater(window_size[0], 0)
             self.assertGreater(cef.DpiAware.Scale((800, 600))[0], 0)
 
-            # OFF - see comments above.
-            # cef.DpiAware.EnableHighDpiSupport()
-            # self.assertTrue(cef.DpiAware.IsProcessDpiAware())
-
             # Make some calls again after DPI Aware was set
             self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple)
             self.assertGreater(cef.DpiAware.Scale([800, 600])[0], 0)
@@ -263,12 +259,8 @@ def test_main(self):
         subtest_message("cef.Request.SetPostData(dict) ok")
 
         # Cookie manager
-        self.assertIsInstance(cef.CookieManager.CreateManager(path=""),
-                              cef.PyCookieManager)
         self.assertIsInstance(cef.CookieManager.GetGlobalManager(),
                               cef.PyCookieManager)
-        self.assertIsInstance(cef.CookieManager.GetBlockingManager(),
-                              cef.PyCookieManager)
         subtest_message("cef.CookieManager ok")
 
         # Window Utils
@@ -342,7 +334,7 @@ def OnAutoResize(self, new_size, **_):
         self.test_case.assertGreaterEqual(new_size[1], 600)
         self.test_case.assertLessEqual(new_size[1], 768)
 
-    def OnLoadingProgressChange(self, progress, **_):
+    def OnLoadingProgressChange(self, browser, progress, **_):
         self.OnLoadingProgressChange_True = True
         self.OnLoadingProgressChange_Progress = progress
 
@@ -364,7 +356,7 @@ def OnContextCreated(self, browser, frame):
             self.test_case.assertFalse(self.OnContextCreatedSecondCall_True)
             self.OnContextCreatedSecondCall_True = True
         self.test_case.assertEqual(browser.GetIdentifier(), MAIN_BROWSER_ID)
-        self.test_case.assertEqual(frame.GetIdentifier(), 2)
+        self.test_case.assertTrue(frame.GetIdentifier())
 
     def OnContextReleased(self, browser, frame):
         """This gets called only for the initial empty context, see comment
@@ -374,7 +366,7 @@ def OnContextReleased(self, browser, frame):
         self.test_case.assertFalse(self.OnContextReleased_True)
         self.OnContextReleased_True = True
         self.test_case.assertEqual(browser.GetIdentifier(), MAIN_BROWSER_ID)
-        self.test_case.assertEqual(frame.GetIdentifier(), 2)
+        self.test_case.assertTrue(frame.GetIdentifier())
 
 class External(object):
     """Javascript 'window.external' object."""
diff --git a/unittests/osr_test.py b/unittests/osr_test.py
index 672e98fe5..a3c209892 100644
--- a/unittests/osr_test.py
+++ b/unittests/osr_test.py
@@ -149,7 +149,7 @@ def test_osr(self):
             browser.SetClientHandler(handler)
 
         # Initiate OSR rendering
-        browser.SendFocusEvent(True)
+        browser.SetFocus(True)
         browser.WasResized()
 
         # Test selection
@@ -196,9 +196,12 @@ def __init__(self, test_case):
         self.loadComplete_True = False
         self.layoutComplete_True = False
 
+
+
     def _OnAccessibilityTreeChange(self, value):
+
         self._OnAccessibilityTreeChange_True = True
-        for event in value:
+        for event in value.get('events', []):
             if "event_type" in event:
                 if event["event_type"] == "loadComplete":
                     # LoadHandler.OnLoadEnd is called after this event