• Home
  • History
  • Annotate
  • only in /external/chromium_org/android_webview/
History log of /external/chromium_org/android_webview/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
fabffb1485867d359bfe2149faee72efe4df2f48 17-Dec-2014 Bo Liu <boliu@google.com> Merge "Cherry-pick: Don't schedule more invokeFunctors than necessary." into m39
141411bccb8ff5f5d56bf79c8d7f911318a7c086 13-Dec-2014 hush <hush@chromium.org> Cherry-pick: Don't schedule more invokeFunctors than necessary.

Cherry-pick with conflicts of
crrev.com/81c62e2d9601d38c44f71857dfabc31e2726cd70

BUG: 18706908

Original description:

The problematic sequence of events is as follows:
1. ShouldRequestOnNonUiThread, which posts a closure
(request_draw_gl_closure_) to UI thread
2. That closure gets run on UI thread, and it schedules the invokeFunctor
with Android framework
3. Before the corresponding invokeFunctor actually happens on RT (which
is DrawGL process mode), ShouldRequestOnUiTdread is called on the UI
thread. At this point, pending_non_ui_ is not null, we cancel the
callback, which does nothing, because WebView has already scheduled an
invokeFunctor with the Android framework in Step 2. Then we schedule
another invokeFunctor immediately on the UI thread. So there are 2
invokeFunctors queued in Android framework in this case.

This CL tries keep track of whether or not we've
queued an invokeFunctor in Android framework already.

Change-Id: I0a084d92ea74412c3938645d63170604e6352318
rowser/shared_renderer_state.cc
ative/aw_contents.cc
83109aa23599e63402ee03cd93f67d3ff874e241 12-Dec-2014 Hui Shu <hush@google.com> Remember user's decisions on SSL errors.

Cherry pick from https://codereview.chromium.org/794023002

Original description:
After CL: https://codereview.chromium.org/369703002, Android
WebView just has a NULL SSLHostStateDelegate. So it does not remember
any user decisions on SSL errors. This is a regression of behavior from
L (m37).

History:
JB behavior: Larger error codes are assumed to have higher severity. And
if the user has allowed an SSL error with a high severity, the user
won't be prompted for a lower severity SSL error.

K and L behavior: A specific SSL error will be allowed only if the error
bit field is a subset of previously allowed error codes.

trunk behavior for webview (without this patch): We don't remember
user's decision at all.

This CL:
Maintain the same behavior with K and L.

Conflicts:
android_webview/browser/aw_browser_context.h
android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java

BUG: 18665047
Change-Id: I0ecbc0b78e9323ef911cd61679fec5e4a6146489
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_ssl_host_state_delegate.cc
rowser/aw_ssl_host_state_delegate.h
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
c64ad5c2e063cde757eba7f9499a8e748b57cbdc 09-Dec-2014 Mikhail Naganov <mnaganov@google.com> Cherry-pick: [Android] Java Bridge: handle requests from Java Script on the background thread

Same as the upsteam patch, with purely syntactic adaptations of "override"
keywords usage to the legacy style used in M39.

Bug: 18520475

Original description:

commit a4b0d4cc0b9780aecd3e23a94293b2e3002baf7e
Author: mnaganov <mnaganov@chromium.org>
Date: Tue Dec 09 13:30:08 2014

[Android] Java Bridge: handle requests from Java Script on the background thread

This allows the page code that calls into injected objects methods to run even
if the browser UI thread is blocked (in WebView, the browser UI thread is the main
app thread, and sometimes people use synchronization primitives there that wait
on some action performed by the injected object, see the bug for an example).

In this CL, we make the minimal required amount of changes in order to simplify
cherry-picking into older branches. A cleanup CL (or CLs) will follow.

High-level description of changes:

1. We intercept messages from renderers on the IO thread using BrowserMessageFilter
and handle Java Bridge messages entirely on the background thread. This implies
the following changes:

2. GinJavaBridgeDispatcherHost has become RefCountedThreadSafe
(via BrowserMessageFilter)

3. We have to use route IDs of RenderFrameHosts instead of pointers to them, as
we can't access RFHs from IO or background threads.

4. Objects registry is now accessed from UI and background threads, and we have to use
locking. We can't anymore restrict access to the registry to a single thread.
This also means we can't anymore implement the registry using IDMap, as it is
explicitly non-thread-safe.

5. A lot of code was removed, as we now serve synchronous requests from renderers
without inter-thread hopping!

6. Of course, a new regression test has been added that now passes.

BUG=438255

Review URL: https://codereview.chromium.org/772123002

Change-Id: I9e517024878f0b95a32f95524de4f8017ba8dc21
Cr-Commit-Position: refs/heads/master@{#307460}
avatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java
78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 08-Dec-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
ndroid_webview_common.target.darwin-mips64.mk
ndroid_webview_common.target.linux-mips64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips64.mk
ndroid_webview_pak.target.darwin-mips64.mk
ndroid_webview_pak.target.linux-mips64.mk
ndroid_webview_resources.target.darwin-mips64.mk
ndroid_webview_resources.target.linux-mips64.mk
ndroid_webview_strings_grd.target.darwin-mips64.mk
ndroid_webview_strings_grd.target.linux-mips64.mk
ibwebviewchromium.target.darwin-mips64.mk
ibwebviewchromium.target.linux-mips64.mk
ative/android_webview_native_jni.target.darwin-mips64.mk
ative/android_webview_native_jni.target.linux-mips64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips64.mk
ative/webview_native.target.darwin-mips64.mk
ative/webview_native.target.linux-mips64.mk
ools/gyp_webview
e4256316f8b5e8d1ec0df1f7762771622a53fa63 22-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: I1bb301dcfe74249d8b66fb60ba577e9095c86b8d
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
165c68f9802332588874b0a207d7f49d03009ddf 22-Nov-2014 Ignacio Solla <igsolla@google.com> Merge "[WebView] Set back button to exit fullscreen." into m39
82266bf9494bbc751c5d727835bf0988a6c51004 20-Nov-2014 boliu <boliu@chromium.org> Cherry-pick: aw: Workaround qualcomm driver bug

Clean cherry-pick of chromium
crrev.com/18abdf1afb8034be81213b23d9e05d34e92bc8d3

BUG: 18386625

Original description:

This is a small webview-specific workaround that affects all drivers.
Will need a better driver/version specific workaround later.

Change-Id: Iec566f9f166397a104badb8b549cc59e6173faac
rowser/scoped_app_gl_state_restore.cc
435c5666f334eef2a59b6cc28532ca4af0c62b74 17-Nov-2014 Ignacio Solla <igsolla@google.com> [WebView] Set back button to exit fullscreen.

This patch fixes a regression from K to L. Tapping the back button
while in fullscreen should exit fullscreen instead of the current
activity.

BUG:17985005
Change-Id: I7a5eb4edebb54ce1e7d6a2b578a87dd7e7de9dbf
ava/src/org/chromium/android_webview/AwContentViewClient.java
5f831b54265f787b194e304d5836f9e5f501265d 21-Nov-2014 Selim Gurun <sgurun@google.com> Merge "Enable using system proxy resolver for android webview" into m39
0253910267cb2e113728c1087e1060207c9d59e9 21-Nov-2014 Selim Gurun <sgurun@google.com> Enable using system proxy resolver for android webview

Bug: 18388001

Clean cherry-pick from
https://crrev.com/200b2f027ce820425e37b08ed8b4e5dc84928276

Android platform provides a local proxy that also handles PAC proxy
resolution. The CL below modified enabled chrome network stack to start
using V8 proxy resolution on Android platform:
https://codereview.chromium.org/573013002/
however webview cannot use V8 proxy resolution since Webview is significantly
different from chrome: Webview is single process vs. chrome is multithreaded
and use of V8 isolates creates concurrency problems with Blink's use of V8
isolates.
For now, we want to establish the prior behavior for android webview and
consider making changes to v8 proxy resolver in future.

BUG=432539
Committed: https://crrev.com/200b2f027ce820425e37b08ed8b4e5dc84928276
Cr-Commit-Position: refs/heads/master@{#305166}

Change-Id: I58becc2acf369956df6c458df13a53dac05caff3
rowser/aw_browser_context.cc
rowser/net/aw_url_request_context_getter.cc
b036d6a1ec5bda0be48156dfcd779a9563a4feb3 17-Nov-2014 Selim Gurun <sgurun@google.com> Merge "Disable channel id" into m39
3c9a4a7bbec40de49d55363e12a368fe0b01dca9 15-Nov-2014 Selim Gurun <sgurun@google.com> Disable channel id

Bug: 18297802

Cherry-pick disable channel id

Android webview does not use channel id since there is no API
to share channel ids and this would break some apps that use
different network stacks. This change is to explicitly
disable it.

BUG=433427
internal bug b/18297802

Review URL: https://codereview.chromium.org/731593003

Change-Id: Iefd0f61c922227d562667f4a53f0bb35b03b444a
Cr-Commit-Position: refs/heads/master@{#304316}
rowser/net/aw_url_request_context_getter.cc
66b65590bbb54dab9b24d1973ea44deaee01a95d 13-Nov-2014 Ben Murdoch <benm@google.com> Merge "Implement support for SmartClip in AwContents." into m39
ef4037479e29143436d95f956f0f0be90459a420 13-Nov-2014 Ignacio Solla <igsolla@google.com> Merge "[WebView] Build chromium against SDK 21." into m39
ed88037384b3793eacfd970667911ea07873a584 04-Nov-2014 Ben Murdoch <benm@google.com> Implement support for SmartClip in AwContents.

Bug: 18222974
Change-Id: I42e787b6205ec3c3764ec5076e2391e4ec4e4deb

Conflicts:
android_webview/java/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContents.java
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
ava/strings/translations/android_webview_strings_am.xtb
ava/strings/translations/android_webview_strings_ar.xtb
ava/strings/translations/android_webview_strings_bg.xtb
ava/strings/translations/android_webview_strings_ca.xtb
ava/strings/translations/android_webview_strings_cs.xtb
ava/strings/translations/android_webview_strings_da.xtb
ava/strings/translations/android_webview_strings_de.xtb
ava/strings/translations/android_webview_strings_el.xtb
ava/strings/translations/android_webview_strings_en-GB.xtb
ava/strings/translations/android_webview_strings_es-419.xtb
ava/strings/translations/android_webview_strings_es.xtb
ava/strings/translations/android_webview_strings_fa.xtb
ava/strings/translations/android_webview_strings_fi.xtb
ava/strings/translations/android_webview_strings_fil.xtb
ava/strings/translations/android_webview_strings_fr.xtb
ava/strings/translations/android_webview_strings_hi.xtb
ava/strings/translations/android_webview_strings_hr.xtb
ava/strings/translations/android_webview_strings_hu.xtb
ava/strings/translations/android_webview_strings_id.xtb
ava/strings/translations/android_webview_strings_it.xtb
ava/strings/translations/android_webview_strings_iw.xtb
ava/strings/translations/android_webview_strings_ja.xtb
ava/strings/translations/android_webview_strings_ko.xtb
ava/strings/translations/android_webview_strings_lt.xtb
ava/strings/translations/android_webview_strings_lv.xtb
ava/strings/translations/android_webview_strings_nl.xtb
ava/strings/translations/android_webview_strings_no.xtb
ava/strings/translations/android_webview_strings_pl.xtb
ava/strings/translations/android_webview_strings_pt-BR.xtb
ava/strings/translations/android_webview_strings_pt-PT.xtb
ava/strings/translations/android_webview_strings_ro.xtb
ava/strings/translations/android_webview_strings_ru.xtb
ava/strings/translations/android_webview_strings_sk.xtb
ava/strings/translations/android_webview_strings_sl.xtb
ava/strings/translations/android_webview_strings_sr.xtb
ava/strings/translations/android_webview_strings_sv.xtb
ava/strings/translations/android_webview_strings_sw.xtb
ava/strings/translations/android_webview_strings_th.xtb
ava/strings/translations/android_webview_strings_tr.xtb
ava/strings/translations/android_webview_strings_uk.xtb
ava/strings/translations/android_webview_strings_vi.xtb
ava/strings/translations/android_webview_strings_zh-CN.xtb
ava/strings/translations/android_webview_strings_zh-TW.xtb
02e351db3d65690ce373bcb43fc71340fd40caf0 10-Nov-2014 Ignacio Solla <igsolla@google.com> [WebView] Build chromium against SDK 21.

BUG:18152150
Change-Id: I5a9a0fe864dab563294b24b56c10270ba5a111fe
ndroid.mk
5b892326406927b709cdaf6c384d4ababf456332 06-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/browser_view_renderer.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
5b62eb5758cb7b791cfdd45cf78f35dc060631b6 27-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.38

This commit was generated by merge_to_master.py.

Change-Id: Id34e308a78a8e250aa0f0b60fcb9f882fc35382e
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/browser_view_renderer_client.h
rowser/hardware_renderer.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/hardware_renderer.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
02b31a78cd8af8635d58046c4f0e3b089da60deb 21-Oct-2014 Ben Murdoch <benm@google.com> Update WebView user agent to reflect M39.

Change-Id: I4c63f997fb3075cb659ea89401a1556208b26d7d
ommon/aw_content_client.cc
4ccfafb49a467adf7819cc5933ef036c1ee41c10 13-Oct-2014 mkosiba <mkosiba@chromium.org> Cherry-pick "[android_webview] Hardcode the default text encoding to UTF-8."

The WebView will use a fixed default value for the text encoding instead
of getting it from the platform. This is in attempt to unify behavior
between devices.

BUG=422366

Review URL: https://codereview.chromium.org/639113004

Cr-Commit-Position: refs/heads/master@{#299287}

Conflicts:
DEPS
android_webview/buildbot/aosp_manifest.xml
android_webview/renderer/aw_content_renderer_client.h
chrome/renderer/chrome_content_renderer_client.h

Change-Id: I0b4f507e6e439561bf89e3a0e668910cbf0c9e08
uildbot/aosp_manifest.xml
ommon/aw_resource.h
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwSettings.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
ative/aw_resource.cc
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
est/shell/res/values/strings.xml
est/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
ava/strings/translations/android_webview_strings_am.xtb
ava/strings/translations/android_webview_strings_ar.xtb
ava/strings/translations/android_webview_strings_bg.xtb
ava/strings/translations/android_webview_strings_ca.xtb
ava/strings/translations/android_webview_strings_cs.xtb
ava/strings/translations/android_webview_strings_da.xtb
ava/strings/translations/android_webview_strings_de.xtb
ava/strings/translations/android_webview_strings_el.xtb
ava/strings/translations/android_webview_strings_en-GB.xtb
ava/strings/translations/android_webview_strings_es-419.xtb
ava/strings/translations/android_webview_strings_es.xtb
ava/strings/translations/android_webview_strings_fa.xtb
ava/strings/translations/android_webview_strings_fi.xtb
ava/strings/translations/android_webview_strings_fil.xtb
ava/strings/translations/android_webview_strings_fr.xtb
ava/strings/translations/android_webview_strings_hi.xtb
ava/strings/translations/android_webview_strings_hr.xtb
ava/strings/translations/android_webview_strings_hu.xtb
ava/strings/translations/android_webview_strings_id.xtb
ava/strings/translations/android_webview_strings_it.xtb
ava/strings/translations/android_webview_strings_iw.xtb
ava/strings/translations/android_webview_strings_ja.xtb
ava/strings/translations/android_webview_strings_ko.xtb
ava/strings/translations/android_webview_strings_lt.xtb
ava/strings/translations/android_webview_strings_lv.xtb
ava/strings/translations/android_webview_strings_nl.xtb
ava/strings/translations/android_webview_strings_no.xtb
ava/strings/translations/android_webview_strings_pl.xtb
ava/strings/translations/android_webview_strings_pt-BR.xtb
ava/strings/translations/android_webview_strings_pt-PT.xtb
ava/strings/translations/android_webview_strings_ro.xtb
ava/strings/translations/android_webview_strings_ru.xtb
ava/strings/translations/android_webview_strings_sk.xtb
ava/strings/translations/android_webview_strings_sl.xtb
ava/strings/translations/android_webview_strings_sr.xtb
ava/strings/translations/android_webview_strings_sv.xtb
ava/strings/translations/android_webview_strings_sw.xtb
ava/strings/translations/android_webview_strings_th.xtb
ava/strings/translations/android_webview_strings_tr.xtb
ava/strings/translations/android_webview_strings_uk.xtb
ava/strings/translations/android_webview_strings_vi.xtb
ava/strings/translations/android_webview_strings_zh-CN.xtb
ava/strings/translations/android_webview_strings_zh-TW.xtb
ative/aw_contents_statics.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
ndroid.mk
EPS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
ndroid_webview_resources.target.darwin-arm.mk
ndroid_webview_resources.target.darwin-arm64.mk
ndroid_webview_resources.target.darwin-mips.mk
ndroid_webview_resources.target.darwin-x86.mk
ndroid_webview_resources.target.darwin-x86_64.mk
ndroid_webview_resources.target.linux-arm.mk
ndroid_webview_resources.target.linux-arm64.mk
ndroid_webview_resources.target.linux-mips.mk
ndroid_webview_resources.target.linux-x86.mk
ndroid_webview_resources.target.linux-x86_64.mk
ndroid_webview_strings_grd.target.darwin-arm.mk
ndroid_webview_strings_grd.target.darwin-arm64.mk
ndroid_webview_strings_grd.target.darwin-mips.mk
ndroid_webview_strings_grd.target.darwin-x86.mk
ndroid_webview_strings_grd.target.darwin-x86_64.mk
ndroid_webview_strings_grd.target.linux-arm.mk
ndroid_webview_strings_grd.target.linux-arm64.mk
ndroid_webview_strings_grd.target.linux-mips.mk
ndroid_webview_strings_grd.target.linux-x86.mk
ndroid_webview_strings_grd.target.linux-x86_64.mk
ndroid_webview_tests.gypi
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.cc
rowser/aw_contents_client_bridge_base.h
rowser/aw_dev_tools_manager_delegate.cc
rowser/aw_dev_tools_manager_delegate.h
rowser/aw_javascript_dialog_manager.cc
rowser/aw_login_delegate.cc
rowser/aw_resource_context.cc
rowser/aw_resource_context.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/global_tile_manager.cc
rowser/global_tile_manager.h
rowser/global_tile_manager_client.h
rowser/global_tile_manager_unittest.cc
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/net/android_stream_reader_url_request_job.h
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/net/input_stream_reader.cc
rowser/net_disk_cache_remover.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/print_manager.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uild/jarjar_resources.gypi
uild/res_hack/values/values.xml
uild/resources_config.mk
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ommon/OWNERS
ommon/print_messages.h
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwAssets.java
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwContentViewClient.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
ava/src/org/chromium/android_webview/AwWebResourceResponse.java
ava/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
ava/src/org/chromium/android_webview/HttpAuthDatabase.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
ava_library_common.mk
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
avatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/CommandLineTest.java
avatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
avatests/src/org/chromium/android_webview/test/KeySystemTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
avatests/src/org/chromium/android_webview/test/LoadUrlTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
avatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
avatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java
avatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.gypi
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/DEPS
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_dev_tools_server.cc
ative/aw_quota_manager_bridge_impl.cc
ative/aw_quota_manager_bridge_impl.h
ative/aw_settings.cc
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_view_delegate.h
ative/aw_web_resource_response_impl.cc
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/cookie_manager.cc
ative/input_stream_impl.cc
ative/permission/permission_request_handler.cc
ative/state_serializer.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_execution_termination_filter.cc
enderer/aw_execution_termination_filter.h
enderer/aw_permission_client.cc
enderer/aw_render_frame_ext.cc
enderer/aw_render_view_ext.cc
enderer/print_web_view_helper.cc
enderer/print_web_view_helper.h
enderer/print_web_view_helper_linux.cc
est/shell/AndroidManifest.xml
est/shell/src/draw_gl/DEPS
est/shell/src/draw_gl/draw_gl.cc
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/shell/src/org/chromium/android_webview/shell/DrawGL.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
ools/find_copyrights.pl
ools/find_files.pl
ools/known_issues.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ndroid_webview.gyp
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
ndroid_webview_resources.target.darwin-arm.mk
ndroid_webview_resources.target.darwin-arm64.mk
ndroid_webview_resources.target.darwin-mips.mk
ndroid_webview_resources.target.darwin-x86.mk
ndroid_webview_resources.target.darwin-x86_64.mk
ndroid_webview_resources.target.linux-arm.mk
ndroid_webview_resources.target.linux-arm64.mk
ndroid_webview_resources.target.linux-mips.mk
ndroid_webview_resources.target.linux-x86.mk
ndroid_webview_resources.target.linux-x86_64.mk
ndroid_webview_strings_grd.target.darwin-arm.mk
ndroid_webview_strings_grd.target.darwin-arm64.mk
ndroid_webview_strings_grd.target.darwin-mips.mk
ndroid_webview_strings_grd.target.darwin-x86.mk
ndroid_webview_strings_grd.target.darwin-x86_64.mk
ndroid_webview_strings_grd.target.linux-arm.mk
ndroid_webview_strings_grd.target.linux-arm64.mk
ndroid_webview_strings_grd.target.linux-mips.mk
ndroid_webview_strings_grd.target.linux-x86.mk
ndroid_webview_strings_grd.target.linux-x86_64.mk
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_quota_permission_context.cc
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uild/resources_config.mk
uildbot/deps_whitelist.py
ava/res/drawable-hdpi/ic_media_video_poster.png
ava/res/drawable-ldpi/ic_media_video_poster.png
ava/res/drawable-mdpi/ic_media_video_poster.png
ava/res/drawable-xhdpi/ic_media_video_poster.png
ava/res/values/strings.xml
ava/src/org/chromium/android_webview/AwAutofillClient.java
ava/src/org/chromium/android_webview/AwContents.java
ava/strings/android_webview_strings.grd
ava/strings/translations/android_webview_strings_am.xtb
ava/strings/translations/android_webview_strings_ar.xtb
ava/strings/translations/android_webview_strings_bg.xtb
ava/strings/translations/android_webview_strings_ca.xtb
ava/strings/translations/android_webview_strings_cs.xtb
ava/strings/translations/android_webview_strings_da.xtb
ava/strings/translations/android_webview_strings_de.xtb
ava/strings/translations/android_webview_strings_el.xtb
ava/strings/translations/android_webview_strings_en-GB.xtb
ava/strings/translations/android_webview_strings_es-419.xtb
ava/strings/translations/android_webview_strings_es.xtb
ava/strings/translations/android_webview_strings_fa.xtb
ava/strings/translations/android_webview_strings_fi.xtb
ava/strings/translations/android_webview_strings_fil.xtb
ava/strings/translations/android_webview_strings_fr.xtb
ava/strings/translations/android_webview_strings_hi.xtb
ava/strings/translations/android_webview_strings_hr.xtb
ava/strings/translations/android_webview_strings_hu.xtb
ava/strings/translations/android_webview_strings_id.xtb
ava/strings/translations/android_webview_strings_it.xtb
ava/strings/translations/android_webview_strings_iw.xtb
ava/strings/translations/android_webview_strings_ja.xtb
ava/strings/translations/android_webview_strings_ko.xtb
ava/strings/translations/android_webview_strings_lt.xtb
ava/strings/translations/android_webview_strings_lv.xtb
ava/strings/translations/android_webview_strings_nl.xtb
ava/strings/translations/android_webview_strings_no.xtb
ava/strings/translations/android_webview_strings_pl.xtb
ava/strings/translations/android_webview_strings_pt-BR.xtb
ava/strings/translations/android_webview_strings_pt-PT.xtb
ava/strings/translations/android_webview_strings_ro.xtb
ava/strings/translations/android_webview_strings_ru.xtb
ava/strings/translations/android_webview_strings_sk.xtb
ava/strings/translations/android_webview_strings_sl.xtb
ava/strings/translations/android_webview_strings_sr.xtb
ava/strings/translations/android_webview_strings_sv.xtb
ava/strings/translations/android_webview_strings_sw.xtb
ava/strings/translations/android_webview_strings_th.xtb
ava/strings/translations/android_webview_strings_tr.xtb
ava/strings/translations/android_webview_strings_uk.xtb
ava/strings/translations/android_webview_strings_vi.xtb
ava/strings/translations/android_webview_strings_zh-CN.xtb
ava/strings/translations/android_webview_strings_zh-TW.xtb
ib/main/webview_entry_point.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/aw_quota_manager_bridge_impl.cc
ative/aw_quota_manager_bridge_impl.h
ools/third_party_files_whitelist.txt
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ndroid.mk
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
ndroid_webview_telemetry_shell.gyp
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/deferred_gpu_command_service.cc
rowser/deferred_gpu_command_service.h
rowser/hardware_renderer.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientBridge.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
ava/src/org/chromium/android_webview/AwWebContentsObserver.java
ava/src/org/chromium/android_webview/ClientCertLookupTable.java
ava/src/org/chromium/android_webview/permission/AwPermissionRequest.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageStartedTest.java
avatests/src/org/chromium/android_webview/test/CommandLineTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_statics.cc
ative/aw_dev_tools_server.cc
ative/aw_settings.cc
ative/aw_web_contents_delegate.cc
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/assets/full_screen_video_test.html
ools/WebViewTelemetryShell/Android.mk
ools/WebViewTelemetryShell/AndroidManifest.xml
ools/WebViewTelemetryShell/res/drawable/ic_launcher.png
ools/WebViewTelemetryShell/res/layout/activity_telemetry.xml
ools/WebViewTelemetryShell/res/values/strings.xml
ools/WebViewTelemetryShell/src/org/chromium/telemetry_shell/JankActivity.java
ools/WebViewTelemetryShell/src/org/chromium/telemetry_shell/TelemetryActivity.java
nittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ndroid.mk
EPS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/browser_view_renderer_client.h
rowser/deferred_gpu_command_service.cc
rowser/deferred_gpu_command_service.h
rowser/global_tile_manager.cc
rowser/global_tile_manager.h
rowser/gpu_memory_buffer_factory_impl.cc
rowser/gpu_memory_buffer_factory_impl.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/net/aw_network_delegate.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/parent_compositor_draw_constraints.cc
rowser/parent_compositor_draw_constraints.h
rowser/parent_output_surface.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uild/resources_config.mk
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ommon/aw_content_client.cc
ommon/aw_switches.cc
ava/src/org/chromium/android_webview/AwAssets.java
ava/src/org/chromium/android_webview/AwAutofillClient.java
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsStatics.java
ava/src/org/chromium/android_webview/AwPicture.java
ava/src/org/chromium/android_webview/AwWebResourceResponse.java
ava/src/org/chromium/android_webview/FullScreenView.java
ava/src/org/chromium/android_webview/InputStreamUtil.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
ava_library_common.mk
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/DEPS
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_assets.cc
ative/aw_assets.h
ative/aw_autofill_client.cc
ative/aw_autofill_client.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_statics.cc
ative/aw_dev_tools_server.cc
ative/aw_media_url_interceptor.cc
ative/aw_media_url_interceptor.h
ative/aw_media_url_interceptor_unittest.cc
ative/aw_picture.cc
ative/aw_picture.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_impl.cc
ative/input_stream_unittest.cc
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
ublic/browser/draw_gl.h
ublic/browser/draw_sw.h
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/unittest/assets/asset_file.ogg
ools/third_party_files_whitelist.txt
nittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java
ebview_pak.mk
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ndroid.mk
EPS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
ndroid_webview_tests.gypi
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_permission_request_delegate.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.h
rowser/aw_cookie_access_policy.cc
rowser/aw_cookie_access_policy.h
rowser/aw_login_delegate.cc
rowser/aw_login_delegate.h
rowser/aw_web_preferences_populater.cc
rowser/aw_web_preferences_populater.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/net/aw_network_delegate.cc
rowser/net/aw_network_delegate.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/parent_output_surface.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uild/resources_config.mk
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/print_messages.h
ommon/render_view_messages.h
ava/generated_src/org/chromium/base/library_loader/NativeLibraries.java
ava/src/org/chromium/android_webview/AwContentViewClient.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwPdfExporter.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwViewMethods.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
ava/src/org/chromium/android_webview/FullScreenView.java
ava/src/org/chromium/android_webview/NullAwViewMethods.java
ava/src/org/chromium/android_webview/OverScrollGlow.java
ava_library_common.mk
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
avatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/KeySystemTest.java
avatests/src/org/chromium/android_webview/test/LoadUrlTest.java
avatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_statics.cc
ative/aw_dev_tools_server.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/aw_web_preferences_populater_impl.cc
ative/aw_web_preferences_populater_impl.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/permission/protected_media_id_permission_request.cc
ative/permission/protected_media_id_permission_request.h
ative/permission/simple_permission_request.cc
ative/permission/simple_permission_request.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_execution_termination_filter.cc
enderer/aw_execution_termination_filter.h
enderer/aw_render_view_ext.cc
enderer/print_web_view_helper.cc
est/shell/assets/cookie_test.html
est/shell/assets/full_screen_video_test.html
ools/third_party_files_whitelist.txt
ebview_pak.mk
1f14a4515e04c9ffc9bac4dd1e2f68611626b800 19-Jul-2014 Ben Murdoch <benm@google.com> Cherry pick crrev.com/281310

Fix the build in master.

Original description:
[Android WebView] Supress focus change when temporarily detached.

The AwContents container view may be "temporarily detached" by the
view system during certain layout operations e.g. if it is a child
of a ListView. In this case, we should ignore changes to focus to
avoid unnecessary churn and loss of state, e.g. when text is selction
the focus toggle results in an action bar toggle and loss of the
text selection.

BUG=391282
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281310

Change-Id: I1ccd6600da05c991a68256bf08d10448afdbb015
ava/src/org/chromium/android_webview/AwContents.java
f35c392caf6898039307022046411d05049009c4 27-Jun-2014 mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Cherrypick: [android_webview] Fix Android.mk module dependencies.

Cherrypick Chromium r280319 to fix constant rebuilds of
android_webview_java:

> LOCAL_ADDITIONAL_DEPENDENCIES works on the file level, not phony
> target level, so the current rule results in rebuilding the
> android_webview_java target whenever we run make.
>
> BUG=389534
> TEST=compile on android_aosp bot
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/332343007
>
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280319 0039d316-1c4b-4281-b951-d872f2087c98

Bug: 15598761
Change-Id: I6a1da1a1ee829e962ada76107fb0109aac0c8da5
ndroid.mk
4b40b0048fbed486657a92ccee9b4301b2f8c815 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge cherrypicked r279402 to fix checkbuild.

Change-Id: I903284c842b92ff0c41ba257d654f6c15037bb15
ndroid.mk
uild/res_hack/values/values.xml
uild/resources_config.mk
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ndroid.mk
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm.mk
ndroid_webview_jarjar_content_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_content_resources.target.darwin-mips.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86.mk
ndroid_webview_jarjar_content_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_content_resources.target.linux-arm.mk
ndroid_webview_jarjar_content_resources.target.linux-arm64.mk
ndroid_webview_jarjar_content_resources.target.linux-mips.mk
ndroid_webview_jarjar_content_resources.target.linux-x86.mk
ndroid_webview_jarjar_content_resources.target.linux-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm.mk
ndroid_webview_jarjar_ui_resources.target.darwin-arm64.mk
ndroid_webview_jarjar_ui_resources.target.darwin-mips.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86.mk
ndroid_webview_jarjar_ui_resources.target.darwin-x86_64.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm.mk
ndroid_webview_jarjar_ui_resources.target.linux-arm64.mk
ndroid_webview_jarjar_ui_resources.target.linux-mips.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86.mk
ndroid_webview_jarjar_ui_resources.target.linux-x86_64.mk
ndroid_webview_resources.target.darwin-arm.mk
ndroid_webview_resources.target.darwin-arm64.mk
ndroid_webview_resources.target.darwin-mips.mk
ndroid_webview_resources.target.darwin-x86.mk
ndroid_webview_resources.target.darwin-x86_64.mk
ndroid_webview_resources.target.linux-arm.mk
ndroid_webview_resources.target.linux-arm64.mk
ndroid_webview_resources.target.linux-mips.mk
ndroid_webview_resources.target.linux-x86.mk
ndroid_webview_resources.target.linux-x86_64.mk
ndroid_webview_strings.target.darwin-arm.mk
ndroid_webview_strings.target.darwin-arm64.mk
ndroid_webview_strings.target.darwin-mips.mk
ndroid_webview_strings.target.darwin-x86.mk
ndroid_webview_strings.target.darwin-x86_64.mk
ndroid_webview_strings.target.linux-arm.mk
ndroid_webview_strings.target.linux-arm64.mk
ndroid_webview_strings.target.linux-mips.mk
ndroid_webview_strings.target.linux-x86.mk
ndroid_webview_strings.target.linux-x86_64.mk
rowser/aw_contents_io_thread_client.h
rowser/aw_request_interceptor.cc
rowser/aw_request_interceptor.h
rowser/aw_web_resource_response.cc
rowser/aw_web_resource_response.h
rowser/intercepted_request_data.cc
rowser/intercepted_request_data.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/net/android_stream_reader_url_request_job.h
rowser/net/android_stream_reader_url_request_job_unittest.cc
uild/AndroidManifest.xml
uild/jarjar_resources.gypi
uild/resources_config.mk
uildbot/aosp_manifest.xml
ava/DEPS
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwWebResourceResponse.java
ava/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java
ava/src/org/chromium/android_webview/InterceptedRequestData.java
ava_library_common.mk
avatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
avatests/src/org/chromium/android_webview/test/KeySystemTest.java
avatests/src/org/chromium/android_webview/test/util/CommonResources.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_protocol_handler.cc
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_io_thread_client_impl.h
ative/aw_web_resource_response_impl.cc
ative/aw_web_resource_response_impl.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/intercepted_request_data_impl.cc
ative/intercepted_request_data_impl.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
est/shell/res/values/config.xml
est/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
ools/webview_licenses.py
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_browser_permission_request_delegate.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/hardware_renderer_interface.h
rowser/hardware_renderer_legacy.cc
rowser/hardware_renderer_legacy.h
rowser/jni_dependency_factory.h
rowser/net/aw_network_delegate.cc
rowser/net/aw_network_delegate.h
rowser/net/aw_url_request_context_getter.cc
rowser/parent_output_surface.h
rowser/scoped_app_gl_state_restore.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ommon/OWNERS
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwAutofillClient.java
ava/src/org/chromium/android_webview/AwAutofillManagerDelegate.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsStatics.java
ava/src/org/chromium/android_webview/AwViewMethods.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageStartedTest.java
avatests/src/org/chromium/android_webview/test/KeySystemTest.java
ib/main/aw_main_delegate.cc
ib/main/aw_main_delegate.h
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_autofill_client.cc
ative/aw_autofill_client.h
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_contents_statics.cc
ative/aw_geolocation_permission_context.cc
ative/aw_geolocation_permission_context.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/permission/aw_permission_request.h
ative/permission/protected_media_id_permission_request.cc
ative/permission/protected_media_id_permission_request.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_content_renderer_client.cc
enderer/aw_key_systems.cc
enderer/aw_render_frame_ext.cc
enderer/aw_render_frame_ext.h
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ndroid.mk
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/hardware_renderer.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
ommon/aw_content_client.cc
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwSettings.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_protocol_handler.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents_statics.cc
ative/aw_dev_tools_server.cc
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_content_renderer_client.cc
enderer/aw_render_frame_observer.cc
enderer/aw_render_frame_observer.h
enderer/print_render_frame_observer.cc
enderer/print_render_frame_observer.h
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_strings.target.darwin-arm.mk
ndroid_webview_strings.target.darwin-arm64.mk
ndroid_webview_strings.target.darwin-mips.mk
ndroid_webview_strings.target.darwin-x86.mk
ndroid_webview_strings.target.darwin-x86_64.mk
ndroid_webview_strings.target.linux-arm.mk
ndroid_webview_strings.target.linux-arm64.mk
ndroid_webview_strings.target.linux-mips.mk
ndroid_webview_strings.target.linux-x86.mk
ndroid_webview_strings.target.linux-x86_64.mk
ndroid_webview_tests.gypi
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_io_thread_client.h
rowser/aw_cookie_access_policy.cc
rowser/aw_cookie_access_policy.h
rowser/aw_cookie_access_policy_unittest.cc
rowser/aw_login_delegate.cc
rowser/aw_request_interceptor.cc
rowser/aw_request_interceptor.h
rowser/aw_static_cookie_policy_unittest.cc
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/browser_view_renderer_client.h
rowser/deferred_gpu_command_service.cc
rowser/deferred_gpu_command_service.h
rowser/gl_view_renderer_manager.cc
rowser/gl_view_renderer_manager.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/hardware_renderer_interface.h
rowser/hardware_renderer_legacy.cc
rowser/hardware_renderer_legacy.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/init_native_callback.h
rowser/parent_output_surface.cc
rowser/parent_output_surface.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/scoped_app_gl_state_restore.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uild/aosp_manifest_dev.xml
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwContentsStatics.java
ava/src/org/chromium/android_webview/AwCookieManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
ava/src/org/chromium/android_webview/OverScrollGlow.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/GeolocationTest.java
avatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java
avatests/src/org/chromium/android_webview/test/util/CookieUtils.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_protocol_handler.cc
ative/android_protocol_handler.h
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_io_thread_client_impl.h
ative/aw_contents_statics.cc
ative/aw_geolocation_permission_context.cc
ative/aw_geolocation_permission_context.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/cookie_manager.cc
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/net_init_native_callback.cc
ative/permission/permission_request_handler.cc
ative/permission/permission_request_handler.h
ative/permission/permission_request_handler_unittest.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_render_view_ext.cc
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
ools/known_issues.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/deferred_gpu_command_service.cc
rowser/deferred_gpu_command_service.h
rowser/gl_view_renderer_manager.cc
rowser/gl_view_renderer_manager.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
avatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
EPS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_login_delegate.cc
rowser/aw_login_delegate.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/global_tile_manager.cc
rowser/global_tile_manager.h
rowser/global_tile_manager_client.h
rowser/global_tile_manager_unittest.cc
rowser/gpu_memory_buffer_factory_impl.cc
rowser/gpu_memory_buffer_factory_impl.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uildbot/aosp_manifest.xml
ommon/devtools_instrumentation.h
ava/src/org/chromium/android_webview/AwAutofillManagerDelegate.java
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientBridge.java
ava/src/org/chromium/android_webview/AwContentsStatics.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
ava/src/org/chromium/android_webview/permission/AwPermissionRequest.java
avatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java
ib/main/aw_main_delegate.cc
ib/main/webview_entry_point.cc
ib/main/webview_tests.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/DEPS
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_statics.cc
ative/aw_contents_statics.h
ative/aw_dev_tools_server.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/aw_web_contents_view_delegate.cc
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/permission/aw_permission_request.cc
ative/permission/aw_permission_request.h
ative/permission/aw_permission_request_delegate.cc
ative/permission/aw_permission_request_delegate.h
ative/permission/media_access_permission_request.cc
ative/permission/media_access_permission_request.h
ative/permission/media_access_permission_request_unittest.cc
ative/permission/permission_request_handler.cc
ative/permission/permission_request_handler.h
ative/permission/permission_request_handler_client.cc
ative/permission/permission_request_handler_client.h
ative/permission/permission_request_handler_unittest.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_key_systems.cc
enderer/aw_render_view_ext.cc
est/shell/AndroidManifest.xml
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/shell/src/org/chromium/android_webview/shell/AwShellSwitches.java
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
WNERS
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-arm64.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-arm64.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm64.mk
ndroid_webview_pak.target.linux-arm64.mk
ndroid_webview_tests.gypi
rowser/aw_cookie_access_policy.cc
rowser/aw_cookie_access_policy.h
rowser/aw_cookie_access_policy_unittest.cc
rowser/browser_view_renderer.cc
rowser/browser_view_renderer_client.h
rowser/gl_view_renderer_manager.cc
rowser/gl_view_renderer_manager.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ava/src/org/chromium/android_webview/AwContentViewClient.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwCookieManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-arm64.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-arm64.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm64.mk
ative/android_webview_native_jni.target.linux-arm64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_settings.cc
ative/aw_settings.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk
ative/cookie_manager.cc
ative/input_stream_android_jar_jni_headers.target.darwin-arm64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-arm64.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-arm64.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
ublic/browser/draw_gl.h
enderer/aw_key_systems.cc
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
ools/gyp_webview
ools/third_party_files_whitelist.txt
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_tests.gypi
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientBridge.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/ClientCertLookupTable.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/DEPS
ative/android_protocol_handler.cc
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_contents_client_bridge_unittest.cc
ative/aw_contents_io_thread_client_impl.cc
ative/aw_form_database.cc
ative/aw_http_auth_handler.cc
ative/aw_pdf_exporter.cc
ative/aw_pdf_exporter.h
ative/aw_picture.cc
ative/aw_picture.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_quota_manager_bridge_impl.h
ative/aw_resource.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/external_video_surface_container_impl.cc
ative/java_browser_view_renderer_helper.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_key_systems.cc
enderer/print_web_view_helper.cc
enderer/print_web_view_helper_linux.cc
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
ools/third_party_files_whitelist.txt
nittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ndroid.mk
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/jni_dependency_factory.h
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
avatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
ib/main/aw_main_delegate.cc
ib/main/aw_main_delegate.h
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_geolocation_permission_context.cc
ative/aw_geolocation_permission_context.h
ative/external_video_surface_container_impl.cc
ative/external_video_surface_container_impl.h
ative/java_browser_view_renderer_helper.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
enderer/print_web_view_helper.cc
enderer/print_web_view_helper.h
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
ebview_pak.mk
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_pak.target.linux-x86_64.mk
rowser/aw_quota_permission_context.cc
rowser/aw_quota_permission_context.h
rowser/browser_view_renderer.cc
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
ava/src/org/chromium/android_webview/AwBrowserProcess.java
avatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_permission_client.cc
enderer/aw_permission_client.h
est/shell/AndroidManifest.xml
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
rowser/browser_view_renderer.cc
rowser/gpu_memory_buffer_factory_impl.cc
rowser/hardware_renderer.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uildbot/aosp_manifest.xml
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
enderer/aw_permission_client.cc
enderer/aw_permission_client.h
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.darwin-x86_64.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ll.target.linux-x86_64.mk
ll_webview.gyp
ndroid_webview.gyp
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ools/gyp_webview
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ll.target.darwin-x86_64.mk
ll.target.linux-x86_64.mk
WNERS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.darwin-x86_64.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.linux-x86_64.mk
ndroid_webview_pak.target.darwin-x86_64.mk
ndroid_webview_pak.target.linux-x86_64.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/gpu_memory_buffer_factory_impl.cc
rowser/hardware_renderer.cc
rowser/net/aw_network_delegate.cc
rowser/net/aw_network_delegate.h
rowser/net/aw_url_request_context_getter.cc
rowser/renderer_host/aw_render_view_host_ext.cc
uildbot/aosp_manifest.xml
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwDevToolsServer.java
ava/src/org/chromium/android_webview/AwPdfExporter.java
ava/src/org/chromium/android_webview/AwSettings.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.darwin-x86_64.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.linux-x86_64.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.darwin-x86_64.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.linux-x86_64.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_dev_tools_server.cc
ative/aw_pdf_exporter.cc
ative/aw_settings.cc
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86_64.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.darwin-x86_64.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.linux-x86_64.mk
ublic/browser/draw_gl.h
enderer/print_web_view_helper.cc
enderer/print_web_view_helper.h
ools/gyp_webview
ools/third_party_files_whitelist.txt
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ools/third_party_files_whitelist.txt
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ndroid.mk
WNERS
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/aw_browser_main_parts.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/browser_view_renderer.cc
rowser/browser_view_renderer.h
rowser/browser_view_renderer_client.h
rowser/gl_view_renderer_manager.cc
rowser/gl_view_renderer_manager.h
rowser/hardware_renderer.cc
rowser/hardware_renderer.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/net/aw_url_request_context_getter.cc
rowser/shared_renderer_state.cc
rowser/shared_renderer_state.h
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ommon/aw_content_client.cc
ommon/aw_content_client.h
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/devtools_instrumentation.h
ommon/print_messages.h
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwPicture.java
ava/src/org/chromium/android_webview/AwPrintDocumentAdapter.java
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
ib/DEPS
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_io_thread_client_impl.cc
ative/aw_dev_tools_server.cc
ative/aw_pdf_exporter.cc
ative/aw_pdf_exporter.h
ative/aw_picture.cc
ative/aw_settings.cc
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/external_video_surface_container_impl.cc
ative/external_video_surface_container_impl.h
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ublic/browser/draw_gl.h
ublic/browser/draw_sw.h
enderer/aw_content_renderer_client.cc
enderer/aw_key_systems.cc
enderer/aw_render_frame_observer.cc
enderer/aw_render_frame_observer.h
enderer/print_web_view_helper.cc
enderer/print_web_view_helper.h
est/shell/res/raw/error.html
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
ools/find_copyrights.pl
ools/gyp_webview
ools/known_issues.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ndroid.mk
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.cc
rowser/aw_contents_client_bridge_base.h
rowser/aw_contents_io_thread_client.h
rowser/aw_cookie_access_policy.cc
rowser/aw_cookie_access_policy.h
rowser/aw_form_database_service_unittest.cc
rowser/aw_javascript_dialog_manager.cc
rowser/aw_javascript_dialog_manager.h
rowser/aw_login_delegate.cc
rowser/aw_login_delegate.h
rowser/aw_pref_store.cc
rowser/aw_request_interceptor.cc
rowser/browser_view_renderer.h
rowser/find_helper.cc
rowser/find_helper.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_network_delegate.cc
rowser/net/aw_network_delegate.h
rowser/net/aw_url_request_context_getter.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
uild/aosp_manifest_dev.xml
uild/install_binary
uildbot/aosp_manifest.xml
uildbot/deps_whitelist.py
ommon/OWNERS
ommon/aw_content_client.cc
ommon/aw_content_client.h
ommon/aw_hit_test_data.h
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/print_messages.cc
ommon/print_messages.h
ommon/render_view_messages.h
ava/generated_src/org/chromium/base/library_loader/NativeLibraries.java
ava/generated_src/org/chromium/content/app/NativeLibraries.java
ava/src/org/chromium/android_webview/AndroidProtocolHandler.java
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwQuotaManagerBridge.java
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/HttpAuthDatabase.java
avatests/AndroidManifest.xml
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/ArchiveTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
avatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwViewportTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/GeolocationTest.java
avatests/src/org/chromium/android_webview/test/GetTitleTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
avatests/src/org/chromium/android_webview/test/LoadUrlTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
avatests/src/org/chromium/android_webview/test/util/JSUtils.java
ib/main/aw_main_delegate.cc
ib/main/webview_entry_point.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_protocol_handler.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_dev_tools_server.cc
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/aw_web_contents_view_delegate.cc
ative/aw_web_contents_view_delegate.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cookie_manager.cc
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/state_serializer.cc
ative/state_serializer_unittest.cc
ative/state_serializer_unittests.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_permission_client.cc
enderer/aw_permission_client.h
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
enderer/print_web_view_helper.cc
est/data/device_files/image_access.html
est/shell/AndroidManifest.xml
est/shell/res/values/strings.xml
est/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
ools/gyp_webview
ools/known_issues.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ndroid.mk
WNERS
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_content_browser_client.cc
rowser/aw_contents_client_bridge_base.h
rowser/aw_resource_context.cc
rowser/aw_resource_context.h
rowser/net/aw_url_request_context_getter.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/renderer_host/print_manager.cc
rowser/renderer_host/print_manager.h
uildbot/OWNERS
uildbot/deps_whitelist.py
ommon/DEPS
ommon/android_webview_message_generator.h
ommon/print_messages.cc
ommon/print_messages.h
ommon/render_view_messages.h
ava/generated_src/org/chromium/content/app/NativeLibraries.java
ava/src/org/chromium/android_webview/AndroidProtocolHandler.java
ava/src/org/chromium/android_webview/AwAutofillManagerDelegate.java
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContentViewClient.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientBridge.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwCookieManager.java
ava/src/org/chromium/android_webview/AwGeolocationPermissions.java
ava/src/org/chromium/android_webview/AwHttpAuthHandler.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwPdfExporter.java
ava/src/org/chromium/android_webview/AwPicture.java
ava/src/org/chromium/android_webview/AwPrintDocumentAdapter.java
ava/src/org/chromium/android_webview/AwQuotaManagerBridge.java
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
ava/src/org/chromium/android_webview/AwZoomControls.java
ava/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java
ava/src/org/chromium/android_webview/ErrorCodeConversionHelper.java
ava/src/org/chromium/android_webview/HttpAuthDatabase.java
ava/src/org/chromium/android_webview/InterceptedRequestData.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
ava/src/org/chromium/android_webview/JsPromptResultReceiver.java
ava/src/org/chromium/android_webview/JsResultHandler.java
ava/src/org/chromium/android_webview/JsResultReceiver.java
ava/src/org/chromium/android_webview/OverScrollGlow.java
ava/src/org/chromium/android_webview/ScrollAccessibilityHelper.java
ava/src/org/chromium/android_webview/SslUtil.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/ArchiveTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwViewportTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
avatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
avatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/GetTitleTest.java
avatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
avatests/src/org/chromium/android_webview/test/LoadUrlTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/UserAgentTest.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
avatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
avatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
avatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
avatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java
avatests/src/org/chromium/android_webview/test/util/CommonResources.java
avatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java
avatests/src/org/chromium/android_webview/test/util/JSUtils.java
avatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java
avatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/DEPS
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_form_database.cc
ative/aw_http_auth_handler.cc
ative/aw_pdf_exporter.cc
ative/aw_pdf_exporter.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk
ative/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk
ative/cookie_manager.cc
ative/input_stream_android_jar_jni_headers.target.darwin-arm.mk
ative/input_stream_android_jar_jni_headers.target.darwin-mips.mk
ative/input_stream_android_jar_jni_headers.target.darwin-x86.mk
ative/input_stream_android_jar_jni_headers.target.linux-arm.mk
ative/input_stream_android_jar_jni_headers.target.linux-mips.mk
ative/input_stream_android_jar_jni_headers.target.linux-x86.mk
ative/java_browser_view_renderer_helper.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/print_web_view_helper.cc
enderer/print_web_view_helper.h
enderer/print_web_view_helper_android.cc
enderer/print_web_view_helper_linux.cc
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
est/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
est/shell/src/org/chromium/android_webview/test/TestContentProvider.java
ools/gyp_webview
nittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_pref_store.cc
rowser/aw_pref_store.h
rowser/aw_request_interceptor.cc
rowser/find_helper.cc
rowser/in_process_view_renderer.cc
rowser/intercepted_request_data.cc
rowser/intercepted_request_data.h
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/init_native_callback.h
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
uildbot/deps_whitelist.py
ommon/aw_content_client.cc
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwContentViewClient.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwViewportTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
ative/aw_web_contents_delegate.cc
ative/cookie_manager.cc
ative/cookie_manager.h
ative/intercepted_request_data_impl.cc
ative/intercepted_request_data_impl.h
ative/net_init_native_callback.cc
ative/state_serializer.cc
ative/state_serializer_unittests.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_key_systems.cc
enderer/aw_key_systems.h
enderer/aw_render_process_observer.cc
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
ools/known_issues.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_browser_context.cc
rowser/in_process_view_renderer.cc
rowser/net/android_stream_reader_url_request_job_unittest.cc
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/ScrollAccessibilityHelper.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/ArchiveTest.java
ib/main/webview_entry_point.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_settings.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
ools/webview_licenses.py
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwViewportTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_dev_tools_server.cc
ative/aw_settings.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_render_view_ext.cc
est/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
ools/third_party_files_whitelist.txt
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/in_process_view_renderer.cc
ommon/url_constants.cc
ommon/url_constants.h
ava/generated_src/org/chromium/content/app/NativeLibraries.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwViewportTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_contents_io_thread_client_impl.cc
ative/aw_settings.cc
ative/cookie_manager.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_content_renderer_client.cc
ools/third_party_files_whitelist.txt
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_form_database_service.cc
rowser/aw_quota_manager_bridge.cc
rowser/aw_quota_manager_bridge.h
rowser/aw_web_preferences_populater.cc
rowser/aw_web_preferences_populater.h
rowser/browser_view_renderer.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/jni_dependency_factory.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
avatests/AndroidManifest.xml
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
ib/main/aw_main_delegate.cc
ib/main/aw_main_delegate.h
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_dev_tools_server.cc
ative/aw_quota_manager_bridge_impl.cc
ative/aw_quota_manager_bridge_impl.h
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_preferences_populater_impl.cc
ative/aw_web_preferences_populater_impl.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
est/shell/AndroidManifest.xml
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
WNERS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_browser_main_parts.cc
rowser/aw_browser_main_parts.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_devtools_delegate.cc
rowser/aw_devtools_delegate.h
rowser/browser_view_renderer.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/scoped_app_gl_state_restore.cc
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwDevToolsServer.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_dev_tools_server.cc
ative/aw_dev_tools_server.h
ative/aw_settings.cc
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ndroid.mk
ll_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_browser_context.cc
rowser/aw_contents_io_thread_client.h
rowser/aw_javascript_dialog_manager.cc
rowser/aw_javascript_dialog_manager.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/in_process_view_renderer.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_io_thread_client_impl.h
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/input_stream_impl.cc
ative/input_stream_unittest.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/DEPS
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
ools/third_party_files_whitelist.txt
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_browser_context.cc
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_devtools_delegate.cc
rowser/aw_devtools_delegate.h
rowser/aw_form_database_service.cc
rowser/aw_form_database_service.h
rowser/aw_form_database_service_unittest.cc
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwViewportTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_settings.cc
ative/aw_web_contents_view_delegate.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ublic/browser/draw_sw.h
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_javascript_dialog_manager.cc
rowser/aw_javascript_dialog_manager.h
rowser/aw_pref_store.cc
rowser/aw_pref_store.h
rowser/in_process_view_renderer.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/AndroidManifest.xml
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_io_thread_client_impl.cc
ative/state_serializer.cc
ative/state_serializer_unittests.cc
enderer/aw_render_process_observer.cc
enderer/aw_render_process_observer.h
est/shell/AndroidManifest.xml
ools/webview_licenses.py
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
rowser/aw_devtools_delegate.cc
rowser/browser_view_renderer.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/aw_network_delegate.cc
rowser/net/aw_url_request_context_getter.cc
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwSettings.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_settings.cc
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/AndroidManifest.xml
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/browser_view_renderer.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
uildbot/deps_whitelist.py
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwPicture.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/DEPS
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_picture.cc
ative/aw_picture.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ublic/browser/draw_sw.h
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_gl_surface.cc
rowser/aw_gl_surface.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ndroid.mk
ll_webview.gyp
rowser/aw_browser_context.cc
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
enderer/aw_render_view_ext.cc
ools/webview_licenses.py
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/in_process_view_renderer.cc
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwContents.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/state_serializer.cc
ools/third_party_files_whitelist.txt
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
rowser/aw_javascript_dialog_manager.cc
rowser/aw_javascript_dialog_manager.h
rowser/browser_view_renderer.h
rowser/gl_view_renderer_manager.cc
rowser/gl_view_renderer_manager.h
rowser/gpu_memory_buffer_factory_impl.cc
rowser/gpu_memory_buffer_factory_impl.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
uildbot/deps_whitelist.py
ava/src/org/chromium/android_webview/AwAutofillManagerDelegate.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_quota_manager_bridge_impl.cc
ative/state_serializer.cc
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
28390f6bb8dc6eb59bac1e0576f95a7740a9bd61 01-Aug-2013 Ben Murdoch <benm@google.com> Cherry pick of https://codereview.chromium.org/19522006

Stability fixes for Chromium WebView.

Bug:9915533

Change-Id: If5730b3f0c79b1ddd56bce3a2903531632ea0bc6
EPS
ndroid_webview.gyp
rowser/in_process_view_renderer.cc
ib/main/aw_main_delegate.cc
fb250657ef40d7500f20882d5c9909c1013367d3 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214456

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
rowser/in_process_view_renderer.cc
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
d3868032626d59662ff73b372b5d584c1d144c53 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214391

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
rowser/in_process_view_renderer.cc
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/browser_view_renderer.h
rowser/gpu_memory_buffer_factory_impl.cc
rowser/gpu_memory_buffer_factory_impl.h
rowser/gpu_memory_buffer_impl.cc
rowser/gpu_memory_buffer_impl.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
ommon/aw_content_client.cc
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
avatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java
ib/main/aw_main_delegate.cc
ib/main/aw_main_delegate.h
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_settings.cc
enderer/aw_render_view_ext.cc
ools/webview_licenses.py
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
rowser/browser_view_renderer.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
ava/src/org/chromium/android_webview/AwContents.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/DEPS
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/OverScrollGlow.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_quota_manager_bridge_impl.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
ools/known_issues.py
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/in_process_view_renderer.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
avatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java
avatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
ndroid_webview.gyp
rowser/aw_download_manager_delegate.cc
rowser/aw_download_manager_delegate.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_settings.cc
ools/third_party_files_whitelist.txt
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwGeolocationPermissions.java
ava/src/org/chromium/android_webview/HttpAuthDatabase.java
ava/src/org/chromium/android_webview/SslUtil.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
ative/DEPS
ative/aw_settings.cc
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_form_database_service_unittest.cc
rowser/browser_view_renderer.h
rowser/find_helper.cc
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/net/input_stream_reader.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/scoped_app_gl_state_restore.cc
rowser/scoped_app_gl_state_restore.h
ommon/aw_hit_test_data.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
avatests/AndroidManifest.xml
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java
avatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_protocol_handler.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_io_thread_client_impl.cc
ative/aw_quota_manager_bridge_impl.cc
ative/aw_web_contents_delegate.cc
ative/cookie_manager.cc
ative/input_stream_impl.cc
ative/state_serializer_unittests.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_content_renderer_client.cc
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
ools/third_party_files_whitelist.txt
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
EPS
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-mips.mk
ndroid_webview_pak.target.linux-x86.mk
rowser/DEPS
rowser/aw_autofill_manager_delegate.cc
rowser/aw_autofill_manager_delegate.h
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_devtools_delegate.cc
rowser/aw_form_database_service.cc
rowser/aw_form_database_service.h
rowser/aw_form_database_service_unittest.cc
rowser/browser_view_renderer.h
rowser/find_helper.cc
rowser/gpu_memory_buffer_impl.cc
rowser/icon_helper.cc
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/aw_url_request_context_getter.cc
ava/src/org/chromium/android_webview/AwAutofillManagerDelegate.java
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwScrollOffsetManager.java
ava/src/org/chromium/android_webview/HttpAuthDatabase.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
avatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/DEPS
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_autofill_manager_delegate.cc
ative/aw_autofill_manager_delegate.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_form_database.cc
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/state_serializer.cc
ative/state_serializer_unittests.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_render_process_observer.cc
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
est/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java
3c54152607de4272b3da0c146b71dcba8a0e5610 28-Jun-2013 Ben Murdoch <benm@google.com> Fixup MIPS makefiles

Change-Id: I9aa2b7e1c2db822880a3f48e308f62979577acd5
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.linux-mips.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.linux-mips.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.linux-mips.mk
e31802ad5b5d9fdf7daba665b671e9ecee368cb8 27-Jun-2013 Ben Murdoch <benm@google.com> Fix MIPS makefiles

Change-Id: I7a0daf1617a3908dd628c2fd4f501cbec1483bd9
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.linux-mips.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.linux-mips.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.linux-mips.mk
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ll.target.darwin-arm.mk
ll.target.darwin-mips.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-mips.mk
ll.target.linux-x86.mk
ndroid.mk
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_common.target.linux-x86.mk
rowser/DEPS
rowser/aw_autofill_manager_delegate.cc
rowser/aw_autofill_manager_delegate.h
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_browser_main_parts.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_devtools_delegate.cc
rowser/aw_form_database_service.cc
rowser/aw_form_database_service_unittest.cc
rowser/aw_login_delegate.cc
rowser/browser_view_renderer.h
rowser/browser_view_renderer_impl.cc
rowser/browser_view_renderer_impl.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/renderer_host/view_renderer_host.cc
rowser/renderer_host/view_renderer_host.h
uildbot/deps_whitelist.py
ommon/OWNERS
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/render_view_messages.h
ommon/renderer_picture_map.cc
ommon/renderer_picture_map.h
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/LoadUrlTest.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/DEPS
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_http_auth_handler.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_view_delegate.cc
ative/aw_web_contents_view_delegate.h
ative/cookie_manager.cc
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-mips.mk
ative/webview_native.target.linux-x86.mk
enderer/aw_content_renderer_client.cc
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
enderer/view_renderer.cc
enderer/view_renderer.h
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
ools/known_issues.py
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ll.target.darwin-mips.mk
ll.target.linux-mips.mk
ndroid_webview_common.target.darwin-mips.mk
ndroid_webview_common.target.linux-mips.mk
ndroid_webview_pak.target.darwin-mips.mk
ndroid_webview_pak.target.linux-mips.mk
rowser/aw_autofill_manager_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-mips.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-mips.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-mips.mk
ative/android_jar_jni_headers.target.linux-mips.mk
ative/android_webview_native_jni.target.darwin-mips.mk
ative/android_webview_native_jni.target.linux-mips.mk
ative/webview_native.gyp
ative/webview_native.target.darwin-mips.mk
ative/webview_native.target.linux-mips.mk
ools/gyp_webview
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-x86.mk
rowser/aw_devtools_delegate.cc
rowser/aw_form_database_service_unittest.cc
rowser/aw_login_delegate.h
rowser/browser_view_renderer.h
rowser/browser_view_renderer_impl.cc
rowser/in_process_renderer/DEPS
rowser/in_process_renderer/in_process_renderer_client.cc
rowser/in_process_renderer/in_process_renderer_client.h
rowser/in_process_renderer/in_process_view_renderer.cc
rowser/in_process_renderer/in_process_view_renderer.h
rowser/in_process_view_renderer.cc
rowser/in_process_view_renderer.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/net/android_stream_reader_url_request_job_unittest.cc
uild/jarjar-rules.txt
uildbot/deps_whitelist.py
ommon/aw_hit_test_data.h
ava/src/org/chromium/android_webview/AwContentVideoViewDelegate.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
ib/main/aw_main_delegate.cc
ib/main/webview_entry_point.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_protocol_handler.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
ative/aw_web_contents_delegate.h
ative/cookie_manager.cc
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/state_serializer_unittests.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-x86.mk
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_render_view_ext.cc
ools/known_issues.py
ools/third_party_files_whitelist.txt
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-x86.mk
rowser/DEPS
rowser/aw_autofill_manager_delegate.cc
rowser/aw_autofill_manager_delegate.h
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_devtools_delegate.cc
rowser/aw_pref_store.cc
rowser/aw_pref_store.h
rowser/browser_view_renderer.h
rowser/browser_view_renderer_impl.cc
rowser/browser_view_renderer_impl.h
rowser/gpu_memory_buffer_factory_impl.cc
rowser/gpu_memory_buffer_factory_impl.h
rowser/gpu_memory_buffer_impl.cc
rowser/gpu_memory_buffer_impl.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/in_process_renderer/in_process_view_renderer.cc
rowser/in_process_renderer/in_process_view_renderer.h
rowser/net/aw_url_request_context_getter.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
uildbot/OWNERS
uildbot/deps_whitelist.py
uildbot/generate_local_manifest.py
ommon/aw_content_client.cc
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/render_view_messages.h
ava/src/org/chromium/android_webview/AwContentVideoViewDelegate.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
ib/main/aw_main_delegate.cc
ib/main/webview_entry_point.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_settings.cc
ative/aw_settings.h
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/state_serializer.cc
ative/state_serializer_unittests.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-x86.mk
ublic/browser/draw_gl.h
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
ools/third_party_files_whitelist.txt
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-x86.mk
rowser/browser_view_renderer_impl.cc
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_url_request_context_getter.cc
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-x86.mk
ative/aw_contents_io_thread_client_impl.cc
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-x86.mk
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_form_database_service.cc
rowser/aw_form_database_service.h
rowser/aw_form_database_service_unittest.cc
rowser/browser_view_renderer.h
rowser/browser_view_renderer_impl.cc
rowser/browser_view_renderer_impl.h
rowser/in_process_renderer/in_process_renderer_client.cc
rowser/in_process_renderer/in_process_view_renderer.cc
rowser/in_process_renderer/in_process_view_renderer.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_job_factory.cc
rowser/net/aw_url_request_job_factory.h
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/view_renderer_host.cc
rowser/renderer_host/view_renderer_host.h
ommon/aw_switches.cc
ommon/aw_switches.h
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwFormDatabase.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwZoomControls.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwZoomTest.java
avatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
ib/DEPS
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-x86.mk
ative/android_webview_jni_registrar.cc
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_form_database.cc
ative/aw_form_database.h
ative/aw_settings.cc
ative/aw_settings.h
ative/webview_native.gyp
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
enderer/view_renderer.cc
enderer/view_renderer.h
ools/third_party_files_whitelist.txt
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
ll.target.darwin-arm.mk
ll.target.darwin-x86.mk
ll.target.linux-arm.mk
ll.target.linux-x86.mk
ndroid.mk
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.darwin-arm.mk
ndroid_webview_common.target.darwin-x86.mk
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_pak.target.darwin-arm.mk
ndroid_webview_pak.target.darwin-x86.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_main_parts.cc
rowser/aw_browser_main_parts.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.h
rowser/aw_devtools_delegate.cc
rowser/aw_devtools_delegate.h
rowser/aw_javascript_dialog_manager.cc
rowser/aw_javascript_dialog_manager.h
rowser/browser_view_renderer.h
rowser/browser_view_renderer_impl.cc
rowser/browser_view_renderer_impl.h
rowser/gpu_memory_buffer_factory_impl.cc
rowser/gpu_memory_buffer_factory_impl.h
rowser/gpu_memory_buffer_impl.cc
rowser/gpu_memory_buffer_impl.h
rowser/icon_helper.cc
rowser/in_process_renderer/DEPS
rowser/in_process_renderer/in_process_renderer_client.cc
rowser/in_process_renderer/in_process_renderer_client.h
rowser/in_process_renderer/in_process_view_renderer.cc
rowser/in_process_renderer/in_process_view_renderer.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_job_factory.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/view_renderer_host.cc
rowser/renderer_host/view_renderer_host.h
ommon/DEPS
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/render_view_messages.h
ava/generated_src/org/chromium/content/app/NativeLibraries.java
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContentVideoViewDelegate.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientBridge.java
ava/src/org/chromium/android_webview/AwFormDatabase.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwNativeWindow.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
ava/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java
ava/src/org/chromium/android_webview/JsResultHandler.java
avatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTargetDensityDpiTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
avatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/UserAgentTest.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
ib/aw_browser_dependency_factory_impl.cc
ib/main/aw_main_delegate.cc
ibwebviewchromium.target.darwin-arm.mk
ibwebviewchromium.target.darwin-x86.mk
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-x86.mk
ative/DEPS
ative/android_jar_jni_headers.target.darwin-arm.mk
ative/android_jar_jni_headers.target.darwin-x86.mk
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.darwin-arm.mk
ative/android_webview_native_jni.target.darwin-x86.mk
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_form_database.cc
ative/aw_form_database.h
ative/aw_javascript_dialog_manager.cc
ative/aw_javascript_dialog_manager.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/aw_web_contents_view_delegate.cc
ative/js_result_handler.cc
ative/js_result_handler.h
ative/state_serializer_unittests.cc
ative/webview_native.gyp
ative/webview_native.target.darwin-arm.mk
ative/webview_native.target.darwin-x86.mk
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-x86.mk
ublic/browser/draw_gl.h
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
ools/gyp_webview
ools/known_issues.py
ools/third_party_files_whitelist.txt
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
ll.target.linux-arm.mk
ll.target.linux-x86.mk
ll.target.mk
ndroid.mk
EPS
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.linux-arm.mk
ndroid_webview_common.target.linux-x86.mk
ndroid_webview_common.target.mk
ndroid_webview_pak.target.linux-arm.mk
ndroid_webview_pak.target.linux-x86.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_browser_main_parts.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_client_bridge_base.cc
rowser/aw_contents_client_bridge_base.h
rowser/aw_contents_io_thread_client.h
rowser/aw_cookie_access_policy.cc
rowser/aw_devtools_delegate.cc
rowser/aw_devtools_delegate.h
rowser/aw_download_manager_delegate.cc
rowser/aw_download_manager_delegate.h
rowser/aw_http_auth_handler_base.h
rowser/aw_login_delegate.cc
rowser/aw_login_delegate.h
rowser/aw_quota_manager_bridge.cc
rowser/aw_quota_manager_bridge.h
rowser/aw_quota_permission_context.cc
rowser/aw_request_interceptor.cc
rowser/aw_request_interceptor.h
rowser/browser_view_renderer.h
rowser/browser_view_renderer_impl.cc
rowser/browser_view_renderer_impl.h
rowser/find_helper.cc
rowser/find_helper.h
rowser/icon_helper.cc
rowser/icon_helper.h
rowser/input_stream.h
rowser/jni_dependency_factory.h
rowser/net/android_stream_reader_url_request_job.cc
rowser/net/android_stream_reader_url_request_job.h
rowser/net/android_stream_reader_url_request_job_unittest.cc
rowser/net/aw_network_delegate.cc
rowser/net/aw_network_delegate.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/net/aw_url_request_job_factory.cc
rowser/net/aw_url_request_job_factory.h
rowser/net/init_native_callback.h
rowser/net/input_stream_reader.cc
rowser/net/input_stream_reader.h
rowser/net/input_stream_reader_unittest.cc
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/renderer_host/view_renderer_host.cc
rowser/renderer_host/view_renderer_host.h
ommon/OWNERS
ommon/aw_content_client.cc
ommon/aw_content_client.h
ommon/aw_hit_test_data.h
ommon/aw_switches.cc
ommon/aw_switches.h
ommon/render_view_messages.h
ommon/renderer_picture_map.cc
ommon/renderer_picture_map.h
ava/AndroidManifest.xml
ava/DEPS
ava/src/org/chromium/android_webview/AwBrowserContext.java
ava/src/org/chromium/android_webview/AwBrowserProcess.java
ava/src/org/chromium/android_webview/AwContentVideoViewDelegate.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsClientBridge.java
ava/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwCookieManager.java
ava/src/org/chromium/android_webview/AwGeolocationPermissions.java
ava/src/org/chromium/android_webview/AwHttpAuthHandler.java
ava/src/org/chromium/android_webview/AwLayoutSizer.java
ava/src/org/chromium/android_webview/AwQuotaManagerBridge.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/CookieManager.java
ava/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java
ava/src/org/chromium/android_webview/SslUtil.java
avatests/AndroidManifest.xml
avatests/assets/asset_file.html
avatests/assets/asset_icon.png
avatests/res/drawable/resource_icon.png
avatests/res/raw/blank_html.html
avatests/res/raw/resource_file.html
avatests/res/raw/resource_icon.png
avatests/res/values/strings.xml
avatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
avatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
avatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerActivity.java
avatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java
avatests/src/org/chromium/android_webview/test/ArchiveTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java
avatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestBase.java
avatests/src/org/chromium/android_webview/test/AwTestContainerView.java
avatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java
avatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
avatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
avatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
avatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/GetTitleTest.java
avatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
avatests/src/org/chromium/android_webview/test/LoadUrlTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/NullContentsClient.java
avatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/TestContentProvider.java
avatests/src/org/chromium/android_webview/test/UserAgentTest.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
avatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
avatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
avatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
avatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
avatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
avatests/src/org/chromium/android_webview/test/util/CommonResources.java
avatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java
avatests/src/org/chromium/android_webview/test/util/JSUtils.java
avatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java
avatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java
ib/DEPS
ib/aw_browser_dependency_factory_impl.cc
ib/aw_browser_dependency_factory_impl.h
ib/main/aw_main_delegate.cc
ib/main/aw_main_delegate.h
ib/main/webview_entry_point.cc
ibwebviewchromium.target.linux-arm.mk
ibwebviewchromium.target.linux-x86.mk
ibwebviewchromium.target.mk
ative/DEPS
ative/android_jar_jni_headers.target.linux-arm.mk
ative/android_jar_jni_headers.target.linux-x86.mk
ative/android_jar_jni_headers.target.mk
ative/android_protocol_handler.cc
ative/android_protocol_handler.h
ative/android_stream_reader_url_request_job.cc
ative/android_stream_reader_url_request_job.h
ative/android_stream_reader_url_request_job_unittests.cc
ative/android_webview_jni_registrar.cc
ative/android_webview_native_jni.target.linux-arm.mk
ative/android_webview_native_jni.target.linux-x86.mk
ative/android_webview_native_jni.target.mk
ative/aw_browser_dependency_factory.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_client_bridge.cc
ative/aw_contents_client_bridge.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_io_thread_client_impl.h
ative/aw_geolocation_permission_context.cc
ative/aw_geolocation_permission_context.h
ative/aw_http_auth_handler.cc
ative/aw_http_auth_handler.h
ative/aw_javascript_dialog_creator.cc
ative/aw_javascript_dialog_creator.h
ative/aw_javascript_dialog_manager.cc
ative/aw_javascript_dialog_manager.h
ative/aw_quota_manager_bridge_impl.cc
ative/aw_quota_manager_bridge_impl.h
ative/aw_settings.cc
ative/aw_settings.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/aw_web_contents_view_delegate.cc
ative/aw_web_contents_view_delegate.h
ative/cookie_manager.cc
ative/cookie_manager.h
ative/input_stream_impl.cc
ative/input_stream_impl.h
ative/input_stream_unittest.cc
ative/intercepted_request_data_impl.cc
ative/intercepted_request_data_impl.h
ative/java_browser_view_renderer_helper.cc
ative/java_browser_view_renderer_helper.h
ative/js_result_handler.cc
ative/js_result_handler.h
ative/net_init_native_callback.cc
ative/state_serializer.cc
ative/state_serializer.h
ative/state_serializer_unittests.cc
ative/webview_native.gyp
ative/webview_native.target.linux-arm.mk
ative/webview_native.target.linux-x86.mk
ative/webview_native.target.mk
ublic/browser/draw_gl.h
ublic/browser/draw_sw.h
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
enderer/view_renderer.cc
enderer/view_renderer.h
est/data/device_files/database_access.html
est/shell/AndroidManifest.xml
est/shell/DEPS
est/shell/assets/asset_file.html
est/shell/assets/asset_icon.png
est/shell/assets/full_screen_video_test.html
est/shell/res/drawable/resource_icon.png
est/shell/res/layout/testshell_activity.xml
est/shell/res/raw/blank_html.html
est/shell/res/raw/resource_file.html
est/shell/res/raw/resource_icon.png
est/shell/res/values/strings.xml
est/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
est/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
est/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java
est/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
est/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java
est/shell/src/org/chromium/android_webview/test/NullContentsClient.java
est/shell/src/org/chromium/android_webview/test/TestContentProvider.java
ools/find_copyrights.pl
ools/gyp_webview
ools/known_incompatible.py
ools/known_issues.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
nittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
ll.target.mk
ndroid.mk
EPS
WNERS
ll_webview.gyp
ndroid_webview.gyp
ndroid_webview_common.target.mk
ndroid_webview_tests.gypi
rowser/DEPS
rowser/aw_browser_context.cc
rowser/aw_browser_context.h
rowser/aw_browser_main_parts.cc
rowser/aw_browser_main_parts.h
rowser/aw_content_browser_client.cc
rowser/aw_content_browser_client.h
rowser/aw_contents_io_thread_client.h
rowser/aw_cookie_access_policy.cc
rowser/aw_cookie_access_policy.h
rowser/aw_http_auth_handler_base.cc
rowser/aw_http_auth_handler_base.h
rowser/aw_login_delegate.cc
rowser/aw_login_delegate.h
rowser/aw_quota_permission_context.cc
rowser/aw_quota_permission_context.h
rowser/aw_request_interceptor.cc
rowser/aw_request_interceptor.h
rowser/aw_result_codes.h
rowser/find_helper.cc
rowser/find_helper.h
rowser/intercepted_request_data.h
rowser/net/aw_network_delegate.cc
rowser/net/aw_network_delegate.h
rowser/net/aw_url_request_context_getter.cc
rowser/net/aw_url_request_context_getter.h
rowser/net/aw_url_request_job_factory.cc
rowser/net/aw_url_request_job_factory.h
rowser/net/init_native_callback.h
rowser/net_disk_cache_remover.cc
rowser/net_disk_cache_remover.h
rowser/renderer_host/aw_render_view_host_ext.cc
rowser/renderer_host/aw_render_view_host_ext.h
rowser/renderer_host/aw_resource_dispatcher_host_delegate.cc
rowser/renderer_host/aw_resource_dispatcher_host_delegate.h
rowser/scoped_allow_wait_for_legacy_web_view_api.h
uild/install_binary
ommon/DEPS
ommon/OWNERS
ommon/android_webview_message_generator.cc
ommon/android_webview_message_generator.h
ommon/aw_content_client.cc
ommon/aw_content_client.h
ommon/aw_hit_test_data.cc
ommon/aw_hit_test_data.h
ommon/aw_resource.h
ommon/render_view_messages.cc
ommon/render_view_messages.h
ommon/url_constants.cc
ommon/url_constants.h
ava/AndroidManifest.xml
ava/DEPS
ava/src/org/chromium/android_webview/AndroidProtocolHandler.java
ava/src/org/chromium/android_webview/AwContents.java
ava/src/org/chromium/android_webview/AwContentsClient.java
ava/src/org/chromium/android_webview/AwContentsIoThreadClient.java
ava/src/org/chromium/android_webview/AwHttpAuthHandler.java
ava/src/org/chromium/android_webview/AwNativeWindow.java
ava/src/org/chromium/android_webview/AwResource.java
ava/src/org/chromium/android_webview/AwSettings.java
ava/src/org/chromium/android_webview/AwWebContentsDelegate.java
ava/src/org/chromium/android_webview/CookieManager.java
ava/src/org/chromium/android_webview/ErrorCodeConversionHelper.java
ava/src/org/chromium/android_webview/HttpAuthDatabase.java
ava/src/org/chromium/android_webview/InterceptedRequestData.java
ava/src/org/chromium/android_webview/JsPromptResultReceiver.java
ava/src/org/chromium/android_webview/JsResultHandler.java
ava/src/org/chromium/android_webview/JsResultReceiver.java
avatests/AndroidManifest.xml
avatests/DEPS
avatests/assets/asset_file.html
avatests/assets/asset_icon.png
avatests/res/drawable/resource_icon.png
avatests/res/raw/blank_html.html
avatests/res/raw/resource_file.html
avatests/res/raw/resource_icon.png
avatests/res/values/strings.xml
avatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
avatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
avatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerActivity.java
avatests/src/org/chromium/android_webview/test/AndroidWebViewTestRunnerApplication.java
avatests/src/org/chromium/android_webview/test/ArchiveTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
avatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
avatests/src/org/chromium/android_webview/test/AwContentsTest.java
avatests/src/org/chromium/android_webview/test/AwSettingsTest.java
avatests/src/org/chromium/android_webview/test/AwTestContainerView.java
avatests/src/org/chromium/android_webview/test/AwTestResourceProvider.java
avatests/src/org/chromium/android_webview/test/ClearHistoryTest.java
avatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java
avatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
avatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java
avatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
avatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
avatests/src/org/chromium/android_webview/test/CookieManagerTest.java
avatests/src/org/chromium/android_webview/test/GetTitleTest.java
avatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
avatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
avatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
avatests/src/org/chromium/android_webview/test/NullContentsClient.java
avatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
avatests/src/org/chromium/android_webview/test/TestContentProvider.java
avatests/src/org/chromium/android_webview/test/UserAgentTest.java
avatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
avatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
avatests/src/org/chromium/android_webview/test/WebViewFindApisTestBase.java
avatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
avatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
avatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
avatests/src/org/chromium/android_webview/test/util/CommonResources.java
avatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java
avatests/src/org/chromium/android_webview/test/util/JSUtils.java
ib/DEPS
ib/aw_browser_dependency_factory_impl.cc
ib/aw_browser_dependency_factory_impl.h
ib/main/aw_main_delegate.cc
ib/main/aw_main_delegate.h
ib/main/webview_entry_point.cc
ib/main/webview_tests.cc
ibwebviewchromium.target.mk
ative/DEPS
ative/android_jar_jni_headers.target.mk
ative/android_protocol_handler.cc
ative/android_protocol_handler.h
ative/android_stream_reader_url_request_job.cc
ative/android_stream_reader_url_request_job.h
ative/android_stream_reader_url_request_job_unittests.cc
ative/android_webview_jni_registrar.cc
ative/android_webview_jni_registrar.h
ative/android_webview_native_jni.target.mk
ative/aw_browser_dependency_factory.cc
ative/aw_browser_dependency_factory.h
ative/aw_contents.cc
ative/aw_contents.h
ative/aw_contents_io_thread_client_impl.cc
ative/aw_contents_io_thread_client_impl.h
ative/aw_http_auth_handler.cc
ative/aw_http_auth_handler.h
ative/aw_javascript_dialog_creator.cc
ative/aw_javascript_dialog_creator.h
ative/aw_resource.cc
ative/aw_resource.h
ative/aw_web_contents_delegate.cc
ative/aw_web_contents_delegate.h
ative/cookie_manager.cc
ative/cookie_manager.h
ative/intercepted_request_data_impl.cc
ative/intercepted_request_data_impl.h
ative/js_result_handler.cc
ative/js_result_handler.h
ative/net_init_native_callback.cc
ative/webview_native.gyp
ative/webview_native.target.mk
ublic/browser/draw_gl.h
enderer/DEPS
enderer/aw_content_renderer_client.cc
enderer/aw_content_renderer_client.h
enderer/aw_render_process_observer.cc
enderer/aw_render_process_observer.h
enderer/aw_render_view_ext.cc
enderer/aw_render_view_ext.h
est/data/device_files/chrome.png
est/data/device_files/hello_world.html
est/data/device_files/iframe_access.html
est/data/device_files/image_access.html
est/data/device_files/localStorage.html
est/data/device_files/script.js
est/data/device_files/xhr_access.html
ools/gyp_webview
ools/known_incompatible.py
ools/third_party_files_whitelist.txt
ools/webview_licenses.py
ebview_pak.mk