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

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

Issue 215733002: Add support to enable EmbeddedSearch API in Android Chrome search results page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1789 }, 1789 },
1790 #if defined(OS_CHROMEOS) 1790 #if defined(OS_CHROMEOS)
1791 { 1791 {
1792 "enable-filemanager-mtp", 1792 "enable-filemanager-mtp",
1793 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME, 1793 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME,
1794 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION, 1794 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION,
1795 kOsCrOS, 1795 kOsCrOS,
1796 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP) 1796 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP)
1797 }, 1797 },
1798 #endif 1798 #endif
1799 #if defined(OS_ANDROID)
1800 {
1801 "enable-embeddedsearch-api",
1802 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME,
1803 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION,
1804 kOsAndroid,
1805 SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI)
1806 },
1807 #endif
1799 }; 1808 };
1800 1809
1801 const Experiment* experiments = kExperiments; 1810 const Experiment* experiments = kExperiments;
1802 size_t num_experiments = arraysize(kExperiments); 1811 size_t num_experiments = arraysize(kExperiments);
1803 1812
1804 // Stores and encapsulates the little state that about:flags has. 1813 // Stores and encapsulates the little state that about:flags has.
1805 class FlagsState { 1814 class FlagsState {
1806 public: 1815 public:
1807 FlagsState() : needs_restart_(false) {} 1816 FlagsState() : needs_restart_(false) {}
1808 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, 1817 void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2313 } 2322 }
2314 2323
2315 const Experiment* GetExperiments(size_t* count) { 2324 const Experiment* GetExperiments(size_t* count) {
2316 *count = num_experiments; 2325 *count = num_experiments;
2317 return experiments; 2326 return experiments;
2318 } 2327 }
2319 2328
2320 } // namespace testing 2329 } // namespace testing
2321 2330
2322 } // namespace about_flags 2331 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698