| OLD | NEW | 
|---|
| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 103                     ".", | 103                     ".", | 
| 104                     "//chrome") | 104                     "//chrome") | 
| 105   } | 105   } | 
| 106 | 106 | 
| 107   if (use_ash) { | 107   if (use_ash) { | 
| 108     sources += [ | 108     sources += [ | 
| 109       "api/tabs/ash_panel_contents.cc", | 109       "api/tabs/ash_panel_contents.cc", | 
| 110       "api/tabs/ash_panel_contents.h", | 110       "api/tabs/ash_panel_contents.h", | 
| 111     ] | 111     ] | 
| 112   } | 112   } | 
| 113   if (use_athena) { |  | 
| 114     defines += [ USE_ATHENA ] |  | 
| 115     sources += rebase_path(gypi_values.chrome_browser_extensions_athena_sources, |  | 
| 116                            ".", |  | 
| 117                            "//chrome") |  | 
| 118   } else { |  | 
| 119     sources += |  | 
| 120         rebase_path(gypi_values.chrome_browser_extensions_non_athena_sources, |  | 
| 121                     ".", |  | 
| 122                     "//chrome") |  | 
| 123   } |  | 
| 124 | 113 | 
| 125   if (is_linux) { | 114   if (is_linux) { | 
| 126     configs += [ "//build/config/linux:fontconfig" ] | 115     configs += [ "//build/config/linux:fontconfig" ] | 
| 127     deps += [ "//dbus" ] | 116     deps += [ "//dbus" ] | 
| 128     if (use_x11) { | 117     if (use_x11) { | 
| 129       configs += [ "//build/config/linux:x11" ] | 118       configs += [ "//build/config/linux:x11" ] | 
| 130       deps += [ | 119       deps += [ | 
| 131         "//ui/events:events_base", | 120         "//ui/events:events_base", | 
| 132         "//ui/events/platform", | 121         "//ui/events/platform", | 
| 133         "//ui/events/platform/x11", | 122         "//ui/events/platform/x11", | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 218                     "//chrome") | 207                     "//chrome") | 
| 219   } | 208   } | 
| 220 | 209 | 
| 221   if (is_chromeos && use_ozone) { | 210   if (is_chromeos && use_ozone) { | 
| 222     sources -= [ "global_shortcut_listener_chromeos.cc" ] | 211     sources -= [ "global_shortcut_listener_chromeos.cc" ] | 
| 223   } | 212   } | 
| 224   if (!use_ozone) { | 213   if (!use_ozone) { | 
| 225     sources -= [ "global_shortcut_listener_ozone.cc" ] | 214     sources -= [ "global_shortcut_listener_ozone.cc" ] | 
| 226   } | 215   } | 
| 227 } | 216 } | 
| OLD | NEW | 
|---|