There are more work needs to be finished, but this should at least allow us to implement login UI

* Added chrome version of ExtensionsDelegate and AppActivity
* introduce use_athena gyp flag
* disabled features/code path that does not work yet on athena. Filed bugs to keep track of them.

BUG=397167
R=mukai@chromium.org, yoz@chromium.org

Review URL: https://codereview.chromium.org/514293003

Cr-Original-Commit-Position: refs/heads/master@{#293023}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 963c8527b331983a8f8ccb7d11aec2a50a6fcf77
This commit is contained in:
oshima 2014-09-02 16:31:34 -07:00 коммит произвёл Commit bot
Родитель 392cc7e5a7
Коммит f2c825e86f
1 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -30,6 +30,9 @@
# Whether or not we are building the Ash shell.
'use_ash%': 0,
# Whether or not we are building the Athena shell.
'use_athena%': 0,
# Whether or not we are using CRAS, the ChromeOS Audio Server.
'use_cras%': 0,
@ -53,6 +56,7 @@
'chromecast%': '<(chromecast)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'embedded%': '<(embedded)',
@ -133,6 +137,7 @@
'desktop_linux%': '<(desktop_linux)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'embedded%': '<(embedded)',
@ -271,6 +276,7 @@
'desktop_linux%': '<(desktop_linux)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'use_ozone_evdev%': '<(use_ozone_evdev)',
@ -1065,6 +1071,7 @@
'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_athena%': '<(use_athena)',
'use_cras%': '<(use_cras)',
'use_openssl%': '<(use_openssl)',
'use_openssl_certs%': '<(use_openssl_certs)',
@ -2563,6 +2570,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
['use_athena==1', {
'defines': ['USE_ATHENA=1'],
}],
['use_pango==1', {
'defines': ['USE_PANGO=1'],
}],