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

Side by Side Diff: chrome_frame/urlmon_bind_status_callback.cc

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert bad indentation, rebase Created 9 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 | « chrome_frame/urlmon_bind_status_callback.h ('k') | chrome_frame/urlmon_moniker.cc » ('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) 2010 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 "chrome_frame/urlmon_bind_status_callback.h" 5 #include "chrome_frame/urlmon_bind_status_callback.h"
6 6
7 #include <mshtml.h> 7 #include <mshtml.h>
8 #include <shlguid.h> 8 #include <shlguid.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 p->status_code(), p->status_text()); 362 p->status_code(), p->status_text());
363 delete p; 363 delete p;
364 } 364 }
365 } 365 }
366 saved_progress_.clear(); 366 saved_progress_.clear();
367 } 367 }
368 } 368 }
369 369
370 if (data_sniffer_.is_cache_valid()) { 370 if (data_sniffer_.is_cache_valid()) {
371 if (data_sniffer_.is_chrome()) { 371 if (data_sniffer_.is_chrome()) {
372 ScopedComPtr<BindContextInfo> info; 372 base::win::ScopedComPtr<BindContextInfo> info;
373 BindContextInfo::FromBindContext(bind_ctx_, info.Receive()); 373 BindContextInfo::FromBindContext(bind_ctx_, info.Receive());
374 DCHECK(info); 374 DCHECK(info);
375 if (info) { 375 if (info) {
376 info->SetToSwitch(data_sniffer_.cache_); 376 info->SetToSwitch(data_sniffer_.cache_);
377 } 377 }
378 } 378 }
379 379
380 hr = data_sniffer_.DrainCache(delegate(), 380 hr = data_sniffer_.DrainCache(delegate(),
381 flags | BSCF_FIRSTDATANOTIFICATION, clip_format_); 381 flags | BSCF_FIRSTDATANOTIFICATION, clip_format_);
382 DLOG_IF(WARNING, INET_E_TERMINATED_BIND != hr) << __FUNCTION__ << 382 DLOG_IF(WARNING, INET_E_TERMINATED_BIND != hr) << __FUNCTION__ <<
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 case BINDSTATUS_CACHEFILENAMEAVAILABLE: 418 case BINDSTATUS_CACHEFILENAMEAVAILABLE:
419 case BINDSTATUS_SERVER_MIMETYPEAVAILABLE: 419 case BINDSTATUS_SERVER_MIMETYPEAVAILABLE:
420 return true; 420 return true;
421 default: 421 default:
422 break; 422 break;
423 } 423 }
424 } 424 }
425 425
426 return false; 426 return false;
427 } 427 }
OLDNEW
« no previous file with comments | « chrome_frame/urlmon_bind_status_callback.h ('k') | chrome_frame/urlmon_moniker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698