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

Update to Chromium revision 213078.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1338 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-24 20:15:18 +00:00
parent 6a7353be3e
commit a2a3513620
69 changed files with 510 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/browser/browser_host_impl.h
View File

@ -28,6 +28,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/file_chooser_params.h"
#include "net/url_request/url_request_context_getter.h"
namespace content {
@ -303,14 +304,17 @@ class CefBrowserHostImpl : public CefBrowserHost,
const content::NativeWebKeyboardEvent& event) OVERRIDE;
virtual bool CanDragEnter(
content::WebContents* source,
const WebDropData& data,
const content::DropData& data,
WebKit::WebDragOperationsMask operations_allowed) OVERRIDE;
virtual bool ShouldCreateWebContents(
content::WebContents* web_contents,
int route_id,
WindowContainerType window_container_type,
const string16& frame_name,
const GURL& target_url) OVERRIDE;
const GURL& target_url,
WindowOpenDisposition disposition,
const WebKit::WebWindowFeatures& features,
bool user_gesture) OVERRIDE;
virtual void WebContentsCreated(content::WebContents* source_contents,
int64 source_frame_id,
const string16& frame_name,
@ -337,7 +341,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
virtual void RenderViewDeleted(
content::RenderViewHost* render_view_host) OVERRIDE;
virtual void RenderViewReady() OVERRIDE;
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
virtual void DidCommitProvisionalLoadForFrame(
int64 frame_id,
bool is_main_frame,
@ -471,6 +475,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
// Used with WebContentsDelegate::RunFileChooser to notify the WebContents.
void OnRunFileChooserDelegateCallback(
content::WebContents* tab,
content::FileChooserParams::Mode mode,
const std::vector<base::FilePath>& file_paths);
CefWindowInfo window_info_;