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

Side by Side Diff: ui/chromeos/ui_chromeos.gyp

Issue 351353004: chromeos: Move some network related UI in ui/chromeos/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-build 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/chromeos/resources/ui_chromeos_resources.grd ('k') | ui/chromeos/ui_chromeos_strings.grd » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'ui_chromeos_resources',
12 'type': 'none',
13 'variables': {
14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources',
15 },
16 'actions': [
17 {
18 'action_name': 'ui_chromeos_resources',
19 'variables': {
20 'grit_grd_file': 'resources/ui_chromeos_resources.grd',
21 },
22 'includes': [ '../../build/grit_action.gypi' ],
23 },
24 ],
25 'includes': [ '../../build/grit_target.gypi' ],
26 },
27 {
28 'target_name': 'ui_chromeos_strings',
29 'type': 'none',
30 'variables': {
31 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings',
32 },
33 'actions': [
34 {
35 'action_name': 'generate_ui_chromeos_strings',
36 'variables': {
37 'grit_grd_file': 'ui_chromeos_strings.grd',
38 },
39 'includes': [ '../../build/grit_action.gypi' ],
40 },
41 ],
42 'includes': [ '../../build/grit_target.gypi' ],
43 },
44 {
11 'target_name': 'ui_chromeos', 45 'target_name': 'ui_chromeos',
12 'type': '<(component)', 46 'type': '<(component)',
13 'dependencies': [ 47 'dependencies': [
14 '../../base/base.gyp:base', 48 '../../base/base.gyp:base',
15 '../../skia/skia.gyp:skia', 49 '../../skia/skia.gyp:skia',
16 '../aura/aura.gyp:aura', 50 '../aura/aura.gyp:aura',
17 '../events/events.gyp:events', 51 '../events/events.gyp:events',
52 '../events/events.gyp:gesture_detection',
18 '../wm/wm.gyp:wm', 53 '../wm/wm.gyp:wm',
54 'ui_chromeos_resources',
55 'ui_chromeos_strings',
19 ], 56 ],
20 'defines': [ 57 'defines': [
21 'UI_CHROMEOS_IMPLEMENTATION', 58 'UI_CHROMEOS_IMPLEMENTATION',
22 ], 59 ],
23 'sources': [ 60 'sources': [
61 'network/network_icon.cc',
62 'network/network_icon.h',
63 'network/network_icon_animation.cc',
64 'network/network_icon_animation.h',
65 'network/network_icon_animation_observer.h',
24 'touch_exploration_controller.cc', 66 'touch_exploration_controller.cc',
25 'touch_exploration_controller.h', 67 'touch_exploration_controller.h',
26 'user_activity_power_manager_notifier.cc', 68 'user_activity_power_manager_notifier.cc',
27 'user_activity_power_manager_notifier.h', 69 'user_activity_power_manager_notifier.h',
28 ], 70 ],
29 }, 71 },
30 ], 72 ],
31 } 73 }
OLDNEW
« no previous file with comments | « ui/chromeos/resources/ui_chromeos_resources.grd ('k') | ui/chromeos/ui_chromeos_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698