| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1190 url::kDataScheme, new net::DataProtocolHandler()); | 1190 url::kDataScheme, new net::DataProtocolHandler()); |
| 1191 DCHECK(set_protocol); | 1191 DCHECK(set_protocol); |
| 1192 #if defined(OS_CHROMEOS) | 1192 #if defined(OS_CHROMEOS) |
| 1193 if (profile_params_) { | 1193 if (profile_params_) { |
| 1194 set_protocol = job_factory->SetProtocolHandler( | 1194 set_protocol = job_factory->SetProtocolHandler( |
| 1195 content::kExternalFileScheme, | 1195 content::kExternalFileScheme, |
| 1196 new chromeos::ExternalFileProtocolHandler(profile_params_->profile)); | 1196 new chromeos::ExternalFileProtocolHandler(profile_params_->profile)); |
| 1197 DCHECK(set_protocol); | 1197 DCHECK(set_protocol); |
| 1198 } | 1198 } |
| 1199 #endif // defined(OS_CHROMEOS) | 1199 #endif // defined(OS_CHROMEOS) |
| 1200 #if defined(OS_ANDROID) | 1200 #if defined(OS_ANDROID) && !defined(USE_AURA) |
| 1201 set_protocol = job_factory->SetProtocolHandler( | 1201 set_protocol = job_factory->SetProtocolHandler( |
| 1202 url::kContentScheme, | 1202 url::kContentScheme, |
| 1203 content::ContentProtocolHandler::Create( | 1203 content::ContentProtocolHandler::Create( |
| 1204 content::BrowserThread::GetBlockingPool()-> | 1204 content::BrowserThread::GetBlockingPool()-> |
| 1205 GetTaskRunnerWithShutdownBehavior( | 1205 GetTaskRunnerWithShutdownBehavior( |
| 1206 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))); | 1206 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))); |
| 1207 #endif | 1207 #endif |
| 1208 | 1208 |
| 1209 job_factory->SetProtocolHandler( | 1209 job_factory->SetProtocolHandler( |
| 1210 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); | 1210 url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 new DevToolsNetworkTransactionFactory( | 1329 new DevToolsNetworkTransactionFactory( |
| 1330 network_controller_.get(), shared_session), | 1330 network_controller_.get(), shared_session), |
| 1331 shared_session->net_log(), backend)); | 1331 shared_session->net_log(), backend)); |
| 1332 } | 1332 } |
| 1333 | 1333 |
| 1334 void ProfileIOData::SetCookieSettingsForTesting( | 1334 void ProfileIOData::SetCookieSettingsForTesting( |
| 1335 content_settings::CookieSettings* cookie_settings) { | 1335 content_settings::CookieSettings* cookie_settings) { |
| 1336 DCHECK(!cookie_settings_.get()); | 1336 DCHECK(!cookie_settings_.get()); |
| 1337 cookie_settings_ = cookie_settings; | 1337 cookie_settings_ = cookie_settings; |
| 1338 } | 1338 } |
| OLD | NEW |