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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 102973005: Move URLBlacklistManager to components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fixed linkage of policy_component Created 7 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 | 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/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "net/socket_stream/socket_stream.h" 52 #include "net/socket_stream/socket_stream.h"
53 #include "net/url_request/url_request.h" 53 #include "net/url_request/url_request.h"
54 54
55 #if defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
56 #include "base/command_line.h" 56 #include "base/command_line.h"
57 #include "base/sys_info.h" 57 #include "base/sys_info.h"
58 #include "chrome/common/chrome_switches.h" 58 #include "chrome/common/chrome_switches.h"
59 #endif 59 #endif
60 60
61 #if defined(ENABLE_CONFIGURATION_POLICY) 61 #if defined(ENABLE_CONFIGURATION_POLICY)
62 #include "chrome/browser/policy/url_blacklist_manager.h" 62 #include "components/policy/core/common/url_blacklist_manager.h"
63 #endif 63 #endif
64 64
65 using content::BrowserThread; 65 using content::BrowserThread;
66 using content::RenderViewHost; 66 using content::RenderViewHost;
67 using content::ResourceRequestInfo; 67 using content::ResourceRequestInfo;
68 68
69 // By default we don't allow access to all file:// urls on ChromeOS and 69 // By default we don't allow access to all file:// urls on ChromeOS and
70 // Android. 70 // Android.
71 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) 71 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
72 bool ChromeNetworkDelegate::g_allow_file_access_ = false; 72 bool ChromeNetworkDelegate::g_allow_file_access_ = false;
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 void* profile) { 772 void* profile) {
773 DCHECK_GE(received_content_length, 0); 773 DCHECK_GE(received_content_length, 0);
774 DCHECK_GE(original_content_length, 0); 774 DCHECK_GE(original_content_length, 0);
775 StoreAccumulatedContentLength(received_content_length, 775 StoreAccumulatedContentLength(received_content_length,
776 original_content_length, 776 original_content_length,
777 data_reduction_type, 777 data_reduction_type,
778 reinterpret_cast<Profile*>(profile_)); 778 reinterpret_cast<Profile*>(profile_));
779 received_content_length_ += received_content_length; 779 received_content_length_ += received_content_length;
780 original_content_length_ += original_content_length; 780 original_content_length_ += original_content_length;
781 } 781 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_mode_url_filter.cc ('k') | chrome/browser/policy/url_blacklist_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698