diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 04:41:21 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 04:41:21 +0000 |
| commit | 00e89fea9ded8fa8b1cb31502ecfd104d90631e2 (patch) | |
| tree | e4500b05231e7bb55dc98f6f685971fe73e280ed | |
| parent | a0448004098a36c0f81cbacadf91be55f9363dc7 (diff) | |
| download | chromium_src-00e89fea9ded8fa8b1cb31502ecfd104d90631e2.zip chromium_src-00e89fea9ded8fa8b1cb31502ecfd104d90631e2.tar.gz chromium_src-00e89fea9ded8fa8b1cb31502ecfd104d90631e2.tar.bz2 | |
Do not set the appid and window icon in Metro
Patch From Gabriel Charette <gab@chromium.org>
BUG=None
TEST=Launch Chrome Metro from Start Screen with Chrome as default.
Review URL: https://chromiumcodereview.appspot.com/10557017
Patch from Gabriel Charette <gab@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142910 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/base/win/shell.cc | 7 |
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( |