| OLD | NEW |
|---|
| 1 # Do NOT add chrome or components to the list below. We shouldn't be | 1 # Do NOT add chrome or components to the list below. We shouldn't be |
| 2 # including files from src/chrome or src/components in src/content. | 2 # including files from src/chrome or src/components in src/content. |
| 3 include_rules = [ | 3 include_rules = [ |
| 4 # The subdirectories in content/ will manually allow their own include | 4 # The subdirectories in content/ will manually allow their own include |
| 5 # directories in content/ so we disallow all of them. | 5 # directories in content/ so we disallow all of them. |
| 6 "-content", | 6 "-content", |
| 7 "+content/common", | 7 "+content/common", |
| 8 "+content/public/common", | 8 "+content/public/common", |
| 9 "+content/public/test", | 9 "+content/public/test", |
| 10 "+content/shell", # for content_browsertests | 10 "+content/shell", # for content_browsertests |
| 11 "+content/test", | 11 "+content/test", |
| 12 | 12 |
| 13 # content isn't tied to prefs so that other embedders are able to pick | 13 # content isn't tied to prefs so that other embedders are able to pick |
| 14 # different ways of storing their preferences. Also, this is to avoid prefs | 14 # different ways of storing their preferences. Also, this is to avoid prefs |
| 15 # being used as a parallel API to the Content API. | 15 # being used as a parallel API to the Content API. |
| 16 "-base/prefs", | 16 "-base/prefs", |
| 17 | 17 |
| 18 "+blink", | 18 "+blink", |
| 19 | 19 |
| 20 "+cc", | 20 "+cc", |
| 21 # If you want to use any of these files, move them to src/base first. | 21 # If you want to use any of these files, move them to src/base first. |
| 22 "-cc/base/scoped_ptr_algorithm.h", | 22 "-cc/base/scoped_ptr_algorithm.h", |
| 23 "-cc/base/scoped_ptr_deque.h", | 23 "-cc/base/scoped_ptr_deque.h", |
| 24 "-cc/base/scoped_ptr_vector.h", | 24 "-cc/base/scoped_ptr_vector.h", |
| 25 | 25 |
| 26 "+crypto", | 26 "+crypto", |
| 27 "+grit/blink_resources.h", | 27 "+grit/blink_resources.h", |
| 28 "+grit/content_resources.h", | 28 "+grit/content_resources.h", |
| 29 "+grit/content_strings.h", | 29 "+grit/content_strings.h", |
| 30 "+grit/ui_resources.h", | |
| 31 "+grit/ui_strings.h", | 30 "+grit/ui_strings.h", |
| 32 "+grit/webkit_resources.h", | 31 "+grit/webkit_resources.h", |
| 33 "+grit/webui_resources.h", | 32 "+grit/webui_resources.h", |
| 34 "+grit/webui_resources_map.h", | 33 "+grit/webui_resources_map.h", |
| 35 | 34 |
| 36 "+dbus", | 35 "+dbus", |
| 37 "+gpu", | 36 "+gpu", |
| 38 "+mojo/application_manager", | 37 "+mojo/application_manager", |
| 39 "+mojo/bindings/js", | 38 "+mojo/bindings/js", |
| 40 "+mojo/common", | 39 "+mojo/common", |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 # Aura is analogous to Win32 or a Gtk, so it is allowed. | 82 # Aura is analogous to Win32 or a Gtk, so it is allowed. |
| 84 "+ui/aura", | 83 "+ui/aura", |
| 85 "+ui/base", | 84 "+ui/base", |
| 86 "+ui/compositor", | 85 "+ui/compositor", |
| 87 "+ui/events", | 86 "+ui/events", |
| 88 "+ui/gfx", | 87 "+ui/gfx", |
| 89 "+ui/gl", | 88 "+ui/gl", |
| 90 "+ui/native_theme", | 89 "+ui/native_theme", |
| 91 "+ui/ozone/gpu", | 90 "+ui/ozone/gpu", |
| 92 "+ui/ozone/public", | 91 "+ui/ozone/public", |
| 92 "+ui/resources/grit/ui_resources.h", |
| 93 "+ui/shell_dialogs", | 93 "+ui/shell_dialogs", |
| 94 "+ui/snapshot", | 94 "+ui/snapshot", |
| 95 "+ui/surface", | 95 "+ui/surface", |
| 96 "+ui/wm", | 96 "+ui/wm", |
| 97 # Content knows about grd files, but the specifics of how to get a resource | 97 # Content knows about grd files, but the specifics of how to get a resource |
| 98 # given its id is left to the embedder. | 98 # given its id is left to the embedder. |
| 99 "-ui/base/l10n", | 99 "-ui/base/l10n", |
| 100 "-ui/base/resource", | 100 "-ui/base/resource", |
| 101 # This file isn't related to grd, so it's fine. | 101 # This file isn't related to grd, so it's fine. |
| 102 "+ui/base/l10n/l10n_util_win.h", | 102 "+ui/base/l10n/l10n_util_win.h", |
| 103 | 103 |
| 104 # Content shouldn't depend on views. While we technically don't need this | 104 # Content shouldn't depend on views. While we technically don't need this |
| 105 # line, since the top level DEPS doesn't allow it, we add it to make this | 105 # line, since the top level DEPS doesn't allow it, we add it to make this |
| 106 # explicit. | 106 # explicit. |
| 107 "-ui/views", | 107 "-ui/views", |
| 108 | 108 |
| 109 "+webkit", | 109 "+webkit", |
| 110 | 110 |
| 111 # For generated JNI includes. | 111 # For generated JNI includes. |
| 112 "+jni", | 112 "+jni", |
| 113 ] | 113 ] |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 480693002:
Use a qualified path for ui_resources.h grit includes. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src