Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: ui/base/dragdrop/os_exchange_data.cc

Issue 13979012: Fix deadlock between UI thread and drag and drop thread on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Retain Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/dragdrop/os_exchange_data.h ('k') | ui/base/dragdrop/os_exchange_data_provider_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/dragdrop/os_exchange_data.h" 5 #include "ui/base/dragdrop/os_exchange_data.h"
6 6
7 #include "base/pickle.h" 7 #include "base/pickle.h"
8 #include "googleurl/src/gurl.h" 8 #include "googleurl/src/gurl.h"
9 9
10 namespace ui { 10 namespace ui {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 const std::string& file_contents) { 149 const std::string& file_contents) {
150 provider_->SetFileContents(filename, file_contents); 150 provider_->SetFileContents(filename, file_contents);
151 } 151 }
152 152
153 bool OSExchangeData::GetFileContents(base::FilePath* filename, 153 bool OSExchangeData::GetFileContents(base::FilePath* filename,
154 std::string* file_contents) const { 154 std::string* file_contents) const {
155 return provider_->GetFileContents(filename, file_contents); 155 return provider_->GetFileContents(filename, file_contents);
156 } 156 }
157 157
158 void OSExchangeData::SetDownloadFileInfo(const DownloadFileInfo& download) { 158 void OSExchangeData::SetDownloadFileInfo(const DownloadFileInfo& download) {
159 return provider_->SetDownloadFileInfo(download); 159 provider_->SetDownloadFileInfo(download);
160 }
161
162 void OSExchangeData::SetInDragLoop(bool in_drag_loop) {
163 provider_->SetInDragLoop(in_drag_loop);
160 } 164 }
161 #endif 165 #endif
162 166
163 #if defined(OS_WIN) || defined(USE_AURA) 167 #if defined(OS_WIN) || defined(USE_AURA)
164 void OSExchangeData::SetHtml(const string16& html, const GURL& base_url) { 168 void OSExchangeData::SetHtml(const string16& html, const GURL& base_url) {
165 provider_->SetHtml(html, base_url); 169 provider_->SetHtml(html, base_url);
166 } 170 }
167 171
168 bool OSExchangeData::GetHtml(string16* html, GURL* base_url) const { 172 bool OSExchangeData::GetHtml(string16* html, GURL* base_url) const {
169 return provider_->GetHtml(html, base_url); 173 return provider_->GetHtml(html, base_url);
170 } 174 }
171 #endif 175 #endif
172 176
173 } // namespace ui 177 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/dragdrop/os_exchange_data.h ('k') | ui/base/dragdrop/os_exchange_data_provider_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698