« back to all changes in this revision
Viewing changes to shared/browser/media/oxide_media_web_contents_observer.cc
- Committer: Riccardo Padovani
- Date: 2015-10-19 07:56:29 UTC
- mfrom: (1088.1.131 oxide)
- Revision ID: riccardo@rpadovani.com-20151019075629-z0mlhwlb9xflkovw
Merge from trunk
- qt/core/browser/media
- shared/browser/notifications
- shared/browser/pepper
- shared/port/media
- shared/renderer/pepper
- files removed:
- patches/arm-webrtc.patch
- files renamed:
- patches/add-limit-max-decoded-image-bytes-switch.patch => patches/limit-max-decoded-image-bytes-on-mobile.patch
- qt/tests/qmltests/core/tst_ScriptMessageRouting_bubbling.html => qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_bubbling.html
- qt/tests/qmltests/core/tst_ScriptMessageRouting_bubbling.qml => qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_bubbling.qml
- qt/tests/qmltests/core/tst_ScriptMessageRouting_direct.html => qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_direct.html
- qt/tests/qmltests/core/tst_ScriptMessageRouting_direct.qml => qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_direct.qml
- qt/tests/qmltests/core/tst_ScriptMessageRouting_no_match.qml => qt/tests/qmltests/core/tst_ScriptMessageRoutingToBrowser_errors.qml
- shared/browser/oxide_form_factor_linux.cc => shared/browser/oxide_form_factor_detection_linux.cc
- shared/browser/oxide_user_agent_override_provider.cc => shared/browser/oxide_render_message_filter.cc
- shared/browser/oxide_user_agent_override_provider.h => shared/browser/oxide_render_message_filter.h
- shared/browser/oxide_form_factor.h => shared/common/oxide_form_factor.h
- files modified:
- CHROMIUM_VERSION
added
removed
shared/browser/media/oxide_media_web_contents_observer.cc
