chrome/browser/options_util.cc - Issue 5367006: Refactor: move HostContentSettingsMap to content_settings

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/options_util.cc

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 10 years 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/net/cookie_policy_browsertest.cc ('k') | chrome/browser/plugin_exceptions_table_model.h » ('j') | no next file with comments »

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

6	6

7 #include "base/thread_restrictions.h"	7 #include "base/thread_restrictions.h"

8 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/download/download_manager.h"	9 #include "chrome/browser/download/download_manager.h"

10 #include "chrome/browser/download/download_prefs.h"	10 #include "chrome/browser/download/download_prefs.h"

	11 #include "chrome/browser/content_settings/host_content_settings_map.h"

11 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

12 #include "chrome/browser/host_content_settings_map.h"

13 #include "chrome/browser/host_zoom_map.h"	13 #include "chrome/browser/host_zoom_map.h"

14 #include "chrome/browser/metrics/metrics_service.h"	14 #include "chrome/browser/metrics/metrics_service.h"

15 #include "chrome/browser/notifications/desktop_notification_service.h"	15 #include "chrome/browser/notifications/desktop_notification_service.h"

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

17 #include "chrome/browser/profile.h"	17 #include "chrome/browser/profile.h"

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

19 #include "chrome/installer/util/google_update_settings.h"	19 #include "chrome/installer/util/google_update_settings.h"

20	20

21 // static	21 // static

22 void OptionsUtil::ResetToDefaults(Profile* profile) {	22 void OptionsUtil::ResetToDefaults(Profile* profile) {

(...skipping 101 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124 if (metrics) {	124 if (metrics) {

125 metrics->SetUserPermitsUpload(enabled);	125 metrics->SetUserPermitsUpload(enabled);

126 if (enabled)	126 if (enabled)

127 metrics->Start();	127 metrics->Start();

128 else	128 else

129 metrics->Stop();	129 metrics->Stop();

130 }	130 }

131	131

132 return enabled;	132 return enabled;

133 }	133 }

OLD	NEW