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

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

Issue 2074643003: MacViews: Views accelerators table should match the Cocoa one. (Closed) Base URL: ssh://bitbucket.browser.yandex-team.ru/chromium/src.git@master
Patch Set: Split global_keyboard_shortcuts_mac.mm into two platform-specific ones, simplified code. Created 4 years, 1 month 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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//build/split_static_library.gni") 9 import("//build/split_static_library.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 3749 matching lines...) Expand 10 before | Expand all | Expand 10 after
3760 if (enable_wayland_server) { 3760 if (enable_wayland_server) {
3761 deps += [ 3761 deps += [
3762 "//components/exo", 3762 "//components/exo",
3763 "//components/exo/wayland", 3763 "//components/exo/wayland",
3764 ] 3764 ]
3765 sources += [ 3765 sources += [
3766 "chrome_browser_main_extra_parts_exo.cc", 3766 "chrome_browser_main_extra_parts_exo.cc",
3767 "chrome_browser_main_extra_parts_exo.h", 3767 "chrome_browser_main_extra_parts_exo.h",
3768 ] 3768 ]
3769 } 3769 }
3770
3771 if (is_mac) {
tapted 2016/10/31 10:16:57 this should be merged with the if (is_mac) on line
themblsha 2016/10/31 16:56:29 Thanks. I'm getting lost in these huge GN files.
3772 if (mac_views_browser) {
3773 sources += [ "global_keyboard_shortcuts_views_mac.mm" ]
3774 } else {
3775 sources += [ "global_keyboard_shortcuts_cocoa_mac.mm" ]
3776 }
3777 }
3770 } 3778 }
3771 3779
3772 if (android_java_ui) { 3780 if (android_java_ui) {
3773 generate_jni("jni_headers") { 3781 generate_jni("jni_headers") {
3774 sources = [ 3782 sources = [
3775 "../android/java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.jav a", 3783 "../android/java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.jav a",
3776 "../android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java" , 3784 "../android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java" ,
3777 "../android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.ja va", 3785 "../android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.ja va",
3778 "../android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.ja va", 3786 "../android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.ja va",
3779 "../android/java/src/org/chromium/chrome/browser/ChromeApplication.java", 3787 "../android/java/src/org/chromium/chrome/browser/ChromeApplication.java",
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
4359 # linking all of the test support. 4367 # linking all of the test support.
4360 static_library("pepper_cdm_test_constants") { 4368 static_library("pepper_cdm_test_constants") {
4361 testonly = true 4369 testonly = true
4362 visibility = [ "//chrome/*" ] 4370 visibility = [ "//chrome/*" ]
4363 sources = [ 4371 sources = [
4364 "media/pepper_cdm_test_constants.cc", 4372 "media/pepper_cdm_test_constants.cc",
4365 "media/pepper_cdm_test_constants.h", 4373 "media/pepper_cdm_test_constants.h",
4366 ] 4374 ]
4367 } 4375 }
4368 } 4376 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698