| 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 "shell/android/main.h" | 5 #include "shell/android/main.h" |
| 6 | 6 |
| 7 #include <stdio.h> | 7 #include <stdio.h> |
| 8 | 8 |
| 9 #include "base/android/fifo_utils.h" | 9 #include "base/android/fifo_utils.h" |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "shell/switches.h" | 43 #include "shell/switches.h" |
| 44 #include "shell/tracer.h" | 44 #include "shell/tracer.h" |
| 45 #include "ui/gl/gl_surface_egl.h" | 45 #include "ui/gl/gl_surface_egl.h" |
| 46 | 46 |
| 47 using base::LazyInstance; | 47 using base::LazyInstance; |
| 48 | 48 |
| 49 namespace shell { | 49 namespace shell { |
| 50 | 50 |
| 51 namespace { | 51 namespace { |
| 52 | 52 |
| 53 // Tag for logging. | |
| 54 const char kLogTag[] = "chromium"; | |
| 55 | |
| 56 // Command line argument for the communication fifo. | 53 // Command line argument for the communication fifo. |
| 57 const char kFifoPath[] = "fifo-path"; | 54 const char kFifoPath[] = "fifo-path"; |
| 58 | 55 |
| 59 // Delay before trying to upload a crash report. This must not slow down | 56 // Delay before trying to upload a crash report. This must not slow down |
| 60 // startup. | 57 // startup. |
| 61 const int kDelayBeforeCrashUploadInSeconds = 60; | 58 const int kDelayBeforeCrashUploadInSeconds = 60; |
| 62 | 59 |
| 63 class MojoShellRunner : public base::DelegateSimpleThread::Delegate { | 60 class MojoShellRunner : public base::DelegateSimpleThread::Delegate { |
| 64 public: | 61 public: |
| 65 MojoShellRunner(const base::FilePath& mojo_shell_child_path) | 62 MojoShellRunner(const base::FilePath& mojo_shell_child_path) |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 mojo::MessagePipeHandle(services_handle))), | 339 mojo::MessagePipeHandle(services_handle))), |
| 343 base::Passed(mojo::ScopedMessagePipeHandle( | 340 base::Passed(mojo::ScopedMessagePipeHandle( |
| 344 mojo::MessagePipeHandle(exposed_services_handle))))); | 341 mojo::MessagePipeHandle(exposed_services_handle))))); |
| 345 } | 342 } |
| 346 | 343 |
| 347 bool RegisterShellService(JNIEnv* env) { | 344 bool RegisterShellService(JNIEnv* env) { |
| 348 return RegisterNativesImpl(env); | 345 return RegisterNativesImpl(env); |
| 349 } | 346 } |
| 350 | 347 |
| 351 } // namespace shell | 348 } // namespace shell |
| OLD | NEW |