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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_resources.gyp

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
« chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc ('K') | « chrome/chrome_repack_chrome_200_percent.gypi ('k') | extensions/browser/extension_icon_image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index a27d9202ae1d5130e634c29d5879c424f0ecd13b..5412b09657cc69c800168a2384d769544a576b6d 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -461,6 +461,11 @@
'<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
],
}],
+ ['use_athena==1', {
+ 'dependencies': [
+ '<(DEPTH)/athena/resources/athena_resources.gyp:athena_resources',
+ ],
+ }],
['enable_autofill_dialog==1 and OS!="android"', {
'dependencies': [
'<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',
« chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc ('K') | « chrome/chrome_repack_chrome_200_percent.gypi ('k') | extensions/browser/extension_icon_image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698