| 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 #ifndef MOJO_SHELL_APPLICATION_INSTANCE_H_ | 5 #ifndef MOJO_SHELL_APPLICATION_INSTANCE_H_ | 
| 6 #define MOJO_SHELL_APPLICATION_INSTANCE_H_ | 6 #define MOJO_SHELL_APPLICATION_INSTANCE_H_ | 
| 7 | 7 | 
|  | 8 #include <stdint.h> | 
|  | 9 | 
| 8 #include <set> | 10 #include <set> | 
| 9 | 11 | 
| 10 #include "base/callback.h" | 12 #include "base/callback.h" | 
|  | 13 #include "base/macros.h" | 
| 11 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" | 
| 12 #include "base/process/process_handle.h" | 15 #include "base/process/process_handle.h" | 
| 13 #include "mojo/application/public/interfaces/application.mojom.h" | 16 #include "mojo/application/public/interfaces/application.mojom.h" | 
| 14 #include "mojo/application/public/interfaces/shell.mojom.h" | 17 #include "mojo/application/public/interfaces/shell.mojom.h" | 
| 15 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" | 
| 16 #include "mojo/shell/capability_filter.h" | 19 #include "mojo/shell/capability_filter.h" | 
| 17 #include "mojo/shell/connect_to_application_params.h" | 20 #include "mojo/shell/connect_to_application_params.h" | 
| 18 #include "mojo/shell/identity.h" | 21 #include "mojo/shell/identity.h" | 
| 19 #include "url/gurl.h" | 22 #include "url/gurl.h" | 
| 20 | 23 | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 88   NativeRunner* native_runner_; | 91   NativeRunner* native_runner_; | 
| 89   base::ProcessId pid_; | 92   base::ProcessId pid_; | 
| 90 | 93 | 
| 91   DISALLOW_COPY_AND_ASSIGN(ApplicationInstance); | 94   DISALLOW_COPY_AND_ASSIGN(ApplicationInstance); | 
| 92 }; | 95 }; | 
| 93 | 96 | 
| 94 }  // namespace shell | 97 }  // namespace shell | 
| 95 }  // namespace mojo | 98 }  // namespace mojo | 
| 96 | 99 | 
| 97 #endif  // MOJO_SHELL_APPLICATION_INSTANCE_H_ | 100 #endif  // MOJO_SHELL_APPLICATION_INSTANCE_H_ | 
| OLD | NEW | 
|---|