Chromium Code Reviews| Index: chrome/browser/net/chrome_network_delegate.cc |
| diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc |
| index 828fe6665fb9348faaa06f9ad9780ee62a6c5ed2..571ddf89111aab9a18fbcda31b7548c83b14782a 100644 |
| --- a/chrome/browser/net/chrome_network_delegate.cc |
| +++ b/chrome/browser/net/chrome_network_delegate.cc |
| @@ -17,6 +17,7 @@ |
| #include "chrome/browser/extensions/event_router_forwarder.h" |
| #include "chrome/browser/extensions/extension_info_map.h" |
| #include "chrome/browser/extensions/extension_process_manager.h" |
| +#include "chrome/browser/google/google_util.h" |
| #include "chrome/browser/net/load_time_stats.h" |
| #include "chrome/browser/performance_monitor/performance_monitor.h" |
| #include "chrome/browser/prefs/pref_service.h" |
| @@ -87,6 +88,16 @@ void ForwardProxyErrors(net::URLRequest* request, |
| } |
| } |
| +void ForceGoogleSafeSearchCallbackWrapper( |
| + const net::CompletionCallback& callback, |
| + net::URLRequest* request, |
| + GURL* new_url, |
| + int rv) { |
| + if (rv == net::OK && new_url->is_empty()) |
| + ChromeNetworkDelegate::ForceGoogleSafeSearch(request, new_url); |
| + callback.Run(rv); |
| +} |
| + |
| enum RequestStatus { REQUEST_STARTED, REQUEST_DONE }; |
| // Notifies the ExtensionProcessManager that a request has started or stopped |
| @@ -146,6 +157,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate( |
| CookieSettings* cookie_settings, |
| BooleanPrefMember* enable_referrers, |
| BooleanPrefMember* enable_do_not_track, |
| + BooleanPrefMember* force_google_safesearch, |
| chrome_browser_net::LoadTimeStats* load_time_stats) |
| : event_router_(event_router), |
| profile_(profile), |
| @@ -153,6 +165,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate( |
| extension_info_map_(extension_info_map), |
| enable_referrers_(enable_referrers), |
| enable_do_not_track_(enable_do_not_track), |
| + force_google_safesearch_(force_google_safesearch), |
| url_blacklist_manager_(url_blacklist_manager), |
| managed_mode_url_filter_(managed_mode_url_filter), |
| load_time_stats_(load_time_stats) { |
| @@ -172,6 +185,7 @@ void ChromeNetworkDelegate::NeverThrottleRequests() { |
| void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| BooleanPrefMember* enable_referrers, |
| BooleanPrefMember* enable_do_not_track, |
| + BooleanPrefMember* force_google_safesearch, |
| PrefService* pref_service) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); |
| @@ -180,6 +194,10 @@ void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service, NULL); |
| enable_do_not_track->MoveToThread(BrowserThread::IO); |
| } |
| + if (force_google_safesearch) { |
| + force_google_safesearch->Init(prefs::kForceSafeSearch, pref_service, NULL); |
| + force_google_safesearch->MoveToThread(BrowserThread::IO); |
| + } |
| } |
| // static |
| @@ -187,6 +205,39 @@ void ChromeNetworkDelegate::AllowAccessToAllFiles() { |
| g_allow_file_access_ = true; |
| } |
| +// static |
| +void ChromeNetworkDelegate::ForceGoogleSafeSearch(net::URLRequest* request, |
| + GURL* new_url) { |
| + // Force SafeSearch. |
| + const bool is_search_url = google_util::IsGoogleSearchUrl( |
| + request->url().spec()); |
| + const bool is_homepage_url = google_util::IsGoogleHomePageUrl( |
| + request->url().spec()); |
| + if (is_search_url || is_homepage_url) { |
| + std::string query = request->url().query(); |
| + std::string single_parameters = chrome::kSafeSearchParameters; |
| + std::string multiple_parameters = "&"+single_parameters; |
|
Bernhard Bauer
2012/10/17 15:23:54
Nit: space before and after operators like "+"
Sergiu
2012/10/19 08:40:55
Done.
|
| + std::string append_parameters; |
| + |
| + if (is_homepage_url && query.empty()) |
| + append_parameters = single_parameters; |
| + else |
| + append_parameters = multiple_parameters; |
| + // Make sure that our parameters are either the only ones |
| + // or have a & before them so that we don't accept &bogussafe=active. |
| + if (query == chrome::kSafeSearchParameters || |
| + query.rfind(multiple_parameters) != std::string::npos) |
| + return; |
|
Bernhard Bauer
2012/10/17 15:23:54
Nit: newline please.
Sergiu
2012/10/19 08:40:55
Done.
|
| + // Add this parameter at the end of this query since it will override the |
| + // other parameters. |
| + query.append(append_parameters); |
| + |
| + GURL::Replacements replacements; |
| + replacements.SetQueryStr(query); |
| + *new_url = request->url().ReplaceComponents(replacements); |
| + } |
| +} |
| + |
| int ChromeNetworkDelegate::OnBeforeURLRequest( |
| net::URLRequest* request, |
| const net::CompletionCallback& callback, |
| @@ -220,6 +271,26 @@ int ChromeNetworkDelegate::OnBeforeURLRequest( |
| request->set_referrer(std::string()); |
| if (enable_do_not_track_ && enable_do_not_track_->GetValue()) |
| request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); |
| + |
| + if (force_google_safesearch_ && force_google_safesearch_->GetValue()) { |
| + net::CompletionCallback wrapped_callback = |
| + base::Bind(&ForceGoogleSafeSearchCallbackWrapper, |
| + callback, |
| + base::Unretained(request), |
| + base::Unretained(new_url)); |
| + |
| + int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( |
| + profile_, extension_info_map_.get(), request, wrapped_callback, |
| + new_url); |
| + |
| + if (rv == net::OK && new_url->is_empty()) { |
| + ForceGoogleSafeSearch(request, new_url); |
| + return net::OK; |
| + } |
| + |
| + return rv; |
| + } |
| + |
| return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( |
| profile_, extension_info_map_.get(), request, callback, new_url); |
| } |