Implement the Windows desktop search redirection feature.

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 <stddef.h>
 
 #include <algorithm>   // For max().
 #include <set>
@@ skipping 77 matching lines @@
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/web_applications/web_app_mac.h"
 #endif
 
 #if defined(OS_WIN)
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/metrics/jumplist_metrics_win.h"
-#include "components/search_engines/desktop_search_win.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "components/search_engines/desktop_search_infobar_delegate_win.h"
+#include "components/search_engines/desktop_search_utils_win.h"
+#include "components/search_engines/template_url.h"
 #endif
 
 #if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #endif
 
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
@@ skipping 252 matching lines @@
   }
 
   // Note: This check should have been done in ProcessCmdLineImpl()
   // before calling this function. However chromeos/login/login_utils.cc
   // calls this function directly (see comments there) so it has to be checked
   // again.
   const bool silent_launch = command_line.HasSwitch(switches::kSilentLaunch);
 
   if (!silent_launch) {
     StartupBrowserCreatorImpl lwp(cur_dir, command_line, this, is_first_run);
-    const std::vector<GURL> urls_to_launch =
-        GetURLsFromCommandLine(command_line, cur_dir, profile);
+    bool should_show_desktop_search_infobar = false;
+    const std::vector<GURL> urls_to_launch = GetURLsFromCommandLine(
+        command_line, cur_dir, profile, &should_show_desktop_search_infobar);
     chrome::HostDesktopType host_desktop_type =
         chrome::HOST_DESKTOP_TYPE_NATIVE;
 
 #if defined(USE_ASH) && !defined(OS_CHROMEOS)
     // We want to maintain only one type of instance for now, either ASH
     // or desktop.
     // TODO(shrikant): Remove this code once we decide on running both desktop
     // and ASH instances side by side.
     if (ash::Shell::HasInstance())
       host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH;
 #endif
 
     const bool launched = lwp.Launch(profile, urls_to_launch,
                                in_synchronous_profile_launch_,
                                host_desktop_type);
     in_synchronous_profile_launch_ = false;
     if (!launched) {
       LOG(ERROR) << "launch error";
       return false;
     }
+
+#if defined(OS_WIN)
+    if (should_show_desktop_search_infobar) {
+      // Show an infobar informing the user that a desktop search has been
+      // redirected to the default search engine.
+      Browser* browser =
+          BrowserList::GetInstance(host_desktop_type)->GetLastActive();

[Peter Kasting, 2016/01/20 03:03:01]

We ultimately only need this in order to get the active WebContents.  Is there a
more direct way of getting this, e.g. to have the launching code directly tell
us what WebContents it opened?

[fdoray, 2016/01/21 21:02:33]

Done. I moved this code to StartupBrowserCreatorImpl::AddInfoBarsIfNecessary.
This method receives a Browser*, so I no longer need
BrowserList::GetInstance()->GetLastActive();

+      if (browser) {

[Peter Kasting, 2016/01/20 03:03:01]

When can this be null?

[fdoray, 2016/01/21 21:02:33]

chrome.exe --no-startup-window

+        WindowsDesktopSearchInfobarDelegate::Show(
+            InfoBarService::FromWebContents(
+                browser->tab_strip_model()->GetActiveWebContents()),
+            TemplateURLServiceFactory::GetForProfile(profile)
+                ->GetDefaultSearchProvider()
+                ->AdjustedShortNameForLocaleDirection(),
+            GURL(std::string(chrome::kChromeUISettingsURL) +
+                 chrome::kSearchEnginesSubPage),
+            profile->GetPrefs());
+      }
+    }
+#endif  // defined(OS_WIN)
   } else {
     in_synchronous_profile_launch_ = false;
   }
 
   profile_launch_observer.Get().AddLaunched(profile);
 
 #if defined(OS_CHROMEOS)
   chromeos::ProfileHelper::Get()->ProfileStartup(profile, process_startup);
 #endif
   return true;
@@ skipping 118 matching lines @@
 // static
 const wchar_t* StartupBrowserCreator::GetDefaultBrowserUrl() {
   return kSetDefaultBrowserHelpUrl;
 }
 #endif  // defined(OS_WIN)
 
 // static
 std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
     const base::CommandLine& command_line,
     const base::FilePath& cur_dir,
-    Profile* profile) {
+    Profile* profile,
+    bool* should_show_desktop_search_infobar) {
+  DCHECK(profile);
+  DCHECK(should_show_desktop_search_infobar);
+
   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>"
     if ((param.value().size() > 2) && (param.value()[0] == '?') &&
         (param.value()[1] == ' ')) {
       GURL url(GetDefaultSearchURLForSearchTerms(
           TemplateURLServiceFactory::GetForProfile(profile),
           param.LossyDisplayName().substr(2)));
       if (url.is_valid()) {
         urls.push_back(url);
         continue;
       }
     }
 
     // Otherwise, fall through to treating it as a URL.
 
     // This will create a file URL or a regular URL.
     // This call can (in rare circumstances) block the UI thread.
     // Allow it until this bug is fixed.
     //  http://code.google.com/p/chromium/issues/detail?id=60641
     GURL url = GURL(param.MaybeAsASCII());
 
 #if defined(OS_WIN)
-    if (ShouldRedirectWindowsDesktopSearchToDefaultSearchEngine(
-            profile->GetPrefs())) {
-      TemplateURLService* template_url_service =
-          TemplateURLServiceFactory::GetForProfile(profile);
-      DCHECK(template_url_service);
-      base::string16 search_terms;
-      if (DetectWindowsDesktopSearch(
-              url, template_url_service->search_terms_data(), &search_terms)) {
-        const GURL search_url(GetDefaultSearchURLForSearchTerms(
-            template_url_service, search_terms));
-        if (search_url.is_valid()) {
-          urls.push_back(search_url);
-          continue;
-        }
-      }
+    // Replace desktop search URL by a default search engine URL if needed.
+    // Ignore cases where there is multiple command line arguments, because

[Peter Kasting, 2016/01/20 03:03:01]

Nit: is -> are

[fdoray, 2016/01/21 21:02:33]

Done.

+    // desktop search never passes multiple URLs to the browser.
+    if (params.size() == 1) {
+      ReplaceWindowsDesktopSearchURLWithDefaultSearchURLIfNeeded(
+          profile->GetPrefs(),
+          TemplateURLServiceFactory::GetForProfile(profile), &url,
+          should_show_desktop_search_infobar);
     }
 #endif  // defined(OS_WIN)
 
     // http://crbug.com/371030: Only use URLFixerUpper if we don't have a valid
     // URL, otherwise we will look in the current directory for a file named
     // 'about' if the browser was started with a about:foo argument.
     if (!url.is_valid()) {
       base::ThreadRestrictions::ScopedAllowIO allow_io;
       url = url_formatter::FixupRelativeFile(cur_dir, param);
     }
@@ skipping 348 matching lines @@
   // 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);
 }