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

Unified Diff: chrome/chrome_browser.gypi

Issue 10912172: [Android] Upstream ChromeBrowserProvider, the Android port ContentProvider implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 104e33be2e8e2792400fb96e204576f912ff82d3..92bfccde6ec3f361984d2c2c049a104539533226 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -116,6 +116,12 @@
'browser/android/android_protocol_adapter.h',
'browser/android/android_stream_reader_url_request_job.cc',
'browser/android/android_stream_reader_url_request_job.h',
+ 'browser/android/blocking_ui_thread_async_request.cc',
+ 'browser/android/blocking_ui_thread_async_request.h',
+ 'browser/android/bookmark_model_observer_task.cc',
+ 'browser/android/bookmark_model_observer_task.h',
+ 'browser/android/chrome_browser_provider.cc',
+ 'browser/android/chrome_browser_provider.h',
'browser/android/chrome_jni_registrar.cc',
'browser/android/chrome_jni_registrar.h',
'browser/android/chrome_startup_flags.cc',
@@ -130,6 +136,7 @@
'browser/android/intent_helper.h',
'browser/android/process_utils.cc',
'browser/android/process_utils.h',
+ 'browser/android/run_on_ui_thread_blocking.h',
'browser/android/tab_android.cc',
'browser/android/tab_android.h',
'browser/api/bookmarks/bookmark_service.h',
@@ -2754,6 +2761,7 @@
'type': 'none',
'sources': [
'android/java/src/org/chromium/chrome/browser/AndroidProtocolAdapter.java',
+ 'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java',
'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',

Powered by Google App Engine
This is Rietveld 408576698