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

Side by Side Diff: chrome/browser/pepper_broker_infobar_delegate.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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
OLDNEW
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"
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 7 #include "chrome/browser/content_settings/host_content_settings_map_factory.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"
16 #include "components/content_settings/core/browser/host_content_settings_map.h" 15 #include "components/content_settings/core/browser/host_content_settings_map.h"
17 #include "components/infobars/core/infobar.h" 16 #include "components/infobars/core/infobar.h"
17 #include "components/prefs/pref_service.h"
18 #include "components/url_formatter/elide_url.h" 18 #include "components/url_formatter/elide_url.h"
19 #include "content/public/browser/page_navigator.h" 19 #include "content/public/browser/page_navigator.h"
20 #include "content/public/browser/plugin_service.h" 20 #include "content/public/browser/plugin_service.h"
21 #include "content/public/browser/user_metrics.h" 21 #include "content/public/browser/user_metrics.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "content/public/common/referrer.h" 23 #include "content/public/common/referrer.h"
24 #include "content/public/common/webplugininfo.h" 24 #include "content/public/common/webplugininfo.h"
25 #include "grit/components_strings.h" 25 #include "grit/components_strings.h"
26 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny")); 145 base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));
146 callback_.Run(result); 146 callback_.Run(result);
147 callback_ = base::Callback<void(bool)>(); 147 callback_ = base::Callback<void(bool)>();
148 content_settings_->SetContentSetting( 148 content_settings_->SetContentSetting(
149 ContentSettingsPattern::FromURLNoWildcard(url_), 149 ContentSettingsPattern::FromURLNoWildcard(url_),
150 ContentSettingsPattern::Wildcard(), 150 ContentSettingsPattern::Wildcard(),
151 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, 151 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
152 std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK); 152 std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
153 tab_content_settings_->SetPepperBrokerAllowed(result); 153 tab_content_settings_->SetPepperBrokerAllowed(result);
154 } 154 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698