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

Side by Side Diff: ash/ash.gyp

Issue 14507003: Add tray warning for Locally managed users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge w/ToT, fix nits Created 7 years, 7 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 | « no previous file | ash/ash_chromeos_strings.grdp » ('j') | ash/ash_chromeos_strings.grdp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 'system/brightness/tray_brightness.cc', 187 'system/brightness/tray_brightness.cc',
188 'system/brightness/tray_brightness.h', 188 'system/brightness/tray_brightness.h',
189 'system/chromeos/audio/audio_observer.h', 189 'system/chromeos/audio/audio_observer.h',
190 'system/chromeos/audio/tray_audio.cc', 190 'system/chromeos/audio/tray_audio.cc',
191 'system/chromeos/audio/tray_audio.h', 191 'system/chromeos/audio/tray_audio.h',
192 'system/chromeos/enterprise/enterprise_domain_observer.h', 192 'system/chromeos/enterprise/enterprise_domain_observer.h',
193 'system/chromeos/enterprise/tray_enterprise.h', 193 'system/chromeos/enterprise/tray_enterprise.h',
194 'system/chromeos/enterprise/tray_enterprise.cc', 194 'system/chromeos/enterprise/tray_enterprise.cc',
195 'system/chromeos/keyboard_brightness_controller.cc', 195 'system/chromeos/keyboard_brightness_controller.cc',
196 'system/chromeos/keyboard_brightness_controller.h', 196 'system/chromeos/keyboard_brightness_controller.h',
197 'system/chromeos/label_tray_view.h',
198 'system/chromeos/label_tray_view.cc',
199 'system/chromeos/managed/tray_locally_managed_user.h',
200 'system/chromeos/managed/tray_locally_managed_user.cc',
197 'system/chromeos/network/network_detailed_view.h', 201 'system/chromeos/network/network_detailed_view.h',
198 'system/chromeos/network/network_icon.cc', 202 'system/chromeos/network/network_icon.cc',
199 'system/chromeos/network/network_icon.h', 203 'system/chromeos/network/network_icon.h',
200 'system/chromeos/network/network_icon_animation.cc', 204 'system/chromeos/network/network_icon_animation.cc',
201 'system/chromeos/network/network_icon_animation.h', 205 'system/chromeos/network/network_icon_animation.h',
202 'system/chromeos/network/network_icon_animation_observer.h', 206 'system/chromeos/network/network_icon_animation_observer.h',
203 'system/chromeos/network/network_list_detailed_view.cc', 207 'system/chromeos/network/network_list_detailed_view.cc',
204 'system/chromeos/network/network_list_detailed_view.h', 208 'system/chromeos/network/network_list_detailed_view.h',
205 'system/chromeos/network/network_list_detailed_view_base.cc', 209 'system/chromeos/network/network_list_detailed_view_base.cc',
206 'system/chromeos/network/network_list_detailed_view_base.h', 210 'system/chromeos/network/network_list_detailed_view_base.h',
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 'shell/cocoa/app-Info.plist', 846 'shell/cocoa/app-Info.plist',
843 ], 847 ],
844 'xcode_settings': { 848 'xcode_settings': {
845 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 849 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
846 }, 850 },
847 }], 851 }],
848 ], 852 ],
849 }, 853 },
850 ], 854 ],
851 } 855 }
OLDNEW
« no previous file with comments | « no previous file | ash/ash_chromeos_strings.grdp » ('j') | ash/ash_chromeos_strings.grdp » ('J')

Powered by Google App Engine
This is Rietveld 408576698