Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 215 if (p.IsAbsolute()) | 215 if (p.IsAbsolute()) |
| 216 return false; | 216 return false; |
| 217 | 217 |
| 218 base::FilePath inspector_dir; | 218 base::FilePath inspector_dir; |
| 219 if (!PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) | 219 if (!PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) |
| 220 return false; | 220 return false; |
| 221 | 221 |
| 222 if (inspector_dir.empty()) | 222 if (inspector_dir.empty()) |
| 223 return false; | 223 return false; |
| 224 | 224 |
| 225 *path = inspector_dir.AppendASCII(relative_path); | 225 base::FilePath debug_path = inspector_dir.AppendASCII("debug"); |
| 226 *path = debug_path.AppendASCII(relative_path); | |
|
mmenke
2016/08/31 00:04:29
Maybe *path = inspector_dir.AppendASCII("debug").A
mmenke
2016/08/31 00:38:40
Also, will this result in leaving junk in the old
chenwilliam
2016/08/31 00:53:06
Done. I added a comment. This path needs to match
| |
| 226 return true; | 227 return true; |
| 227 } | 228 } |
| 228 | 229 |
| 229 class DebugDevToolsInterceptor : public net::URLRequestInterceptor { | 230 class DebugDevToolsInterceptor : public net::URLRequestInterceptor { |
| 230 public: | 231 public: |
| 231 // net::URLRequestInterceptor implementation. | 232 // net::URLRequestInterceptor implementation. |
| 232 net::URLRequestJob* MaybeInterceptRequest( | 233 net::URLRequestJob* MaybeInterceptRequest( |
| 233 net::URLRequest* request, | 234 net::URLRequest* request, |
| 234 net::NetworkDelegate* network_delegate) const override { | 235 net::NetworkDelegate* network_delegate) const override { |
| 235 base::FilePath path; | 236 base::FilePath path; |
| (...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1376 void ProfileIOData::SetCookieSettingsForTesting( | 1377 void ProfileIOData::SetCookieSettingsForTesting( |
| 1377 content_settings::CookieSettings* cookie_settings) { | 1378 content_settings::CookieSettings* cookie_settings) { |
| 1378 DCHECK(!cookie_settings_.get()); | 1379 DCHECK(!cookie_settings_.get()); |
| 1379 cookie_settings_ = cookie_settings; | 1380 cookie_settings_ = cookie_settings; |
| 1380 } | 1381 } |
| 1381 | 1382 |
| 1382 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( | 1383 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( |
| 1383 const GURL& url) const { | 1384 const GURL& url) const { |
| 1384 return url_blacklist_manager_->GetURLBlacklistState(url); | 1385 return url_blacklist_manager_->GetURLBlacklistState(url); |
| 1385 } | 1386 } |
| OLD | NEW |