| 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/port/common", | 8 "+content/port/common", |
| 9 "+content/public/common", | 9 "+content/public/common", |
| 10 "+content/public/test", | 10 "+content/public/test", |
| 11 "+content/shell", # for content_browsertests | 11 "+content/shell", # for content_browsertests |
| 12 "+content/test", | 12 "+content/test", |
| 13 | 13 |
| 14 # content isn't tied to prefs so that other embedders are able to pick | 14 # content isn't tied to prefs so that other embedders are able to pick |
| 15 # different ways of storing their preferences. Also, this is to avoid prefs | 15 # different ways of storing their preferences. Also, this is to avoid prefs |
| 16 # being used as a parallel API to the Content API. | 16 # being used as a parallel API to the Content API. |
| 17 "-base/prefs", | 17 "-base/prefs", |
| 18 | 18 |
| 19 "+cc", | 19 "+cc", |
| 20 "-cc/base/thread.h", # http://crbug.com/249172 | |
| 21 "!cc/base/thread_impl.h", # http://crbug.com/249172 | |
| 22 # If you want to use any of these files, move them to src/base first. | 20 # If you want to use any of these files, move them to src/base first. |
| 23 "-cc/base/hash_pair.h", | 21 "-cc/base/hash_pair.h", |
| 24 "-cc/base/scoped_ptr_algorithm.h", | 22 "-cc/base/scoped_ptr_algorithm.h", |
| 25 "-cc/base/scoped_ptr_deque.h", | 23 "-cc/base/scoped_ptr_deque.h", |
| 26 "-cc/base/scoped_ptr_hash_map.h", | |
| 27 "-cc/base/scoped_ptr_vector.h", | 24 "-cc/base/scoped_ptr_vector.h", |
| 28 | 25 |
| 29 "+crypto", | 26 "+crypto", |
| 30 "+grit/blink_resources.h", | 27 "+grit/blink_resources.h", |
| 31 "+grit/content_resources.h", | 28 "+grit/content_resources.h", |
| 32 "+grit/ui_resources.h", | 29 "+grit/ui_resources.h", |
| 33 "+grit/ui_strings.h", | 30 "+grit/ui_strings.h", |
| 34 "+grit/webkit_resources.h", | 31 "+grit/webkit_resources.h", |
| 35 "+grit/webkit_strings.h", | 32 "+grit/webkit_strings.h", |
| 36 "+grit/webui_resources.h", | 33 "+grit/webui_resources.h", |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 # Content shouldn't depend on views. While we technically don't need this | 94 # Content shouldn't depend on views. While we technically don't need this |
| 98 # line, since the top level DEPS doesn't allow it, we add it to make this | 95 # line, since the top level DEPS doesn't allow it, we add it to make this |
| 99 # explicit. | 96 # explicit. |
| 100 "-ui/views", | 97 "-ui/views", |
| 101 | 98 |
| 102 "+webkit", | 99 "+webkit", |
| 103 | 100 |
| 104 # For generated JNI includes. | 101 # For generated JNI includes. |
| 105 "+jni", | 102 "+jni", |
| 106 ] | 103 ] |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 23653002:
Move ScopedPtrHashMap from cc to base (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src