| OLD | NEW |
|---|
| 1 # Do NOT add chrome to the list below. We shouldn't be including files from | 1 # Do NOT add chrome to the list below. We shouldn't be including files from |
| 2 # src/chrome in src/content. | 2 # src/chrome in src/content. |
| 3 include_rules = [ | 3 include_rules = [ |
| 4 "+crypto", | 4 "+crypto", |
| 5 | 5 |
| 6 "-chrome", | 6 "-chrome", |
| 7 # Until we move most of our testing infrastructure in a way that content can | 7 # Until we move most of our testing infrastructure in a way that content can |
| 8 # make use of it. | 8 # make use of it. |
| 9 "+chrome/test", | 9 "+chrome/test", |
| 10 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 # Don't allow inclusion of these other libs we shouldn't be calling directly. | 30 # Don't allow inclusion of these other libs we shouldn't be calling directly. |
| 31 "-v8", | 31 "-v8", |
| 32 "-tools", | 32 "-tools", |
| 33 | 33 |
| 34 # Allow inclusion of third-party code: | 34 # Allow inclusion of third-party code: |
| 35 "+third_party/gpsd", | 35 "+third_party/gpsd", |
| 36 "+third_party/mozilla", | 36 "+third_party/mozilla", |
| 37 "+third_party/npapi/bindings", | 37 "+third_party/npapi/bindings", |
| 38 "+third_party/sqlite", | 38 "+third_party/sqlite", |
| 39 "+third_party/tcmalloc", | 39 "+third_party/tcmalloc", |
| 40 "+third_party/khronos", | |
| 41 # Allow inclusion of WebKit API files. | 40 # Allow inclusion of WebKit API files. |
| 42 "+third_party/WebKit/Source/WebKit/chromium", | 41 "+third_party/WebKit/Source/WebKit/chromium", |
| 43 | 42 |
| 44 # Aura is analogous to Win32 or a Gtk, so it is allowed. | 43 # Aura is analogous to Win32 or a Gtk, so it is allowed. |
| 45 "+ui/aura", | 44 "+ui/aura", |
| 46 "+ui/base", | 45 "+ui/base", |
| 47 "+ui/gfx", | 46 "+ui/gfx", |
| 48 # Content knows about grd files, but the specifics of how to get a resource | 47 # Content knows about grd files, but the specifics of how to get a resource |
| 49 # given its id is left to the embedder. | 48 # given its id is left to the embedder. |
| 50 "-ui/base/l10n", | 49 "-ui/base/l10n", |
| 51 "-ui/base/resource", | 50 "-ui/base/resource", |
| 52 # This file isn't related to grd, so it's fine. | 51 # This file isn't related to grd, so it's fine. |
| 53 "+ui/base/l10n/l10n_util_win.h", | 52 "+ui/base/l10n/l10n_util_win.h", |
| 54 | 53 |
| 55 # Content shouldn't depend on views. While we technically don't need this | 54 # Content shouldn't depend on views. While we technically don't need this |
| 56 # line, since the top level DEPS doesn't allow it, we add it to make this | 55 # line, since the top level DEPS doesn't allow it, we add it to make this |
| 57 # explicit. | 56 # explicit. |
| 58 "-views", | 57 "-views", |
| 59 | 58 |
| 60 # Aura Shell consumes views, so it too is banned. | 59 # Aura Shell consumes views, so it too is banned. |
| 61 "-ui/aura_shell", | 60 "-ui/aura_shell", |
| 62 | 61 |
| 63 "+webkit", | 62 "+webkit", |
| 64 ] | 63 ] |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8633020:
Revert 111170 - Move GL headers from gpu to third_party/khronos (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/