Work toward getting chrome to build with u16string.
Bug: 911896
Change-Id: If6a241f7bf5760cafbaf6313e41d856cf9823709
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2682998
Commit-Queue: Peter Kasting <[email protected]>
Auto-Submit: Peter Kasting <[email protected]>
Reviewed-by: Eric Seckler <[email protected]>
Reviewed-by: Tommy Li <[email protected]>
Reviewed-by: Patrick Monette <[email protected]>
Reviewed-by: Theresa <[email protected]>
Cr-Commit-Position: refs/heads/master@{#852374}
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index a6c4d17c..502264a4 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/strings/string_util.h"
#include "base/task/thread_pool.h"
#include "base/threading/thread.h"
#include "chrome/browser/win/icon_reader_service.h"
@@ -116,16 +117,17 @@
const base::string16& group) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ std::wstring icon_group = base::AsWString(group);
if (icon.isNull()) {
- std::move(finally_).Run(std::move(default_icon_), group);
+ std::move(finally_).Run(std::move(default_icon_), icon_group);
} else {
gfx::Image image(icon);
- std::move(finally_).Run(std::move(image), group);
+ std::move(finally_).Run(std::move(image), icon_group);
}
}
// Must be called in a COM context. |group| should be a file extension.
-gfx::Image GetIconForFileExtension(base::string16 group,
+gfx::Image GetIconForFileExtension(const std::wstring& group,
IconLoader::IconSize icon_size) {
int size = 0;
switch (icon_size) {
