chrome/browser/media/media_stream_capture_indicator.cc - Issue 13409003: Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

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/media/media_stream_capture_indicator.cc

Issue 13409003: Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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

« android_webview/browser/aw_content_browser_client.cc ('K') | « chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc ('k') | chrome/browser/metrics/metrics_log.cc » ('j') | components/autofill/browser/autofill_country.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_capture_indicator.cc

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

--- chrome/browser/media/media_stream_capture_indicator.cc (revision 192091)

+++ chrome/browser/media/media_stream_capture_indicator.cc (working copy)

@@ -8,6 +8,7 @@

#include "base/i18n/rtl.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

+#include "base/prefs/pref_service.h"

#include "base/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/browser_process.h"

@@ -19,6 +20,7 @@

#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/browser/ui/screen_capture_notification_ui.h"

#include "chrome/common/extensions/api/icons/icons_handler.h"

+#include "chrome/common/pref_names.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/content_browser_client.h"

#include "content/public/browser/invalidate_type.h"

@@ -94,9 +96,10 @@

tab_title = GetSecurityOrigin(web_contents);

} else {

// If the page's title matches its URL, use its security originator.

+ Profile* profile =

+ Profile::FromBrowserContext(web_contents->GetBrowserContext());

std::string languages =

- content::GetContentClient()->browser()->GetAcceptLangs(

- web_contents->GetBrowserContext());

+ profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

if (tab_title == net::FormatUrl(web_contents->GetURL(), languages))

tab_title = GetSecurityOrigin(web_contents);

}