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

Side by Side Diff: chrome/browser/content_settings/content_settings_policy_provider.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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
OLDNEW
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/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/content_settings/content_settings_rule.h" 12 #include "chrome/browser/content_settings/content_settings_rule.h"
13 #include "chrome/browser/content_settings/content_settings_utils.h" 13 #include "chrome/browser/content_settings/content_settings_utils.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/common/chrome_notification_types.h" 15 #include "chrome/common/chrome_notification_types.h"
16 #include "chrome/common/content_settings_pattern.h" 16 #include "chrome/common/content_settings_pattern.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/notification_details.h" 19 #include "content/public/browser/notification_details.h"
20 #include "content/public/browser/notification_source.h" 20 #include "content/public/browser/notification_source.h"
21 21
22 using content::BrowserThread;
23
22 namespace { 24 namespace {
23 25
24 // The preferences used to manage ContentSettingsTypes. 26 // The preferences used to manage ContentSettingsTypes.
25 const char* kPrefToManageType[CONTENT_SETTINGS_NUM_TYPES] = { 27 const char* kPrefToManageType[CONTENT_SETTINGS_NUM_TYPES] = {
26 prefs::kManagedDefaultCookiesSetting, 28 prefs::kManagedDefaultCookiesSetting,
27 prefs::kManagedDefaultImagesSetting, 29 prefs::kManagedDefaultImagesSetting,
28 prefs::kManagedDefaultJavaScriptSetting, 30 prefs::kManagedDefaultJavaScriptSetting,
29 prefs::kManagedDefaultPluginsSetting, 31 prefs::kManagedDefaultPluginsSetting,
30 prefs::kManagedDefaultPopupsSetting, 32 prefs::kManagedDefaultPopupsSetting,
31 prefs::kManagedDefaultGeolocationSetting, 33 prefs::kManagedDefaultGeolocationSetting,
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 NOTREACHED() << "Unexpected notification"; 448 NOTREACHED() << "Unexpected notification";
447 return; 449 return;
448 } 450 }
449 NotifyObservers(ContentSettingsPattern(), 451 NotifyObservers(ContentSettingsPattern(),
450 ContentSettingsPattern(), 452 ContentSettingsPattern(),
451 CONTENT_SETTINGS_TYPE_DEFAULT, 453 CONTENT_SETTINGS_TYPE_DEFAULT,
452 std::string()); 454 std::string());
453 } 455 }
454 456
455 } // namespace content_settings 457 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698