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

Side by Side Diff: chrome_frame/protocol_sink_wrap.cc

Issue 6962028: Properly clear URL on BINDSTATUS_REDIRECTING (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <htiframe.h> 5 #include <htiframe.h>
6 #include <mshtml.h> 6 #include <mshtml.h>
7 7
8 #include "chrome_frame/protocol_sink_wrap.h" 8 #include "chrome_frame/protocol_sink_wrap.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 // (acts as if this is the first time 390 // (acts as if this is the first time
391 // BINDSTATUS_MIMETYPEAVAILABLE is received). 391 // BINDSTATUS_MIMETYPEAVAILABLE is received).
392 HRESULT ProtData::ReportProgress(IInternetProtocolSink* delegate, 392 HRESULT ProtData::ReportProgress(IInternetProtocolSink* delegate,
393 ULONG status_code, LPCWSTR status_text) { 393 ULONG status_code, LPCWSTR status_text) {
394 switch (status_code) { 394 switch (status_code) {
395 case BINDSTATUS_DIRECTBIND: 395 case BINDSTATUS_DIRECTBIND:
396 renderer_type_ = RENDERER_TYPE_OTHER; 396 renderer_type_ = RENDERER_TYPE_OTHER;
397 break; 397 break;
398 398
399 case BINDSTATUS_REDIRECTING: 399 case BINDSTATUS_REDIRECTING:
400 url_.empty(); 400 url_.clear();
401 if (status_text) 401 if (status_text)
402 url_ = status_text; 402 url_ = status_text;
403 break; 403 break;
404 404
405 case BINDSTATUS_SERVER_MIMETYPEAVAILABLE: 405 case BINDSTATUS_SERVER_MIMETYPEAVAILABLE:
406 has_server_mime_type_ = true; 406 has_server_mime_type_ = true;
407 SaveSuggestedMimeType(status_text); 407 SaveSuggestedMimeType(status_text);
408 return S_OK; 408 return S_OK;
409 409
410 // TODO(stoyan): BINDSTATUS_RAWMIMETYPE 410 // TODO(stoyan): BINDSTATUS_RAWMIMETYPE
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 // Explicit release, otherwise ~CComObjectStackEx will complain about 940 // Explicit release, otherwise ~CComObjectStackEx will complain about
941 // outstanding reference to us, because it runs before ~FakeProtocol 941 // outstanding reference to us, because it runs before ~FakeProtocol
942 prot.transaction_.Release(); 942 prot.transaction_.Release();
943 } 943 }
944 } 944 }
945 945
946 void TransactionHooks::RevertHooks() { 946 void TransactionHooks::RevertHooks() {
947 vtable_patch::UnpatchInterfaceMethods(CTransaction_PatchInfo); 947 vtable_patch::UnpatchInterfaceMethods(CTransaction_PatchInfo);
948 vtable_patch::UnpatchInterfaceMethods(CTransaction2_PatchInfo); 948 vtable_patch::UnpatchInterfaceMethods(CTransaction2_PatchInfo);
949 } 949 }
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