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

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

Issue 7821010: Move web intents switch to content_switches. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/browser.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 <list> 7 #include <list>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/content_settings/content_settings_details.h" 12 #include "chrome/browser/content_settings/content_settings_details.h"
13 #include "chrome/browser/content_settings/content_settings_extension_provider.h" 13 #include "chrome/browser/content_settings/content_settings_extension_provider.h"
14 #include "chrome/browser/content_settings/content_settings_observable_provider.h " 14 #include "chrome/browser/content_settings/content_settings_observable_provider.h "
15 #include "chrome/browser/content_settings/content_settings_policy_provider.h" 15 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
16 #include "chrome/browser/content_settings/content_settings_pref_provider.h" 16 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
17 #include "chrome/browser/content_settings/content_settings_provider.h" 17 #include "chrome/browser/content_settings/content_settings_provider.h"
18 #include "chrome/browser/content_settings/content_settings_utils.h" 18 #include "chrome/browser/content_settings/content_settings_utils.h"
19 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/prefs/scoped_user_pref_update.h" 21 #include "chrome/browser/prefs/scoped_user_pref_update.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/common/chrome_notification_types.h" 23 #include "chrome/common/chrome_notification_types.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "content/browser/browser_thread.h" 27 #include "content/browser/browser_thread.h"
28 #include "content/browser/user_metrics.h" 28 #include "content/browser/user_metrics.h"
29 #include "content/common/content_switches.h"
29 #include "content/common/notification_service.h" 30 #include "content/common/notification_service.h"
30 #include "content/common/notification_source.h" 31 #include "content/common/notification_source.h"
31 #include "googleurl/src/gurl.h" 32 #include "googleurl/src/gurl.h"
32 #include "net/base/net_errors.h" 33 #include "net/base/net_errors.h"
33 #include "net/base/net_util.h" 34 #include "net/base/net_util.h"
34 #include "net/base/static_cookie_policy.h" 35 #include "net/base/static_cookie_policy.h"
35 36
36 namespace { 37 namespace {
37 38
38 // Returns true if we should allow all content types for this URL. This is 39 // Returns true if we should allow all content types for this URL. This is
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, 544 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
544 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ? 545 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
545 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW); 546 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
546 } 547 }
547 if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) { 548 if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
548 SetBlockThirdPartyCookies(cookie_behavior == 549 SetBlockThirdPartyCookies(cookie_behavior ==
549 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES); 550 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
550 } 551 }
551 } 552 }
552 } 553 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698