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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_resource_throttle.cc

Issue 2568953002: Revert of Supervised Users: Create ResourceThrottle only if filtering is enabled (Closed)
Patch Set: Created 4 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised_user/supervised_user_resource_throttle.h" 5 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "chrome/browser/supervised_user/supervised_user_interstitial.h" 10 #include "chrome/browser/supervised_user/supervised_user_interstitial.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } // namespace 110 } // namespace
111 111
112 // static 112 // static
113 std::unique_ptr<SupervisedUserResourceThrottle> 113 std::unique_ptr<SupervisedUserResourceThrottle>
114 SupervisedUserResourceThrottle::MaybeCreate( 114 SupervisedUserResourceThrottle::MaybeCreate(
115 const net::URLRequest* request, 115 const net::URLRequest* request,
116 content::ResourceType resource_type, 116 content::ResourceType resource_type,
117 const SupervisedUserURLFilter* url_filter) { 117 const SupervisedUserURLFilter* url_filter) {
118 // Only treat main frame requests (ignoring subframes and subresources). 118 // Only treat main frame requests (ignoring subframes and subresources).
119 bool is_main_frame = resource_type == content::RESOURCE_TYPE_MAIN_FRAME; 119 bool is_main_frame = resource_type == content::RESOURCE_TYPE_MAIN_FRAME;
120 if (!is_main_frame || !url_filter->enabled()) 120 if (!is_main_frame)
121 return nullptr; 121 return nullptr;
122 122
123 // Can't use base::MakeUnique because the constructor is private. 123 // Can't use base::MakeUnique because the constructor is private.
124 return base::WrapUnique( 124 return base::WrapUnique(
125 new SupervisedUserResourceThrottle(request, url_filter)); 125 new SupervisedUserResourceThrottle(request, url_filter));
126 } 126 }
127 127
128 SupervisedUserResourceThrottle::SupervisedUserResourceThrottle( 128 SupervisedUserResourceThrottle::SupervisedUserResourceThrottle(
129 const net::URLRequest* request, 129 const net::URLRequest* request,
130 const SupervisedUserURLFilter* url_filter) 130 const SupervisedUserURLFilter* url_filter)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 Resume(); 208 Resume();
209 } 209 }
210 210
211 void SupervisedUserResourceThrottle::OnInterstitialResult( 211 void SupervisedUserResourceThrottle::OnInterstitialResult(
212 bool continue_request) { 212 bool continue_request) {
213 if (continue_request) 213 if (continue_request)
214 Resume(); 214 Resume();
215 else 215 else
216 Cancel(); 216 Cancel();
217 } 217 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698