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

Side by Side Diff: content/common/BUILD.gn

Issue 989993002: x11: Use scoped_ptr<> for X11 objects where it makes sense. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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
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 import("//content/common/common.gni") 7 import("//content/common/common.gni")
8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") 8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
9 9
10 if (is_chromeos && current_cpu != "arm") { 10 if (is_chromeos && current_cpu != "arm") {
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 } 276 }
277 } else { 277 } else {
278 sources -= [ "font_list_pango.cc" ] 278 sources -= [ "font_list_pango.cc" ]
279 } 279 }
280 280
281 if (use_x11) { 281 if (use_x11) {
282 include_dirs += [ "//third_party/khronos" ] 282 include_dirs += [ "//third_party/khronos" ]
283 configs += [ "//build/config/linux:xcomposite" ] 283 configs += [ "//build/config/linux:xcomposite" ]
284 284
285 if (current_cpu != "arm" || !is_chromeos) { 285 if (current_cpu != "arm" || !is_chromeos) {
286 sources += [ 286 sources += [ "gpu/x_util.h" ]
287 "gpu/x_util.cc",
288 "gpu/x_util.h",
289 ]
290 } 287 }
291 } 288 }
292 289
293 if (enable_plugins) { 290 if (enable_plugins) {
294 deps += [ "//ppapi/shared_impl" ] 291 deps += [ "//ppapi/shared_impl" ]
295 } else { 292 } else {
296 sources -= [ 293 sources -= [
297 "pepper_file_util.cc", 294 "pepper_file_util.cc",
298 "pepper_file_util.h", 295 "pepper_file_util.h",
299 "pepper_messages.h", 296 "pepper_messages.h",
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 "presentation/presentation_service.mojom", 470 "presentation/presentation_service.mojom",
474 "presentation/presentation_session.mojom", 471 "presentation/presentation_session.mojom",
475 "render_frame_setup.mojom", 472 "render_frame_setup.mojom",
476 ] 473 ]
477 474
478 deps = [ 475 deps = [
479 "//content/public/common:mojo_bindings", 476 "//content/public/common:mojo_bindings",
480 "//third_party/mojo/src/mojo/public/interfaces/application:application", 477 "//third_party/mojo/src/mojo/public/interfaces/application:application",
481 ] 478 ]
482 } 479 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc ('k') | content/common/gpu/x_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698