diff options
| -rw-r--r-- | content/browser/android/browser_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | content/browser/android/child_process_launcher_android.cc (renamed from content/browser/android/child_process_launcher.cc) | 2 | ||||
| -rw-r--r-- | content/browser/android/child_process_launcher_android.h (renamed from content/browser/android/child_process_launcher.h) | 7 | ||||
| -rw-r--r-- | content/browser/child_process_launcher.cc | 2 | ||||
| -rw-r--r-- | content/content_browser.gypi | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc index d15391b..1915337 100644 --- a/content/browser/android/browser_jni_registrar.cc +++ b/content/browser/android/browser_jni_registrar.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "content/browser/android/android_browser_process.h" -#include "content/browser/android/child_process_launcher.h" +#include "content/browser/android/child_process_launcher_android.h" #include "content/browser/android/content_settings.h" #include "content/browser/android/content_video_view.h" #include "content/browser/android/content_view_core_impl.h" diff --git a/content/browser/android/child_process_launcher.cc b/content/browser/android/child_process_launcher_android.cc index 32feae6..3a954dc 100644 --- a/content/browser/android/child_process_launcher.cc +++ b/content/browser/android/child_process_launcher_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/android/child_process_launcher.h" +#include "content/browser/android/child_process_launcher_android.h" #include "base/android/jni_android.h" #include "base/android/jni_array.h" diff --git a/content/browser/android/child_process_launcher.h b/content/browser/android/child_process_launcher_android.h index 4b152c6..e83e04e 100644 --- a/content/browser/android/child_process_launcher.h +++ b/content/browser/android/child_process_launcher_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_H_ -#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_H_ +#ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ +#define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ #include <jni.h> @@ -33,5 +33,4 @@ bool RegisterChildProcessLauncher(JNIEnv* env); } // namespace content -#endif // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_H_ - +#endif // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 20df18e..991223d 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -29,7 +29,7 @@ #include "content/browser/mach_broker_mac.h" #elif defined(OS_ANDROID) #include "base/android/jni_android.h" -#include "content/browser/android/child_process_launcher.h" +#include "content/browser/android/child_process_launcher_android.h" #elif defined(OS_POSIX) #include "base/memory/singleton.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 4e270a6..0f6a65a 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -214,8 +214,8 @@ 'browser/android/android_browser_process.h', 'browser/android/browser_jni_registrar.cc', 'browser/android/browser_jni_registrar.h', - 'browser/android/child_process_launcher.cc', - 'browser/android/child_process_launcher.h', + 'browser/android/child_process_launcher_android.cc', + 'browser/android/child_process_launcher_android.h', 'browser/android/content_settings.cc', 'browser/android/content_settings.h', 'browser/android/content_startup_flags.cc', |