| Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
|
| index a5906ad03819007aa370f52136d29bcf07b0ed31..688b2a336f66430da51722825bb0c77f5ea38f31 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
|
| @@ -18,7 +18,7 @@
|
| #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
|
| #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
|
| #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
|
| -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "net/base/net_util.h"
|
| @@ -197,8 +197,7 @@ bool ContentSettingDecoration::UpdateFromWebContents(
|
|
|
| // Check if the animation has already run.
|
| TabSpecificContentSettings* content_settings =
|
| - TabContentsWrapper::GetCurrentWrapperForContents(web_contents)->
|
| - content_settings();
|
| + TabContents::FromWebContents(web_contents)->content_settings();
|
| ContentSettingsType content_type =
|
| content_setting_image_model_->get_content_settings_type();
|
| bool ran_animation = content_settings->IsBlockageIndicated(content_type);
|
| @@ -263,7 +262,7 @@ bool ContentSettingDecoration::AcceptsMousePress() {
|
| bool ContentSettingDecoration::OnMousePressed(NSRect frame) {
|
| // Get host. This should be shared on linux/win/osx medium-term.
|
| Browser* browser = browser::GetLastActiveBrowser();
|
| - TabContentsWrapper* tabContents = browser->GetSelectedTabContentsWrapper();
|
| + TabContents* tabContents = browser->GetActiveTabContents();
|
| if (!tabContents)
|
| return true;
|
|
|
|
|