Setting chrome as the default browser is now fixed on Windows 10

chrome/browser/ui/startup/startup_browser_creator.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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 428 matching lines @@
 // static
 void StartupBrowserCreator::RegisterLocalStatePrefs(
     PrefRegistrySimple* registry) {
 #if defined(OS_WIN)
   registry->RegisterStringPref(prefs::kLastWelcomedOSVersion, std::string());
   registry->RegisterBooleanPref(prefs::kWelcomePageOnOSUpgradeEnabled, true);
 #endif
 }
 
 // static
+bool StartupBrowserCreator::HasUrlFilters() {
+  return !GetUrlFilters()->empty();
+}
+
+// static
+bool StartupBrowserCreator::ExecuteFilterCallback(const GURL& url) {
+  UrlFilters* filters = GetUrlFilters();
+  auto it = filters->find(url);
+  if (it != filters->end()) {

[grt (UTC plus 2), 2015/09/22 18:21:47]

nit to reduce braces:
  if (it == filters->end())
    return false;
  it->second.Run();
  return true;

+    it->second.Run();
+    return true;
+  }
+  return false;
+}
+
+// static
+bool StartupBrowserCreator::UrlFilterExists(const GURL& url) {
+  UrlFilters* filters = GetUrlFilters();
+  return filters->find(url) != filters->end();
+}
+
+// static
+void StartupBrowserCreator::AddUrlFilter(
+    const GURL& url,
+    const base::Callback<void(void)>& callback) {
+  GetUrlFilters()->insert({url, callback});

[grt (UTC plus 2), 2015/09/22 18:21:47]

how about:
  (*GetUrlFilters())[url] = callback;

+}
+
+// static
+void StartupBrowserCreator::RemoveUrlFilter(const GURL& url) {
+  DCHECK(UrlFilterExists(url));
+
+  UrlFilters* filters = GetUrlFilters();
+  filters->erase(filters->find(url));

[grt (UTC plus 2), 2015/09/22 18:21:47]

remove the DCHECK above and change this to:
  size_t num_erased = filters->erase(url);
  DCHECK_NE(0, num_erased);

+}
+
+// static
 std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
     const base::CommandLine& command_line,
     const base::FilePath& cur_dir,
     Profile* profile) {
   std::vector<GURL> urls;
 
   const base::CommandLine::StringVector& params = command_line.GetArgs();
   for (size_t i = 0; i < params.size(); ++i) {
     base::FilePath param = base::FilePath(params[i]);
     // Handle Vista way of searching - "? <search-term>"
@@ skipping 45 matching lines @@
 }
 
 // static
 bool StartupBrowserCreator::ProcessCmdLineImpl(
     const base::CommandLine& command_line,
     const base::FilePath& cur_dir,
     bool process_startup,
     Profile* last_used_profile,
     const Profiles& last_opened_profiles,
     StartupBrowserCreator* browser_creator) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
 
   DCHECK(last_used_profile);
   if (process_startup) {
     if (command_line.HasSwitch(switches::kDisablePromptOnRepost))
       content::NavigationController::DisablePromptOnRepost();
   }
 
   bool silent_launch = false;
 
@@ skipping 118 matching lines @@
 
     // Return early here since we don't want to open a browser window.
     // The exception is when there are no browser windows, since we don't want
     // chrome to shut down.
     // TODO(jackhou): Do this properly once keep-alive is handled by the
     // background page of apps. Tracked at http://crbug.com/175381
     if (chrome::GetTotalBrowserCountForProfile(last_used_profile) != 0)
       return true;
   }
 
+  // Filters out specific urls.

[grt (UTC plus 2), 2015/09/22 18:21:47]

nit: Filters -> Filter

+  if (HasUrlFilters()) {
+    for (const auto& arg : command_line.GetArgs()) {
+      GURL url(arg);
+      if (url.is_valid() && browser_creator->ExecuteFilterCallback(url))
+        return true;
+    }
+  }
+
 #if defined(OS_WIN)
   // Log whether this process was a result of an action in the Windows Jumplist.
   if (command_line.HasSwitch(switches::kWinJumplistAction)) {
     jumplist::LogJumplistActionFromSwitchValue(
         command_line.GetSwitchValueASCII(switches::kWinJumplistAction));
   }
 #endif
 
   chrome::startup::IsProcessStartup is_process_startup = process_startup ?
       chrome::startup::IS_PROCESS_STARTUP :
@@ skipping 158 matching lines @@
   }
 
   ProcessCmdLineImpl(command_line, cur_dir, false, profile, Profiles(), NULL);
 }
 
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
+// static
+StartupBrowserCreator::UrlFilters* StartupBrowserCreator::GetUrlFilters() {
+  static UrlFilters* url_filters_ = new UrlFilters();

[grt (UTC plus 2), 2015/09/22 18:21:47]

in the vast majority of Chrome runs, there will never be any filters. how about
avoiding the alloc of it until it's actually needed? as it is, HasUrlFilters
will cause the instance to be created to check to see if it's empty.
alternatively, you could make url_filters_ a private static class member so that
the filtering code could be:
  if (url_filters_) {
    ...
  }

+  return url_filters_;
+}
+
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }
 
 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
                                      const base::CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kProfileDirectory)) {
     return user_data_dir.Append(
         command_line.GetSwitchValuePath(switches::kProfileDirectory));
   }
 
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
     return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
         GetProfilePath(user_data_dir);
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(
       user_data_dir);
 }