chrome/browser/chrome_content_browser_client.cc - Issue 9845033: Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9845033: Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix dcheck Created 8 years, 9 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/chrome_content_browser_client.cc

===================================================================

--- chrome/browser/chrome_content_browser_client.cc (revision 128803)

+++ chrome/browser/chrome_content_browser_client.cc (working copy)

@@ -36,6 +36,7 @@

#include "chrome/browser/geolocation/chrome_access_token_store.h"

#include "chrome/browser/google/google_util.h"

#include "chrome/browser/infobars/infobar_tab_helper.h"

+#include "chrome/browser/media/media_internals.h"

#include "chrome/browser/net/chrome_net_log.h"

#include "chrome/browser/notifications/desktop_notification_service.h"

#include "chrome/browser/notifications/desktop_notification_service_factory.h"

@@ -1162,6 +1163,10 @@

#endif // TOOLKIT_VIEWS || OS_LINUX

}

+content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {

+ return MediaInternals::GetInstance();

void ChromeContentBrowserClient::RequestDesktopNotificationPermission(

const GURL& source_origin,

int callback_context,

« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/io_thread.h » ('j') | no next file with comments »