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

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

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resolve comments Created 8 years 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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 12 matching lines...) Expand all
23 #include "content/public/browser/user_metrics.h" 23 #include "content/public/browser/user_metrics.h"
24 #include "grit/chromium_strings.h" 24 #include "grit/chromium_strings.h"
25 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "grit/google_chrome_strings.h" 26 #include "grit/google_chrome_strings.h"
27 #include "media/base/media_switches.h" 27 #include "media/base/media_switches.h"
28 #include "ui/app_list/app_list_switches.h" 28 #include "ui/app_list/app_list_switches.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/ui_base_switches.h" 30 #include "ui/base/ui_base_switches.h"
31 #include "ui/gfx/switches.h" 31 #include "ui/gfx/switches.h"
32 #include "ui/gl/gl_switches.h" 32 #include "ui/gl/gl_switches.h"
33 #include "webkit/media/media_switches.h"
33 34
34 #if defined(USE_ASH) 35 #if defined(USE_ASH)
35 #include "ash/ash_switches.h" 36 #include "ash/ash_switches.h"
36 #endif 37 #endif
37 38
38 #if defined(USE_AURA) 39 #if defined(USE_AURA)
39 #include "ui/aura/aura_switches.h" 40 #include "ui/aura/aura_switches.h"
40 #endif 41 #endif
41 42
42 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
(...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 } 1571 }
1571 1572
1572 const Experiment* GetExperiments(size_t* count) { 1573 const Experiment* GetExperiments(size_t* count) {
1573 *count = num_experiments; 1574 *count = num_experiments;
1574 return experiments; 1575 return experiments;
1575 } 1576 }
1576 1577
1577 } // namespace testing 1578 } // namespace testing
1578 1579
1579 } // namespace about_flags 1580 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698