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

Side by Side Diff: chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc

Issue 8603015: Get rid of a bunch of view_messages.h includes from chrome by making the TabContentsObserver inte... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix linux and try to fix mac again Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 5 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 10 matching lines...) Expand all
21 all_contents_blocked_(false), 21 all_contents_blocked_(false),
22 tab_contents_wrapper_(tab_contents), 22 tab_contents_wrapper_(tab_contents),
23 delegate_(NULL) { 23 delegate_(NULL) {
24 } 24 }
25 25
26 BlockedContentTabHelper::~BlockedContentTabHelper() { 26 BlockedContentTabHelper::~BlockedContentTabHelper() {
27 } 27 }
28 28
29 void BlockedContentTabHelper::DidNavigateMainFrame( 29 void BlockedContentTabHelper::DidNavigateMainFrame(
30 const content::LoadCommittedDetails& details, 30 const content::LoadCommittedDetails& details,
31 const ViewHostMsg_FrameNavigate_Params& params) { 31 const content::FrameNavigateParams& params) {
32 // Clear all page actions, blocked content notifications and browser actions 32 // Clear all page actions, blocked content notifications and browser actions
33 // for this tab, unless this is an in-page navigation. 33 // for this tab, unless this is an in-page navigation.
34 if (!details.is_in_page) { 34 if (!details.is_in_page) {
35 // Close blocked popups. 35 // Close blocked popups.
36 if (blocked_contents_->GetBlockedContentsCount()) { 36 if (blocked_contents_->GetBlockedContentsCount()) {
37 blocked_contents_->Clear(); 37 blocked_contents_->Clear();
38 PopupNotificationVisibilityChanged(false); 38 PopupNotificationVisibilityChanged(false);
39 } 39 }
40 } 40 }
41 } 41 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 } 115 }
116 116
117 size_t BlockedContentTabHelper::GetBlockedContentsCount() const { 117 size_t BlockedContentTabHelper::GetBlockedContentsCount() const {
118 return blocked_contents_->GetBlockedContentsCount(); 118 return blocked_contents_->GetBlockedContentsCount();
119 } 119 }
120 120
121 void BlockedContentTabHelper::GetBlockedContents( 121 void BlockedContentTabHelper::GetBlockedContents(
122 std::vector<TabContentsWrapper*>* blocked_contents) const { 122 std::vector<TabContentsWrapper*>* blocked_contents) const {
123 blocked_contents_->GetBlockedContents(blocked_contents); 123 blocked_contents_->GetBlockedContents(blocked_contents);
124 } 124 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/blocked_content_tab_helper.h ('k') | chrome/browser/ui/bookmarks/bookmark_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698