diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 23:39:54 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 23:39:54 +0000 |
| commit | 1201dd0fcf84829c1098d1a9510e2b6fcba4125e (patch) | |
| tree | ab7bd462a9df2366a9b3de5dda1f5c100638dd59 /build | |
| parent | 43f8df45a704cc6a1fa6976baf4d1a139dc75e46 (diff) | |
| download | chromium_src-1201dd0fcf84829c1098d1a9510e2b6fcba4125e.zip chromium_src-1201dd0fcf84829c1098d1a9510e2b6fcba4125e.tar.gz chromium_src-1201dd0fcf84829c1098d1a9510e2b6fcba4125e.tar.bz2 | |
Change MessagePumpLinux to MessagePumpOzone
BUG=178543
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/14624010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 5 | ||||
| -rw-r--r-- | build/common.gypi | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/build/build_config.h b/build/build_config.h index 3ee3de5..fef6be5 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -68,11 +68,6 @@ #define OS_POSIX 1 #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ - !defined(OS_NACL) && !defined(USE_MESSAGEPUMP_LINUX) -#define USE_X11 1 // Use X for graphics. -#endif - // Use tcmalloc #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) #define USE_TCMALLOC 1 diff --git a/build/common.gypi b/build/common.gypi index cf259c3..60321e2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -27,9 +27,6 @@ # Whether or not we are building the Ash shell. 'use_ash%': 0, - # Whether or not we are using the embedded messagepump. - 'use_messagepump_linux%': 0, - # Use a raw surface abstraction. 'use_ozone%': 0, }, @@ -39,9 +36,6 @@ 'use_ash%': '<(use_ash)', 'use_ozone%': '<(use_ozone)', - # Whether or not we are using the /dev/input/event* message pump. - 'use_messagepump_linux%': '<(use_messagepump_linux)', - # Whether we are using Views Toolkit 'toolkit_views%': 0, @@ -101,7 +95,6 @@ 'chromeos%': '<(chromeos)', 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', - 'use_messagepump_linux%': '<(use_messagepump_linux)', 'use_ozone%': '<(use_ozone)', 'use_openssl%': '<(use_openssl)', 'enable_viewport%': '<(enable_viewport)', @@ -140,7 +133,7 @@ }], # Set toolkit_uses_gtk for the Chromium browser on Linux. - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_messagepump_linux==0', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0', { 'toolkit_uses_gtk%': 1, }, { 'toolkit_uses_gtk%': 0, @@ -186,7 +179,6 @@ 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', - 'use_messagepump_linux%': '<(use_messagepump_linux)', 'use_ozone%': '<(use_ozone)', 'use_openssl%': '<(use_openssl)', 'enable_viewport%': '<(enable_viewport)', @@ -450,7 +442,7 @@ }], # Flags to use X11 on non-Mac POSIX platforms. - ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_messagepump_linux==1', { + ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 'use_x11%': 0, }, { 'use_x11%': 1, @@ -724,7 +716,6 @@ 'os_bsd%': '<(os_bsd)', 'os_posix%': '<(os_posix)', 'use_glib%': '<(use_glib)', - 'use_messagepump_linux%': '<(use_messagepump_linux)', 'use_ozone%': '<(use_ozone)', 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 'use_x11%': '<(use_x11)', @@ -1863,9 +1854,6 @@ ['use_ash==1', { 'defines': ['USE_ASH=1'], }], - ['use_messagepump_linux==1', { - 'defines': ['USE_MESSAGEPUMP_LINUX=1'], - }], ['use_ozone==1', { 'defines': ['USE_OZONE=1'], }], |