Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 1598553003: Implement the Windows desktop search redirection feature. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build errors due to prefs being moved in components Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #else 74 #else
75 #include "ui/message_center/message_center_switches.h" 75 #include "ui/message_center/message_center_switches.h"
76 #endif 76 #endif
77 77
78 #if defined(OS_CHROMEOS) 78 #if defined(OS_CHROMEOS)
79 #include "chromeos/chromeos_switches.h" 79 #include "chromeos/chromeos_switches.h"
80 #include "third_party/cros_system_api/switches/chrome_switches.h" 80 #include "third_party/cros_system_api/switches/chrome_switches.h"
81 #endif 81 #endif
82 82
83 #if defined(OS_WIN) 83 #if defined(OS_WIN)
84 #include "components/search_engines/desktop_search_win.h" 84 #include "components/search_engines/desktop_search_utils.h"
85 #endif // defined(OS_WIN) 85 #endif // defined(OS_WIN)
86 86
87 #if defined(ENABLE_APP_LIST) 87 #if defined(ENABLE_APP_LIST)
88 #include "ui/app_list/app_list_switches.h" 88 #include "ui/app_list/app_list_switches.h"
89 #endif 89 #endif
90 90
91 #if defined(ENABLE_EXTENSIONS) 91 #if defined(ENABLE_EXTENSIONS)
92 #include "extensions/common/switches.h" 92 #include "extensions/common/switches.h"
93 #endif 93 #endif
94 94
(...skipping 1965 matching lines...) Expand 10 before | Expand all | Expand 10 after
2060 {"enable-md-history", 2060 {"enable-md-history",
2061 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME, 2061 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
2062 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, 2062 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION,
2063 kOsDesktop | kOsAndroid, 2063 kOsDesktop | kOsAndroid,
2064 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)}, 2064 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)},
2065 #if defined(OS_WIN) 2065 #if defined(OS_WIN)
2066 {"enable-windows-desktop-search-redirection", 2066 {"enable-windows-desktop-search-redirection",
2067 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME, 2067 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_NAME,
2068 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION, 2068 IDS_FLAGS_WINDOWS_DESKTOP_SEARCH_REDIRECTION_DESCRIPTION,
2069 kOsWin, 2069 kOsWin,
2070 FEATURE_VALUE_TYPE(kWindowsDesktopSearchRedirectionFeature)}, 2070 FEATURE_VALUE_TYPE(kDesktopSearchRedirectionFeature)},
2071 #endif // defined(OS_WIN) 2071 #endif // defined(OS_WIN)
2072 {"force-ui-direction", 2072 {"force-ui-direction",
2073 IDS_FLAGS_FORCE_UI_DIRECTION_NAME, 2073 IDS_FLAGS_FORCE_UI_DIRECTION_NAME,
2074 IDS_FLAGS_FORCE_UI_DIRECTION_DESCRIPTION, 2074 IDS_FLAGS_FORCE_UI_DIRECTION_DESCRIPTION,
2075 kOsAll, 2075 kOsAll,
2076 MULTI_VALUE_TYPE(kForceUIDirectionChoices)}, 2076 MULTI_VALUE_TYPE(kForceUIDirectionChoices)},
2077 #if defined(ENABLE_EXTENSIONS) 2077 #if defined(ENABLE_EXTENSIONS)
2078 {"enable-md-extensions", 2078 {"enable-md-extensions",
2079 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME, 2079 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_NAME,
2080 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, 2080 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION,
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2354 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2355 2355
2356 const FeatureEntry* GetFeatureEntries(size_t* count) { 2356 const FeatureEntry* GetFeatureEntries(size_t* count) {
2357 *count = arraysize(kFeatureEntries); 2357 *count = arraysize(kFeatureEntries);
2358 return kFeatureEntries; 2358 return kFeatureEntries;
2359 } 2359 }
2360 2360
2361 } // namespace testing 2361 } // namespace testing
2362 2362
2363 } // namespace about_flags 2363 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/search_engines/template_url_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698