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

Side by Side Diff: chrome_frame/urlmon_moniker.cc

Issue 976007: Don't assume that the mime type for documents that mshtml rejects is CF (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
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_moniker.h" 5 #include "chrome_frame/urlmon_moniker.h"
6 6
7 #include <shlguid.h> 7 #include <shlguid.h>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome_frame/bho.h" 10 #include "chrome_frame/bho.h"
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 } 479 }
480 480
481 return hr; 481 return hr;
482 } 482 }
483 483
484 // static 484 // static
485 HRESULT MonikerPatch::BindToStorage(IMoniker_BindToStorage_Fn original, 485 HRESULT MonikerPatch::BindToStorage(IMoniker_BindToStorage_Fn original,
486 IMoniker* me, IBindCtx* bind_ctx, 486 IMoniker* me, IBindCtx* bind_ctx,
487 IMoniker* to_left, REFIID iid, void** obj) { 487 IMoniker* to_left, REFIID iid, void** obj) {
488 DLOG(INFO) << __FUNCTION__; 488 DLOG(INFO) << __FUNCTION__;
489 DCHECK(iid == IID_IStream); 489 DCHECK(iid == IID_IStream || iid == IID_IUnknown);
490 DCHECK(to_left == NULL); 490 DCHECK(to_left == NULL);
491 491
492 HRESULT hr = E_UNEXPECTED; 492 HRESULT hr = E_UNEXPECTED;
493 NavigationManager* mgr = NavigationManager::GetThreadInstance(); 493 NavigationManager* mgr = NavigationManager::GetThreadInstance();
494 if (mgr) { 494 if (mgr) {
495 CComHeapPtr<WCHAR> url; 495 CComHeapPtr<WCHAR> url;
496 hr = me->GetDisplayName(bind_ctx, NULL, &url); 496 hr = me->GetDisplayName(bind_ctx, NULL, &url);
497 DCHECK(SUCCEEDED(hr)); 497 DCHECK(SUCCEEDED(hr));
498 bool interest = mgr->IsTopLevelUrl(url); 498 bool interest = mgr->IsTopLevelUrl(url);
499 DLOG(INFO) << "interest: " << interest << " url " << url; 499 DLOG(INFO) << "interest: " << interest << " url " << url;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 } else if (cache_out) { 604 } else if (cache_out) {
605 *cache_out = cache.Detach(); 605 *cache_out = cache.Detach();
606 } 606 }
607 607
608 bscb->OnStopBinding(hr, NULL); 608 bscb->OnStopBinding(hr, NULL);
609 } 609 }
610 610
611 return hr; 611 return hr;
612 } 612 }
613 613
OLDNEW
« chrome_frame/urlmon_bind_status_callback.cc ('K') | « chrome_frame/urlmon_bind_status_callback.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698