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

Side by Side Diff: chrome/browser/extensions/BUILD.gn

Issue 1192583002: Revert of views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/BUILD.gn ('k') | chrome/chrome_browser.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 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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 8
9 assert(enable_extensions) 9 assert(enable_extensions)
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 "//chrome") 109 "//chrome")
110 } 110 }
111 111
112 if (use_ash) { 112 if (use_ash) {
113 sources += [ 113 sources += [
114 "api/tabs/ash_panel_contents.cc", 114 "api/tabs/ash_panel_contents.cc",
115 "api/tabs/ash_panel_contents.h", 115 "api/tabs/ash_panel_contents.h",
116 ] 116 ]
117 } 117 }
118 118
119 if (use_aura) {
120 deps += [
121 "//ui/keyboard",
122 "//ui/keyboard:resources",
123 ]
124 }
125
126 if (toolkit_views) {
127 deps += [ "//ui/views" ]
128 }
129
130 if (is_linux) { 119 if (is_linux) {
131 configs += [ "//build/config/linux:fontconfig" ] 120 configs += [ "//build/config/linux:fontconfig" ]
132 deps += [ "//dbus" ] 121 deps += [ "//dbus" ]
133 if (use_x11) { 122 if (use_x11) {
134 configs += [ "//build/config/linux:x11" ] 123 configs += [ "//build/config/linux:x11" ]
135 deps += [ 124 deps += [
136 "//ui/events:events_base", 125 "//ui/events:events_base",
137 "//ui/events/platform", 126 "//ui/events/platform",
138 "//ui/events/platform/x11", 127 "//ui/events/platform/x11",
139 ] 128 ]
(...skipping 20 matching lines...) Expand all
160 149
161 if (use_brlapi) { 150 if (use_brlapi) {
162 deps += [ "//build/config/linux:libbrlapi" ] 151 deps += [ "//build/config/linux:libbrlapi" ]
163 sources += rebase_path(gypi_values.chrome_browser_extensions_brlapi_sources, 152 sources += rebase_path(gypi_values.chrome_browser_extensions_brlapi_sources,
164 ".", 153 ".",
165 "//chrome") 154 "//chrome")
166 } else { 155 } else {
167 sources += [ "api/braille_display_private/braille_controller_stub.cc" ] 156 sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
168 } 157 }
169 158
159 if (use_aura) {
160 deps += [
161 "//ui/keyboard",
162 "//ui/keyboard:resources",
163 ]
164 }
165
170 # chromeos uses its own global_shortcut_listener, _x11 is not necessary. 166 # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
171 if (is_chromeos || !use_x11) { 167 if (is_chromeos || !use_x11) {
172 sources -= [ 168 sources -= [
173 "global_shortcut_listener_x11.cc", 169 "global_shortcut_listener_x11.cc",
174 "global_shortcut_listener_x11.h", 170 "global_shortcut_listener_x11.h",
175 ] 171 ]
176 } 172 }
177 173
178 if (is_win || is_mac) { 174 if (is_win || is_mac) {
179 deps += [ "//components/wifi" ] 175 deps += [ "//components/wifi" ]
(...skipping 22 matching lines...) Expand all
202 "//chrome") 198 "//chrome")
203 } 199 }
204 200
205 if (is_chromeos && use_ozone) { 201 if (is_chromeos && use_ozone) {
206 sources -= [ "global_shortcut_listener_chromeos.cc" ] 202 sources -= [ "global_shortcut_listener_chromeos.cc" ]
207 } 203 }
208 if (!use_ozone) { 204 if (!use_ozone) {
209 sources -= [ "global_shortcut_listener_ozone.cc" ] 205 sources -= [ "global_shortcut_listener_ozone.cc" ]
210 } 206 }
211 } 207 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698