diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 10:01:03 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 10:01:03 +0000 |
| commit | f36871d4b4fc1dd0762080a942fa7a6610c62652 (patch) | |
| tree | c7d22ae3b11c99a21e36836946545b6071f1b5f4 /chrome/browser/media | |
| parent | caf2d44beb7b64ba7b9278e5722659ad104921e9 (diff) | |
| download | chromium_src-f36871d4b4fc1dd0762080a942fa7a6610c62652.zip chromium_src-f36871d4b4fc1dd0762080a942fa7a6610c62652.tar.gz chromium_src-f36871d4b4fc1dd0762080a942fa7a6610c62652.tar.bz2 | |
Simple fix for a crash after last night's checkin. When |tab_content| was NULL we tried to return NULL as string16, which string16 does not like.
TBR=xians
Review URL: https://chromiumcodereview.appspot.com/10384002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media')
| -rw-r--r-- | chrome/browser/media/media_stream_capture_indicator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index 64cc0c9..9332e26 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -294,7 +294,7 @@ string16 MediaStreamCaptureIndicator::GetTitle(int render_process_id, WebContents* tab_content = tab_util::GetWebContentsByID( render_process_id, render_view_id); if (!tab_content) - return NULL; + return string16(); string16 tab_title = tab_content->GetTitle(); if (tab_title.empty()) { |