summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing/print_view_manager_base.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 22:37:22 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 22:37:22 +0000
commit1efbb84347e9c7f030c5ae752c285da80d1b836a (patch)
tree05a57f4331fac337a71d283b6d32889bb743367c /chrome/browser/printing/print_view_manager_base.cc
parent3627aa3fa39aef7cbcc3dfd67b51e8fb9efa68c5 (diff)
downloadchromium_src-1efbb84347e9c7f030c5ae752c285da80d1b836a.zip
chromium_src-1efbb84347e9c7f030c5ae752c285da80d1b836a.tar.gz
chromium_src-1efbb84347e9c7f030c5ae752c285da80d1b836a.tar.bz2
Remove the concept of blocked contents.
Now that the popup blocker doesn't hide the WebContents but disables creating one in the first place, we don't need the concept anymore. Instant also used blocked contents. However, this is no longer used according to the instant team (and there are no tests...) BUG=290054 R=jam@chromium.org,samarth@chromium.org,cdn@chromium.org Review URL: https://chromiumcodereview.appspot.com/23729007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_view_manager_base.cc')
-rw-r--r--chrome/browser/printing/print_view_manager_base.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index 5479409..ba65acd 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -57,13 +57,10 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
number_pages_(0),
printing_succeeded_(false),
inside_inner_message_loop_(false),
- cookie_(0),
- tab_content_blocked_(false) {
+ cookie_(0) {
#if defined(OS_POSIX) && !defined(OS_MACOSX)
expecting_first_page_ = true;
#endif
- registrar_.Add(this, chrome::NOTIFICATION_CONTENT_BLOCKED_STATE_CHANGED,
- content::Source<content::WebContents>(web_contents));
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
printing_enabled_.Init(
@@ -85,7 +82,7 @@ bool PrintViewManagerBase::PrintNow() {
void PrintViewManagerBase::UpdateScriptedPrintingBlocked() {
Send(new PrintMsg_SetScriptedPrintingBlocked(
routing_id(),
- !printing_enabled_.GetValue() || tab_content_blocked_));
+ !printing_enabled_.GetValue()));
}
void PrintViewManagerBase::NavigationStopped() {
@@ -241,11 +238,6 @@ void PrintViewManagerBase::Observe(
OnNotifyPrintJobEvent(*content::Details<JobEventDetails>(details).ptr());
break;
}
- case chrome::NOTIFICATION_CONTENT_BLOCKED_STATE_CHANGED: {
- tab_content_blocked_ = *content::Details<const bool>(details).ptr();
- UpdateScriptedPrintingBlocked();
- break;
- }
default: {
NOTREACHED();
break;