mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 35.0.1916.86.
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1685 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Index: browser/browser_plugin/browser_plugin_guest.cc
|
||||
===================================================================
|
||||
--- browser/browser_plugin/browser_plugin_guest.cc (revision 262261)
|
||||
--- browser/browser_plugin/browser_plugin_guest.cc (revision 266998)
|
||||
+++ browser/browser_plugin/browser_plugin_guest.cc (working copy)
|
||||
@@ -794,7 +794,8 @@
|
||||
return this;
|
||||
@@ -14,7 +14,7 @@ Index: browser/browser_plugin/browser_plugin_guest.cc
|
||||
// http://crbug.com/140315).
|
||||
Index: browser/browser_plugin/browser_plugin_guest.h
|
||||
===================================================================
|
||||
--- browser/browser_plugin/browser_plugin_guest.h (revision 262261)
|
||||
--- browser/browser_plugin/browser_plugin_guest.h (revision 266998)
|
||||
+++ browser/browser_plugin/browser_plugin_guest.h (working copy)
|
||||
@@ -204,7 +204,8 @@
|
||||
double progress) OVERRIDE;
|
||||
@@ -28,9 +28,9 @@ Index: browser/browser_plugin/browser_plugin_guest.h
|
||||
const NativeWebKeyboardEvent& event) OVERRIDE;
|
||||
Index: browser/web_contents/web_contents_impl.cc
|
||||
===================================================================
|
||||
--- browser/web_contents/web_contents_impl.cc (revision 262261)
|
||||
--- browser/web_contents/web_contents_impl.cc (revision 266998)
|
||||
+++ browser/web_contents/web_contents_impl.cc (working copy)
|
||||
@@ -2788,7 +2788,7 @@
|
||||
@@ -2804,7 +2804,7 @@
|
||||
void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
|
||||
const ContextMenuParams& params) {
|
||||
// Allow WebContentsDelegates to handle the context menu operation first.
|
||||
@@ -41,7 +41,7 @@ Index: browser/web_contents/web_contents_impl.cc
|
||||
render_view_host_delegate_view_->ShowContextMenu(render_frame_host, params);
|
||||
Index: browser/web_contents/web_contents_view_mac.mm
|
||||
===================================================================
|
||||
--- browser/web_contents/web_contents_view_mac.mm (revision 262261)
|
||||
--- browser/web_contents/web_contents_view_mac.mm (revision 266998)
|
||||
+++ browser/web_contents/web_contents_view_mac.mm (working copy)
|
||||
@@ -227,12 +227,6 @@
|
||||
void WebContentsViewMac::ShowContextMenu(
|
||||
@@ -58,7 +58,7 @@ Index: browser/web_contents/web_contents_view_mac.mm
|
||||
else
|
||||
Index: public/browser/web_contents_delegate.cc
|
||||
===================================================================
|
||||
--- public/browser/web_contents_delegate.cc (revision 262261)
|
||||
--- public/browser/web_contents_delegate.cc (revision 266998)
|
||||
+++ public/browser/web_contents_delegate.cc (working copy)
|
||||
@@ -76,6 +76,7 @@
|
||||
}
|
||||
@@ -70,7 +70,7 @@ Index: public/browser/web_contents_delegate.cc
|
||||
}
|
||||
Index: public/browser/web_contents_delegate.h
|
||||
===================================================================
|
||||
--- public/browser/web_contents_delegate.h (revision 262261)
|
||||
--- public/browser/web_contents_delegate.h (revision 266998)
|
||||
+++ public/browser/web_contents_delegate.h (working copy)
|
||||
@@ -35,6 +35,7 @@
|
||||
class DownloadItem;
|
||||
|
Reference in New Issue
Block a user