mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 20:02:24 +01:00
8aac23386e
- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest object passed to OnBeforeBrowse will no longer have an associated request identifier. - Mac: Remove additional helper apps which are no longer required (see http://crbug.com/520680) - Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see http://crbug.com/517114) - Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and NPAPI plugins are no longer supported (see http://crbug.com/470301#c11) - Add CefFormatUrlForSecurityDisplay function in cef_parser.h - Fix crash when passing `--disable-extensions` command-line flag (issue #1721) - Linux: Fix NSS handler loading (issue #1727)
96 lines
3.2 KiB
Diff
96 lines
3.2 KiB
Diff
diff --git web_contents.cc web_contents.cc
|
|
index 887f242..a7cc318 100644
|
|
--- web_contents.cc
|
|
+++ web_contents.cc
|
|
@@ -21,7 +21,9 @@ WebContents::CreateParams::CreateParams(BrowserContext* context)
|
|
initially_hidden(false),
|
|
guest_delegate(nullptr),
|
|
context(nullptr),
|
|
- renderer_initiated_creation(false) {}
|
|
+ renderer_initiated_creation(false),
|
|
+ view(nullptr),
|
|
+ delegate_view(nullptr) {}
|
|
|
|
WebContents::CreateParams::CreateParams(
|
|
BrowserContext* context, SiteInstance* site)
|
|
@@ -36,7 +38,9 @@ WebContents::CreateParams::CreateParams(
|
|
initially_hidden(false),
|
|
guest_delegate(nullptr),
|
|
context(nullptr),
|
|
- renderer_initiated_creation(false) {}
|
|
+ renderer_initiated_creation(false),
|
|
+ view(nullptr),
|
|
+ delegate_view(nullptr) {}
|
|
|
|
WebContents::CreateParams::~CreateParams() {
|
|
}
|
|
diff --git web_contents.h web_contents.h
|
|
index 08c5ba9..459fe19 100644
|
|
--- web_contents.h
|
|
+++ web_contents.h
|
|
@@ -52,9 +52,11 @@ class PageState;
|
|
class RenderFrameHost;
|
|
class RenderProcessHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
class SiteInstance;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
struct CustomContextMenuContext;
|
|
struct DropData;
|
|
struct Manifest;
|
|
@@ -142,6 +144,10 @@ class WebContents : public PageNavigator,
|
|
// RenderFrame, have already been created on the renderer side, and
|
|
// WebContents construction should take this into account.
|
|
bool renderer_initiated_creation;
|
|
+
|
|
+ // Optionally specify the view and delegate view.
|
|
+ content::WebContentsView* view;
|
|
+ content::RenderViewHostDelegateView* delegate_view;
|
|
};
|
|
|
|
// Creates a new WebContents.
|
|
diff --git web_contents_delegate.cc web_contents_delegate.cc
|
|
index b3d2d70..727401c 100644
|
|
--- web_contents_delegate.cc
|
|
+++ web_contents_delegate.cc
|
|
@@ -138,7 +138,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
|
|
const std::string& frame_name,
|
|
const GURL& target_url,
|
|
const std::string& partition_id,
|
|
- SessionStorageNamespace* session_storage_namespace) {
|
|
+ SessionStorageNamespace* session_storage_namespace,
|
|
+ content::WebContentsView** view,
|
|
+ content::RenderViewHostDelegateView** delegate_view) {
|
|
return true;
|
|
}
|
|
|
|
diff --git web_contents_delegate.h web_contents_delegate.h
|
|
index 76dfd36..f3bec13 100644
|
|
--- web_contents_delegate.h
|
|
+++ web_contents_delegate.h
|
|
@@ -39,9 +39,11 @@ class DownloadItem;
|
|
class JavaScriptDialogManager;
|
|
class PageState;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class SessionStorageNamespace;
|
|
class WebContents;
|
|
class WebContentsImpl;
|
|
+class WebContentsView;
|
|
struct ColorSuggestion;
|
|
struct ContextMenuParams;
|
|
struct DropData;
|
|
@@ -299,7 +301,9 @@ class CONTENT_EXPORT WebContentsDelegate {
|
|
const std::string& frame_name,
|
|
const GURL& target_url,
|
|
const std::string& partition_id,
|
|
- SessionStorageNamespace* session_storage_namespace);
|
|
+ SessionStorageNamespace* session_storage_namespace,
|
|
+ content::WebContentsView** view,
|
|
+ content::RenderViewHostDelegateView** delegate_view);
|
|
|
|
// Notifies the delegate about the creation of a new WebContents. This
|
|
// typically happens when popups are created.
|