| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/pepper_broker_infobar_delegate.h" | 5 #include "chrome/browser/pepper_broker_infobar_delegate.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/content_settings/host_content_settings_map.h" | |
| 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 10 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
| 11 #include "chrome/browser/plugins/plugin_finder.h" | 10 #include "chrome/browser/plugins/plugin_finder.h" |
| 12 #include "chrome/browser/plugins/plugin_metadata.h" | 11 #include "chrome/browser/plugins/plugin_metadata.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/grit/generated_resources.h" | 14 #include "chrome/grit/generated_resources.h" |
| 15 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 16 #include "components/infobars/core/infobar.h" | 16 #include "components/infobars/core/infobar.h" |
| 17 #include "content/public/browser/page_navigator.h" | 17 #include "content/public/browser/page_navigator.h" |
| 18 #include "content/public/browser/plugin_service.h" | 18 #include "content/public/browser/plugin_service.h" |
| 19 #include "content/public/browser/user_metrics.h" | 19 #include "content/public/browser/user_metrics.h" |
| 20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 21 #include "content/public/common/referrer.h" | 21 #include "content/public/common/referrer.h" |
| 22 #include "content/public/common/webplugininfo.h" | 22 #include "content/public/common/webplugininfo.h" |
| 23 #include "grit/components_strings.h" | 23 #include "grit/components_strings.h" |
| 24 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
| 25 #include "net/base/net_util.h" | 25 #include "net/base/net_util.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny")); | 147 base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny")); |
| 148 callback_.Run(result); | 148 callback_.Run(result); |
| 149 callback_ = base::Callback<void(bool)>(); | 149 callback_ = base::Callback<void(bool)>(); |
| 150 content_settings_->SetContentSetting( | 150 content_settings_->SetContentSetting( |
| 151 ContentSettingsPattern::FromURLNoWildcard(url_), | 151 ContentSettingsPattern::FromURLNoWildcard(url_), |
| 152 ContentSettingsPattern::Wildcard(), | 152 ContentSettingsPattern::Wildcard(), |
| 153 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, | 153 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, |
| 154 std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK); | 154 std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK); |
| 155 tab_content_settings_->SetPepperBrokerAllowed(result); | 155 tab_content_settings_->SetPepperBrokerAllowed(result); |
| 156 } | 156 } |
| OLD | NEW |