| Index: chrome/app/android/chrome_android_initializer.cc
|
| diff --git a/chrome/app/android/chrome_android_initializer.cc b/chrome/app/android/chrome_android_initializer.cc
|
| index dd7d46f89e0a4bf600df28d709ba2f230e531c95..de84812775dc1f6f32feb420e13fd61408930ec7 100644
|
| --- a/chrome/app/android/chrome_android_initializer.cc
|
| +++ b/chrome/app/android/chrome_android_initializer.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/android/jni_android.h"
|
| #include "base/logging.h"
|
| #include "chrome/app/android/chrome_main_delegate_android.h"
|
| +#include "chrome/common/chrome_version_info.h"
|
| #include "content/public/app/android_library_loader_hooks.h"
|
| #include "content/public/app/content_main.h"
|
| #include "net/proxy/proxy_resolver_v8.h"
|
| @@ -17,6 +18,11 @@ jint RunChrome(JavaVM* vm, ChromeMainDelegateAndroid* main_delegate) {
|
| if (!content::RegisterLibraryLoaderEntryHook(env))
|
| return -1;
|
|
|
| + // Pass the library version number to content so that we can check it from the
|
| + // Java side before continuing initialization
|
| + chrome::VersionInfo vi;
|
| + content::SetVersionNumber(vi.Version().c_str());
|
| +
|
| DCHECK(main_delegate);
|
| content::SetContentMainDelegate(main_delegate);
|
|
|
|
|