diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 20:03:11 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 20:03:11 +0000 |
| commit | e39d622ab74b10bf1414fac5cc708e3f4535f1d4 (patch) | |
| tree | 321d6bea46e0ad82254ab403636bc510b48e9d47 /base/message_loop | |
| parent | 8196c7db377cb05e2a85c4bd04f69e1ab947a7ee (diff) | |
| download | chromium_src-e39d622ab74b10bf1414fac5cc708e3f4535f1d4.zip chromium_src-e39d622ab74b10bf1414fac5cc708e3f4535f1d4.tar.gz chromium_src-e39d622ab74b10bf1414fac5cc708e3f4535f1d4.tar.bz2 | |
ozone: Fix libbase_nacl build after MessagePumpOzone removal
BUG=354062
R=rjkroege@chromium.org, sky@chromium.org
TBR=darin@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/231863010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_loop.cc | 2 | ||||
| -rw-r--r-- | base/message_loop/message_loop.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index d4315c1..5f51fb7 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -680,7 +680,7 @@ void MessageLoopForUI::RemoveObserver(Observer* observer) { } #endif // !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID) -#if defined(USE_OZONE) +#if defined(USE_OZONE) && !defined(OS_NACL) bool MessageLoopForUI::WatchFileDescriptor( int fd, bool persistent, diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index 7222df7..a56de80 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -585,7 +585,7 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop { void RemoveObserver(Observer* observer); #endif -#if defined(USE_OZONE) +#if defined(USE_OZONE) && !defined(OS_NACL) // Please see MessagePumpLibevent for definition. bool WatchFileDescriptor( int fd, |