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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments, rebase Created 6 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_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c64d05fe746fd5cb9bac19beb17f1aabb55952d7..e09d720f38e3eb36af749eb6f7e1f791ce41498f 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2473,6 +2473,11 @@
'browser/ui/ash/session_state_delegate_views.cc',
'browser/ui/ash/session_state_delegate_views.h',
],
+ # Used when athena is enabled.
+ 'chrome_browser_ui_athena_sources': [
+ 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc',
+ 'browser/ui/views/athena/chrome_browser_main_extra_parts_athena.h',
+ ],
# Counts desktop Linux and ChromeOS.
'chrome_browser_ui_linux_sources': [
'browser/ui/startup/autolaunch_prompt.cc',
@@ -2731,6 +2736,15 @@
}, { # use_ash==0
'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ],
}],
+ ['use_athena==1', {
+ 'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
+ 'dependencies': [
+ '<(DEPTH)/athena/athena.gyp:athena_lib',
+ '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
+ '<(DEPTH)/athena/athena.gyp:athena_content_lib',
+ '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
+ ],
+ }],
['toolkit_views==1', {
'sources': [ '<@(chrome_browser_ui_views_sources)' ],
'conditions': [
« no previous file with comments | « chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc ('k') | chrome/chrome_repack_chrome_100_percent.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698