Add a preference to control Windows desktop search redirection.

chrome/browser/about_flags.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/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 74 matching lines @@
 #endif
 
 #if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_switches.h"
 #endif
 
+#if defined(OS_WIN)
+#include "components/search_engines/desktop_search_win.h"
+#endif  // defined(OS_WIN)

[Peter Kasting, 2015/12/03 05:41:39]

Nit: I suggest grouping together OS_, USE_, and ENABLE_ groups of ifdefs; right
now the order is arbitrary.

[fdoray, 2015/12/03 17:16:17]

Done.

+
 using flags_ui::FeatureEntry;
 using flags_ui::kOsMac;
 using flags_ui::kOsWin;
 using flags_ui::kOsLinux;
 using flags_ui::kOsCrOS;
 using flags_ui::kOsAndroid;
 using flags_ui::kOsCrOSOwnerOnly;
 
 namespace about_flags {
 
@@ skipping 1955 matching lines @@
 #endif
 #if defined(TOOLKIT_VIEWS)
     {"enable-autofill-credit-card-upload",
      IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME,
      IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION,
      kOsCrOS | kOsWin | kOsLinux,
      ENABLE_DISABLE_VALUE_TYPE(
          autofill::switches::kEnableOfferUploadCreditCards,
          autofill::switches::kDisableOfferUploadCreditCards)},
 #endif  // defined(TOOLKIT_VIEWS)
+#if defined(OS_WIN)
+    {"enable-windows-desktop-search-redirection",
+     IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME,
+     IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION,
+     kOsWin,
+     FEATURE_VALUE_TYPE(kWindowsDesktopSearchRedirectionFeature)},
+#endif  // defined(OS_WIN)
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 class FlagsStateSingleton {
  public:
   FlagsStateSingleton()
       : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
   ~FlagsStateSingleton() {}
@@ skipping 185 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags