| 929504d64b38e05de7355e162311d6791ad6f54d |
|
19-Aug-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 37.0.2062.95
This commit was generated by merge_to_master.py.
Change-Id: I3f9f26ef388c68b51c867e1f7d1565494e623c61
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| b32d2322a3158a4e5ff9e8356b380b7af6014609 |
|
11-Aug-2014 |
igsolla@chromium.org <igsolla@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> |
Cherry-pick: [Android WebView] API to enable fullscreen.
NOTE: this cherry-pick will only be landed after these changes
https://googleplex-android-review.git.corp.google.com/#/c/523937/
https://googleplex-android-review.git.corp.google.com/#/c/523939/
Added a new method, ie. AwContents.setFullscreenSupported, that
will be called by the glue layer when the WebView app supports
fullscreen.
This is follow-up change to:
https://codereview.chromium.org/428633004/
BUG=389496
Review URL: https://codereview.chromium.org/425343002
Cr-Commit-Position: refs/heads/master@{#288723}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288723 0039d316-1c4b-4281-b951-d872f2087c98
Conflicts:
android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
android_webview/native/aw_settings.cc
content/public/common/common_param_traits_macros.h
content/public/common/web_preferences.cc
content/public/common/web_preferences.h
content/renderer/render_view_impl.cc
Change-Id: Ie0fb7da4a7ccb5557a22ba5c2ab1d9df2e373876
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| d5b30db946a5970bb5d2a1708a387ee636f00275 |
|
13-Aug-2014 |
Ignacio Solla <igsolla@google.com> |
Cherry-pick: Propagate disallow_fullscreen_for_non_media_elements to renderer.
NOTE: this cherry-pick will only be landed after
https://googleplex-android-review.git.corp.google.com/#/c/523936/
We are setting it here:
https://code.google.com/p/chromium/codesearch#chromium/src/android_webview/native/aw_settings.cc&l=437
But we are not yet propagating it to blink because this line
was missing.
This change will only be landed after the next blink deps roll including:
https://codereview.chromium.org/422923002/
Review URL: https://codereview.chromium.org/422963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286189 0039d316-1c4b-4281-b951-d872f2087c98
Conflicts:
content/renderer/render_view_impl.cc
Change-Id: I93874959117f2a88555632f0dac0bbbd020d1427
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|
| 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
/external/chromium_org/content/public/common/common_param_traits_macros.h
|