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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
OLDNEW
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/host_content_settings_map.h" 5 #include "chrome/browser/host_content_settings_map.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chrome_thread.h" 10 #include "chrome/browser/chrome_thread.h"
11 #include "chrome/browser/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/profile.h" 12 #include "chrome/browser/profile.h"
13 #include "chrome/browser/scoped_pref_update.h" 13 #include "chrome/browser/prefs/scoped_pref_update.h"
14 #include "chrome/common/notification_service.h" 14 #include "chrome/common/notification_service.h"
15 #include "chrome/common/notification_source.h" 15 #include "chrome/common/notification_source.h"
16 #include "chrome/common/notification_type.h" 16 #include "chrome/common/notification_type.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "googleurl/src/gurl.h" 20 #include "googleurl/src/gurl.h"
21 #include "googleurl/src/url_canon.h" 21 #include "googleurl/src/url_canon.h"
22 #include "googleurl/src/url_parse.h" 22 #include "googleurl/src/url_parse.h"
23 #include "net/base/dns_util.h" 23 #include "net/base/dns_util.h"
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 if (!profile_) 878 if (!profile_)
879 return; 879 return;
880 PrefService* prefs = profile_->GetPrefs(); 880 PrefService* prefs = profile_->GetPrefs();
881 prefs->RemovePrefObserver(prefs::kDefaultContentSettings, this); 881 prefs->RemovePrefObserver(prefs::kDefaultContentSettings, this);
882 prefs->RemovePrefObserver(prefs::kContentSettingsPatterns, this); 882 prefs->RemovePrefObserver(prefs::kContentSettingsPatterns, this);
883 prefs->RemovePrefObserver(prefs::kBlockThirdPartyCookies, this); 883 prefs->RemovePrefObserver(prefs::kBlockThirdPartyCookies, this);
884 notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED, 884 notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
885 Source<Profile>(profile_)); 885 Source<Profile>(profile_));
886 profile_ = NULL; 886 profile_ = NULL;
887 } 887 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698