summaryrefslogtreecommitdiff
path: root/chromium/ui/chromeos
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 13:42:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:27:51 +0000
commit8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch)
treed29d987c4d7b173cf853279b79a51598f104b403 /chromium/ui/chromeos
parent830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff)
downloadqtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/ui/chromeos')
-rw-r--r--chromium/ui/chromeos/BUILD.gn8
-rw-r--r--chromium/ui/chromeos/search_box/BUILD.gn24
2 files changed, 24 insertions, 8 deletions
diff --git a/chromium/ui/chromeos/BUILD.gn b/chromium/ui/chromeos/BUILD.gn
index 8ef1bca5769..c15c784e377 100644
--- a/chromium/ui/chromeos/BUILD.gn
+++ b/chromium/ui/chromeos/BUILD.gn
@@ -9,8 +9,6 @@ assert(is_chromeos)
component("chromeos") {
output_name = "ui_chromeos"
sources = [
- "accelerometer/accelerometer_util.cc",
- "accelerometer/accelerometer_util.h",
"devicetype_utils.cc",
"devicetype_utils.h",
"ime/candidate_view.cc",
@@ -26,10 +24,6 @@ component("chromeos") {
"ime/input_method_menu_manager.h",
"ime/mode_indicator_view.cc",
"ime/mode_indicator_view.h",
- "touch_accessibility_enabler.cc",
- "touch_accessibility_enabler.h",
- "touch_exploration_controller.cc",
- "touch_exploration_controller.h",
"user_activity_power_manager_notifier.cc",
"user_activity_power_manager_notifier.h",
]
@@ -70,8 +64,6 @@ test("ui_chromeos_unittests") {
"ime/input_method_menu_item_unittest.cc",
"ime/input_method_menu_manager_unittest.cc",
"run_all_unittests.cc",
- "touch_accessibility_enabler_unittest.cc",
- "touch_exploration_controller_unittest.cc",
]
deps = [
":chromeos",
diff --git a/chromium/ui/chromeos/search_box/BUILD.gn b/chromium/ui/chromeos/search_box/BUILD.gn
new file mode 100644
index 00000000000..826cad941df
--- /dev/null
+++ b/chromium/ui/chromeos/search_box/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("search_box") {
+ sources = [
+ "search_box_constants.h",
+ "search_box_view_base.cc",
+ "search_box_view_base.h",
+ "search_box_view_delegate.h",
+ ]
+
+ defines = [ "SEARCH_BOX_IMPLEMENTATION" ]
+
+ deps = [
+ "//base",
+ "//skia",
+ "//ui/base",
+ "//ui/base/ime",
+ "//ui/events",
+ "//ui/strings",
+ "//ui/views",
+ ]
+}