| OLD | NEW |
| 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 "shell/application_manager/application_manager.h" | 5 #include "shell/application_manager/application_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 ConnectToService(GURL("mojo:authenticating_url_loader_interceptor"), | 208 ConnectToService(GURL("mojo:authenticating_url_loader_interceptor"), |
| 209 &interceptor_meta_factory); | 209 &interceptor_meta_factory); |
| 210 mojo::URLLoaderInterceptorFactoryPtr interceptor_factory; | 210 mojo::URLLoaderInterceptorFactoryPtr interceptor_factory; |
| 211 interceptor_meta_factory->CreateURLLoaderInterceptorFactory( | 211 interceptor_meta_factory->CreateURLLoaderInterceptorFactory( |
| 212 GetProxy(&interceptor_factory), authentication_service.Pass()); | 212 GetProxy(&interceptor_factory), authentication_service.Pass()); |
| 213 authenticating_network_service_->RegisterURLLoaderInterceptor( | 213 authenticating_network_service_->RegisterURLLoaderInterceptor( |
| 214 interceptor_factory.Pass()); | 214 interceptor_factory.Pass()); |
| 215 initialized_authentication_interceptor_ = true; | 215 initialized_authentication_interceptor_ = true; |
| 216 } | 216 } |
| 217 | 217 |
| 218 new NetworkFetcher(options_.disable_cache, resolved_url, | 218 new NetworkFetcher(options_.disable_cache, options_.force_offline_by_default, |
| 219 url_response_disk_cache_.get(), network_service, callback); | 219 resolved_url, url_response_disk_cache_.get(), |
| 220 network_service, callback); |
| 220 } | 221 } |
| 221 | 222 |
| 222 bool ApplicationManager::ConnectToRunningApplication( | 223 bool ApplicationManager::ConnectToRunningApplication( |
| 223 const GURL& resolved_url, | 224 const GURL& resolved_url, |
| 224 const GURL& requestor_url, | 225 const GURL& requestor_url, |
| 225 InterfaceRequest<ServiceProvider>* services, | 226 InterfaceRequest<ServiceProvider>* services, |
| 226 ServiceProviderPtr* exposed_services) { | 227 ServiceProviderPtr* exposed_services) { |
| 227 GURL application_url = GetBaseURLAndQuery(resolved_url, nullptr); | 228 GURL application_url = GetBaseURLAndQuery(resolved_url, nullptr); |
| 228 ShellImpl* shell_impl = GetShellImpl(application_url); | 229 ShellImpl* shell_impl = GetShellImpl(application_url); |
| 229 if (!shell_impl) | 230 if (!shell_impl) |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 return args_it->second; | 511 return args_it->second; |
| 511 return std::vector<std::string>(); | 512 return std::vector<std::string>(); |
| 512 } | 513 } |
| 513 | 514 |
| 514 void ApplicationManager::CleanupRunner(NativeRunner* runner) { | 515 void ApplicationManager::CleanupRunner(NativeRunner* runner) { |
| 515 native_runners_.erase( | 516 native_runners_.erase( |
| 516 std::find(native_runners_.begin(), native_runners_.end(), runner)); | 517 std::find(native_runners_.begin(), native_runners_.end(), runner)); |
| 517 } | 518 } |
| 518 | 519 |
| 519 } // namespace shell | 520 } // namespace shell |
| OLD | NEW |