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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits, minor refactoring Created 6 years, 5 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 0f9bf07c0702f1edd8c123f2ccaa01e4da2fefee..88358ea295f99c8371c4a81af5ddda4b62e98f98 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2208,8 +2208,6 @@
'browser/ui/views/passwords/save_password_refusal_combobox_model.h',
'browser/ui/views/pdf_password_dialog.cc',
'browser/ui/views/process_singleton_dialog_linux.cc',
- 'browser/ui/views/profiles/avatar_label.cc',
- 'browser/ui/views/profiles/avatar_label.h',
'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
'browser/ui/views/profiles/avatar_menu_bubble_view.h',
'browser/ui/views/profiles/avatar_menu_button.cc',
@@ -2220,6 +2218,8 @@
'browser/ui/views/profiles/profile_chooser_view.h',
'browser/ui/views/profiles/profile_reset_bubble_view.cc',
'browser/ui/views/profiles/profile_reset_bubble_view.h',
+ 'browser/ui/views/profiles/supervised_user_avatar_label.cc',
+ 'browser/ui/views/profiles/supervised_user_avatar_label.h',
'browser/ui/views/profiles/user_manager_view.cc',
'browser/ui/views/profiles/user_manager_view.h',
'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
@@ -2930,6 +2930,18 @@
['enable_google_now==1 and OS!="android"', {
'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ],
}],
+ ['enable_managed_users==0', {
+ 'sources!': [
+ 'browser/ui/views/profiles/supervised_user_avatar_label.cc',
+ 'browser/ui/views/profiles/supervised_user_avatar_label.h',
+ 'browser/ui/webui/options/managed_user_create_confirm_handler.cc',
+ 'browser/ui/webui/options/managed_user_create_confirm_handler.h',
+ 'browser/ui/webui/options/managed_user_import_handler.cc',
+ 'browser/ui/webui/options/managed_user_import_handler.h',
+ 'browser/ui/webui/options/managed_user_learn_more_handler.cc',
+ 'browser/ui/webui/options/managed_user_learn_more_handler.h',
+ ],
+ }],
['enable_webrtc==1', {
'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ],
}],

Powered by Google App Engine
This is Rietveld 408576698