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

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

Issue 697343002: Revert of Use a stub implementation of GlobalShortcutListener for Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash47_media_stub
Patch Set: Created 6 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
« no previous file with comments | « no previous file | chrome/browser/extensions/global_shortcut_listener_athena.h » ('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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 112 }
113 if (use_athena) { 113 if (use_athena) {
114 defines += [ USE_ATHENA ] 114 defines += [ USE_ATHENA ]
115 sources += rebase_path( 115 sources += rebase_path(
116 gypi_values.chrome_browser_extensions_athena_sources, 116 gypi_values.chrome_browser_extensions_athena_sources,
117 ".", "//chrome") 117 ".", "//chrome")
118 } else { 118 } else {
119 sources += rebase_path( 119 sources += rebase_path(
120 gypi_values.chrome_browser_extensions_non_athena_sources, 120 gypi_values.chrome_browser_extensions_non_athena_sources,
121 ".", "//chrome") 121 ".", "//chrome")
122 if (is_chromeos) {
123 sources += rebase_path(
124 gypi_values.chrome_browser_extensions_chromeos_non_athena_sources,
125 ".", "//chrome")
126 }
127 } 122 }
128 123
129 if (is_linux) { 124 if (is_linux) {
130 configs += [ "//build/config/linux:fontconfig" ] 125 configs += [ "//build/config/linux:fontconfig" ]
131 deps += [ "//dbus" ] 126 deps += [ "//dbus" ]
132 if (use_x11) { 127 if (use_x11) {
133 configs += [ 128 configs += [
134 "//build/config/linux:x11", 129 "//build/config/linux:x11",
135 ] 130 ]
136 deps += [ 131 deps += [
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 gypi_values.chrome_browser_extensions_app_list_sources, 223 gypi_values.chrome_browser_extensions_app_list_sources,
229 ".", "//chrome") 224 ".", "//chrome")
230 } 225 }
231 226
232 if (!use_ozone) { 227 if (!use_ozone) {
233 sources -= [ 228 sources -= [
234 "global_shortcut_listener_ozone.cc", 229 "global_shortcut_listener_ozone.cc",
235 ] 230 ]
236 } 231 }
237 } 232 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/global_shortcut_listener_athena.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698