Update to Chromium revision 198276.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1249 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-05-07 21:48:34 +00:00
parent 1cd4c79994
commit 2801cfd5b1
27 changed files with 148 additions and 161 deletions

View File

@ -1750,7 +1750,7 @@ void CefBrowserHostImpl::RequestMediaAccessPermission(
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kEnableMediaStream)) {
// Cancel the request.
callback.Run(devices);
callback.Run(devices, scoped_ptr<content::MediaStreamUI>());
return;
}
@ -1783,7 +1783,7 @@ void CefBrowserHostImpl::RequestMediaAccessPermission(
}
}
callback.Run(devices);
callback.Run(devices, scoped_ptr<content::MediaStreamUI>());
}