diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:55:30 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 22:55:30 +0000 |
commit | 627e05130fa2d98498dbd19fdcae4a173801d797 (patch) | |
tree | 6ab91bc7d842c689a509e897a09c5a789798ac17 /chrome/browser/sidebar | |
parent | 632197304ce0bb8fa5cd8931fe90c3c19cdeeab8 (diff) | |
download | chromium_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/sidebar')
-rw-r--r-- | chrome/browser/sidebar/sidebar_container.cc | 4 | ||||
-rw-r--r-- | chrome/browser/sidebar/sidebar_manager.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/sidebar/sidebar_container.cc b/chrome/browser/sidebar/sidebar_container.cc index 17b83c4..ec8ba22 100644 --- a/chrome/browser/sidebar/sidebar_container.cc +++ b/chrome/browser/sidebar/sidebar_container.cc @@ -31,7 +31,7 @@ SidebarContainer::SidebarContainer(TabContents* tab, use_default_icon_(true) { // Create TabContents for sidebar. sidebar_contents_.reset( - new TabContents(Profile::FromBrowserContext(tab->browser_context()), + new TabContents(Profile::FromBrowserContext(tab->GetBrowserContext()), NULL, MSG_ROUTING_NONE, NULL, NULL)); sidebar_contents_->SetDelegate(this); } @@ -123,7 +123,7 @@ void SidebarContainer::OnImageLoaded(SkBitmap* image, const Extension* SidebarContainer::GetExtension() const { Profile* profile = - Profile::FromBrowserContext(sidebar_contents_->browser_context()); + Profile::FromBrowserContext(sidebar_contents_->GetBrowserContext()); ExtensionService* service = profile->GetExtensionService(); if (!service) return NULL; diff --git a/chrome/browser/sidebar/sidebar_manager.cc b/chrome/browser/sidebar/sidebar_manager.cc index dc1d04d..caf9e8e 100644 --- a/chrome/browser/sidebar/sidebar_manager.cc +++ b/chrome/browser/sidebar/sidebar_manager.cc @@ -88,7 +88,7 @@ void SidebarManager::NotifyStateChanges( if (was_active_host != NULL) { Profile* profile = Profile::FromBrowserContext( - was_active_sidebar_contents->browser_context()); + was_active_sidebar_contents->GetBrowserContext()); ExtensionSidebarEventRouter::OnStateChanged( profile, was_active_host->tab_contents(), @@ -98,7 +98,7 @@ void SidebarManager::NotifyStateChanges( if (active_host != NULL) { Profile* profile = Profile::FromBrowserContext( - active_sidebar_contents->browser_context()); + active_sidebar_contents->GetBrowserContext()); ExtensionSidebarEventRouter::OnStateChanged( profile, active_host->tab_contents(), @@ -121,7 +121,7 @@ void SidebarManager::ShowSidebar(TabContents* tab, host->Show(); - Profile* profile = Profile::FromBrowserContext(tab->browser_context()); + Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext()); ExtensionSidebarEventRouter::OnStateChanged( profile, tab, content_id, extension_sidebar_constants::kShownState); @@ -179,7 +179,7 @@ void SidebarManager::HideSidebar(TabContents* tab, UnregisterSidebarContainerFor(tab, content_id); - Profile* profile = Profile::FromBrowserContext(tab->browser_context()); + Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext()); ExtensionSidebarEventRouter::OnStateChanged( profile, tab, content_id, extension_sidebar_constants::kHiddenState); |