diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 22:14:16 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 22:14:16 +0000 |
| commit | 220fc392f3f58cdd787bbc5abc5c91d52302d83d (patch) | |
| tree | f1a1f5dbe5b4a3b938f0cdce9127792f499726b0 /chrome/browser | |
| parent | 9f92f9ea3310af9846f84a5390cb52b00ff0a59c (diff) | |
| download | chromium_src-220fc392f3f58cdd787bbc5abc5c91d52302d83d.zip chromium_src-220fc392f3f58cdd787bbc5abc5c91d52302d83d.tar.gz chromium_src-220fc392f3f58cdd787bbc5abc5c91d52302d83d.tar.bz2 | |
Revert 39732 due to reliability bot failures.
Sometimes there is not a current context.
TBR=jochen
BUG=36600
TEST=none
Review URL: http://codereview.chromium.org/652158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/renderer_host/database_dispatcher_host.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc index 270e3f9..e7734ac 100644 --- a/chrome/browser/renderer_host/database_dispatcher_host.cc +++ b/chrome/browser/renderer_host/database_dispatcher_host.cc @@ -181,15 +181,13 @@ void DatabaseDispatcherHost::OnDatabaseOpenFile(const string16& vfs_file_name, static void SetOpenFileResponseParams( ViewMsg_DatabaseOpenFileResponse_Params* params, base::PlatformFile file_handle, - base::PlatformFile dir_handle, - bool is_blocked) { + base::PlatformFile dir_handle) { #if defined(OS_WIN) params->file_handle = file_handle; #elif defined(OS_POSIX) params->file_handle = base::FileDescriptor(file_handle, true); params->dir_handle = base::FileDescriptor(dir_handle, true); #endif - params->blocked = is_blocked; } // Scheduled by the IO thread on the file thread. @@ -221,8 +219,7 @@ void DatabaseDispatcherHost::DatabaseOpenFile(const string16& vfs_file_name, } ViewMsg_DatabaseOpenFileResponse_Params response_params; - SetOpenFileResponseParams(&response_params, target_handle, target_dir_handle, - false /* blocked */); + SetOpenFileResponseParams(&response_params, target_handle, target_dir_handle); ChromeThread::PostTask( ChromeThread::IO, FROM_HERE, NewRunnableMethod(this, @@ -479,8 +476,7 @@ void DatabaseDispatcherHost::OnDatabaseOpenFileBlocked(int32 message_id) { ViewMsg_DatabaseOpenFileResponse_Params response_params; SetOpenFileResponseParams(&response_params, base::kInvalidPlatformFileValue, - base::kInvalidPlatformFileValue, - true /* blocked */); + base::kInvalidPlatformFileValue); SendMessage(new ViewMsg_DatabaseOpenFileResponse(message_id, response_params)); } |