Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit 90cd7f0

Browse files
author
Dominik Röttsches
committed
Merge pull request #7 from rakuco/cameo_webview_proto
Taking Kubo's commits, thx.
2 parents fa56709 + 84749f5 commit 90cd7f0

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

build/build_config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
// Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
3434
#if !defined(TOOLKIT_VIEWS)
3535
#define TOOLKIT_GTK
36+
#define TOOLKIT_EFL
3637
#endif
3738
#elif defined(_WIN32)
3839
#define OS_WIN 1

build/common.gypi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@
133133

134134
# Set toolkit_uses_gtk for the Chromium browser on Linux.
135135
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
136+
'toolkit_uses_efl%': 1,
136137
'toolkit_uses_gtk%': 1,
137138
}, {
139+
'toolkit_uses_efl%': 0,
138140
'toolkit_uses_gtk%': 0,
139141
}],
140142

@@ -175,6 +177,7 @@
175177
'host_arch%': '<(host_arch)',
176178
'target_arch%': '<(target_arch)',
177179
'toolkit_views%': '<(toolkit_views)',
180+
'toolkit_uses_efl%': '<(toolkit_uses_efl)',
178181
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
179182
'use_aura%': '<(use_aura)',
180183
'use_ash%': '<(use_ash)',
@@ -702,6 +705,7 @@
702705
'os_posix%': '<(os_posix)',
703706
'use_glib%': '<(use_glib)',
704707
'use_messagepump_linux%': '<(use_messagepump_linux)',
708+
'toolkit_uses_efl%': '<(toolkit_uses_efl)',
705709
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
706710
'use_x11%': '<(use_x11)',
707711
'use_gnome_keyring%': '<(use_gnome_keyring)',

content/content_browser.gypi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,6 +1156,15 @@
11561156
'../dbus/dbus.gyp:dbus',
11571157
],
11581158
}],
1159+
['toolkit_uses_efl == 1', {
1160+
'dependencies': [
1161+
'../build/linux/system.gyp:efl',
1162+
],
1163+
'sources/': [
1164+
['exclude', 'browser/web_contents/web_contents_view_gtk.cc'],
1165+
['exclude', 'browser/web_contents/web_contents_view_gtk.h'],
1166+
]
1167+
}],
11591168
['OS=="linux"', {
11601169
'dependencies': [
11611170
'../build/linux/system.gyp:udev',

0 commit comments

Comments
 (0)