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

Side by Side Diff: chrome/browser/managed_mode/managed_mode_resource_throttle.cc

Issue 11299035: Support manual (white|black)list, previewing and allowing after interstitial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/managed_mode/managed_mode_resource_throttle.h" 5 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
6 6
7 #include "chrome/browser/managed_mode/managed_mode.h" 7 #include "chrome/browser/managed_mode/managed_mode.h"
8 #include "chrome/browser/managed_mode/managed_mode_interstitial.h" 8 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
9 #include "chrome/browser/managed_mode/managed_mode_url_filter.h" 9 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
10 #include "chrome/browser/policy/url_blacklist_manager.h"
Bernhard Bauer 2012/11/16 15:04:46 Is this necessary?
Sergiu 2012/11/26 14:48:08 Removed.
10 #include "content/public/browser/resource_controller.h" 11 #include "content/public/browser/resource_controller.h"
11 #include "net/url_request/url_request.h" 12 #include "net/url_request/url_request.h"
12 13
13 ManagedModeResourceThrottle::ManagedModeResourceThrottle( 14 ManagedModeResourceThrottle::ManagedModeResourceThrottle(
14 const net::URLRequest* request, 15 const net::URLRequest* request,
15 int render_process_host_id, 16 int render_process_host_id,
16 int render_view_id, 17 int render_view_id,
17 bool is_main_frame) 18 bool is_main_frame)
18 : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), 19 : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
19 request_(request), 20 request_(request),
(...skipping 21 matching lines...) Expand all
41 } 42 }
42 } 43 }
43 44
44 void ManagedModeResourceThrottle::OnInterstitialResult(bool continue_request) { 45 void ManagedModeResourceThrottle::OnInterstitialResult(bool continue_request) {
45 if (continue_request) { 46 if (continue_request) {
46 controller()->Resume(); 47 controller()->Resume();
47 } else { 48 } else {
48 controller()->Cancel(); 49 controller()->Cancel();
49 } 50 }
50 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698