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

Unified Diff: chrome/browser/chrome_browser_main_android.cc

Issue 10911202: Revert 155950 - Add initial Chromium TestShell support for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | « chrome/app/chrome_main_delegate.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_android.cc
===================================================================
--- chrome/browser/chrome_browser_main_android.cc (revision 155957)
+++ chrome/browser/chrome_browser_main_android.cc (working copy)
@@ -4,6 +4,8 @@
#include "chrome/browser/chrome_browser_main_android.h"
+#include "base/android/jni_android.h"
+#include "chrome/browser/android/chrome_jni_registrar.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/common/main_function_params.h"
#include "net/android/network_change_notifier_factory.h"
@@ -18,6 +20,11 @@
}
void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ DCHECK(env);
+
+ chrome::android::RegisterJni(env);
+
net::NetworkChangeNotifier::SetFactory(
new net::android::NetworkChangeNotifierFactory());
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698