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

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

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 if (BrowserThread::GetBlockingPool()->IsShutdownInProgress()) { 705 if (BrowserThread::GetBlockingPool()->IsShutdownInProgress()) {
706 // Abort package installation if shutdown was initiated, crbug.com/235525 706 // Abort package installation if shutdown was initiated, crbug.com/235525
707 ReportFailure( 707 ReportFailure(
708 ABORTED_DUE_TO_SHUTDOWN, 708 ABORTED_DUE_TO_SHUTDOWN,
709 l10n_util::GetStringFUTF16( 709 l10n_util::GetStringFUTF16(
710 IDS_EXTENSION_PACKAGE_INSTALL_ERROR, 710 IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
711 ASCIIToUTF16("ABORTED_DUE_TO_SHUTDOWN"))); 711 ASCIIToUTF16("ABORTED_DUE_TO_SHUTDOWN")));
712 return false; 712 return false;
713 } 713 }
714 714
715 const SkBitmap& image = images[i].a; 715 const SkBitmap& image = get<0>(images[i]);
716 base::FilePath path_suffix = images[i].b; 716 base::FilePath path_suffix = get<1>(images[i]);
717 if (path_suffix.MaybeAsASCII() == install_icon_path) 717 if (path_suffix.MaybeAsASCII() == install_icon_path)
718 *install_icon = image; 718 *install_icon = image;
719 719
720 if (path_suffix.IsAbsolute() || path_suffix.ReferencesParent()) { 720 if (path_suffix.IsAbsolute() || path_suffix.ReferencesParent()) {
721 // Invalid path for bitmap image. 721 // Invalid path for bitmap image.
722 ReportFailure( 722 ReportFailure(
723 INVALID_PATH_FOR_BITMAP_IMAGE, 723 INVALID_PATH_FOR_BITMAP_IMAGE,
724 l10n_util::GetStringFUTF16( 724 l10n_util::GetStringFUTF16(
725 IDS_EXTENSION_PACKAGE_INSTALL_ERROR, 725 IDS_EXTENSION_PACKAGE_INSTALL_ERROR,
726 ASCIIToUTF16("INVALID_PATH_FOR_BITMAP_IMAGE"))); 726 ASCIIToUTF16("INVALID_PATH_FOR_BITMAP_IMAGE")));
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 831
832 void SandboxedUnpacker::Cleanup() { 832 void SandboxedUnpacker::Cleanup() {
833 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread()); 833 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
834 if (!temp_dir_.Delete()) { 834 if (!temp_dir_.Delete()) {
835 LOG(WARNING) << "Can not delete temp directory at " 835 LOG(WARNING) << "Can not delete temp directory at "
836 << temp_dir_.path().value(); 836 << temp_dir_.path().value();
837 } 837 }
838 } 838 }
839 839
840 } // namespace extensions 840 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698