mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
cb907f3649
- Mac: Remove Carbon interpose library (see http://crbug.com/157130). - Remove unused LOGSEVERITY_ERROR_REPORT value (see http://crbug.com/352378). - CefURLRequest in the render process will now always have the UR_FLAG_REPORT_LOAD_TIMING flag set (see http://crbug.com/376025#c15). - Change CefGeolocationHandler::OnRequestGeolocationPermission return value from void to boolean. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1753 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
133 lines
4.4 KiB
Diff
133 lines
4.4 KiB
Diff
Index: content_browser_client.cc
|
|
===================================================================
|
|
--- content_browser_client.cc (revision 280796)
|
|
+++ content_browser_client.cc (working copy)
|
|
@@ -280,6 +280,10 @@
|
|
return true;
|
|
}
|
|
|
|
+SkColor ContentBrowserClient::GetBaseBackgroundColor(RenderViewHost* rvh) {
|
|
+ return SK_ColorWHITE;
|
|
+}
|
|
+
|
|
base::FilePath ContentBrowserClient::GetDefaultDownloadDirectory() {
|
|
return base::FilePath();
|
|
}
|
|
Index: content_browser_client.h
|
|
===================================================================
|
|
--- content_browser_client.h (revision 280796)
|
|
+++ content_browser_client.h (working copy)
|
|
@@ -23,6 +23,7 @@
|
|
#include "net/cookies/canonical_cookie.h"
|
|
#include "net/url_request/url_request_interceptor.h"
|
|
#include "net/url_request/url_request_job_factory.h"
|
|
+#include "third_party/skia/include/core/SkColor.h"
|
|
#include "third_party/WebKit/public/web/WebNotificationPresenter.h"
|
|
#include "ui/base/window_open_disposition.h"
|
|
#include "webkit/browser/fileapi/file_system_context.h"
|
|
@@ -538,6 +539,9 @@
|
|
// Clears browser cookies.
|
|
virtual void ClearCookies(RenderViewHost* rvh) {}
|
|
|
|
+ // Returns the base background color.
|
|
+ virtual SkColor GetBaseBackgroundColor(RenderViewHost* rvh);
|
|
+
|
|
// Returns the default download directory.
|
|
// This can be called on any thread.
|
|
virtual base::FilePath GetDefaultDownloadDirectory();
|
|
Index: web_contents.cc
|
|
===================================================================
|
|
--- web_contents.cc (revision 280796)
|
|
+++ web_contents.cc (working copy)
|
|
@@ -17,7 +17,9 @@
|
|
main_frame_routing_id(MSG_ROUTING_NONE),
|
|
initially_hidden(false),
|
|
guest_delegate(NULL),
|
|
- context(NULL) {}
|
|
+ context(NULL),
|
|
+ view(NULL),
|
|
+ delegate_view(NULL) {}
|
|
|
|
WebContents::CreateParams::CreateParams(
|
|
BrowserContext* context, SiteInstance* site)
|
|
@@ -29,7 +31,9 @@
|
|
main_frame_routing_id(MSG_ROUTING_NONE),
|
|
initially_hidden(false),
|
|
guest_delegate(NULL),
|
|
- context(NULL) {}
|
|
+ context(NULL),
|
|
+ view(NULL),
|
|
+ delegate_view(NULL) {}
|
|
|
|
WebContents::CreateParams::~CreateParams() {
|
|
}
|
|
Index: web_contents.h
|
|
===================================================================
|
|
--- web_contents.h (revision 280796)
|
|
+++ web_contents.h (working copy)
|
|
@@ -51,9 +51,11 @@
|
|
class RenderFrameHost;
|
|
class RenderProcessHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
class SiteInstance;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
struct CustomContextMenuContext;
|
|
struct DropData;
|
|
struct RendererPreferences;
|
|
@@ -116,6 +118,10 @@
|
|
// Used to specify the location context which display the new view should
|
|
// belong. This can be NULL if not needed.
|
|
gfx::NativeView context;
|
|
+
|
|
+ // Optionally specify the view and delegate view.
|
|
+ content::WebContentsView* view;
|
|
+ content::RenderViewHostDelegateView* delegate_view;
|
|
};
|
|
|
|
// Creates a new WebContents.
|
|
Index: web_contents_delegate.cc
|
|
===================================================================
|
|
--- web_contents_delegate.cc (revision 280796)
|
|
+++ web_contents_delegate.cc (working copy)
|
|
@@ -136,7 +136,9 @@
|
|
const base::string16& 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;
|
|
}
|
|
|
|
Index: web_contents_delegate.h
|
|
===================================================================
|
|
--- web_contents_delegate.h (revision 280796)
|
|
+++ web_contents_delegate.h (working copy)
|
|
@@ -36,9 +36,11 @@
|
|
class JavaScriptDialogManager;
|
|
class PageState;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class SessionStorageNamespace;
|
|
class WebContents;
|
|
class WebContentsImpl;
|
|
+class WebContentsView;
|
|
struct ColorSuggestion;
|
|
struct ContextMenuParams;
|
|
struct DropData;
|
|
@@ -312,7 +314,9 @@
|
|
const base::string16& 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.
|