Upstream ResourceManager

content/app/android/library_loader_hooks.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/command_line_android.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_string.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/tracked_objects.h"
 #include "content/app/android/app_jni_registrar.h"
 #include "content/browser/android/browser_jni_registrar.h"
 #include "content/common/android/common_jni_registrar.h"
 #include "content/common/content_constants_internal.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "device/battery/android/battery_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
+#include "ui/android/ui_android_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 
 namespace content {
 
 bool EnsureJniRegistered(JNIEnv* env) {
   static bool g_jni_init_done = false;
 
@@ skipping 24 matching lines @@
 
     if (!content::android::RegisterAppJni(env))
       return false;
 
     if (!device::android::RegisterBatteryJni(env))
       return false;
 
     if (!media::RegisterJni(env))
       return false;
 
+    if (!ui::RegisterUIAndroidJni(env))
+      return false;
+
     g_jni_init_done = true;
   }
 
   return true;
 }
 
 bool LibraryLoaded(JNIEnv* env, jclass clazz) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTraceStartup)) {
@@ skipping 23 matching lines @@
                        false,    // Thread ID
                        false,    // Timestamp
                        false);   // Tick count
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   return EnsureJniRegistered(env);
 }
 
 }  // namespace content