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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 1192233002: Merge libchrome_staging target into browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged chrome_staging_unittests as well Created 5 years, 6 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
« chrome/android/chrome_apk.gyp ('K') | « chrome/android/chrome_apk.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ad426fd411606106e6f1e85245645a03f3a947dc..a7a5ea8745c87d534b4a6acc89ae7ac5a8cb32ea 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -37,6 +37,8 @@
'browser/android/banners/app_banner_infobar_delegate_android.h',
'browser/android/banners/app_banner_manager_android.cc',
'browser/android/banners/app_banner_manager_android.h',
+ 'browser/android/bookmark/edit_bookmark_helper.cc',
+ 'browser/android/bookmark/edit_bookmark_helper.h',
'browser/android/bookmarks/bookmarks_bridge.cc',
'browser/android/bookmarks/bookmarks_bridge.h',
'browser/android/bookmarks/partner_bookmarks_reader.cc',
@@ -45,6 +47,8 @@
'browser/android/bookmarks/partner_bookmarks_shim.h',
'browser/android/chrome_jni_registrar.cc',
'browser/android/chrome_jni_registrar.h',
+ 'browser/android/chrome_main_delegate_staging_android.cc',
+ 'browser/android/chrome_main_delegate_staging_android.h',
'browser/android/chrome_media_client_android.cc',
'browser/android/chrome_media_client_android.h',
'browser/android/chrome_startup_flags.cc',
@@ -53,6 +57,8 @@
'browser/android/chrome_web_contents_delegate_android.h',
'browser/android/chromium_application.cc',
'browser/android/chromium_application.h',
+ 'browser/android/compositor/compositor_view.cc',
+ 'browser/android/compositor/compositor_view.h',
'browser/android/compositor/decoration_title.cc',
'browser/android/compositor/decoration_title.h',
'browser/android/compositor/layer/content_layer.cc',
@@ -60,6 +66,10 @@
'browser/android/compositor/layer/contextual_search_layer.cc',
'browser/android/compositor/layer/contextual_search_layer.h',
'browser/android/compositor/layer/layer.h',
+ 'browser/android/compositor/layer/reader_mode_layer.cc',
+ 'browser/android/compositor/layer/reader_mode_layer.h',
+ 'browser/android/compositor/layer/tab_handle_layer.cc',
+ 'browser/android/compositor/layer/tab_handle_layer.h',
'browser/android/compositor/layer/tab_layer.cc',
'browser/android/compositor/layer/tab_layer.h',
'browser/android/compositor/layer/throbber_layer.cc',
@@ -70,18 +80,35 @@
'browser/android/compositor/layer/toolbar_layer.h',
'browser/android/compositor/layer_title_cache.cc',
'browser/android/compositor/layer_title_cache.h',
+ 'browser/android/compositor/scene_layer/contextual_search_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/contextual_search_scene_layer.h',
+ 'browser/android/compositor/scene_layer/reader_mode_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/reader_mode_scene_layer.h',
'browser/android/compositor/scene_layer/scene_layer.cc',
'browser/android/compositor/scene_layer/scene_layer.h',
'browser/android/compositor/scene_layer/static_tab_scene_layer.cc',
'browser/android/compositor/scene_layer/static_tab_scene_layer.h',
+ 'browser/android/compositor/scene_layer/tab_list_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/tab_list_scene_layer.h',
+ 'browser/android/compositor/scene_layer/tab_strip_scene_layer.cc',
+ 'browser/android/compositor/scene_layer/tab_strip_scene_layer.h',
'browser/android/compositor/tab_content_manager.cc',
'browser/android/compositor/tab_content_manager.h',
+ 'browser/android/contextualsearch/contextual_search_context.cc',
+ 'browser/android/contextualsearch/contextual_search_context.h',
+ 'browser/android/contextualsearch/contextual_search_delegate.cc',
+ 'browser/android/contextualsearch/contextual_search_delegate.h',
+ 'browser/android/contextualsearch/contextual_search_manager.cc',
+ 'browser/android/contextualsearch/contextual_search_manager.h',
+ 'browser/android/contextualsearch/contextual_search_tab_helper.cc',
+ 'browser/android/contextualsearch/contextual_search_tab_helper.h',
'browser/android/cookies/cookies_fetcher.cc',
'browser/android/cookies/cookies_fetcher.h',
'browser/android/dev_tools_discovery_provider_android.cc',
'browser/android/dev_tools_discovery_provider_android.h',
'browser/android/dev_tools_server.cc',
'browser/android/dev_tools_server.h',
+ 'browser/android/document/document_web_contents_delegate.cc',
'browser/android/dom_distiller/external_feedback_reporter_android.cc',
'browser/android/dom_distiller/external_feedback_reporter_android.h',
'browser/android/download/android_download_manager_overwrite_infobar_delegate.cc',
@@ -187,6 +214,8 @@
'browser/android/resource_id.h',
'browser/android/resource_mapper.cc',
'browser/android/resource_mapper.h',
+ 'browser/android/rlz/revenue_stats.cc',
+ 'browser/android/rlz/revenue_stats.h',
'browser/android/seccomp_support_detector.cc',
'browser/android/seccomp_support_detector.h',
'browser/android/shortcut_data_fetcher.cc',
@@ -199,8 +228,12 @@
'browser/android/signin/account_management_screen_helper.h',
'browser/android/signin/signin_manager_android.cc',
'browser/android/signin/signin_manager_android.h',
+ 'browser/android/staging_jni_registrar.cc',
+ 'browser/android/staging_jni_registrar.h',
'browser/android/tab/background_content_view_helper.cc',
'browser/android/tab/background_content_view_helper.h',
+ 'browser/android/tab/thumbnail_tab_helper_android.cc',
+ 'browser/android/tab/thumbnail_tab_helper_android.h',
'browser/android/tab_android.cc',
'browser/android/tab_android.h',
'browser/android/tab_load_status.h',
@@ -1775,6 +1808,17 @@
'android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java',
'android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurity.java',
'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/bookmark/EditBookmarkHelper.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/compositor/CompositorView.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/rlz/RevenueStats.java',
+ 'android/java_staging/src/org/chromium/chrome/browser/tab/ThumbnailTabHelper.java',
],
'chrome_browser_mdns_sources': [
'browser/local_discovery/privet_traffic_detector.cc',
@@ -2397,6 +2441,9 @@
# "Safe Browsing Basic" files used for safe browsing in full mode
# (safe_browsing=1), mobile (=2), and mobile-extended (=3).
'chrome_browser_safe_browsing_basic_sources': [
+ 'browser/android/spdy_proxy_resource_throttle.cc',
newt (away) 2015/06/19 02:06:23 bengr: where should these source files be listed?
bengr 2015/06/22 20:50:29 Good question. This is code that was written for A
+ 'browser/android/spdy_proxy_resource_throttle.h',
+
'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
'browser/safe_browsing/malware_details.cc',
« chrome/android/chrome_apk.gyp ('K') | « chrome/android/chrome_apk.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698