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

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

Issue 314033002: Files.app: Flip the flag and enable MTP support by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 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/file_manager/volume_manager.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) 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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 // associate the version with a FieldTrial. FieldTrials don't currently support 420 // associate the version with a FieldTrial. FieldTrials don't currently support
421 // flag=value flags. 421 // flag=value flags.
422 const Experiment::Choice kMalwareInterstitialVersions[] = { 422 const Experiment::Choice kMalwareInterstitialVersions[] = {
423 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 423 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
424 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2, 424 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2,
425 switches::kMalwareInterstitialVersionV2, "" }, 425 switches::kMalwareInterstitialVersionV2, "" },
426 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3, 426 { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3,
427 switches::kMalwareInterstitialVersionV3, "" }, 427 switches::kMalwareInterstitialVersionV3, "" },
428 }; 428 };
429 429
430 #if defined(OS_CHROMEOS)
431 const Experiment::Choice kEnableFileManagerMTPChoices[] = {
432 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
433 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
434 chromeos::switches::kEnableFileManagerMTP, "true" },
435 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
436 chromeos::switches::kEnableFileManagerMTP, "false" }
437 };
438 #endif
439
430 // RECORDING USER METRICS FOR FLAGS: 440 // RECORDING USER METRICS FOR FLAGS:
431 // ----------------------------------------------------------------------------- 441 // -----------------------------------------------------------------------------
432 // The first line of the experiment is the internal name. If you'd like to 442 // The first line of the experiment is the internal name. If you'd like to
433 // gather statistics about the usage of your flag, you should append a marker 443 // gather statistics about the usage of your flag, you should append a marker
434 // comment to the end of the feature name, like so: 444 // comment to the end of the feature name, like so:
435 // "my-special-feature", // FLAGS:RECORD_UMA 445 // "my-special-feature", // FLAGS:RECORD_UMA
436 // 446 //
437 // After doing that, run 447 // After doing that, run
438 // tools/metrics/actions/extract_actions.py 448 // tools/metrics/actions/extract_actions.py
439 // to add the metric to actions.xml (which will enable UMA to record your 449 // to add the metric to actions.xml (which will enable UMA to record your
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1777 IDS_FLAGS_DISABLE_EMBEDDED_SHARED_WORKER_DESCRIPTION, 1787 IDS_FLAGS_DISABLE_EMBEDDED_SHARED_WORKER_DESCRIPTION,
1778 kOsDesktop, 1788 kOsDesktop,
1779 SINGLE_VALUE_TYPE(switches::kDisableEmbeddedSharedWorker) 1789 SINGLE_VALUE_TYPE(switches::kDisableEmbeddedSharedWorker)
1780 }, 1790 },
1781 #if defined(OS_CHROMEOS) 1791 #if defined(OS_CHROMEOS)
1782 { 1792 {
1783 "enable-filemanager-mtp", 1793 "enable-filemanager-mtp",
1784 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME, 1794 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME,
1785 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION, 1795 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION,
1786 kOsCrOS, 1796 kOsCrOS,
1787 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP) 1797 MULTI_VALUE_TYPE(kEnableFileManagerMTPChoices)
1788 }, 1798 },
1789 #endif 1799 #endif
1790 // TODO(tyoshino): Remove this temporary flag and command line switch. See 1800 // TODO(tyoshino): Remove this temporary flag and command line switch. See
1791 // crbug.com/366483 for the target milestone. 1801 // crbug.com/366483 for the target milestone.
1792 { 1802 {
1793 "allow-insecure-websocket-from-https-origin", 1803 "allow-insecure-websocket-from-https-origin",
1794 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, 1804 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME,
1795 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, 1805 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION,
1796 kOsAll, 1806 kOsAll,
1797 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) 1807 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin)
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
2402 } 2412 }
2403 2413
2404 const Experiment* GetExperiments(size_t* count) { 2414 const Experiment* GetExperiments(size_t* count) {
2405 *count = num_experiments; 2415 *count = num_experiments;
2406 return experiments; 2416 return experiments;
2407 } 2417 }
2408 2418
2409 } // namespace testing 2419 } // namespace testing
2410 2420
2411 } // namespace about_flags 2421 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/file_manager/volume_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698