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

Side by Side Diff: chrome/browser/extensions/sandboxed_unpacker.cc

Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Two more Created 6 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/extensions/sandboxed_unpacker.h" 5 #include "chrome/browser/extensions/sandboxed_unpacker.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 // Error removing old image file. 689 // Error removing old image file.
690 ReportFailure( 690 ReportFailure(
691 ERROR_REMOVING_OLD_IMAGE_FILE, 691 ERROR_REMOVING_OLD_IMAGE_FILE,
692 l10n_util::GetStringFUTF16( 692 l10n_util::GetStringFUTF16(
693 IDS_EXTENSION_PACKAGE_INSTALL_ERROR, 693 IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
694 ASCIIToUTF16("ERROR_REMOVING_OLD_IMAGE_FILE"))); 694 ASCIIToUTF16("ERROR_REMOVING_OLD_IMAGE_FILE")));
695 return false; 695 return false;
696 } 696 }
697 } 697 }
698 698
699 const std::string& install_icon_path = IconsInfo::GetIcons(extension_).Get( 699 const std::string& install_icon_path =
700 extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_BIGGER); 700 IconsInfo::GetIcons(extension_.get()).Get(
701 extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_BIGGER);
701 702
702 // Write our parsed images back to disk as well. 703 // Write our parsed images back to disk as well.
703 for (size_t i = 0; i < images.size(); ++i) { 704 for (size_t i = 0; i < images.size(); ++i) {
704 if (BrowserThread::GetBlockingPool()->IsShutdownInProgress()) { 705 if (BrowserThread::GetBlockingPool()->IsShutdownInProgress()) {
705 // Abort package installation if shutdown was initiated, crbug.com/235525 706 // Abort package installation if shutdown was initiated, crbug.com/235525
706 ReportFailure( 707 ReportFailure(
707 ABORTED_DUE_TO_SHUTDOWN, 708 ABORTED_DUE_TO_SHUTDOWN,
708 l10n_util::GetStringFUTF16( 709 l10n_util::GetStringFUTF16(
709 IDS_EXTENSION_PACKAGE_INSTALL_ERROR, 710 IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
710 ASCIIToUTF16("ABORTED_DUE_TO_SHUTDOWN"))); 711 ASCIIToUTF16("ABORTED_DUE_TO_SHUTDOWN")));
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 831
831 void SandboxedUnpacker::Cleanup() { 832 void SandboxedUnpacker::Cleanup() {
832 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread()); 833 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
833 if (!temp_dir_.Delete()) { 834 if (!temp_dir_.Delete()) {
834 LOG(WARNING) << "Can not delete temp directory at " 835 LOG(WARNING) << "Can not delete temp directory at "
835 << temp_dir_.path().value(); 836 << temp_dir_.path().value();
836 } 837 }
837 } 838 }
838 839
839 } // namespace extensions 840 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698