Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//chromecast/chromecast.gni") | 6 import("//chromecast/chromecast.gni") |
| 7 import("//services/service_manager/public/service_manifest.gni") | 7 import("//services/service_manager/public/service_manifest.gni") |
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") |
| 9 import("//tools/grit/grit_rule.gni") | 9 import("//tools/grit/grit_rule.gni") |
| 10 | 10 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 "cast_memory_pressure_monitor.cc", | 124 "cast_memory_pressure_monitor.cc", |
| 125 "cast_memory_pressure_monitor.h", | 125 "cast_memory_pressure_monitor.h", |
| 126 "metrics/external_metrics.cc", | 126 "metrics/external_metrics.cc", |
| 127 "metrics/external_metrics.h", | 127 "metrics/external_metrics.h", |
| 128 ] | 128 ] |
| 129 | 129 |
| 130 deps += [ | 130 deps += [ |
| 131 "//build/linux:fontconfig", | 131 "//build/linux:fontconfig", |
| 132 "//components/metrics:serialization", | 132 "//components/metrics:serialization", |
| 133 "//ui/aura", | 133 "//ui/aura", |
| 134 "//ui/base/ime", | |
|
halliwell
2017/01/18 00:50:40
does this need rebasing?
Joshua LeVasseur
2017/01/18 00:55:38
No, this is correct: I've moved the IME logic from
| |
| 135 ] | 134 ] |
| 136 } else if (is_android) { | 135 } else if (is_android) { |
| 137 sources += [ | 136 sources += [ |
| 138 "android/cast_content_window_android.cc", | 137 "android/cast_content_window_android.cc", |
| 139 "android/cast_content_window_android.h", | 138 "android/cast_content_window_android.h", |
| 140 "android/cast_metrics_helper_android.cc", | 139 "android/cast_metrics_helper_android.cc", |
| 141 "android/cast_metrics_helper_android.h", | 140 "android/cast_metrics_helper_android.h", |
| 142 "android/cast_web_contents_activity.cc", | 141 "android/cast_web_contents_activity.cc", |
| 143 "android/cast_web_contents_activity.h", | 142 "android/cast_web_contents_activity.h", |
| 144 "android/jni_registrar.cc", | 143 "android/jni_registrar.cc", |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 277 "android/apk/src/org/chromium/chromecast/shell/CastContentWindowAndroid.ja va", | 276 "android/apk/src/org/chromium/chromecast/shell/CastContentWindowAndroid.ja va", |
| 278 "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java", | 277 "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java", |
| 279 "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java", | 278 "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java", |
| 280 "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java", | 279 "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java", |
| 281 "android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.jav a", | 280 "android/apk/src/org/chromium/chromecast/shell/CastWebContentsActivity.jav a", |
| 282 ] | 281 ] |
| 283 | 282 |
| 284 jni_package = "chromecast" | 283 jni_package = "chromecast" |
| 285 } | 284 } |
| 286 } | 285 } |
| OLD | NEW |