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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 283053002: Add compositing, layers to app_list_demo Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase onto master -- probably slightly broken Created 6 years, 4 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_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c64d05fe746fd5cb9bac19beb17f1aabb55952d7..0c461ebf1635fa8d7c95b6c47a684a077c4c8575 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1848,6 +1848,9 @@
'browser/ui/views/sync/one_click_signin_bubble_view.cc',
'browser/ui/views/sync/one_click_signin_bubble_view.h',
],
+ 'chrome_browser_ui_task_manager_non_mac_sources': [
+ 'browser/ui/views/task_manager_view.cc',
+ ],
'chrome_browser_ui_task_manager_sources': [
'browser/ui/cocoa/task_manager_mac.h',
'browser/ui/cocoa/task_manager_mac.mm',
@@ -1944,6 +1947,7 @@
'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
'browser/ui/views/certificate_viewer_win.cc',
+ 'browser/ui/views/chrome_views_delegate.cc',
'browser/ui/views/chrome_views_delegate_chromeos.cc',
'browser/ui/views/chrome_web_dialog_view.cc',
'browser/ui/views/collected_cookies_views.cc',
@@ -2662,8 +2666,11 @@
['enable_one_click_signin==1', {
'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ]
}],
+ ['enable_task_manager==1 and OS!="mac"', {
+ 'sources': [ '<@(chrome_browser_ui_task_manager_non_mac_sources)' ],
+ }],
['enable_task_manager==1', {
- 'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ],
+ 'sources': [ '<@(chrome_browser_ui_task_manager_sources' ],
}],
['disable_nacl==0', {
'sources': [ '<@(chrome_browser_ui_nacl_sources)' ],
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.cc ('k') | content/browser/compositor/browser_compositor_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698