Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: chromecast/shell/app/android/cast_jni_loader.cc

Issue 638803002: Reorganizes Chromecast code to better reflect functional dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extra DEPS: chromecast/crash/android --> chromecast/common Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromecast/shell/app/DEPS ('k') | chromecast/shell/app/cast_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/shell/app/android/cast_jni_loader.cc
diff --git a/chromecast/shell/app/android/cast_jni_loader.cc b/chromecast/shell/app/android/cast_jni_loader.cc
deleted file mode 100644
index 4cbf8f8e15446ba625a4ebe4cf9809189e9634e7..0000000000000000000000000000000000000000
--- a/chromecast/shell/app/android/cast_jni_loader.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 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 "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/android/library_loader/library_loader_hooks.h"
-#include "base/basictypes.h"
-#include "base/debug/debugger.h"
-#include "base/logging.h"
-#include "chromecast/android/cast_jni_registrar.h"
-#include "chromecast/android/platform_jni_loader.h"
-#include "chromecast/shell/app/cast_main_delegate.h"
-#include "content/public/app/android_library_loader_hooks.h"
-#include "content/public/app/content_main.h"
-#include "content/public/browser/android/compositor.h"
-
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
- base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
- base::android::InitVM(vm);
- JNIEnv* env = base::android::AttachCurrentThread();
-
- if (!base::android::RegisterLibraryLoaderEntryHook(env)) return -1;
-
- // To be called only from the UI thread. If loading the library is done on
- // a separate thread, this should be moved elsewhere.
- if (!chromecast::android::RegisterJni(env)) return -1;
- // Allow platform-specific implementations to perform more JNI registration.
- if (!chromecast::android::PlatformRegisterJni(env)) return -1;
-
- content::Compositor::Initialize();
- content::SetContentMainDelegate(new chromecast::shell::CastMainDelegate);
-
- return JNI_VERSION_1_4;
-}
« no previous file with comments | « chromecast/shell/app/DEPS ('k') | chromecast/shell/app/cast_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698