diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-12-01 16:04:54 +0000 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-12-02 12:48:28 +0000 |
| commit | f1db1f116e53299d77f6458ca3bfa5f0b4a160cb (patch) | |
| tree | f3c759186f84281dcbbee1324322ea58c2287dc1 /WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | 0dea64c9575802352241ad43b78e20198a6e137c (diff) | |
| download | external_webkit-f1db1f116e53299d77f6458ca3bfa5f0b4a160cb.zip external_webkit-f1db1f116e53299d77f6458ca3bfa5f0b4a160cb.tar.gz external_webkit-f1db1f116e53299d77f6458ca3bfa5f0b4a160cb.tar.bz2 | |
Enable SPDY, and renames initChromiumLogging
initChromiumLogging is now renamed to the more generic initChromium,
the files are renamed to ChromiumInit.*
Change-Id: Ic9639d637f25e664b51d076b9b0ee58c2867c1b5
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index b9b4b75..1ddbb82 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -33,7 +33,7 @@ #include "MemoryCache.h" #include "Chrome.h" #include "ChromeClientAndroid.h" -#include "ChromiumLogging.h" +#include "ChromiumInit.h" #include "ContextMenuClientAndroid.h" #include "DeviceMotionClientAndroid.h" #include "DeviceOrientationClientAndroid.h" @@ -1036,8 +1036,8 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss ScriptController::initializeThreading(); #if USE(CHROME_NETWORK_STACK) - // Initialize chromium logging, needs to be done before any chromium code is called - initChromiumLogging(); + // needs to be called before any other chromium code + initChromium(); #endif #ifdef ANDROID_INSTRUMENT |