summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/base/win/shell.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/base/win/shell.cc b/ui/base/win/shell.cc
index 3081d77..a73ec3e 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(