summaryrefslogtreecommitdiffstats
path: root/android/content
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at r12.0.742.93: Compile fix in url_constants.ccKristian Monsen2011-07-082-0/+83
| | | | | | | | | | | Part of file was moved to content, added it to the Android/content directory. I guess we have to think about syncing content if we do more merges. Upstream CL: http://codereview.chromium.org/6874038 Change-Id: I4ac909bbfcf67c4d5db7eac236d6c9027bd3691d
* Merge Chromium at r12.0.742.93: Compile fixes from moving ↵Kristian Monsen2011-07-081-1/+1
| | | | | | | url_request_context_getter Change-Id: I9daca7590633f466d3066e359a3bb8c6d29d6d19 http://codereview.chromium.org/6778025
* Merge Chromium at r11.0.696.0: Adding Android tab_contents.h and ↵Kristian Monsen2011-06-302-0/+74
tab_contents_observer.h These were completly forked anyway. These files were moved to a new top level chromium directory, content. We are only using these two files from that directory. Putting these two in android/content and not importing all other files from content. Change-Id: I38a10232100a9ea14911c2818794291040301da7