diff options
| author | tzik <tzik@chromium.org> | 2016-03-08 16:51:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 00:52:59 +0000 |
| commit | b2f765b6545e69fa91c275bd76cc7386b29892de (patch) | |
| tree | e0e9a90a5aa98fce61cdbe68986a88a048be2e6e | |
| parent | 1e43e0d8e6dc2ec7c73a2587d21c079663e89159 (diff) | |
| download | chromium_src-b2f765b6545e69fa91c275bd76cc7386b29892de.zip chromium_src-b2f765b6545e69fa91c275bd76cc7386b29892de.tar.gz chromium_src-b2f765b6545e69fa91c275bd76cc7386b29892de.tar.bz2 | |
Replace base::Tuple in //extensions with std::tuple
BUG=554987
Review URL: https://codereview.chromium.org/1773593004
Cr-Commit-Position: refs/heads/master@{#380001}
| -rw-r--r-- | extensions/browser/sandboxed_unpacker.cc | 5 | ||||
| -rw-r--r-- | extensions/common/extension_utility_messages.h | 3 | ||||
| -rw-r--r-- | extensions/utility/unpacker.cc | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc index 4652225..ab84c2a 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc @@ -8,6 +8,7 @@ #include <stdint.h> #include <set> +#include <tuple> #include "base/bind.h" #include "base/command_line.h" @@ -775,8 +776,8 @@ bool SandboxedUnpacker::RewriteImageFiles(SkBitmap* install_icon) { return false; } - const SkBitmap& image = base::get<0>(images[i]); - base::FilePath path_suffix = base::get<1>(images[i]); + const SkBitmap& image = std::get<0>(images[i]); + base::FilePath path_suffix = std::get<1>(images[i]); if (path_suffix.MaybeAsASCII() == install_icon_path) *install_icon = image; diff --git a/extensions/common/extension_utility_messages.h b/extensions/common/extension_utility_messages.h index 24df23f..28b9c0a 100644 --- a/extensions/common/extension_utility_messages.h +++ b/extensions/common/extension_utility_messages.h @@ -5,6 +5,7 @@ // Multiply-included message file, so no include guard. #include <string> +#include <tuple> #include "extensions/common/update_manifest.h" #include "ipc/ipc_message_macros.h" @@ -17,7 +18,7 @@ #ifndef EXTENSIONS_COMMON_EXTENSION_UTILITY_MESSAGES_H_ #define EXTENSIONS_COMMON_EXTENSION_UTILITY_MESSAGES_H_ -typedef std::vector<base::Tuple<SkBitmap, base::FilePath>> DecodedImages; +using DecodedImages = std::vector<std::tuple<SkBitmap, base::FilePath>>; #endif // EXTENSIONS_COMMON_EXTENSION_UTILITY_MESSAGES_H_ diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc index 083cb72..837a0d8 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -7,6 +7,7 @@ #include <stddef.h> #include <set> +#include <tuple> #include <utility> #include "base/files/file_enumerator.h" @@ -247,7 +248,7 @@ bool Unpacker::AddDecodedImage(const base::FilePath& path) { return false; } - internal_data_->decoded_images.push_back(base::MakeTuple(image_bitmap, path)); + internal_data_->decoded_images.push_back(std::make_tuple(image_bitmap, path)); return true; } |