Jason Chen db87c0df6f resolved conflicts from merge of c3b112ba to master ...

Change-Id: I76a5f88849ab617af3316d63378bf3296256e8e1

2010-11-05 20:21:29 -07:00

..

AccessibilityInjector.java

Accessibility support for WebViews

2010-09-13 10:21:34 -07:00

BrowserFrame.java

Move more of android file handling in Java

2010-11-04 12:05:58 +00:00

ByteArrayBuilder.java

…

CacheLoader.java

…

CacheManager.java

Fix the last remaining @deprecated tag without comment warning.

2010-09-10 15:55:43 -04:00

CallbackProxy.java

Work around race condition in CallBackProxy.

2010-11-04 19:51:06 +00:00

CertTool.java

…

ConsoleMessage.java

…

ContentLoader.java

…

CookieManager.java

Hook up remaining CookieManager methods

2010-10-28 15:37:33 +01:00

CookieSyncManager.java

Update Chromium HTTP stack to get database and cache paths from CookieSyncManager

2010-10-27 14:06:53 +01:00

DataLoader.java

…

DateSorter.java

…

DebugFlags.java

Delete unused WebView drag tracking code

2010-10-14 09:39:25 +01:00

DeviceMotionAndOrientationManager.java

Rename DeviceOrientationManager to DeviceMotionAndOrientationManager

2010-10-15 17:08:20 +01:00

DeviceMotionService.java

Rename DeviceOrientationManager to DeviceMotionAndOrientationManager

2010-10-15 17:08:20 +01:00

DeviceOrientationService.java

Rename DeviceOrientationManager to DeviceMotionAndOrientationManager

2010-10-15 17:08:20 +01:00

DownloadListener.java

…

EventLogTags.logtags

…

FileLoader.java

…

FindActionModeCallback.java

Exit action mode when destroying the WebView or loading.

2010-09-15 11:43:49 -04:00

FrameLoader.java

Add support for UAProf header in HTTP requests

2010-11-02 13:26:24 +01:00

GeolocationPermissions.java

…

GeolocationService.java

Pass the WebView context to the GeolocationService from WebKit

2010-06-29 13:11:51 +01:00

HTML5Audio.java

Add the HTML5Audio class, to support the audio tag.

2010-10-18 12:56:02 +01:00

HTML5VideoViewProxy.java

Don't force ended when full screen video is returned manually.

2010-10-18 16:25:59 -07:00

HttpAuthHandler.java

HTTP auth for Chromium HTTP stack (Java side)

2010-09-16 12:51:39 +01:00

HttpAuthHandlerImpl.java

HTTP auth for Chromium HTTP stack (Java side)

2010-09-16 12:51:39 +01:00

JsPromptResult.java

…

JsResult.java

…

JWebCoreJavaBridge.java

DO NOT MERGE

2010-09-13 10:47:58 -07:00

L10nUtils.java

Add a class that stores localised strings used by libchromium.

2010-10-29 11:44:42 +01:00

LoadListener.java

Implement file downloads for Chrome HTTP stack (Java side)

2010-10-20 15:55:12 +01:00

MimeTypeMap.java

Implement file downloads for Chrome HTTP stack (Java side)

2010-10-20 15:55:12 +01:00

MockGeolocation.java

…

Network.java

HTTP auth for Chromium HTTP stack (Java side)

2010-09-16 12:51:39 +01:00

package.html

…

PerfChecker.java

…

Plugin.java

…

PluginData.java

…

PluginFullScreenHolder.java

…

PluginList.java

…

PluginManager.java

am a3faa923: am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread

2010-08-30 08:34:23 -07:00

PluginStub.java

…

SelectActionModeCallback.java

Move Find on page and Select ActionModes to framework.

2010-09-01 11:48:05 -04:00

SslErrorHandler.java

…

StreamLoader.java

…

UrlInterceptHandler.java

…

UrlInterceptRegistry.java

…

URLUtil.java

Make fields in WebAddress private, add getters/setters

2010-10-13 16:21:01 +01:00

ValueCallback.java

…

ViewManager.java

…

WebBackForwardList.java

…

WebBackForwardListClient.java

…

WebChromeClient.java

Move Find on page and Select ActionModes to framework.

2010-09-01 11:48:05 -04:00

WebHistoryItem.java

If no touch icon is specified by a <link> tag, return <host>/apple-touch-icon.png as

2010-07-02 16:47:39 +01:00

WebIconDatabase.java

…

WebSettings.java

Stabilize reflow, aka, the fit-to-screen option in settings.

2010-10-29 13:53:33 -07:00

WebStorage.java

…

WebSyncManager.java

…

WebTextView.java

Use the new web email and password variations.

2010-11-04 14:02:14 -04:00

WebView.java

Don't draw the selection pointer on long press.

2010-11-05 14:43:10 -04:00

WebViewClient.java

Fix warnings in docs generation.

2010-08-31 14:02:38 +01:00

WebViewCore.java

Display the AutoFill preview string in the drop down box.

2010-11-05 12:33:29 +00:00

WebViewDatabase.java

Update the storage locations used by the Chromium HTTP stack

2010-09-28 12:32:05 +01:00

WebViewWorker.java

…

ZoomControlBase.java

…

ZoomControlEmbedded.java

…

ZoomControlExternal.java

…

ZoomManager.java

Use minPrefWidth instead of viewsize.x.

2010-11-04 17:58:17 -07:00