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

Unified Diff: chrome/chrome_browser.gypi

Issue 787023002: Upstream more layers, decoration title, layer_title_cache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: upstream resources as well Created 6 years 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 d8bd257eb9004fb34059f0208ee678715169ad5e..3f2f7ac8e7f337b6e83725ffd98e084d17e66748 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -47,9 +47,21 @@
'browser/android/chrome_web_contents_delegate_android.h',
'browser/android/chromium_application.cc',
'browser/android/chromium_application.h',
+ 'browser/android/compositor/decoration_title.cc',
+ 'browser/android/compositor/decoration_title.h',
'browser/android/compositor/layer/layer.h',
+ 'browser/android/compositor/layer/content_layer.cc',
+ 'browser/android/compositor/layer/content_layer.h',
+ 'browser/android/compositor/layer/contextual_search_layer.cc',
+ 'browser/android/compositor/layer/contextual_search_layer.h',
+ 'browser/android/compositor/layer/tab_layer.cc',
+ 'browser/android/compositor/layer/tab_layer.h',
'browser/android/compositor/layer/thumbnail_layer.cc',
'browser/android/compositor/layer/thumbnail_layer.h',
+ 'browser/android/compositor/layer/toolbar_layer.cc',
+ 'browser/android/compositor/layer/toolbar_layer.h',
+ 'browser/android/compositor/layer_title_cache.cc',
+ 'browser/android/compositor/layer_title_cache.h',
'browser/android/compositor/tab_content_manager.cc',
'browser/android/compositor/tab_content_manager.h',
'browser/android/content_view_util.cc',
@@ -1580,6 +1592,7 @@
'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',
+ 'android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java',
'android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java',
'android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java',
'android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java',

Powered by Google App Engine
This is Rietveld 408576698