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

Side by Side Diff: chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc

Issue 1210013007: clang/win: Fix warnings to prepare for building without -Wno-reorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-unsequenced
Patch Set: Created 5 years, 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 // MTPDeviceDelegateImplWin implementation. 5 // MTPDeviceDelegateImplWin implementation.
6 6
7 #include "chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h" 7 #include "chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h"
8 8
9 #include <portabledevice.h> 9 #include <portabledevice.h>
10 10
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 reply(reply) { 360 reply(reply) {
361 } 361 }
362 362
363 MTPDeviceDelegateImplWin::PendingTaskInfo::~PendingTaskInfo() { 363 MTPDeviceDelegateImplWin::PendingTaskInfo::~PendingTaskInfo() {
364 } 364 }
365 365
366 MTPDeviceDelegateImplWin::MTPDeviceDelegateImplWin( 366 MTPDeviceDelegateImplWin::MTPDeviceDelegateImplWin(
367 const base::string16& registered_device_path, 367 const base::string16& registered_device_path,
368 const base::string16& pnp_device_id, 368 const base::string16& pnp_device_id,
369 const base::string16& storage_object_id) 369 const base::string16& storage_object_id)
370 : storage_device_info_(pnp_device_id, registered_device_path, 370 : init_state_(UNINITIALIZED),
371 media_task_runner_(MediaFileSystemBackend::MediaTaskRunner()),
372 storage_device_info_(pnp_device_id,
373 registered_device_path,
371 storage_object_id), 374 storage_object_id),
372 init_state_(UNINITIALIZED),
373 media_task_runner_(MediaFileSystemBackend::MediaTaskRunner()),
374 task_in_progress_(false), 375 task_in_progress_(false),
375 weak_ptr_factory_(this) { 376 weak_ptr_factory_(this) {
376 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 377 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
377 DCHECK(!registered_device_path.empty()); 378 DCHECK(!registered_device_path.empty());
378 DCHECK(!pnp_device_id.empty()); 379 DCHECK(!pnp_device_id.empty());
379 DCHECK(!storage_object_id.empty()); 380 DCHECK(!storage_object_id.empty());
380 DCHECK(media_task_runner_.get()); 381 DCHECK(media_task_runner_.get());
381 } 382 }
382 383
383 MTPDeviceDelegateImplWin::~MTPDeviceDelegateImplWin() { 384 MTPDeviceDelegateImplWin::~MTPDeviceDelegateImplWin() {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 current_snapshot_details_->file_info(), 694 current_snapshot_details_->file_info(),
694 current_snapshot_details_->request_info().snapshot_file_path); 695 current_snapshot_details_->request_info().snapshot_file_path);
695 } else { 696 } else {
696 current_snapshot_details_->request_info().error_callback.Run( 697 current_snapshot_details_->request_info().error_callback.Run(
697 base::File::FILE_ERROR_FAILED); 698 base::File::FILE_ERROR_FAILED);
698 } 699 }
699 task_in_progress_ = false; 700 task_in_progress_ = false;
700 current_snapshot_details_.reset(); 701 current_snapshot_details_.reset();
701 ProcessNextPendingRequest(); 702 ProcessNextPendingRequest();
702 } 703 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698