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

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

Issue 6594063: Update a bunch of files to the new location of browser_thread.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
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/host_content_settings_map.h" 5 #include "chrome/browser/content_settings/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/browser_thread.h"
11 #include "chrome/browser/content_settings/content_settings_details.h" 10 #include "chrome/browser/content_settings/content_settings_details.h"
12 #include "chrome/browser/content_settings/content_settings_provider.h" 11 #include "chrome/browser/content_settings/content_settings_provider.h"
13 #include "chrome/browser/content_settings/content_settings_policy_provider.h" 12 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
14 #include "chrome/browser/content_settings/content_settings_pref_provider.h" 13 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
15 #include "chrome/browser/metrics/user_metrics.h" 14 #include "chrome/browser/metrics/user_metrics.h"
16 #include "chrome/browser/prefs/pref_service.h" 15 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/prefs/scoped_pref_update.h" 17 #include "chrome/browser/prefs/scoped_pref_update.h"
19 #include "chrome/common/notification_service.h" 18 #include "chrome/common/notification_service.h"
20 #include "chrome/common/notification_source.h" 19 #include "chrome/common/notification_source.h"
21 #include "chrome/common/notification_type.h" 20 #include "chrome/common/notification_type.h"
22 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
24 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
24 #include "content/browser/browser_thread.h"
25 #include "googleurl/src/gurl.h" 25 #include "googleurl/src/gurl.h"
26 #include "net/base/net_util.h" 26 #include "net/base/net_util.h"
27 #include "net/base/static_cookie_policy.h" 27 #include "net/base/static_cookie_policy.h"
28 28
29 namespace { 29 namespace {
30 30
31 // Returns true if we should allow all content types for this URL. This is 31 // Returns true if we should allow all content types for this URL. This is
32 // true for various internal objects like chrome:// URLs, so UI and other 32 // true for various internal objects like chrome:// URLs, so UI and other
33 // things users think of as "not webpages" don't break. 33 // things users think of as "not webpages" don't break.
34 static bool ShouldAllowAllContent(const GURL& url) { 34 static bool ShouldAllowAllContent(const GURL& url) {
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, 471 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
472 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ? 472 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
473 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW); 473 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
474 } 474 }
475 if (!prefs->HasPrefPath(prefs::kBlockThirdPartyCookies)) { 475 if (!prefs->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
476 SetBlockThirdPartyCookies(cookie_behavior == 476 SetBlockThirdPartyCookies(cookie_behavior ==
477 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES); 477 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
478 } 478 }
479 } 479 }
480 } 480 }
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.h ('k') | chrome/browser/download/base_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698