Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7004)

Unified Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Issue 10533046: TabContentsWrapper -> TabContents, part 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compiling is good Created 8 years, 6 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
Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index c9d315ebe653de9085b067bfc110b1de78aeb385..49371f148bcd81a2e781445bf97ace6a21bb4fbd 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/content_settings/tab_specific_content_settings.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/browser/ui/views/content_setting_bubble_contents.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "content/public/browser/web_contents.h"
@@ -80,7 +80,7 @@ void ContentSettingImageView::UpdateFromWebContents(WebContents* web_contents) {
TabSpecificContentSettings* content_settings = NULL;
if (web_contents) {
- content_settings = TabContentsWrapper::GetCurrentWrapperForContents(
+ content_settings = TabContents::GetOwningTabContentsForWebContents(
web_contents)->content_settings();
}
if (!content_settings || content_settings->IsBlockageIndicated(
@@ -166,7 +166,7 @@ void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
if (!HitTest(event.location()))
return;
- TabContentsWrapper* tab_contents = parent_->GetTabContentsWrapper();
+ TabContents* tab_contents = parent_->GetTabContents();
if (!tab_contents)
return;
« no previous file with comments | « chrome/browser/ui/views/location_bar/click_handler.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698