mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
199a3faafe
- The CefSettings.release_dcheck_enabled option has been removed. This functionality can be enabled by setting the dcheck_always_on=1 gyp variable before building CEF/Chromium. See http://crbug.com/350462 for details. - The UR_FLAG_ALLOW_COOKIES option has been removed and the functionality has been merged into UR_FLAG_ALLOW_CACHED_CREDENTIALS. - Mac: [NSApplication sharedApplication] should no longer be called in the renderer process. See http://crbug.com/306348 for details. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1641 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
Index: web_dialog_view.cc
|
|
===================================================================
|
|
--- web_dialog_view.cc (revision 261035)
|
|
+++ web_dialog_view.cc (working copy)
|
|
@@ -257,13 +257,6 @@
|
|
return true;
|
|
}
|
|
|
|
-bool WebDialogView::HandleContextMenu(
|
|
- const content::ContextMenuParams& params) {
|
|
- if (delegate_)
|
|
- return delegate_->HandleContextMenu(params);
|
|
- return WebDialogWebContentsDelegate::HandleContextMenu(params);
|
|
-}
|
|
-
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// content::WebContentsDelegate implementation:
|
|
|
|
@@ -337,6 +330,15 @@
|
|
*proceed_to_fire_unload = proceed;
|
|
}
|
|
|
|
+bool WebDialogView::HandleContextMenu(
|
|
+ content::RenderFrameHost* render_frame_host,
|
|
+ const content::ContextMenuParams& params) {
|
|
+ if (delegate_)
|
|
+ return delegate_->HandleContextMenu(params);
|
|
+ return WebDialogWebContentsDelegate::HandleContextMenu(render_frame_host,
|
|
+ params);
|
|
+}
|
|
+
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// WebDialogView, private:
|
|
|
|
Index: web_dialog_view.h
|
|
===================================================================
|
|
--- web_dialog_view.h (revision 261035)
|
|
+++ web_dialog_view.h (working copy)
|
|
@@ -74,6 +74,7 @@
|
|
virtual const views::Widget* GetWidget() const OVERRIDE;
|
|
|
|
// Overridden from ui::WebDialogDelegate:
|
|
+ using ui::WebDialogDelegate::HandleContextMenu;
|
|
virtual ui::ModalType GetDialogModalType() const OVERRIDE;
|
|
virtual base::string16 GetDialogTitle() const OVERRIDE;
|
|
virtual GURL GetDialogContentURL() const OVERRIDE;
|
|
@@ -91,8 +92,6 @@
|
|
virtual void OnCloseContents(content::WebContents* source,
|
|
bool* out_close_dialog) OVERRIDE;
|
|
virtual bool ShouldShowDialogTitle() const OVERRIDE;
|
|
- virtual bool HandleContextMenu(
|
|
- const content::ContextMenuParams& params) OVERRIDE;
|
|
|
|
// Overridden from content::WebContentsDelegate:
|
|
virtual void MoveContents(content::WebContents* source,
|
|
@@ -115,6 +114,9 @@
|
|
virtual void BeforeUnloadFired(content::WebContents* tab,
|
|
bool proceed,
|
|
bool* proceed_to_fire_unload) OVERRIDE;
|
|
+ virtual bool HandleContextMenu(
|
|
+ content::RenderFrameHost* render_frame_host,
|
|
+ const content::ContextMenuParams& params) OVERRIDE;
|
|
|
|
private:
|
|
FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered);
|