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

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

Issue 895363005: Revert of Split ui/base/ime into a new component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « ash/ash.gyp ('k') | chrome/browser/extensions/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/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 import("//components/nacl/nacl_defines.gni") 8 import("//components/nacl/nacl_defines.gni")
9 9
10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 "//third_party/leveldatabase", 268 "//third_party/leveldatabase",
269 "//third_party/libaddressinput", 269 "//third_party/libaddressinput",
270 "//third_party/libyuv", 270 "//third_party/libyuv",
271 "//third_party/mojo/src/mojo/edk/system", 271 "//third_party/mojo/src/mojo/edk/system",
272 "//third_party/mojo/src/mojo/public/cpp/bindings", 272 "//third_party/mojo/src/mojo/public/cpp/bindings",
273 "//third_party/mojo/src/mojo/public/js", 273 "//third_party/mojo/src/mojo/public/js",
274 "//third_party/npapi", 274 "//third_party/npapi",
275 "//third_party/re2", 275 "//third_party/re2",
276 "//third_party/smhasher:cityhash", 276 "//third_party/smhasher:cityhash",
277 "//third_party/webrtc/modules/desktop_capture", 277 "//third_party/webrtc/modules/desktop_capture",
278 "//ui/base/ime",
279 "//ui/gl", 278 "//ui/gl",
280 "//ui/surface", 279 "//ui/surface",
281 "//ui/web_dialogs", 280 "//ui/web_dialogs",
282 "//v8", 281 "//v8",
283 282
284 ## TODO(tonyg): Remove this dependency (crbug.com/280157). 283 ## TODO(tonyg): Remove this dependency (crbug.com/280157).
285 #"../testing/perf/perf_test.gyp:*", TODO(GYP) 284 #"../testing/perf/perf_test.gyp:*", TODO(GYP)
286 ] 285 ]
287 } else { # iOS 286 } else { # iOS
288 sources += 287 sources +=
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 ] 1113 ]
1115 } 1114 }
1116 1115
1117 if (enable_wifi_bootstrapping) { 1116 if (enable_wifi_bootstrapping) {
1118 sources += [ 1117 sources += [
1119 "local_discovery/wifi/mock_wifi_manager.cc", 1118 "local_discovery/wifi/mock_wifi_manager.cc",
1120 "local_discovery/wifi/mock_wifi_manager.h", 1119 "local_discovery/wifi/mock_wifi_manager.h",
1121 ] 1120 ]
1122 } 1121 }
1123 } 1122 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698