summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_content_browser_client.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 22:55:30 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-21 22:55:30 +0000
commit627e05130fa2d98498dbd19fdcae4a173801d797 (patch)
tree6ab91bc7d842c689a509e897a09c5a789798ac17 /chrome/browser/chrome_content_browser_client.cc
parent632197304ce0bb8fa5cd8931fe90c3c19cdeeab8 (diff)
downloadchromium_src-627e05130fa2d98498dbd19fdcae4a173801d797.zip
chromium_src-627e05130fa2d98498dbd19fdcae4a173801d797.tar.gz
chromium_src-627e05130fa2d98498dbd19fdcae4a173801d797.tar.bz2
Rename TabContents::browser_context() to GetBrowserContext and put it into the WebContents interface.
BUG=98716 Review URL: http://codereview.chromium.org/9021022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
-rw-r--r--chrome/browser/chrome_content_browser_client.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 7269b0a..7127cc9 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -896,7 +896,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
}
prerender::PrerenderManager* prerender_manager =
prerender::PrerenderManagerFactory::GetForProfile(
- Profile::FromBrowserContext(tab->browser_context()));
+ Profile::FromBrowserContext(tab->GetBrowserContext()));
if (prerender_manager && prerender_manager->IsTabContentsPrerendering(tab)) {
if (prerender_manager->prerender_tracker()->TryCancel(
handler->render_process_host_id(),
@@ -929,7 +929,7 @@ void ChromeContentBrowserClient::SelectClientCertificate(
DCHECK(requesting_url.is_valid()) << "Invalid URL string: https://"
<< cert_request_info->host_and_port;
- Profile* profile = Profile::FromBrowserContext(tab->browser_context());
+ Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
DCHECK(profile);
scoped_ptr<Value> filter(
profile->GetHostContentSettingsMap()->GetWebsiteSetting(