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

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

Issue 688523002: [Cocoa] Tab audio mute control, behind a switch (off by default). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevent TabStripController from unconditionally causing creation of MediaIndicatorButton. Created 6 years, 1 month 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
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 1947 matching lines...) Expand 10 before | Expand all | Expand 10 after
1958 #endif 1958 #endif
1959 #if defined(OS_CHROMEOS) 1959 #if defined(OS_CHROMEOS)
1960 { 1960 {
1961 "wake-on-packets", 1961 "wake-on-packets",
1962 IDS_FLAGS_WAKE_ON_PACKETS_NAME, 1962 IDS_FLAGS_WAKE_ON_PACKETS_NAME,
1963 IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, 1963 IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION,
1964 kOsCrOSOwnerOnly, 1964 kOsCrOSOwnerOnly,
1965 SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets) 1965 SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets)
1966 }, 1966 },
1967 #endif // OS_CHROMEOS 1967 #endif // OS_CHROMEOS
1968 #if defined(USE_AURA)
1969 { 1968 {
1970 "enable-tab-audio-muting", 1969 "enable-tab-audio-muting",
1971 IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME, 1970 IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME,
1972 IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_DESCRIPTION, 1971 IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_DESCRIPTION,
1973 kOsWin | kOsLinux | kOsCrOS, 1972 kOsDesktop,
1974 SINGLE_VALUE_TYPE(switches::kEnableTabAudioMuting) 1973 SINGLE_VALUE_TYPE(switches::kEnableTabAudioMuting)
1975 }, 1974 },
1976 #endif // defined(USE_AURA)
1977 { 1975 {
1978 "enable-credential-manager-api", 1976 "enable-credential-manager-api",
1979 IDS_FLAGS_CREDENTIAL_MANAGER_API_NAME, 1977 IDS_FLAGS_CREDENTIAL_MANAGER_API_NAME,
1980 IDS_FLAGS_CREDENTIAL_MANAGER_API_DESCRIPTION, 1978 IDS_FLAGS_CREDENTIAL_MANAGER_API_DESCRIPTION,
1981 kOsAll, 1979 kOsAll,
1982 SINGLE_VALUE_TYPE(switches::kEnableCredentialManagerAPI) 1980 SINGLE_VALUE_TYPE(switches::kEnableCredentialManagerAPI)
1983 }, 1981 },
1984 #if defined(ENABLE_PLUGINS) 1982 #if defined(ENABLE_PLUGINS)
1985 { 1983 {
1986 "enable-plugin-power-saver", 1984 "enable-plugin-power-saver",
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
2593 } 2591 }
2594 2592
2595 const Experiment* GetExperiments(size_t* count) { 2593 const Experiment* GetExperiments(size_t* count) {
2596 *count = num_experiments; 2594 *count = num_experiments;
2597 return experiments; 2595 return experiments;
2598 } 2596 }
2599 2597
2600 } // namespace testing 2598 } // namespace testing
2601 2599
2602 } // namespace about_flags 2600 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698