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

Side by Side Diff: ash/ash.gyp

Issue 196133012: Fix incorrect use of AXState caused when refactoring two enums into one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename SetStateFlag -> AddStateFlag Created 6 years, 9 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 | « no previous file | ash/system/tray/hover_highlight_view.cc » ('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 (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': [
11 'ash_resources.gypi', 11 'ash_resources.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'ash', 15 'target_name': 'ash',
16 'type': '<(component)', 16 'type': '<(component)',
17 'dependencies': [ 17 'dependencies': [
18 '../base/base.gyp:base', 18 '../base/base.gyp:base',
19 '../base/base.gyp:base_i18n', 19 '../base/base.gyp:base_i18n',
20 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 20 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
21 '../cc/cc.gyp:cc', 21 '../cc/cc.gyp:cc',
22 '../content/content.gyp:content_browser', 22 '../content/content.gyp:content_browser',
23 '../media/media.gyp:media', 23 '../media/media.gyp:media',
24 '../net/net.gyp:net', 24 '../net/net.gyp:net',
25 '../skia/skia.gyp:skia', 25 '../skia/skia.gyp:skia',
26 '../third_party/icu/icu.gyp:icui18n', 26 '../third_party/icu/icu.gyp:icui18n',
27 '../third_party/icu/icu.gyp:icuuc', 27 '../third_party/icu/icu.gyp:icuuc',
28 '../ui/accessibility/accessibility.gyp:accessibility',
28 '../ui/app_list/app_list.gyp:app_list', 29 '../ui/app_list/app_list.gyp:app_list',
29 '../ui/aura/aura.gyp:aura', 30 '../ui/aura/aura.gyp:aura',
30 '../ui/base/strings/ui_strings.gyp:ui_strings', 31 '../ui/base/strings/ui_strings.gyp:ui_strings',
31 '../ui/base/ui_base.gyp:ui_base', 32 '../ui/base/ui_base.gyp:ui_base',
32 '../ui/compositor/compositor.gyp:compositor', 33 '../ui/compositor/compositor.gyp:compositor',
33 '../ui/events/events.gyp:events', 34 '../ui/events/events.gyp:events',
34 '../ui/gfx/gfx.gyp:gfx', 35 '../ui/gfx/gfx.gyp:gfx',
35 '../ui/gfx/gfx.gyp:gfx_geometry', 36 '../ui/gfx/gfx.gyp:gfx_geometry',
36 '../ui/keyboard/keyboard.gyp:keyboard', 37 '../ui/keyboard/keyboard.gyp:keyboard',
37 '../ui/message_center/message_center.gyp:message_center', 38 '../ui/message_center/message_center.gyp:message_center',
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 }], 1142 }],
1142 ['chromeos==1', { 1143 ['chromeos==1', {
1143 'dependencies': [ 1144 'dependencies': [
1144 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1145 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1145 ], 1146 ],
1146 }], 1147 }],
1147 ], 1148 ],
1148 }, 1149 },
1149 ], 1150 ],
1150 } 1151 }
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/hover_highlight_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698