Bug 737833 - Disallow AppUserModelID registration calls for immersive mode. r=rstrong
authorBrian R. Bondy <netzen@gmail.com>
Mon, 17 Sep 2012 15:22:33 -0400
changeset 107784 d212c1a845e2014ebe76b40d9172d9f554c9f747
parent 107783 451c73598cc77c3659904c50c0b1b5c6c757383a
child 107785 b7b2e59c623775bca01e96276801da72a783a040
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersrstrong
bugs737833
milestone18.0a1
Bug 737833 - Disallow AppUserModelID registration calls for immersive mode. r=rstrong
widget/windows/WinTaskbar.cpp
--- a/widget/windows/WinTaskbar.cpp
+++ b/widget/windows/WinTaskbar.cpp
@@ -323,16 +323,20 @@ WinTaskbar::GetDefaultGroupId(nsAString 
 }
 
 // (static) Called from AppShell
 bool
 WinTaskbar::RegisterAppUserModelID() {
   if (WinUtils::GetWindowsVersion() < WinUtils::WIN7_VERSION)
     return false;
 
+  if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
+    return false;
+  }
+
   SetCurrentProcessExplicitAppUserModelIDPtr funcAppUserModelID = nullptr;
   bool retVal = false;
 
   nsAutoString uid;
   if (!GetAppUserModelID(uid))
     return false;
 
   HMODULE hDLL = ::LoadLibraryW(kShellLibraryName);