summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-10-21 23:36:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-22 06:37:09 +0000
commit5ff98192081303f53baa0a07601f3f679572774f (patch)
tree6eaa7552c53716dae564a12ed8759330c9ea95aa /ui
parent43d826bb5fa1d218b6f56da410137b387df970ee (diff)
downloadchromium_src-5ff98192081303f53baa0a07601f3f679572774f.zip
chromium_src-5ff98192081303f53baa0a07601f3f679572774f.tar.gz
chromium_src-5ff98192081303f53baa0a07601f3f679572774f.tar.bz2
Make unit_tests compile in Mac GN
Adds mac app_shim targets. Removed a bunch of links from the root BUILD.gn to random targets. These are all pulled in organically now. Adds crashpad build. Switches components/crash to using it. Enables content_browsertests, content_perftests, and content_gl_benchmark which now compile. Add newline to end of keyboard_content_util.cc. libexif is now a loadable module like in GYP (unit_tests wouldn't load without this). A few conditions I added checks for mac_views_browser. These are based on how I think it should work, the mac views build doesn't work in GN yet. BUG=512600 Review URL: https://codereview.chromium.org/1417673004 Cr-Commit-Position: refs/heads/master@{#355500}
Diffstat (limited to 'ui')
-rw-r--r--ui/keyboard/content/keyboard_content_util.cc2
-rw-r--r--ui/views/controls/webview/BUILD.gn2
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/keyboard/content/keyboard_content_util.cc b/ui/keyboard/content/keyboard_content_util.cc
index 48bb08a..12d9970a1 100644
--- a/ui/keyboard/content/keyboard_content_util.cc
+++ b/ui/keyboard/content/keyboard_content_util.cc
@@ -105,4 +105,4 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
return kKeyboardResources;
}
-} // namespace keyboard \ No newline at end of file
+} // namespace keyboard
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
index 9ad4b60..2c16f50 100644
--- a/ui/views/controls/webview/BUILD.gn
+++ b/ui/views/controls/webview/BUILD.gn
@@ -6,6 +6,7 @@ component("webview") {
sources = [
"unhandled_keyboard_event_handler.cc",
"unhandled_keyboard_event_handler.h",
+ "unhandled_keyboard_event_handler_mac.mm",
"unhandled_keyboard_event_handler_win.cc",
"web_dialog_view.cc",
"web_dialog_view.h",
@@ -33,7 +34,6 @@ component("webview") {
public_deps = [
"//base",
"//content/public/browser",
- "//ui/aura",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/views",