Index: chrome/browser/net/chrome_network_delegate.h |
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h |
index 0913b7138ec896dacbc781fa035c7a13ab91ff91..f13c97c07a4c0bf281a5da0cf3e98870ea4a5d8c 100644 |
--- a/chrome/browser/net/chrome_network_delegate.h |
+++ b/chrome/browser/net/chrome_network_delegate.h |
@@ -5,10 +5,14 @@ |
#ifndef CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_ |
#define CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_ |
+#include <set> |
+#include <string> |
+ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/ref_counted.h" |
#include "net/base/network_delegate.h" |
+#include "net/url_request/url_request.h" |
class CookieSettings; |
class ExtensionInfoMap; |
@@ -50,6 +54,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
CookieSettings* cookie_settings, |
BooleanPrefMember* enable_referrers, |
BooleanPrefMember* enable_do_not_track, |
+ BooleanPrefMember* enable_safesearch, |
Pam (message me for reviews)
2012/10/17 11:37:37
As above, "force" (or "require", etc.) rather than
Sergiu
2012/10/17 14:48:58
Done.
|
chrome_browser_net::LoadTimeStats* load_time_stats); |
virtual ~ChromeNetworkDelegate(); |
@@ -62,6 +67,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
// This method should be called on the UI thread. |
static void InitializePrefsOnUIThread(BooleanPrefMember* enable_referrers, |
BooleanPrefMember* enable_do_not_track, |
+ BooleanPrefMember* enable_safesearch, |
PrefService* pref_service); |
// When called, all file:// URLs will now be accessible. If this is not |
@@ -124,6 +130,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
// Weak, owned by our owner. |
BooleanPrefMember* enable_referrers_; |
BooleanPrefMember* enable_do_not_track_; |
+ BooleanPrefMember* enable_safesearch_; |
battre
2012/10/16 16:05:49
how about renaming this to enforce_google_safesear
Sergiu
2012/10/17 14:48:58
Done.
|
// Weak, owned by our owner. |
const policy::URLBlacklistManager* url_blacklist_manager_; |
@@ -135,6 +142,10 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
// When true, allow access to all file:// URLs. |
static bool g_allow_file_access_; |
+ // Set of requests modified by the managed mode which can not be |
+ // altered by extensions. |
+ std::set<net::URLRequest*> mod_by_managed_mode_; |
battre
2012/10/16 16:05:49
I think we should rename this to "modified_by_mana
Joao da Silva
2012/10/16 16:26:46
Use a more descriptive name:
modified_by_managed_
Bernhard Bauer
2012/10/16 16:37:33
What is this "managed mode" you speak of? ;-) The
Pam (message me for reviews)
2012/10/17 11:37:37
So "modified_by_policy_", with a comment to match.
Sergiu
2012/10/17 14:48:58
Done.
Sergiu
2012/10/17 14:48:58
Done.
Sergiu
2012/10/17 14:48:58
Done.
|
+ |
// True if OnCanThrottleRequest should always return false. |
// |
// Note: This needs to be static as the instance of |