| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mojo/services/network/network_service_delegate.h" | 5 #include "mojo/services/network/network_service_delegate.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
| 10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 NetworkServiceDelegateObserver* observer) { | 42 NetworkServiceDelegateObserver* observer) { |
| 43 observers_.AddObserver(observer); | 43 observers_.AddObserver(observer); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void NetworkServiceDelegate::RemoveObserver( | 46 void NetworkServiceDelegate::RemoveObserver( |
| 47 NetworkServiceDelegateObserver* observer) { | 47 NetworkServiceDelegateObserver* observer) { |
| 48 observers_.RemoveObserver(observer); | 48 observers_.RemoveObserver(observer); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void NetworkServiceDelegate::Initialize(Shell* shell, const std::string& url, | 51 void NetworkServiceDelegate::Initialize(Shell* shell, const std::string& url, |
| 52 uint32_t id) { | 52 uint32_t id, uint32_t user_id) { |
| 53 shell_ = shell; | 53 shell_ = shell; |
| 54 | 54 |
| 55 // TODO(erg): Find everything else that writes to the filesystem and | 55 // TODO(erg): Find everything else that writes to the filesystem and |
| 56 // transition it to proxying mojo:filesystem. We shouldn't have any path | 56 // transition it to proxying mojo:filesystem. We shouldn't have any path |
| 57 // calculation code here, but sadly need it until the transition is done. In | 57 // calculation code here, but sadly need it until the transition is done. In |
| 58 // the mean time, manually handle the user-data-dir switch (which gets set in | 58 // the mean time, manually handle the user-data-dir switch (which gets set in |
| 59 // tests) so that tests are writing to a temp dir. | 59 // tests) so that tests are writing to a temp dir. |
| 60 base::FilePath base_path; | 60 base::FilePath base_path; |
| 61 const base::CommandLine* command_line = | 61 const base::CommandLine* command_line = |
| 62 base::CommandLine::ForCurrentProcess(); | 62 base::CommandLine::ForCurrentProcess(); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 } | 111 } |
| 112 | 112 |
| 113 void NetworkServiceDelegate::Create( | 113 void NetworkServiceDelegate::Create( |
| 114 Connection* connection, | 114 Connection* connection, |
| 115 InterfaceRequest<URLLoaderFactory> request) { | 115 InterfaceRequest<URLLoaderFactory> request) { |
| 116 new URLLoaderFactoryImpl(context_.get(), shell_->CreateAppRefCount(), | 116 new URLLoaderFactoryImpl(context_.get(), shell_->CreateAppRefCount(), |
| 117 std::move(request)); | 117 std::move(request)); |
| 118 } | 118 } |
| 119 | 119 |
| 120 } // namespace mojo | 120 } // namespace mojo |
| OLD | NEW |