chrome/browser/content_settings/content_settings_policy_provider.cc - Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common.

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/content_settings/content_settings_policy_provider.cc

Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Keeping up to date with trunk. Created 9 years, 3 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

« no previous file with comments | « chrome/browser/content_settings/content_settings_pattern_unittest.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/content_settings/content_settings_policy_provider.h"	5 #include "chrome/browser/content_settings/content_settings_policy_provider.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/json/json_reader.h"	11 #include "base/json/json_reader.h"

12 #include "chrome/browser/content_settings/content_settings_pattern.h"

13 #include "chrome/browser/content_settings/content_settings_utils.h"	12 #include "chrome/browser/content_settings/content_settings_utils.h"

14 #include "chrome/browser/prefs/pref_service.h"	13 #include "chrome/browser/prefs/pref_service.h"

15 #include "chrome/browser/prefs/scoped_user_pref_update.h"	14 #include "chrome/browser/prefs/scoped_user_pref_update.h"

16 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/common/chrome_notification_types.h"	16 #include "chrome/common/chrome_notification_types.h"

	17 #include "chrome/common/content_settings_pattern.h"

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

19 #include "content/browser/browser_thread.h"	19 #include "content/browser/browser_thread.h"

20 #include "content/common/notification_service.h"	20 #include "content/common/notification_service.h"

21 #include "content/common/notification_source.h"	21 #include "content/common/notification_source.h"

22 #include "webkit/plugins/npapi/plugin_group.h"	22 #include "webkit/plugins/npapi/plugin_group.h"

23 #include "webkit/plugins/npapi/plugin_list.h"	23 #include "webkit/plugins/npapi/plugin_list.h"

24	24

25 namespace {	25 namespace {

26	26

27 // The preferences used to manage ContentSettingsTypes.	27 // The preferences used to manage ContentSettingsTypes.

(...skipping 528 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
556 ContentSettingsPattern(),	556 ContentSettingsPattern(),

557 CONTENT_SETTINGS_TYPE_DEFAULT,	557 CONTENT_SETTINGS_TYPE_DEFAULT,

558 std::string());	558 std::string());

559 }	559 }

560 } else {	560 } else {

561 NOTREACHED() << "Unexpected notification";	561 NOTREACHED() << "Unexpected notification";

562 }	562 }

563 }	563 }

564	564

565 } // namespace content_settings	565 } // namespace content_settings

OLD	NEW