chrome/browser/pepper_broker_infobar_delegate.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 | Annotate | Revision Log

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 "chrome/browser/api/infobars/infobar_service.h"	8 #include "chrome/browser/api/infobars/infobar_service.h"

8 #include "chrome/browser/content_settings/host_content_settings_map.h"	9 #include "chrome/browser/content_settings/host_content_settings_map.h"

9 #include "chrome/browser/plugins/plugin_finder.h"	10 #include "chrome/browser/plugins/plugin_finder.h"

10 #include "chrome/browser/plugins/plugin_metadata.h"	11 #include "chrome/browser/plugins/plugin_metadata.h"

11 #include "chrome/browser/prefs/pref_service.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

14 #include "content/public/browser/page_navigator.h"	14 #include "content/public/browser/page_navigator.h"

15 #include "content/public/browser/plugin_service.h"	15 #include "content/public/browser/plugin_service.h"

16 #include "content/public/browser/user_metrics.h"	16 #include "content/public/browser/user_metrics.h"

17 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

18 #include "content/public/common/referrer.h"	18 #include "content/public/common/referrer.h"

19 #include "grit/generated_resources.h"	19 #include "grit/generated_resources.h"

20 #include "grit/theme_resources.h"	20 #include "grit/theme_resources.h"

21 #include "net/base/net_util.h"	21 #include "net/base/net_util.h"

(...skipping 147 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 content::UserMetricsAction("PPAPI.BrokerInfobarClickedAllow") :	169 content::UserMetricsAction("PPAPI.BrokerInfobarClickedAllow") :

170 content::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));	170 content::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));

171 callback_.Run(result);	171 callback_.Run(result);

172 callback_ = base::Callback<void(bool)>();	172 callback_ = base::Callback<void(bool)>();

173 content_settings_->SetContentSetting(	173 content_settings_->SetContentSetting(

174 ContentSettingsPattern::FromURLNoWildcard(url_),	174 ContentSettingsPattern::FromURLNoWildcard(url_),

175 ContentSettingsPattern::Wildcard(),	175 ContentSettingsPattern::Wildcard(),

176 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,	176 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,

177 std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);	177 std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);

178 }	178 }

OLD	NEW