Cleanup dual_mode handling in ShellIntegrationWin after Metro removal.

chrome/browser/shell_integration_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
 #include <propkey.h>  // Needs to come after shobjidl.h.
@@ skipping 175 matching lines @@
   for (size_t i = 0; i < arraysize(kLocations); ++i) {
     base::FilePath path;
     if (!PathService::Get(kLocations[i].location_id, &path)) {
       NOTREACHED();
       continue;
     }
 
     if (kLocations[i].sub_dir)
       path = path.Append(kLocations[i].sub_dir);
 
-    bool check_dual_mode = kLocations[i].location_id == base::DIR_START_MENU ||
-                           kLocations[i].location_id == base::DIR_TASKBAR_PINS;
+    // Clear |dual_mode| property from taskbar pins as those are user-level
+    // shortcuts which aren't handled by the installer.
+    bool clear_dual_mode = kLocations[i].location_id == base::DIR_TASKBAR_PINS;
     ShellIntegration::MigrateShortcutsInPathInternal(chrome_exe, path,
-                                                     check_dual_mode);
+                                                     clear_dual_mode);
   }
 }
 
 // Windows 8 introduced a new protocol->executable binding system which cannot
 // be retrieved in the HKCR registry subkey method implemented below. We call
 // AssocQueryString with the new Win8-only flag ASSOCF_IS_PROTOCOL instead.
 base::string16 GetAppForProtocolUsingAssocQuery(const GURL& url) {
   base::string16 url_scheme = base::ASCIIToUTF16(url.scheme());
   // Don't attempt to query protocol association on an empty string.
   if (url_scheme.empty())
@@ skipping 308 matching lines @@
   static const int64_t kMigrateChromiumShortcutsDelaySeconds = 15;
   BrowserThread::PostDelayedTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&MigrateChromiumShortcutsCallback),
       base::TimeDelta::FromSeconds(kMigrateChromiumShortcutsDelaySeconds));
 }
 
 int ShellIntegration::MigrateShortcutsInPathInternal(
     const base::FilePath& chrome_exe,
     const base::FilePath& path,
-    bool check_dual_mode) {
+    bool clear_dual_mode) {
   DCHECK(base::win::GetVersion() >= base::win::VERSION_WIN7);
 
   // Enumerate all pinned shortcuts in the given path directly.
   base::FileEnumerator shortcuts_enum(
       path, false,  // not recursive
       base::FileEnumerator::FILES, FILE_PATH_LITERAL("*.lnk"));
 
   bool is_per_user_install = InstallUtil::IsPerUserInstall(chrome_exe);
 
   int shortcuts_migrated = 0;
@@ skipping 52 matching lines @@
         case VT_LPWSTR:
           if (expected_app_id != base::string16(propvariant.get().pwszVal))
             updated_properties.set_app_id(expected_app_id);
           break;
         default:
           NOTREACHED();
           continue;
       }
     }
 
-    // Only set dual mode if the expected app id is the default app id.
+    // Clear |dual_mode| property from any shortcuts that previously had it (as
+    // requested by caller).
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     base::string16 default_chromium_model_id(
         ShellUtil::GetBrowserModelId(dist, is_per_user_install));
-    if (check_dual_mode && expected_app_id == default_chromium_model_id) {
-      // TODO(scottmg): Simplify with no Metro: http://crbug.com/558054.
-      const bool dual_mode_desired = false;
+    if (clear_dual_mode && expected_app_id == default_chromium_model_id) {
       propvariant.Reset();
       if (property_store->GetValue(PKEY_AppUserModel_IsDualMode,
                                    propvariant.Receive()) != S_OK) {
         // When in doubt, prefer to not update the shortcut.
         NOTREACHED();
         continue;
-      } else {
-        switch (propvariant.get().vt) {
-          case VT_EMPTY:
-            // If dual_mode is not set at all, make sure it gets set to true if
-            // desired.
-            if (dual_mode_desired)
-              updated_properties.set_dual_mode(true);
-            break;
-          case VT_BOOL:
-            // Make sure dual_mode is set as desired.
-            if ((!!propvariant.get().boolVal) != dual_mode_desired)
-              updated_properties.set_dual_mode(dual_mode_desired);
-            break;
-          default:
-            NOTREACHED();
-            continue;
-        }
+      }
+      if (propvariant.get().vt == VT_BOOL &&
+                 !!propvariant.get().boolVal) {
+        updated_properties.set_dual_mode(false);
       }
     }
 
     persist_file.Release();
     shell_link.Release();
 
     // Update the shortcut if some of its properties need to be updated.
     if (updated_properties.options &&
         base::win::CreateOrUpdateShortcutLink(
             shortcut, updated_properties,
@@ skipping 99 matching lines @@
   if (!RegisterBrowser())
     return false;
 
   if (ShouldResetDefaultBrowser())
     ResetDefaultBrowser();
 
   base::CommandLine cmdline(base::FilePath(L"openwith.exe"));
   cmdline.AppendArgNative(StartupBrowserCreator::GetDefaultBrowserUrl());
   return base::LaunchProcess(cmdline, base::LaunchOptions()).IsValid();
 }