diff options
| author | xhwang <xhwang@chromium.org> | 2015-04-23 09:10:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 16:10:31 +0000 |
| commit | 93df4b62af8c312d166bcf7afecb03321924c6fd (patch) | |
| tree | 8bc3a95b454f778f1fb38a519a5a64f7daa1dce8 | |
| parent | b38f53c6d9742117bc607c7f58379b056fdbfbc4 (diff) | |
| download | chromium_src-93df4b62af8c312d166bcf7afecb03321924c6fd.zip chromium_src-93df4b62af8c312d166bcf7afecb03321924c6fd.tar.gz chromium_src-93df4b62af8c312d166bcf7afecb03321924c6fd.tar.bz2 | |
PepperOutputProtectionMessageFilter: Do not add observer if client ID is invalid.
BUG=455941
Review URL: https://codereview.chromium.org/1041483007
Cr-Commit-Position: refs/heads/master@{#326531}
| -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_; } |