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

42
cef1/libcef/drag_download_file.cc
View File

@@ -51,11 +51,11 @@ DragDownloadFile::~DragDownloadFile() {
#endif
}
bool DragDownloadFile::Start(ui::DownloadFileObserver* observer) {
void DragDownloadFile::Start(ui::DownloadFileObserver* observer) {
AssertCurrentlyOnDragThread();
if (is_started_)
return true;
return;
is_started_ = true;
DCHECK(!observer_.get());
@@ -68,18 +68,19 @@ bool DragDownloadFile::Start(ui::DownloadFileObserver* observer) {
// name already exists.
if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("chrome"),
&temp_dir_path_))
return false;
return;
file_path_ = temp_dir_path_.Append(file_name_);
}
InitiateDownload();
}
// On Windows, we need to wait till the download file is completed.
#if defined(OS_WIN)
StartNestedMessageLoop();
#endif
bool DragDownloadFile::Wait() {
AssertCurrentlyOnDragThread();
if (is_started_)
nested_loop_.Run();
return is_successful_;
}
@@ -118,10 +119,8 @@ void DragDownloadFile::DownloadCompleted(bool is_successful) {
is_successful_ = is_successful;
// On Windows, we need to stop the waiting.
#if defined(OS_WIN)
QuitNestedMessageLoop();
#endif
if (nested_loop_.running())
nested_loop_.Quit();
}
void DragDownloadFile::AssertCurrentlyOnDragThread() {
@@ -137,24 +136,3 @@ void DragDownloadFile::AssertCurrentlyOnUIThread() {
DCHECK(CefThread::CurrentlyOn(CefThread::UI));
#endif
}
#if defined(OS_WIN)
void DragDownloadFile::StartNestedMessageLoop() {
AssertCurrentlyOnDragThread();
bool old_state = MessageLoop::current()->NestableTasksAllowed();
MessageLoop::current()->SetNestableTasksAllowed(true);
is_running_nested_message_loop_ = true;
MessageLoop::current()->Run();
MessageLoop::current()->SetNestableTasksAllowed(old_state);
}
void DragDownloadFile::QuitNestedMessageLoop() {
AssertCurrentlyOnDragThread();
if (is_running_nested_message_loop_) {
is_running_nested_message_loop_ = false;
MessageLoop::current()->Quit();
}
}
#endif