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

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

Issue 8277018: Move content_switches to content\public\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/mac/relauncher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/content_settings/content_settings_utils.h" 21 #include "chrome/browser/content_settings/content_settings_utils.h"
22 #include "chrome/browser/extensions/extension_service.h" 22 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/prefs/pref_service.h" 23 #include "chrome/browser/prefs/pref_service.h"
24 #include "chrome/common/chrome_notification_types.h" 24 #include "chrome/common/chrome_notification_types.h"
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/content_settings_pattern.h" 26 #include "chrome/common/content_settings_pattern.h"
27 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "content/browser/browser_thread.h" 29 #include "content/browser/browser_thread.h"
30 #include "content/browser/user_metrics.h" 30 #include "content/browser/user_metrics.h"
31 #include "content/common/content_switches.h"
32 #include "content/common/notification_service.h" 31 #include "content/common/notification_service.h"
33 #include "content/common/notification_source.h" 32 #include "content/common/notification_source.h"
33 #include "content/public/common/content_switches.h"
34 #include "googleurl/src/gurl.h" 34 #include "googleurl/src/gurl.h"
35 #include "net/base/net_errors.h" 35 #include "net/base/net_errors.h"
36 #include "net/base/static_cookie_policy.h" 36 #include "net/base/static_cookie_policy.h"
37 37
38 namespace { 38 namespace {
39 39
40 // Returns true if we should allow all content types for this URL. This is 40 // Returns true if we should allow all content types for this URL. This is
41 // true for various internal objects like chrome:// URLs, so UI and other 41 // true for various internal objects like chrome:// URLs, so UI and other
42 // things users think of as "not webpages" don't break. 42 // things users think of as "not webpages" don't break.
43 bool ShouldAllowAllContent(const GURL& url, ContentSettingsType content_type) { 43 bool ShouldAllowAllContent(const GURL& url, ContentSettingsType content_type) {
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, 571 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
572 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ? 572 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
573 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW); 573 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
574 } 574 }
575 if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) { 575 if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
576 SetBlockThirdPartyCookies(cookie_behavior == 576 SetBlockThirdPartyCookies(cookie_behavior ==
577 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES); 577 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
578 } 578 }
579 } 579 }
580 } 580 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/mac/relauncher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698