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

Side by Side Diff: ui/base/BUILD.gn

Issue 833893003: Move UserActivityDetector to ui/base/user_activity/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't build test on android Created 5 years, 11 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
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_aura.cc ('k') | ui/base/ui_base.gyp » ('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/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/android/rules.gni") 9 import("//build/config/android/rules.gni")
10 } 10 }
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 "ui_base_export.h", 226 "ui_base_export.h",
227 "ui_base_exports.cc", 227 "ui_base_exports.cc",
228 "ui_base_paths.cc", 228 "ui_base_paths.cc",
229 "ui_base_paths.h", 229 "ui_base_paths.h",
230 "ui_base_switches.cc", 230 "ui_base_switches.cc",
231 "ui_base_switches.h", 231 "ui_base_switches.h",
232 "ui_base_switches_util.cc", 232 "ui_base_switches_util.cc",
233 "ui_base_switches_util.h", 233 "ui_base_switches_util.h",
234 "ui_base_types.cc", 234 "ui_base_types.cc",
235 "ui_base_types.h", 235 "ui_base_types.h",
236 "user_activity/user_activity_detector.cc",
237 "user_activity/user_activity_detector.h",
238 "user_activity/user_activity_observer.h",
236 "view_prop.cc", 239 "view_prop.cc",
237 "view_prop.h", 240 "view_prop.h",
238 "webui/jstemplate_builder.cc", 241 "webui/jstemplate_builder.cc",
239 "webui/jstemplate_builder.h", 242 "webui/jstemplate_builder.h",
240 "webui/web_ui_util.cc", 243 "webui/web_ui_util.cc",
241 "webui/web_ui_util.h", 244 "webui/web_ui_util.h",
242 "win/accessibility_ids_win.h", 245 "win/accessibility_ids_win.h",
243 "win/accessibility_misc_utils.cc", 246 "win/accessibility_misc_utils.cc",
244 "win/accessibility_misc_utils.h", 247 "win/accessibility_misc_utils.h",
245 "win/atl_module.h", 248 "win/atl_module.h",
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 "l10n/l10n_util_unittest.cc", 737 "l10n/l10n_util_unittest.cc",
735 "l10n/l10n_util_win_unittest.cc", 738 "l10n/l10n_util_win_unittest.cc",
736 "l10n/time_format_unittest.cc", 739 "l10n/time_format_unittest.cc",
737 "layout_unittest.cc", 740 "layout_unittest.cc",
738 "models/tree_node_iterator_unittest.cc", 741 "models/tree_node_iterator_unittest.cc",
739 "resource/data_pack_literal.cc", 742 "resource/data_pack_literal.cc",
740 "resource/data_pack_unittest.cc", 743 "resource/data_pack_unittest.cc",
741 "resource/resource_bundle_unittest.cc", 744 "resource/resource_bundle_unittest.cc",
742 "test/test_clipboard_unittest.cc", 745 "test/test_clipboard_unittest.cc",
743 "test/run_all_unittests.cc", 746 "test/run_all_unittests.cc",
747 "user_activity/user_activity_detector_unittest.cc",
744 ] 748 ]
745 749
750 if (is_android) {
751 sources -= [ "user_activity/user_activity_detector_unittest.cc" ]
752 }
753
746 if (is_ios) { 754 if (is_ios) {
747 # Compile this Mac file on iOS as well. 755 # Compile this Mac file on iOS as well.
748 set_sources_assignment_filter([]) 756 set_sources_assignment_filter([])
749 sources += [ "l10n/l10n_util_mac_unittest.mm" ] 757 sources += [ "l10n/l10n_util_mac_unittest.mm" ]
750 set_sources_assignment_filter(sources_assignment_filter) 758 set_sources_assignment_filter(sources_assignment_filter)
751 } else { # !is_ios 759 } else { # !is_ios
752 sources += [ 760 sources += [
753 "accelerators/accelerator_manager_unittest.cc", 761 "accelerators/accelerator_manager_unittest.cc",
754 "accelerators/menu_label_accelerator_util_linux_unittest.cc", 762 "accelerators/menu_label_accelerator_util_linux_unittest.cc",
755 "clipboard/custom_data_helper_unittest.cc", 763 "clipboard/custom_data_helper_unittest.cc",
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 # TODO(GYP) Mac (ui_base_tests_bundle) 913 # TODO(GYP) Mac (ui_base_tests_bundle)
906 if (is_android) { 914 if (is_android) {
907 unittest_apk("ui_base_unittests_apk") { 915 unittest_apk("ui_base_unittests_apk") {
908 unittests_dep = ":ui_base_unittests" 916 unittests_dep = ":ui_base_unittests"
909 deps = [ 917 deps = [
910 ":ui_base_unittests", 918 ":ui_base_unittests",
911 "//chrome:resources", 919 "//chrome:resources",
912 ] 920 ]
913 } 921 }
914 } 922 }
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_aura.cc ('k') | ui/base/ui_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698