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

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

Issue 2437623005: Let Flash take one-shot focus in default MediaSession (Closed)
Patch Set: IsDuckFlash -> ShouldDuckFlash Created 4 years, 2 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
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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 switches::kDisableWebRtcHWEncodingNone}, 613 switches::kDisableWebRtcHWEncodingNone},
614 }; 614 };
615 #endif // ENABLE_WEBRTC 615 #endif // ENABLE_WEBRTC
616 616
617 #if !defined(OS_ANDROID) 617 #if !defined(OS_ANDROID)
618 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = { 618 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = {
619 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DISABLED, "", ""}, 619 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DISABLED, "", ""},
620 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED, 620 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED,
621 switches::kEnableDefaultMediaSession, ""}, 621 switches::kEnableDefaultMediaSession, ""},
622 #if defined(ENABLE_PLUGINS) 622 #if defined(ENABLE_PLUGINS)
623 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED_WITH_FLASH, 623 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED_DUCK_FLASH,
624 switches::kEnableDefaultMediaSession, 624 switches::kEnableDefaultMediaSession,
625 switches::kEnableDefaultMediaSessionWithFlash}, 625 switches::kEnableDefaultMediaSessionDuckFlash},
626 #endif // defined(ENABLE_PLUGINS) 626 #endif // defined(ENABLE_PLUGINS)
627 }; 627 };
628 #endif // !defined(OS_ANDROID) 628 #endif // !defined(OS_ANDROID)
629 629
630 // RECORDING USER METRICS FOR FLAGS: 630 // RECORDING USER METRICS FOR FLAGS:
631 // ----------------------------------------------------------------------------- 631 // -----------------------------------------------------------------------------
632 // The first line of the entry is the internal name. 632 // The first line of the entry is the internal name.
633 // 633 //
634 // To add a new entry, add to the end of kFeatureEntries. There are two 634 // To add a new entry, add to the end of kFeatureEntries. There are two
635 // distinct types of entries: 635 // distinct types of entries:
(...skipping 1637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2273 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2273 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2274 2274
2275 const FeatureEntry* GetFeatureEntries(size_t* count) { 2275 const FeatureEntry* GetFeatureEntries(size_t* count) {
2276 *count = arraysize(kFeatureEntries); 2276 *count = arraysize(kFeatureEntries);
2277 return kFeatureEntries; 2277 return kFeatureEntries;
2278 } 2278 }
2279 2279
2280 } // namespace testing 2280 } // namespace testing
2281 2281
2282 } // namespace about_flags 2282 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/media/session/pepper_playback_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698