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_pref_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_pref_provider.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/auto_reset.h" | 12 #include "base/auto_reset.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
16 #include "chrome/browser/content_settings/content_settings_pattern.h" | |
17 #include "chrome/browser/content_settings/content_settings_utils.h" | 16 #include "chrome/browser/content_settings/content_settings_utils.h" |
18 #include "chrome/browser/prefs/pref_service.h" | 17 #include "chrome/browser/prefs/pref_service.h" |
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
20 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/common/chrome_notification_types.h" | 20 #include "chrome/common/chrome_notification_types.h" |
22 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
23 #include "chrome/common/content_settings.h" | 22 #include "chrome/common/content_settings.h" |
| 23 #include "chrome/common/content_settings_pattern.h" |
24 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
25 #include "content/browser/browser_thread.h" | 25 #include "content/browser/browser_thread.h" |
26 #include "content/browser/user_metrics.h" | 26 #include "content/browser/user_metrics.h" |
27 #include "content/common/notification_service.h" | 27 #include "content/common/notification_service.h" |
28 #include "content/common/notification_source.h" | 28 #include "content/common/notification_source.h" |
29 #include "googleurl/src/gurl.h" | 29 #include "googleurl/src/gurl.h" |
30 #include "net/base/net_util.h" | 30 #include "net/base/net_util.h" |
31 | 31 |
32 namespace { | 32 namespace { |
33 | 33 |
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1374 if (settings_dictionary->GetInteger( | 1374 if (settings_dictionary->GetInteger( |
1375 kTypeNames[CONTENT_SETTINGS_TYPE_GEOLOCATION], &setting_value)) { | 1375 kTypeNames[CONTENT_SETTINGS_TYPE_GEOLOCATION], &setting_value)) { |
1376 UpdateObsoleteGeolocationPref(pattern_pair.first, | 1376 UpdateObsoleteGeolocationPref(pattern_pair.first, |
1377 pattern_pair.second, | 1377 pattern_pair.second, |
1378 ContentSetting(setting_value)); | 1378 ContentSetting(setting_value)); |
1379 } | 1379 } |
1380 } | 1380 } |
1381 } | 1381 } |
1382 | 1382 |
1383 } // namespace content_settings | 1383 } // namespace content_settings |
OLD | NEW |