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

Side by Side Diff: chrome_frame/urlmon_url_request.cc

Issue 3743005: Fix a regression in ChromeFrame which caused download attachments to not work... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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 | « no previous file | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome_frame/urlmon_url_request.h" 5 #include "chrome_frame/urlmon_url_request.h"
6 6
7 #include <wininet.h> 7 #include <wininet.h>
8 #include <urlmon.h> 8 #include <urlmon.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // GetBindInfo call as per contract but the return values are 150 // GetBindInfo call as per contract but the return values are
151 // ignored. So just set "get" as a method to make our GetBindInfo 151 // ignored. So just set "get" as a method to make our GetBindInfo
152 // implementation happy. 152 // implementation happy.
153 method_ = "get"; 153 method_ = "get";
154 return S_OK; 154 return S_OK;
155 } 155 }
156 156
157 void UrlmonUrlRequest::TerminateBind(TerminateBindCallback* callback) { 157 void UrlmonUrlRequest::TerminateBind(TerminateBindCallback* callback) {
158 DCHECK_EQ(thread_, PlatformThread::CurrentId()); 158 DCHECK_EQ(thread_, PlatformThread::CurrentId());
159 DLOG(INFO) << __FUNCTION__ << me(); 159 DLOG(INFO) << __FUNCTION__ << me();
160 cleanup_transaction_ = false;
160 if (status_.get_state() == Status::DONE) { 161 if (status_.get_state() == Status::DONE) {
161 // Binding is stopped. Note result could be an error. 162 // Binding is stopped. Note result could be an error.
162 callback->Run(moniker_, bind_context_); 163 callback->Run(moniker_, bind_context_);
163 delete callback; 164 delete callback;
164 } else { 165 } else {
165 // WORKING (ABORTING?). Save the callback. 166 // WORKING (ABORTING?). Save the callback.
166 // Now we will return INET_TERMINATE_BIND from ::OnDataAvailable() and in 167 // Now we will return INET_TERMINATE_BIND from ::OnDataAvailable() and in
167 // ::OnStopBinding will invoke the callback passing our moniker and 168 // ::OnStopBinding will invoke the callback passing our moniker and
168 // bind context. 169 // bind context.
169 terminate_bind_callback_.reset(callback); 170 terminate_bind_callback_.reset(callback);
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1210 privacy_info_.privacy_records[UTF8ToWide(url)]; 1211 privacy_info_.privacy_records[UTF8ToWide(url)];
1211 1212
1212 privacy_entry.flags |= flags; 1213 privacy_entry.flags |= flags;
1213 privacy_entry.policy_ref = UTF8ToWide(policy_ref); 1214 privacy_entry.policy_ref = UTF8ToWide(policy_ref);
1214 1215
1215 if (fire_privacy_event && IsWindow(notification_window_)) { 1216 if (fire_privacy_event && IsWindow(notification_window_)) {
1216 PostMessage(notification_window_, WM_FIRE_PRIVACY_CHANGE_NOTIFICATION, 1, 1217 PostMessage(notification_window_, WM_FIRE_PRIVACY_CHANGE_NOTIFICATION, 1,
1217 0); 1218 0);
1218 } 1219 }
1219 } 1220 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698