bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix compile errors due to Chromium update.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1138 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-03-12 21:46:38 +00:00
parent 518e36fb9c
commit f0abe2369c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libcef/browser/browser_host_impl.cc
View File

@@ -42,6 +42,7 @@
#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h" #include "content/public/browser/notification_types.h"
#include "content/public/browser/resource_request_info.h" #include "content/public/browser/resource_request_info.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/common/file_chooser_params.h" #include "content/public/common/file_chooser_params.h"
#include "ui/shell_dialogs/selected_file_info.h" #include "ui/shell_dialogs/selected_file_info.h"

3
libcef/browser/chrome_scheme_handler.cc
View File

@@ -693,8 +693,9 @@ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
WrapChromeProtocolHandler( WrapChromeProtocolHandler(
scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
chrome_protocol_handler) { chrome_protocol_handler) {
return make_scoped_ptr( scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> ret(
new ChromeProtocolHandlerWrapper(chrome_protocol_handler.Pass())); new ChromeProtocolHandlerWrapper(chrome_protocol_handler.Pass()));
return ret.Pass();
} }
} // namespace scheme } // namespace scheme

2
libcef/browser/menu_creator_runner_mac.mm
View File

@@ -29,7 +29,7 @@ bool CefMenuCreatorRunnerMac::RunContextMenu(CefMenuCreator* manager) {
useWithPopUpButtonCell:NO]; useWithPopUpButtonCell:NO];
NSView* parent_view = NSView* parent_view =
manager->browser()->GetWebContents()->GetContentNativeView(); manager->browser()->GetWebContents()->GetView()->GetContentNativeView();
// Synthesize an event for the click, as there is no certainty that // Synthesize an event for the click, as there is no certainty that
// [NSApp currentEvent] will return a valid event. // [NSApp currentEvent] will return a valid event.