diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 00:25:07 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 00:25:07 +0000 |
| commit | 950f9ce2cda8b1599b086b2069f5fae5baeb4f7b (patch) | |
| tree | 1fb1948df91bc3c3371bd96d18db8d07ed4d5e53 /content/renderer | |
| parent | 55ba78fbae8f226be8b5c02714ce702e871f8e10 (diff) | |
| download | chromium_src-950f9ce2cda8b1599b086b2069f5fae5baeb4f7b.zip chromium_src-950f9ce2cda8b1599b086b2069f5fae5baeb4f7b.tar.gz chromium_src-950f9ce2cda8b1599b086b2069f5fae5baeb4f7b.tar.bz2 | |
Fix for downstream webview build
Follow up to https://codereview.chromium.org/11638036/ - webrtc is not
used so need to include these files conditionally.
BUG=
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11679006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 9697944..ab837eb 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -91,7 +91,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/webrtc/system_wrappers/interface/event_tracer.h" #include "ui/base/layout.h" #include "ui/base/ui_base_switches.h" #include "v8/include/v8.h" @@ -111,6 +110,10 @@ #include "ipc/ipc_channel_posix.h" #endif +#if defined(ENABLE_WEBRTC) +#include "third_party/webrtc/system_wrappers/interface/event_tracer.h" +#endif + using WebKit::WebDocument; using WebKit::WebFrame; using WebKit::WebNetworkStateNotifier; @@ -194,6 +197,7 @@ void AddHistogramSample(void* hist, int sample) { histogram->Add(sample); } +#if defined(ENABLE_WEBRTC) const unsigned char* GetCategoryEnabled(const char* name) { return TRACE_EVENT_API_GET_CATEGORY_ENABLED(name); } @@ -210,6 +214,7 @@ void AddTraceEvent(char phase, TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, num_args, arg_names, arg_types, arg_values, flags); } +#endif } // namespace |