1675a64 - platform/external/chromium_org

commit	1675a649fd7a8b3cb80ffddae2dc181f122353c5	[log] [tgz]
author	Ben Murdoch <benm@google.com>	Wed Oct 22 18:55:17 2014 +0100
committer	Ben Murdoch <benm@google.com>	Wed Oct 22 18:55:17 2014 +0100
tree	eb1ec66a619d0b0680d83b54523dc381a74e04ae
parent	b985a5157c04424e8c2fd5091938349a768d4329 [diff]

Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760

android_webview/android_webview_jarjar_content_resources.target.darwin-arm.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-mips.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-x86.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.darwin-x86_64.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-arm.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-arm64.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-mips.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-x86.mk[diff]
android_webview/android_webview_jarjar_content_resources.target.linux-x86_64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-arm.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-mips.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-x86.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.darwin-x86_64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-arm.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-arm64.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-mips.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk[diff]
android_webview/android_webview_jarjar_ui_resources.target.linux-x86_64.mk[diff]
android_webview/browser/browser_view_renderer.cc[diff]
android_webview/browser/browser_view_renderer.h[diff]
android_webview/browser/hardware_renderer.cc[diff]
android_webview/browser/shared_renderer_state.cc[diff]
android_webview/browser/shared_renderer_state.h[diff]
ash/accelerators/accelerator_table.cc[diff]
ash/display/display_change_observer_chromeos.cc[diff]
ash/display/display_manager_unittest.cc[diff]
ash/screen_util.cc[diff]
build/common.gypi[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
cc/animation/animation_curve.h[diff]
cc/animation/keyframed_animation_curve.cc[diff]
cc/animation/keyframed_animation_curve.h[diff]
cc/animation/keyframed_animation_curve_unittest.cc[diff]
cc/animation/layer_animation_controller.cc[diff]
cc/animation/layer_animation_controller.h[diff]
cc/animation/layer_animation_controller_unittest.cc[diff]
cc/animation/transform_operations.cc[diff]
cc/animation/transform_operations.h[diff]
cc/animation/transform_operations_unittest.cc[diff]
cc/input/input_handler.h[diff]
cc/input/page_scale_animation.h[diff]
cc/layers/picture_layer_impl.cc[diff]
cc/layers/picture_layer_impl_unittest.cc[diff]
cc/resources/picture_pile.cc[diff]
cc/resources/picture_pile_unittest.cc[diff]
cc/scheduler/scheduler_state_machine.cc[diff]
cc/scheduler/scheduler_unittest.cc[diff]
cc/test/animation_test_common.cc[diff]
cc/test/animation_test_common.h[diff]
cc/trees/layer_tree_host.cc[diff]
cc/trees/layer_tree_host_common.cc[diff]
cc/trees/layer_tree_host_impl.cc[diff]
cc/trees/layer_tree_host_impl.h[diff]
cc/trees/layer_tree_host_impl_unittest.cc[diff]
cc/trees/layer_tree_host_unittest.cc[diff]
cc/trees/layer_tree_impl.cc[diff]
cc/trees/layer_tree_impl.h[diff]
chrome/VERSION[diff]
chrome/app/generated_resources.grd[diff]
chrome/app/resources/locale_settings.grd[diff]
chrome/browser/about_flags.cc[diff]
chrome/browser/chrome_device_client.cc[diff]
chrome/browser/chromeos/app_mode/kiosk_app_manager.cc[diff]
chrome/browser/chromeos/login/enrollment/enrollment_screen.cc[diff]
chrome/browser/chromeos/login/enrollment/enrollment_screen.h[diff]
chrome/browser/chromeos/login/lock/screen_locker.cc[diff]
chrome/browser/chromeos/login/login_utils.cc[diff]
chrome/browser/chromeos/login/session/user_session_manager.cc[diff]
chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.cc[diff]
chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.h[diff]
chrome/browser/chromeos/login/supervised/supervised_user_login_flow.cc[diff]
chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h[diff]
chrome/browser/chromeos/login/user_flow.cc[diff]
chrome/browser/chromeos/login/user_flow.h[diff]
chrome/browser/chromeos/policy/enterprise_install_attributes.cc[diff]
chrome/browser/extensions/content_verifier_browsertest.cc[diff]
chrome/browser/extensions/extension_management.cc[diff]
chrome/browser/extensions/extension_management.h[diff]
chrome/browser/extensions/extension_management_unittest.cc[diff]
chrome/browser/extensions/install_verifier.cc[diff]
chrome/browser/google/google_update_win.cc[diff]
chrome/browser/google/google_update_win.h[diff]
chrome/browser/invalidation/profile_invalidation_provider_factory.cc[diff]
chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc[diff]
chrome/browser/media/media_capture_devices_dispatcher.cc[diff]
chrome/browser/net/ssl_config_service_manager_pref.cc[diff]
chrome/browser/policy/configuration_policy_handler_list_factory.cc[diff]
chrome/browser/policy/policy_browsertest.cc[diff]
chrome/browser/prefs/command_line_pref_store.cc[diff]
chrome/browser/resources/chromeos/neterror.css[diff]
chrome/browser/resources/chromeos/neterror.js[diff]
chrome/browser/resources/chromeos/offline_net_load.html[diff]
chrome/browser/resources/options/options_page.css[diff]
chrome/browser/resources/options/startup_overlay.css[diff]
chrome/browser/services/gcm/gcm_desktop_utils.cc[diff]
chrome/browser/services/gcm/gcm_profile_service.cc[diff]
chrome/browser/services/gcm/gcm_profile_service_unittest.cc[diff]
chrome/browser/signin/easy_unlock_service.cc[diff]
chrome/browser/signin/easy_unlock_service.h[diff]
chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc[diff]
chrome/browser/signin/easy_unlock_service_factory.cc[diff]
chrome/browser/signin/easy_unlock_service_regular.cc[diff]
chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc[diff]
chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc[diff]
chrome/browser/ui/browser_window.h[diff]
chrome/browser/ui/cocoa/browser_window_cocoa.h[diff]
chrome/browser/ui/cocoa/browser_window_cocoa.mm[diff]
chrome/browser/ui/cocoa/browser_window_controller.mm[diff]
chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h[diff]
chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm[diff]
chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm[diff]
chrome/browser/ui/fullscreen/fullscreen_controller.cc[diff]
chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc[diff]
chrome/browser/ui/toolbar/toolbar_model_impl.cc[diff]
chrome/browser/ui/toolbar/wrench_menu_model.cc[diff]
chrome/browser/ui/views/tabs/tab.cc[diff]
chrome/browser/ui/website_settings/website_settings.cc[diff]
chrome/browser/ui/webui/help/version_updater_win.cc[diff]
chrome/common/chrome_switches.cc[diff]
chrome/common/chrome_switches.h[diff]
chrome/common/extensions/api/_permission_features.json[diff]
chrome/common/pref_names.cc[diff]
chrome/common/pref_names.h[diff]
chrome/installer/mac/sign_app.sh.in[diff]
chrome/installer/mac/sign_versioned_dir.sh.in[diff]
chrome/renderer/resources/neterror.css[diff]
chrome/test/base/test_browser_window.h[diff]
components/data_reduction_proxy_version_header.target.darwin-arm.mk[diff]
components/data_reduction_proxy_version_header.target.darwin-arm64.mk[diff]
components/data_reduction_proxy_version_header.target.darwin-mips.mk[diff]
components/data_reduction_proxy_version_header.target.darwin-x86.mk[diff]
components/data_reduction_proxy_version_header.target.darwin-x86_64.mk[diff]
components/data_reduction_proxy_version_header.target.linux-arm.mk[diff]
components/data_reduction_proxy_version_header.target.linux-arm64.mk[diff]
components/data_reduction_proxy_version_header.target.linux-mips.mk[diff]
components/data_reduction_proxy_version_header.target.linux-x86.mk[diff]
components/data_reduction_proxy_version_header.target.linux-x86_64.mk[diff]
components/gcm_driver.gypi[diff]
components/gcm_driver/BUILD.gn[diff]
components/gcm_driver/DEPS[diff]
components/gcm_driver/fake_gcm_client.cc[diff]
components/gcm_driver/fake_gcm_client.h[diff]
components/gcm_driver/fake_gcm_driver.cc[diff]
components/gcm_driver/fake_gcm_driver.h[diff]
components/gcm_driver/gcm_channel_status_request.cc[diff]
components/gcm_driver/gcm_channel_status_request.h[diff]
components/gcm_driver/gcm_channel_status_request_unittest.cc[diff]
components/gcm_driver/gcm_channel_status_syncer.cc[diff]
components/gcm_driver/gcm_channel_status_syncer.h[diff]
components/gcm_driver/gcm_driver.h[diff]
components/gcm_driver/gcm_driver_android.cc[diff]
components/gcm_driver/gcm_driver_android.h[diff]
components/gcm_driver/gcm_driver_desktop.cc[diff]
components/gcm_driver/gcm_driver_desktop.h[diff]
components/gcm_driver/gcm_driver_desktop_unittest.cc[diff]
components/gcm_driver/proto/BUILD.gn[Deleted - diff]
components/invalidation/ticl_invalidation_service.cc[diff]
components/policy/core/common/cloud/enterprise_metrics.cc[diff]
components/policy/core/common/cloud/enterprise_metrics.h[diff]
components/policy/resources/policy_templates.json[diff]
content/browser/accessibility/browser_accessibility_android.cc[diff]
content/browser/accessibility/dump_accessibility_tree_browsertest.cc[diff]
content/browser/android/web_contents_observer_android.cc[diff]
content/browser/browser_plugin/browser_plugin_guest.cc[diff]
content/browser/browser_plugin/browser_plugin_guest.h[diff]
content/browser/frame_host/frame_tree.cc[diff]
content/browser/frame_host/frame_tree.h[diff]
content/browser/frame_host/frame_tree_node.cc[diff]
content/browser/frame_host/frame_tree_node.h[diff]
content/browser/frame_host/frame_tree_unittest.cc[diff]
content/browser/frame_host/render_frame_host_impl.cc[diff]
content/browser/frame_host/render_frame_host_manager_unittest.cc[diff]
content/browser/frame_host/render_widget_host_view_child_frame.cc[diff]
content/browser/frame_host/render_widget_host_view_child_frame.h[diff]
content/browser/frame_host/render_widget_host_view_guest.cc[diff]
content/browser/frame_host/render_widget_host_view_guest.h[diff]
content/browser/media/android/browser_media_player_manager.cc[diff]
content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc[diff]
content/browser/renderer_host/render_widget_host_impl.cc[diff]
content/browser/renderer_host/render_widget_host_impl.h[diff]
content/browser/renderer_host/render_widget_host_view_android.cc[diff]
content/browser/renderer_host/render_widget_host_view_android.h[diff]
content/browser/renderer_host/render_widget_host_view_aura.cc[diff]
content/browser/renderer_host/render_widget_host_view_aura.h[diff]
content/browser/renderer_host/render_widget_host_view_base.h[diff]
content/browser/renderer_host/render_widget_host_view_mac.h[diff]
content/browser/renderer_host/render_widget_host_view_mac.mm[diff]
content/common/gpu/client/gl_helper_readback_support.cc[diff]
content/common/gpu/media/gpu_video_encode_accelerator.cc[diff]
content/common/gpu/media/v4l2_video_encode_accelerator.cc[diff]
content/common/gpu/media/v4l2_video_encode_accelerator.h[diff]
content/common/view_messages.h[diff]
content/common_aidl.target.darwin-arm.mk[diff]
content/common_aidl.target.darwin-arm64.mk[diff]
content/common_aidl.target.darwin-mips.mk[diff]
content/common_aidl.target.darwin-x86.mk[diff]
content/common_aidl.target.darwin-x86_64.mk[diff]
content/common_aidl.target.linux-arm.mk[diff]
content/common_aidl.target.linux-arm64.mk[diff]
content/common_aidl.target.linux-mips.mk[diff]
content/common_aidl.target.linux-x86.mk[diff]
content/common_aidl.target.linux-x86_64.mk[diff]
content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png[diff]
content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png[diff]
content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png[diff]
content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png[diff]
content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png[diff]
content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png[diff]
content/public/android/java/res/drawable-xxhdpi/ic_menu_search_holo_light.png[Added - diff]
content/public/android/java/res/drawable-xxhdpi/ic_menu_share_holo_light.png[Added - diff]
content/public/android/java/res/drawable-xxxhdpi/ic_menu_search_holo_light.png[Added - diff]
content/public/android/java/res/drawable-xxxhdpi/ic_menu_share_holo_light.png[Added - diff]
content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java[diff]
content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java[diff]
content/public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java[diff]
content/renderer/input/input_handler_proxy_unittest.cc[diff]
content/renderer/npapi/webplugin_delegate_proxy.cc[diff]
content/renderer/render_frame_impl.cc[diff]
content/renderer/render_view_browsertest.cc[diff]
content/renderer/render_view_impl.cc[diff]
content/renderer/render_widget.cc[diff]
content/renderer/render_widget.h[diff]
content/renderer/renderer_font_platform_win.cc[diff]
content/test/data/accessibility/input-text-value-expected-android.txt[Added - diff]
content/test/data/accessibility/input-text-value-expected-mac.txt[Added - diff]
content/test/data/accessibility/input-text-value-expected-win.txt[Added - diff]
content/test/data/accessibility/input-text-value.html[Added - diff]
content/test/test_render_view_host.h[diff]
device/hid/hid_connection.cc[diff]
device/hid/hid_connection.h[diff]
device/hid/hid_connection_linux.cc[diff]
device/hid/hid_connection_linux.h[diff]
device/hid/hid_connection_mac.cc[diff]
device/hid/hid_connection_mac.h[diff]
device/hid/hid_connection_unittest.cc[diff]
device/hid/hid_connection_win.cc[diff]
device/hid/hid_connection_win.h[diff]
device/hid/hid_device_info.cc[diff]
device/hid/hid_device_info.h[diff]
device/hid/hid_service.cc[diff]
device/hid/hid_service.h[diff]
device/hid/hid_service_linux.cc[diff]
device/hid/hid_service_mac.cc[diff]
device/hid/hid_service_mac.h[diff]
device/hid/hid_service_unittest.cc[diff]
device/hid/hid_service_win.cc[diff]
extensions/browser/api/async_api_function.cc[diff]
extensions/browser/api/hid/hid_api.cc[diff]
extensions/browser/api/hid/hid_connection_resource.cc[diff]
extensions/browser/api/hid/hid_connection_resource.h[diff]
extensions/browser/api/hid/hid_device_manager.cc[diff]
extensions/browser/computed_hashes.cc[diff]
extensions/browser/computed_hashes_unittest.cc[diff]
extensions/browser/content_verifier.cc[diff]
extensions/browser/content_verifier_io_data.cc[diff]
extensions/browser/content_verifier_io_data.h[diff]
extensions/browser/content_verify_job.cc[diff]
extensions/browser/content_verify_job.h[diff]
extensions/shell/browser/shell_device_client.cc[diff]
gpu/config/gpu_driver_bug_list_json.cc[diff]
media/base/android/java/src/org/chromium/media/MediaCodecBridge.java[diff]
media/base/android/java/src/org/chromium/media/MediaPlayerListener.java[diff]
media/base/android/media_codec_bridge.cc[diff]
media/base/android/media_codec_bridge.h[diff]
media/base/android/media_player_android.cc[diff]
media/base/android/media_player_android.h[diff]
media/base/android/media_player_bridge.cc[diff]
media/base/android/media_player_bridge.h[diff]
media/base/android/media_player_listener.cc[diff]
media/base/android/media_player_listener.h[diff]
media/base/android/media_source_player.cc[diff]
media/base/android/media_source_player.h[diff]
net/base/net_error_list.h[diff]
net/quic/quic_flow_controller.cc[diff]
net/quic/quic_flow_controller.h[diff]
net/quic/quic_session.cc[diff]
net/quic/quic_session_test.cc[diff]
net/quic/reliable_quic_stream.cc[diff]
net/quic/reliable_quic_stream.h[diff]
net/socket/ssl_client_socket_nss.cc[diff]
net/socket/ssl_client_socket_openssl.cc[diff]
net/ssl/ssl_config.cc[diff]
net/ssl/ssl_config.h[diff]
net/url_request/url_request_unittest.cc[diff]
remoting/android/java/src/org/chromium/chromoting/Desktop.java[diff]
remoting/android/java/src/org/chromium/chromoting/HostListLoader.java[diff]
remoting/host/chromoting_host.cc[diff]
remoting/host/host_config.cc[diff]
remoting/host/host_config.h[diff]
remoting/host/host_status_observer.h[diff]
remoting/host/mac/me2me_preference_pane.mm[diff]
remoting/host/remoting_me2me_host.cc[diff]
remoting/host/win/elevated_controller.cc[diff]
remoting/webapp/host_controller.js[diff]
remoting/webapp/session_connector_impl.js[diff]
remoting/webapp/signal_strategy.js[diff]
sync/internal_api/public/util/experiments.h[diff]
sync/protocol/BUILD.gn[diff]
sync/protocol/experiment_status.proto[Renamed from components/gcm_driver/proto/gcm_channel_status.proto - diff]
sync/sync.gyp[diff]
tools/metrics/actions/actions.xml[diff]
tools/metrics/histograms/histograms.xml[diff]
ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java[diff]
ui/app_list/app_list_switches.cc[diff]
ui/compositor/transform_animation_curve_adapter.cc[diff]
ui/compositor/transform_animation_curve_adapter.h[diff]
ui/events/keycodes/keyboard_code_conversion_x.cc[diff]
ui/file_manager/file_manager/foreground/js/file_grid.js[diff]
ui/file_manager/file_manager/foreground/js/file_manager.js[diff]
ui/login/screen_container.css[diff]

313 files changed