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

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

Issue 9702028: bluetooth: remove command-line flag, enabling by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 kOsAll, 375 kOsAll,
376 SINGLE_VALUE_TYPE(switches::kEnablePanels) 376 SINGLE_VALUE_TYPE(switches::kEnablePanels)
377 }, 377 },
378 { 378 {
379 "disable-shortcuts-provider", 379 "disable-shortcuts-provider",
380 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER, 380 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER,
381 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER_DESCRIPTION, 381 IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER_DESCRIPTION,
382 kOsAll, 382 kOsAll,
383 SINGLE_VALUE_TYPE(switches::kDisableShortcutsProvider) 383 SINGLE_VALUE_TYPE(switches::kDisableShortcutsProvider)
384 }, 384 },
385 #if defined(OS_CHROMEOS)
386 {
387 "enable-bluetooth",
388 IDS_FLAGS_ENABLE_BLUETOOTH_NAME,
389 IDS_FLAGS_ENABLE_BLUETOOTH_DESCRIPTION,
390 kOsCrOS,
391 SINGLE_VALUE_TYPE(switches::kEnableBluetooth)
392 },
393 #endif
394 { 385 {
395 "memory-widget", 386 "memory-widget",
396 IDS_FLAGS_MEMORY_WIDGET_NAME, 387 IDS_FLAGS_MEMORY_WIDGET_NAME,
397 IDS_FLAGS_MEMORY_WIDGET_DESCRIPTION, 388 IDS_FLAGS_MEMORY_WIDGET_DESCRIPTION,
398 kOsCrOS, 389 kOsCrOS,
399 #if defined(OS_CHROMEOS) 390 #if defined(OS_CHROMEOS)
400 // This switch exists only on Chrome OS. 391 // This switch exists only on Chrome OS.
401 SINGLE_VALUE_TYPE(switches::kMemoryWidget) 392 SINGLE_VALUE_TYPE(switches::kMemoryWidget)
402 #else 393 #else
403 SINGLE_VALUE_TYPE("") 394 SINGLE_VALUE_TYPE("")
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 } 1023 }
1033 1024
1034 const Experiment* GetExperiments(size_t* count) { 1025 const Experiment* GetExperiments(size_t* count) {
1035 *count = num_experiments; 1026 *count = num_experiments;
1036 return experiments; 1027 return experiments;
1037 } 1028 }
1038 1029
1039 } // namespace testing 1030 } // namespace testing
1040 1031
1041 } // namespace about_flags 1032 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698