Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1542)

Unified Diff: chrome/browser/media/media_stream_capture_indicator.cc

Issue 10407122: Get rid of the last RenderViewHostDelegate usage in chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_capture_indicator.cc
===================================================================
--- chrome/browser/media/media_stream_capture_indicator.cc (revision 138434)
+++ chrome/browser/media/media_stream_capture_indicator.cc (working copy)
@@ -15,8 +15,8 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_view_host_delegate.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -69,16 +69,15 @@
DCHECK(command_id >= IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_FIRST &&
command_id <= IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_LAST);
int index = command_id - IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_FIRST;
- WebContents* tab_content = tab_util::GetWebContentsByID(
+ WebContents* web_content = tab_util::GetWebContentsByID(
tabs_[index].render_process_id, tabs_[index].render_view_id);
- DCHECK(tab_content);
- if (!tab_content || !tab_content->GetRenderViewHost() ||
- !tab_content->GetRenderViewHost()->GetDelegate()) {
+ DCHECK(web_content);
+ if (!web_content) {
NOTREACHED();
return;
}
- tab_content->GetRenderViewHost()->GetDelegate()->Activate();
+ web_content->GetDelegate()->ActivateContents(web_content);
}
void MediaStreamCaptureIndicator::CaptureDevicesOpened(
« no previous file with comments | « chrome/browser/extensions/extension_tabs_module.cc ('k') | chrome/browser/printing/background_printing_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698