| Index: chrome/browser/ui/tab_contents/tab_contents.cc
|
| diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
|
| index 7c2326a004ae5a909441f8a5babb369f8b1fc10b..c4bf323eb225e95b57b3939db1ba88882a85f41f 100644
|
| --- a/chrome/browser/ui/tab_contents/tab_contents.cc
|
| +++ b/chrome/browser/ui/tab_contents/tab_contents.cc
|
| @@ -208,18 +208,29 @@ TabContents* TabContents::Clone() {
|
| // static deprecated
|
| TabContents* TabContents::GetCurrentWrapperForContents(
|
| WebContents* contents) {
|
| - return GetOwningTabContentsForWebContents(contents);
|
| + return FromWebContents(contents);
|
| }
|
|
|
| // static deprecated
|
| const TabContents* TabContents::GetCurrentWrapperForContents(
|
| const WebContents* contents) {
|
| - return GetOwningTabContentsForWebContents(contents);
|
| + return FromWebContents(contents);
|
| }
|
|
|
| -// static
|
| +// static deprecated
|
| TabContents* TabContents::GetOwningTabContentsForWebContents(
|
| WebContents* contents) {
|
| + return FromWebContents(contents);
|
| +}
|
| +
|
| +// static deprecated
|
| +const TabContents* TabContents::GetOwningTabContentsForWebContents(
|
| + const WebContents* contents) {
|
| + return FromWebContents(contents);
|
| +}
|
| +
|
| +// static
|
| +TabContents* TabContents::FromWebContents(WebContents* contents) {
|
| TabContents** tab_contents =
|
| property_accessor()->GetProperty(contents->GetPropertyBag());
|
|
|
| @@ -227,8 +238,7 @@ TabContents* TabContents::GetOwningTabContentsForWebContents(
|
| }
|
|
|
| // static
|
| -const TabContents* TabContents::GetOwningTabContentsForWebContents(
|
| - const WebContents* contents) {
|
| +const TabContents* TabContents::FromWebContents(const WebContents* contents) {
|
| TabContents* const* tab_contents =
|
| property_accessor()->GetProperty(contents->GetPropertyBag());
|
|
|
|
|