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

Side by Side 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: Include missing browsertest .js file in chrome_tests.gypi Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chrome_browser_ui_non_ios_sources': [ 7 'chrome_browser_ui_non_ios_sources': [
8 'browser/ui/accelerator_utils.h', 8 'browser/ui/accelerator_utils.h',
9 'browser/ui/android/android_about_app_info.cc', 9 'browser/ui/android/android_about_app_info.cc',
10 'browser/ui/android/android_about_app_info.h', 10 'browser/ui/android/android_about_app_info.h',
(...skipping 2139 matching lines...) Expand 10 before | Expand all | Expand 10 after
2150 'browser/ui/views/panels/x11_panel_resizer.cc', 2150 'browser/ui/views/panels/x11_panel_resizer.cc',
2151 'browser/ui/views/panels/x11_panel_resizer.h', 2151 'browser/ui/views/panels/x11_panel_resizer.h',
2152 'browser/ui/views/passwords/manage_password_item_view.cc', 2152 'browser/ui/views/passwords/manage_password_item_view.cc',
2153 'browser/ui/views/passwords/manage_password_item_view.h', 2153 'browser/ui/views/passwords/manage_password_item_view.h',
2154 'browser/ui/views/passwords/manage_passwords_bubble_view.cc', 2154 'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
2155 'browser/ui/views/passwords/manage_passwords_bubble_view.h', 2155 'browser/ui/views/passwords/manage_passwords_bubble_view.h',
2156 'browser/ui/views/passwords/manage_passwords_icon_view.cc', 2156 'browser/ui/views/passwords/manage_passwords_icon_view.cc',
2157 'browser/ui/views/passwords/manage_passwords_icon_view.h', 2157 'browser/ui/views/passwords/manage_passwords_icon_view.h',
2158 'browser/ui/views/pdf_password_dialog.cc', 2158 'browser/ui/views/pdf_password_dialog.cc',
2159 'browser/ui/views/process_singleton_dialog_linux.cc', 2159 'browser/ui/views/process_singleton_dialog_linux.cc',
2160 'browser/ui/views/profiles/avatar_label.cc',
2161 'browser/ui/views/profiles/avatar_label.h',
2162 'browser/ui/views/profiles/avatar_menu_bubble_view.cc', 2160 'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
2163 'browser/ui/views/profiles/avatar_menu_bubble_view.h', 2161 'browser/ui/views/profiles/avatar_menu_bubble_view.h',
2164 'browser/ui/views/profiles/avatar_menu_button.cc', 2162 'browser/ui/views/profiles/avatar_menu_button.cc',
2165 'browser/ui/views/profiles/avatar_menu_button.h', 2163 'browser/ui/views/profiles/avatar_menu_button.h',
2166 'browser/ui/views/profiles/new_avatar_button.cc', 2164 'browser/ui/views/profiles/new_avatar_button.cc',
2167 'browser/ui/views/profiles/new_avatar_button.h', 2165 'browser/ui/views/profiles/new_avatar_button.h',
2168 'browser/ui/views/profiles/profile_chooser_view.cc', 2166 'browser/ui/views/profiles/profile_chooser_view.cc',
2169 'browser/ui/views/profiles/profile_chooser_view.h', 2167 'browser/ui/views/profiles/profile_chooser_view.h',
2170 'browser/ui/views/profiles/profile_reset_bubble_view.cc', 2168 'browser/ui/views/profiles/profile_reset_bubble_view.cc',
2171 'browser/ui/views/profiles/profile_reset_bubble_view.h', 2169 'browser/ui/views/profiles/profile_reset_bubble_view.h',
2170 'browser/ui/views/profiles/supervised_user_avatar_label.cc',
2171 'browser/ui/views/profiles/supervised_user_avatar_label.h',
2172 'browser/ui/views/profiles/user_manager_view.cc', 2172 'browser/ui/views/profiles/user_manager_view.cc',
2173 'browser/ui/views/profiles/user_manager_view.h', 2173 'browser/ui/views/profiles/user_manager_view.h',
2174 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' , 2174 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' ,
2175 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h', 2175 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
2176 'browser/ui/views/sad_tab_view.cc', 2176 'browser/ui/views/sad_tab_view.cc',
2177 'browser/ui/views/sad_tab_view.h', 2177 'browser/ui/views/sad_tab_view.h',
2178 'browser/ui/views/session_crashed_bubble_view.cc', 2178 'browser/ui/views/session_crashed_bubble_view.cc',
2179 'browser/ui/views/session_crashed_bubble_view.h', 2179 'browser/ui/views/session_crashed_bubble_view.h',
2180 'browser/ui/views/settings_api_bubble_helper_views.cc', 2180 'browser/ui/views/settings_api_bubble_helper_views.cc',
2181 'browser/ui/views/settings_api_bubble_helper_views.h', 2181 'browser/ui/views/settings_api_bubble_helper_views.h',
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
2956 'dependencies': [ 2956 'dependencies': [
2957 'browser_extensions', 2957 'browser_extensions',
2958 'browser/extensions/api/api_registration.gyp:chrome_api_registration ', 2958 'browser/extensions/api/api_registration.gyp:chrome_api_registration ',
2959 'common/extensions/api/api.gyp:chrome_api', 2959 'common/extensions/api/api.gyp:chrome_api',
2960 ], 2960 ],
2961 'sources': [ '<@(chrome_browser_ui_extensions_sources)' ], 2961 'sources': [ '<@(chrome_browser_ui_extensions_sources)' ],
2962 }], 2962 }],
2963 ['enable_google_now==1 and OS!="android"', { 2963 ['enable_google_now==1 and OS!="android"', {
2964 'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ], 2964 'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ],
2965 }], 2965 }],
2966 ['enable_managed_users==0', {
2967 'sources!': [
2968 'browser/ui/views/profiles/supervised_user_avatar_label.cc',
2969 'browser/ui/views/profiles/supervised_user_avatar_label.h',
2970 'browser/ui/webui/options/supervised_user_create_confirm_handler.cc' ,
2971 'browser/ui/webui/options/supervised_user_create_confirm_handler.h',
2972 'browser/ui/webui/options/supervised_user_import_handler.cc',
2973 'browser/ui/webui/options/supervised_user_import_handler.h',
2974 'browser/ui/webui/options/supervised_user_learn_more_handler.cc',
2975 'browser/ui/webui/options/supervised_user_learn_more_handler.h',
2976 ],
2977 }],
2966 ['enable_webrtc==1', { 2978 ['enable_webrtc==1', {
2967 'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ], 2979 'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ],
2968 }], 2980 }],
2969 ['enable_service_discovery==1', { 2981 ['enable_service_discovery==1', {
2970 'sources': [ '<@(chrome_browser_ui_service_discovery_sources)' ], 2982 'sources': [ '<@(chrome_browser_ui_service_discovery_sources)' ],
2971 }], 2983 }],
2972 ['enable_spellcheck==1', { 2984 ['enable_spellcheck==1', {
2973 'dependencies': [ 2985 'dependencies': [
2974 '../third_party/hunspell/hunspell.gyp:hunspell', 2986 '../third_party/hunspell/hunspell.gyp:hunspell',
2975 ], 2987 ],
2976 }], 2988 }],
2977 # Temporary fix to break the browser_ui target into smaller chunks so it 2989 # Temporary fix to break the browser_ui target into smaller chunks so it
2978 # will link with SyzyASan builds. 2990 # will link with SyzyASan builds.
2979 ['OS=="win" and syzyasan==1', { 2991 ['OS=="win" and syzyasan==1', {
2980 'msvs_shard': 4, 2992 'msvs_shard': 4,
2981 }], 2993 }],
2982 ['OS!="android" and OS!="ios"', { 2994 ['OS!="android" and OS!="ios"', {
2983 'dependencies': [ 2995 'dependencies': [
2984 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 2996 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
2985 ], 2997 ],
2986 }], 2998 }],
2987 ], 2999 ],
2988 }, 3000 },
2989 ], 3001 ],
2990 } 3002 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698