| Index: ui/base/win/shell.cc
|
| diff --git a/ui/base/win/shell.cc b/ui/base/win/shell.cc
|
| index 3081d77c1cb904731078e8efbe6105cafb860f62..a73ec3e97704327103d74a56f70b4ba15e136fdc 100644
|
| --- a/ui/base/win/shell.cc
|
| +++ b/ui/base/win/shell.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/file_path.h"
|
| #include "base/native_library.h"
|
| #include "base/string_util.h"
|
| +#include "base/win/metro.h"
|
| #include "base/win/scoped_comptr.h"
|
| #include "base/win/win_util.h"
|
| #include "base/win/windows_version.h"
|
| @@ -23,8 +24,10 @@ namespace {
|
| void SetAppIdAndIconForWindow(const string16& app_id,
|
| const string16& app_icon,
|
| HWND hwnd) {
|
| - // This functionality is only available on Win7+.
|
| - if (base::win::GetVersion() < base::win::VERSION_WIN7)
|
| + // This functionality is only available on Win7+. It also doesn't make sense
|
| + // to do this for Chrome Metro.
|
| + if (base::win::GetVersion() < base::win::VERSION_WIN7 ||
|
| + base::win::IsMetroProcess())
|
| return;
|
| base::win::ScopedComPtr<IPropertyStore> pps;
|
| HRESULT result = SHGetPropertyStoreForWindow(
|
|
|