depends on http://codereview.chromium.org/9466022/
depends on http://codereview.chromium.org/9465018/

BUG=110050
TEST=When the profile is not connected to a google account, each time the user
logs in to a google property an infobar will ask the user if he would like to
connect the profile to this account.  If so, a dialog pops up with more
information, and allows the user to start or cancel.  The user can also not
choose the default sync settings, in which case pressing start will bring
up the advanced sync dialog.

Review URL: http://codereview.chromium.org/9453035

git-svn-id: http://src.chromium.org/svn/trunk/src/build@124996 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
rogerta@chromium.org 2012-03-05 21:02:40 +00:00
Родитель 00a8349bc2
Коммит 6c6a6b9616
1 изменённых файлов: 13 добавлений и 0 удалений

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

@ -229,6 +229,9 @@
# libraries on linux x86-64 and arm, plus ASLR.
'linux_fpic%': 1,
# Whether one-click signin is enabled or not.
'enable_one_click_signin%': 0,
# Enable navigator.registerProtocolHandler and supporting UI.
'enable_register_protocol_handler%': 1,
@ -372,6 +375,12 @@
'file_manager_extension%': 0,
}],
# For now one-click signin is enabled only for windows since the UI
# is not yet complete for other platforms.
['OS=="win"', {
'enable_one_click_signin%': 1,
}],
['OS=="android"', {
'proprietary_codecs%': 1,
'enable_webrtc%': 0,
@ -458,6 +467,7 @@
'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
'use_third_party_translations%': '<(use_third_party_translations)',
'remoting%': '<(remoting)',
'enable_one_click_signin%': '<(enable_one_click_signin)',
'enable_webrtc%': '<(enable_webrtc)',
'chromium_win_pch%': '<(chromium_win_pch)',
'p2p_apis%': '<(p2p_apis)',
@ -1137,6 +1147,9 @@
['use_nss==1', {
'defines': ['USE_NSS=1'],
}],
['enable_one_click_signin==1', {
'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
}],
['toolkit_uses_gtk==1', {
'defines': ['TOOLKIT_USES_GTK=1'],
}],