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 165669.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@902 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-11-06 17:13:58 +00:00
parent 1177da898b
commit 255fdad295
28 changed files with 116 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cef1/libcef/drag_download_file.h
View File

@@ -12,6 +12,7 @@
#include "base/file_path.h"
#include "base/memory/linked_ptr.h"
#include "base/message_loop.h"
#include "base/run_loop.h"
#include "googleurl/src/gurl.h"
#include "ui/base/dragdrop/download_file_interface.h"
@@ -42,23 +43,15 @@ class DragDownloadFile : public ui::DownloadFileProvider {
// DownloadFileProvider methods.
// Called on drag-and-drop thread (Windows).
// Called on UI thread (MacOSX).
virtual bool Start(ui::DownloadFileObserver* observer);
virtual void Stop();
#if defined(OS_WIN)
virtual IStream* GetStream() { return NULL; }
#endif
virtual void Start(ui::DownloadFileObserver* observer) OVERRIDE;
virtual bool Wait() OVERRIDE;
virtual void Stop() OVERRIDE;
private:
// Called on drag-and-drop thread (Windows).
// Called on UI thread (Windows).
virtual ~DragDownloadFile();
// Called on drag-and-drop thread (Windows only).
#if defined(OS_WIN)
void StartNestedMessageLoop();
void QuitNestedMessageLoop();
#endif
// Called on either drag-and-drop thread or UI thread (Windows).
// Called on UI thread (MacOSX).
void InitiateDownload();
@@ -86,6 +79,7 @@ class DragDownloadFile : public ui::DownloadFileProvider {
bool is_started_;
bool is_successful_;
scoped_refptr<ui::DownloadFileObserver> observer_;
base::RunLoop nested_loop_;
// Accessed on drag-and-drop thread (Windows only).
#if defined(OS_WIN)