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

Side by Side Diff: chrome/app/android/chrome_android_initializer.cc

Issue 227233006: Make net use v8 through gin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/app/android/chrome_android_initializer.h" 5 #include "chrome/app/android/chrome_android_initializer.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/library_loader/library_loader_hooks.h" 8 #include "base/android/library_loader/library_loader_hooks.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/app/android/chrome_main_delegate_android.h" 10 #include "chrome/app/android/chrome_main_delegate_android.h"
11 #include "chrome/common/chrome_version_info.h" 11 #include "chrome/common/chrome_version_info.h"
12 #include "content/public/app/android_library_loader_hooks.h" 12 #include "content/public/app/android_library_loader_hooks.h"
13 #include "content/public/app/content_main.h" 13 #include "content/public/app/content_main.h"
14 #include "net/proxy/proxy_resolver_v8.h"
15 14
16 jint RunChrome(JavaVM* vm, ChromeMainDelegateAndroid* main_delegate) { 15 jint RunChrome(JavaVM* vm, ChromeMainDelegateAndroid* main_delegate) {
17 base::android::InitVM(vm); 16 base::android::InitVM(vm);
18 JNIEnv* env = base::android::AttachCurrentThread(); 17 JNIEnv* env = base::android::AttachCurrentThread();
19 if (!base::android::RegisterLibraryLoaderEntryHook(env)) 18 if (!base::android::RegisterLibraryLoaderEntryHook(env))
20 return -1; 19 return -1;
21 20
22 // Pass the library version number to content so that we can check it from the 21 // Pass the library version number to content so that we can check it from the
23 // Java side before continuing initialization 22 // Java side before continuing initialization
24 chrome::VersionInfo vi; 23 chrome::VersionInfo vi;
25 base::android::SetLibraryLoadedHook(&content::LibraryLoaded); 24 base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
26 base::android::SetVersionNumber(vi.Version().c_str()); 25 base::android::SetVersionNumber(vi.Version().c_str());
27 26
28 DCHECK(main_delegate); 27 DCHECK(main_delegate);
29 content::SetContentMainDelegate(main_delegate); 28 content::SetContentMainDelegate(main_delegate);
30 29
31 // http://crbug.com/173648 . V8's default isolate is used by ProxyResolverV8
32 // to resolve PAC urls. The default isolate is created by static initializer
33 // on the shared library thread, and can only be looked up in that thread's
34 // TLS.
35 net::ProxyResolverV8::RememberDefaultIsolate();
36
37 return JNI_VERSION_1_4; 30 return JNI_VERSION_1_4;
38 } 31 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698