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

Side by Side Diff: ui/views/BUILD.gn

Issue 393953008: Add ui/display, message_center, webview to GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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/shell_dialogs/shell_dialogs.gyp ('k') | ui/views/controls/webview/BUILD.gn » ('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 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("views.gyp") ], 10 [ rebase_path("views.gyp") ],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 forward_dependent_configs_from = [ "//ui/accessibility:ax_gen" ] 43 forward_dependent_configs_from = [ "//ui/accessibility:ax_gen" ]
44 44
45 if (!use_ash) { 45 if (!use_ash) {
46 sources -= [ 46 sources -= [
47 "bubble/tray_bubble_view.cc", 47 "bubble/tray_bubble_view.cc",
48 "bubble/tray_bubble_view.h", 48 "bubble/tray_bubble_view.h",
49 ] 49 ]
50 } 50 }
51 if (use_x11 && !is_chromeos) { 51 if (use_x11 && !is_chromeos) {
52 #deps += [ '../display/display.gyp:display_util' ] TODO(GYP) 52 deps += [ "//ui/display/util" ]
53 } 53 }
54 if (is_linux && !is_chromeos) { 54 if (is_linux && !is_chromeos) {
55 sources -= [ "window/window_button_order_provider.cc" ] 55 sources -= [ "window/window_button_order_provider.cc" ]
56 #deps += [ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs' ] TODO(GYP) 56 deps += [ "//ui/shell_dialogs" ]
57 } else { 57 } else {
58 sources -= [ 58 sources -= [
59 "linux_ui/linux_ui.h", 59 "linux_ui/linux_ui.h",
60 "linux_ui/linux_ui.cc", 60 "linux_ui/linux_ui.cc",
61 "linux_ui/status_icon_linux.h", 61 "linux_ui/status_icon_linux.h",
62 "linux_ui/status_icon_linux.cc", 62 "linux_ui/status_icon_linux.cc",
63 "linux_ui/window_button_order_observer.h", 63 "linux_ui/window_button_order_observer.h",
64 "linux_ui/window_button_order_provider.cc", 64 "linux_ui/window_button_order_provider.cc",
65 ] 65 ]
66 } 66 }
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 "//ui/compositor", 250 "//ui/compositor",
251 "//ui/resources", 251 "//ui/resources",
252 "//ui/resources:ui_test_pak", 252 "//ui/resources:ui_test_pak",
253 "//ui/string", 253 "//ui/string",
254 "//ui/wm", 254 "//ui/wm",
255 ] 255 ]
256 } 256 }
257 } 257 }
258 258
259 } # if false 259 } # if false
OLDNEW
« no previous file with comments | « ui/shell_dialogs/shell_dialogs.gyp ('k') | ui/views/controls/webview/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698