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

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

Issue 10260020: Make Omnibox HistoryURL Provider always aggressive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit test. Created 8 years, 7 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 if (bitmask & kBitsToOs[i].bit) 65 if (bitmask & kBitsToOs[i].bit)
66 list->Append(new StringValue(kBitsToOs[i].name)); 66 list->Append(new StringValue(kBitsToOs[i].name));
67 } 67 }
68 68
69 // Names for former Chrome OS Labs experiments, shared with prefs migration 69 // Names for former Chrome OS Labs experiments, shared with prefs migration
70 // code. 70 // code.
71 const char kMediaPlayerExperimentName[] = "media-player"; 71 const char kMediaPlayerExperimentName[] = "media-player";
72 const char kAdvancedFileSystemExperimentName[] = "advanced-file-system"; 72 const char kAdvancedFileSystemExperimentName[] = "advanced-file-system";
73 const char kVerticalTabsExperimentName[] = "vertical-tabs"; 73 const char kVerticalTabsExperimentName[] = "vertical-tabs";
74 74
75 const Experiment::Choice kOmniboxAggressiveHistoryURLChoices[] = {
76 { IDS_FLAGS_OMNIBOX_AGGRESSIVE_HISTORY_URL_SCORING_AUTOMATIC, "", "" },
77 { IDS_FLAGS_OMNIBOX_AGGRESSIVE_HISTORY_URL_SCORING_ENABLED,
78 switches::kOmniboxAggressiveHistoryURL,
79 switches::kOmniboxAggressiveHistoryURLEnabled },
80 { IDS_FLAGS_OMNIBOX_AGGRESSIVE_HISTORY_URL_SCORING_DISABLED,
81 switches::kOmniboxAggressiveHistoryURL,
82 switches::kOmniboxAggressiveHistoryURLDisabled }
83 };
84
85 const Experiment::Choice kOmniboxInlineHistoryQuickProviderChoices[] = { 75 const Experiment::Choice kOmniboxInlineHistoryQuickProviderChoices[] = {
86 { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_AUTOMATIC, "", "" }, 76 { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_AUTOMATIC, "", "" },
87 { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_ALLOWED, 77 { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_ALLOWED,
88 switches::kOmniboxInlineHistoryQuickProvider, 78 switches::kOmniboxInlineHistoryQuickProvider,
89 switches::kOmniboxInlineHistoryQuickProviderAllowed }, 79 switches::kOmniboxInlineHistoryQuickProviderAllowed },
90 { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_PROHIBITED, 80 { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_PROHIBITED,
91 switches::kOmniboxInlineHistoryQuickProvider, 81 switches::kOmniboxInlineHistoryQuickProvider,
92 switches::kOmniboxInlineHistoryQuickProviderProhibited } 82 switches::kOmniboxInlineHistoryQuickProviderProhibited }
93 }; 83 };
94 84
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 { 364 {
375 "enable-smooth-scrolling", // FLAGS:RECORD_UMA 365 "enable-smooth-scrolling", // FLAGS:RECORD_UMA
376 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME, 366 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME,
377 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION, 367 IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION,
378 // Can't expose the switch unless the code is compiled in. 368 // Can't expose the switch unless the code is compiled in.
379 // On by default for the Mac (different implementation in WebKit). 369 // On by default for the Mac (different implementation in WebKit).
380 kOsWin | kOsLinux | kOsCrOS, 370 kOsWin | kOsLinux | kOsCrOS,
381 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) 371 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)
382 }, 372 },
383 { 373 {
384 "omnibox-aggressive-with-history-url",
385 IDS_FLAGS_OMNIBOX_AGGRESSIVE_HISTORY_URL_SCORING_NAME,
386 IDS_FLAGS_OMNIBOX_AGGRESSIVE_HISTORY_URL_SCORING_DESCRIPTION,
387 kOsAll,
388 MULTI_VALUE_TYPE(kOmniboxAggressiveHistoryURLChoices)
389 },
390 {
391 "omnibox-inline-history-quick-provider", 374 "omnibox-inline-history-quick-provider",
392 IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_NAME, 375 IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_NAME,
393 IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_DESCRIPTION, 376 IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_DESCRIPTION,
394 kOsAll, 377 kOsAll,
395 MULTI_VALUE_TYPE(kOmniboxInlineHistoryQuickProviderChoices) 378 MULTI_VALUE_TYPE(kOmniboxInlineHistoryQuickProviderChoices)
396 }, 379 },
397 { 380 {
398 "enable-panels", 381 "enable-panels",
399 IDS_FLAGS_ENABLE_PANELS_NAME, 382 IDS_FLAGS_ENABLE_PANELS_NAME,
400 IDS_FLAGS_ENABLE_PANELS_DESCRIPTION, 383 IDS_FLAGS_ENABLE_PANELS_DESCRIPTION,
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 } 1089 }
1107 1090
1108 const Experiment* GetExperiments(size_t* count) { 1091 const Experiment* GetExperiments(size_t* count) {
1109 *count = num_experiments; 1092 *count = num_experiments;
1110 return experiments; 1093 return experiments;
1111 } 1094 }
1112 1095
1113 } // namespace testing 1096 } // namespace testing
1114 1097
1115 } // namespace about_flags 1098 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698