| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/runner/context.h" | 5 #include "mojo/runner/context.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 | 155 |
| 156 private: | 156 private: |
| 157 StrongBinding<ServiceProvider> binding_; | 157 StrongBinding<ServiceProvider> binding_; |
| 158 | 158 |
| 159 DISALLOW_COPY_AND_ASSIGN(TracingServiceProvider); | 159 DISALLOW_COPY_AND_ASSIGN(TracingServiceProvider); |
| 160 }; | 160 }; |
| 161 | 161 |
| 162 } // namespace | 162 } // namespace |
| 163 | 163 |
| 164 Context::Context(const base::FilePath& shell_file_root) | 164 Context::Context(const base::FilePath& shell_file_root) |
| 165 : shell_file_root_(shell_file_root), main_entry_time_(base::Time::Now()) {} | 165 : shell_file_root_(shell_file_root), |
| 166 package_manager_(nullptr), |
| 167 main_entry_time_(base::Time::Now()) {} |
| 166 | 168 |
| 167 Context::~Context() { | 169 Context::~Context() { |
| 168 DCHECK(!base::MessageLoop::current()); | 170 DCHECK(!base::MessageLoop::current()); |
| 169 } | 171 } |
| 170 | 172 |
| 171 // static | 173 // static |
| 172 void Context::EnsureEmbedderIsInitialized() { | 174 void Context::EnsureEmbedderIsInitialized() { |
| 173 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER; | 175 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER; |
| 174 setup.Get(); | 176 setup.Get(); |
| 175 } | 177 } |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 base::MessageLoop::current()->Quit(); | 295 base::MessageLoop::current()->Quit(); |
| 294 } else { | 296 } else { |
| 295 app_complete_callback_.Run(); | 297 app_complete_callback_.Run(); |
| 296 } | 298 } |
| 297 } | 299 } |
| 298 } | 300 } |
| 299 } | 301 } |
| 300 | 302 |
| 301 } // namespace runner | 303 } // namespace runner |
| 302 } // namespace mojo | 304 } // namespace mojo |
| OLD | NEW |