diff options
| author | Steve Block <steveblock@google.com> | 2010-10-18 10:40:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-18 10:40:42 -0700 |
| commit | 456bc40a2584f222aecc5331f26ae5ce7a9fc8aa (patch) | |
| tree | 34c700978a109e3716afc91aad7ab5a213fe0f4d /WebKit/android/jni/WebViewCore.h | |
| parent | 21e501a7c1f2756aafb4a0ce635cc3da3e668b48 (diff) | |
| parent | ce9059cc142923289338127a469177d2eb57579f (diff) | |
| download | external_webkit-456bc40a2584f222aecc5331f26ae5ce7a9fc8aa.zip external_webkit-456bc40a2584f222aecc5331f26ae5ce7a9fc8aa.tar.gz external_webkit-456bc40a2584f222aecc5331f26ae5ce7a9fc8aa.tar.bz2 | |
Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"
Diffstat (limited to 'WebKit/android/jni/WebViewCore.h')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h index e5fd210..2ff517f 100644 --- a/WebKit/android/jni/WebViewCore.h +++ b/WebKit/android/jni/WebViewCore.h @@ -30,7 +30,7 @@ #include "FileChooser.h" #include "CacheBuilder.h" #include "CachedHistory.h" -#include "DeviceOrientationManager.h" +#include "DeviceMotionAndOrientationManager.h" #include "DOMSelection.h" #include "PictureSet.h" #include "PlatformGraphicsContext.h" @@ -499,7 +499,7 @@ namespace android { void notifyWebAppCanBeInstalled(); void setWebTextViewAutoFillable(int queryId); - DeviceOrientationManager* deviceOrientationManager() { return &m_deviceOrientationManager; } + DeviceMotionAndOrientationManager* deviceMotionAndOrientationManager() { return &m_deviceMotionAndOrientationManager; } // these members are shared with webview.cpp static Mutex gFrameCacheMutex; @@ -617,7 +617,7 @@ namespace android { uint32_t m_now; #endif - DeviceOrientationManager m_deviceOrientationManager; + DeviceMotionAndOrientationManager m_deviceMotionAndOrientationManager; private: // called from constructor, to add this to a global list |