Mac: Fix compile errors due to Chromium update.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1138 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
518e36fb9c
commit
f0abe2369c
|
@ -42,6 +42,7 @@
|
|||
#include "content/public/browser/notification_source.h"
|
||||
#include "content/public/browser/notification_types.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 "ui/shell_dialogs/selected_file_info.h"
|
||||
|
||||
|
|
|
@ -693,8 +693,9 @@ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
|||
WrapChromeProtocolHandler(
|
||||
scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
||||
chrome_protocol_handler) {
|
||||
return make_scoped_ptr(
|
||||
scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> ret(
|
||||
new ChromeProtocolHandlerWrapper(chrome_protocol_handler.Pass()));
|
||||
return ret.Pass();
|
||||
}
|
||||
|
||||
} // namespace scheme
|
||||
|
|
|
@ -29,7 +29,7 @@ bool CefMenuCreatorRunnerMac::RunContextMenu(CefMenuCreator* manager) {
|
|||
useWithPopUpButtonCell:NO];
|
||||
|
||||
NSView* parent_view =
|
||||
manager->browser()->GetWebContents()->GetContentNativeView();
|
||||
manager->browser()->GetWebContents()->GetView()->GetContentNativeView();
|
||||
|
||||
// Synthesize an event for the click, as there is no certainty that
|
||||
// [NSApp currentEvent] will return a valid event.
|
||||
|
|
Loading…
Reference in New Issue