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

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

Issue 6992074: Remove --enable-vpn (enabled always) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cros_mock.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) 289 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu)
290 }, 290 },
291 { 291 {
292 "ppapi-flash-in-process", 292 "ppapi-flash-in-process",
293 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, 293 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME,
294 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, 294 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION,
295 kOsAll, 295 kOsAll,
296 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) 296 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess)
297 }, 297 },
298 { 298 {
299 "enable-vpn",
300 IDS_FLAGS_ENABLE_VPN_NAME,
301 IDS_FLAGS_ENABLE_VPN_DESCRIPTION,
302 kOsCrOS,
303 #if defined(OS_CHROMEOS)
304 // The switch exists only on Chrome OS.
305 SINGLE_VALUE_TYPE(switches::kEnableVPN)
306 #else
307 SINGLE_VALUE_TYPE("")
308 #endif
309 },
310 {
311 "multi-profiles", 299 "multi-profiles",
312 IDS_FLAGS_MULTI_PROFILES_NAME, 300 IDS_FLAGS_MULTI_PROFILES_NAME,
313 IDS_FLAGS_MULTI_PROFILES_DESCRIPTION, 301 IDS_FLAGS_MULTI_PROFILES_DESCRIPTION,
314 kOsAll, 302 kOsAll,
315 SINGLE_VALUE_TYPE(switches::kMultiProfiles) 303 SINGLE_VALUE_TYPE(switches::kMultiProfiles)
316 }, 304 },
317 { 305 {
318 "restrict-instant-to-search", 306 "restrict-instant-to-search",
319 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME, 307 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME,
320 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION, 308 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION,
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 } 749 }
762 750
763 const Experiment* GetExperiments(size_t* count) { 751 const Experiment* GetExperiments(size_t* count) {
764 *count = num_experiments; 752 *count = num_experiments;
765 return experiments; 753 return experiments;
766 } 754 }
767 755
768 } // namespace testing 756 } // namespace testing
769 757
770 } // namespace about_flags 758 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/cros_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698