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

Side by Side Diff: content/browser/DEPS

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: fix tests 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
« no previous file with comments | « no previous file | content/browser/encrypted_media_browsertest.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 include_rules = [ 1 include_rules = [
2 "+content/gpu", # For gpu_info_collector.h and in-process GPU 2 "+content/gpu", # For gpu_info_collector.h and in-process GPU
3 "+content/port/browser", 3 "+content/port/browser",
4 "+content/public/browser", 4 "+content/public/browser",
5 "+media/audio", # For audio input for speech input feature. 5 "+media/audio", # For audio input for speech input feature.
6 "+media/base/android", # For Android JNI registration. 6 "+media/base", # For Android JNI registration and kEnableEncryptedMedia.
7 "+ui/ui_controls", # this should probably move into a DEPS file under test. 7 "+ui/ui_controls", # this should probably move into a DEPS file under test.
8 8
9 # Other libraries. 9 # Other libraries.
10 "+third_party/iaccessible2", 10 "+third_party/iaccessible2",
11 "+third_party/isimpledom", 11 "+third_party/isimpledom",
12 "+third_party/khronos", # For enum definitions only 12 "+third_party/khronos", # For enum definitions only
13 "+third_party/speex", 13 "+third_party/speex",
14 14
15 # Allow non-browser Chrome OS code to be used. 15 # Allow non-browser Chrome OS code to be used.
16 "+chromeos/power", 16 "+chromeos/power",
17 17
18 # DO NOT ADD ANY CHROME INCLUDES HERE!!! 18 # DO NOT ADD ANY CHROME INCLUDES HERE!!!
19 # See https://sites.google.com/a/chromium.org/dev/developers/content-module 19 # See https://sites.google.com/a/chromium.org/dev/developers/content-module
20 # for more information. 20 # for more information.
21 ] 21 ]
OLDNEW
« no previous file with comments | « no previous file | content/browser/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698