| 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 "content/shell/browser/shell.h" | 5 #include "content/shell/browser/shell.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/strings/string_piece.h" | 13 #include "base/strings/string_piece.h" |
| 14 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
| 15 #include "content/shell/android/shell_manager.h" | 15 #include "content/shell/android/shell_manager.h" |
| 16 #include "jni/Shell_jni.h" | 16 #include "jni/Shell_jni.h" |
| 17 | 17 |
| 18 using base::android::AttachCurrentThread; | 18 using base::android::AttachCurrentThread; |
| 19 using base::android::ConvertUTF8ToJavaString; | 19 using base::android::ConvertUTF8ToJavaString; |
| 20 | 20 |
| 21 namespace content { | 21 namespace content { |
| 22 | 22 |
| 23 void Shell::PlatformInitialize(const gfx::Size& default_window_size) { | 23 void Shell::PlatformInitialize(const gfx::Size& default_window_size) { |
| 24 CommandLine* command_line = CommandLine::ForCurrentProcess(); | |
| 25 DCHECK(command_line->HasSwitch(switches::kEnableThreadedCompositing)); | |
| 26 } | 24 } |
| 27 | 25 |
| 28 void Shell::PlatformExit() { | 26 void Shell::PlatformExit() { |
| 29 } | 27 } |
| 30 | 28 |
| 31 void Shell::PlatformCleanUp() { | 29 void Shell::PlatformCleanUp() { |
| 32 JNIEnv* env = AttachCurrentThread(); | 30 JNIEnv* env = AttachCurrentThread(); |
| 33 if (java_object_.is_null()) | 31 if (java_object_.is_null()) |
| 34 return; | 32 return; |
| 35 Java_Shell_onNativeDestroyed(env, java_object_.obj()); | 33 Java_Shell_onNativeDestroyed(env, java_object_.obj()); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 return RegisterNativesImpl(env); | 102 return RegisterNativesImpl(env); |
| 105 } | 103 } |
| 106 | 104 |
| 107 // static | 105 // static |
| 108 void CloseShell(JNIEnv* env, jclass clazz, jlong shellPtr) { | 106 void CloseShell(JNIEnv* env, jclass clazz, jlong shellPtr) { |
| 109 Shell* shell = reinterpret_cast<Shell*>(shellPtr); | 107 Shell* shell = reinterpret_cast<Shell*>(shellPtr); |
| 110 shell->Close(); | 108 shell->Close(); |
| 111 } | 109 } |
| 112 | 110 |
| 113 } // namespace content | 111 } // namespace content |
| OLD | NEW |