diff options
| author | bratell@opera.com <bratell@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 22:03:21 +0000 |
|---|---|---|
| committer | bratell@opera.com <bratell@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 22:03:21 +0000 |
| commit | 7b52ed95f57e6df952bde57039475aa0236f5320 (patch) | |
| tree | 2481fdba12ee7ce3a7c9495dca40440526867081 /content | |
| parent | 96b1ed9b7e92091f1c158e792cecc9452fca6245 (diff) | |
| download | chromium_src-7b52ed95f57e6df952bde57039475aa0236f5320.zip chromium_src-7b52ed95f57e6df952bde57039475aa0236f5320.tar.gz chromium_src-7b52ed95f57e6df952bde57039475aa0236f5320.tar.bz2 | |
Missing OS guard before including android header.
An Android header was unconditionally included. It works as long as the
header doesn't use any Android specific code but it's doomed to
break something eventually.
BUG=None
Review URL: https://codereview.chromium.org/267323008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 4cf4cdc..c01dc5c 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -59,7 +59,6 @@ #include "content/browser/indexed_db/indexed_db_dispatcher_host.h" #include "content/browser/loader/resource_message_filter.h" #include "content/browser/loader/resource_scheduler_filter.h" -#include "content/browser/media/android/browser_demuxer_android.h" #include "content/browser/media/capture/audio_mirroring_manager.h" #include "content/browser/media/media_internals.h" #include "content/browser/message_port_message_filter.h" @@ -150,6 +149,10 @@ #include "webkit/browser/fileapi/sandbox_file_system_backend.h" #include "webkit/common/resource_type.h" +#if defined(OS_ANDROID) +#include "content/browser/media/android/browser_demuxer_android.h" +#endif + #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "content/common/font_cache_dispatcher_win.h" |