| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/app/android_library_loader_hooks.h" | 5 #include "content/public/app/android_library_loader_hooks.h" |
| 6 | 6 |
| 7 #include "base/android/base_jni_registrar.h" | 7 #include "base/android/base_jni_registrar.h" |
| 8 #include "base/android/command_line_android.h" | 8 #include "base/android/command_line_android.h" |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_registrar.h" | 10 #include "base/android/jni_registrar.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 if (!media::RegisterJni(env)) | 65 if (!media::RegisterJni(env)) |
| 66 return false; | 66 return false; |
| 67 | 67 |
| 68 g_jni_init_done = true; | 68 g_jni_init_done = true; |
| 69 } | 69 } |
| 70 | 70 |
| 71 return true; | 71 return true; |
| 72 } | 72 } |
| 73 | 73 |
| 74 bool LibraryLoaded(JNIEnv* env, jclass clazz) { | 74 bool LibraryLoaded(JNIEnv* env, jclass clazz) { |
| 75 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 75 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 76 | 76 |
| 77 if (command_line->HasSwitch(switches::kTraceStartup)) { | 77 if (command_line->HasSwitch(switches::kTraceStartup)) { |
| 78 base::debug::CategoryFilter category_filter( | 78 base::debug::CategoryFilter category_filter( |
| 79 command_line->GetSwitchValueASCII(switches::kTraceStartup)); | 79 command_line->GetSwitchValueASCII(switches::kTraceStartup)); |
| 80 base::debug::TraceLog::GetInstance()->SetEnabled( | 80 base::debug::TraceLog::GetInstance()->SetEnabled( |
| 81 category_filter, | 81 category_filter, |
| 82 base::debug::TraceLog::RECORDING_MODE, | 82 base::debug::TraceLog::RECORDING_MODE, |
| 83 base::debug::TraceOptions()); | 83 base::debug::TraceOptions()); |
| 84 } | 84 } |
| 85 | 85 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 101 false, // Thread ID | 101 false, // Thread ID |
| 102 false, // Timestamp | 102 false, // Timestamp |
| 103 false); // Tick count | 103 false); // Tick count |
| 104 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() | 104 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() |
| 105 << ", default verbosity = " << logging::GetVlogVerbosity(); | 105 << ", default verbosity = " << logging::GetVlogVerbosity(); |
| 106 | 106 |
| 107 return EnsureJniRegistered(env); | 107 return EnsureJniRegistered(env); |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace content | 110 } // namespace content |
| OLD | NEW |