summaryrefslogtreecommitdiffstats
path: root/media/video/capture/win/video_capture_device_win.h
diff options
context:
space:
mode:
authorvrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 00:55:43 +0000
committervrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 00:55:43 +0000
commitd95595eb5145e310baf692f359f9488faf73750d (patch)
tree41e2e610d8c3856acf1f747891509dcd12abbd65 /media/video/capture/win/video_capture_device_win.h
parentb3c1b3b66d1c720172e731d1bfc44cfb44c992a3 (diff)
downloadchromium_src-d95595eb5145e310baf692f359f9488faf73750d.zip
chromium_src-d95595eb5145e310baf692f359f9488faf73750d.tar.gz
chromium_src-d95595eb5145e310baf692f359f9488faf73750d.tar.bz2
Revert 247164 "Implement browser-side logging to WebRtc log"
Need to revert this because it's causing crashes on Canary. BUG=338848 > Implement browser-side logging to WebRtc log > > This adds a logging callback to RenderProcessHost and also adds logging > for device enumeration in the browser process. > > BUG=332261 > > Review URL: https://codereview.chromium.org/140843007 TBR=vrk@chromium.org Review URL: https://codereview.chromium.org/132233058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/capture/win/video_capture_device_win.h')
-rw-r--r--media/video/capture/win/video_capture_device_win.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h
index 8c9e546..164c01c 100644
--- a/media/video/capture/win/video_capture_device_win.h
+++ b/media/video/capture/win/video_capture_device_win.h
@@ -59,7 +59,7 @@ class VideoCaptureDeviceWin
virtual void FrameReceived(const uint8* buffer, int length);
bool CreateCapabilityMap();
- void SetErrorState(const std::string& reason);
+ void SetErrorState(const char* reason);
Name device_name_;
InternalState state_;