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 49 matching lines @@
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "ui/views/views_switches.h"
 
 #if !defined(OS_ANDROID)
 #include "ui/message_center/message_center_switches.h"
 #endif
 
-#if defined(USE_ASH)
-#include "ash/ash_switches.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #include "third_party/cros_system_api/switches/chrome_switches.h"
 #endif
 
+#if defined(OS_WIN)
+#include "components/search_engines/desktop_search_win.h"
+#endif  // defined(OS_WIN)
+
 #if defined(ENABLE_APP_LIST)
 #include "ui/app_list/app_list_switches.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/switches.h"
 #endif
 
 #if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h"
 #endif
 
+#if defined(USE_ASH)
+#include "ash/ash_switches.h"
+#endif
+
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_switches.h"
 #endif
 
 using flags_ui::FeatureEntry;
 using flags_ui::kOsMac;
 using flags_ui::kOsWin;
 using flags_ui::kOsLinux;
 using flags_ui::kOsCrOS;
 using flags_ui::kOsAndroid;
@@ skipping 1970 matching lines @@
     {"enable-tab-switcher-in-document-mode",
      IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_NAME,
      IDS_FLAGS_TAB_SWITCHER_IN_DOCUMENT_MODE_DESCRIPTION, kOsAndroid,
      SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)},
 #endif  // OS_ANDROID
      {"enable-md-history",
       IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
       IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION,
       kOsDesktop | kOsAndroid,
       SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)},
+#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 193 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags