diff options
| -rw-r--r-- | chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc index 9af20a8..b6d5b6a 100644 --- a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc @@ -170,11 +170,13 @@ PepperOutputProtectionMessageFilter::Delegate::GetClientId() { window_ = rfh->GetNativeView(); if (!window_) return ui::DisplayConfigurator::kInvalidClientId; - window_->AddObserver(this); ui::DisplayConfigurator* configurator = ash::Shell::GetInstance()->display_configurator(); client_id_ = configurator->RegisterContentProtectionClient(); + + if (client_id_ != ui::DisplayConfigurator::kInvalidClientId) + window_->AddObserver(this); } return client_id_; } |