e4256316f8b5e8d1ec0df1f7762771622a53fa63 - platform/external/chromium_org

commit	e4256316f8b5e8d1ec0df1f7762771622a53fa63	[log] [tgz]
author	Ben Murdoch <benm@google.com>	Sat Nov 22 01:28:32 2014 +0000
committer	Ben Murdoch <benm@google.com>	Sat Nov 22 01:28:32 2014 +0000
tree	9d8282f7a323fad191129fddbcf5601903fa161c
parent	165c68f9802332588874b0a207d7f49d03009ddf [diff]

Merge from Chromium at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: I1bb301dcfe74249d8b66fb60ba577e9095c86b8d

android_webview/libwebviewchromium.target.darwin-arm.mk[diff]
android_webview/libwebviewchromium.target.darwin-arm64.mk[diff]
android_webview/libwebviewchromium.target.darwin-mips.mk[diff]
android_webview/libwebviewchromium.target.darwin-x86.mk[diff]
android_webview/libwebviewchromium.target.darwin-x86_64.mk[diff]
android_webview/libwebviewchromium.target.linux-arm.mk[diff]
android_webview/libwebviewchromium.target.linux-arm64.mk[diff]
android_webview/libwebviewchromium.target.linux-mips.mk[diff]
android_webview/libwebviewchromium.target.linux-x86.mk[diff]
android_webview/libwebviewchromium.target.linux-x86_64.mk[diff]
build/android/pylib/gtest/setup.py[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
cc/resources/picture_pile_unittest.cc[diff]
chrome/VERSION[diff]
chrome/app/generated_resources.grd[diff]
chrome/browser/android/provider/chrome_browser_provider.cc[diff]
chrome/browser/android/provider/chrome_browser_provider.h[diff]
chrome/browser/component_updater/recovery_component_installer.cc[diff]
chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc[diff]
chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc[diff]
chrome/browser/extensions/extension_tab_util.cc[diff]
chrome/browser/extensions/extension_uninstall_dialog.cc[diff]
chrome/browser/extensions/extension_uninstall_dialog.h[diff]
chrome/browser/plugins/plugin_info_message_filter.cc[diff]
chrome/browser/plugins/plugin_info_message_filter.h[diff]
chrome/browser/resources/plugin_metadata/plugins_win.json[diff]
chrome/browser/signin/easy_unlock_screenlock_state_handler.cc[diff]
chrome/browser/signin/easy_unlock_screenlock_state_handler.h[diff]
chrome/browser/signin/easy_unlock_screenlock_state_handler_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_signin_chromeos.cc[diff]
chrome/browser/sync/test/integration/enable_disable_test.cc[diff]
chrome/browser/ui/android/tab_model/tab_model.h[diff]
chrome/browser/ui/android/tab_model/tab_model_list.cc[diff]
chrome/browser/ui/android/tab_model/tab_model_list_unittest.cc[Added - diff]
chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm[diff]
chrome/browser/ui/settings_window_manager.cc[diff]
chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc[diff]
chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc[Added - diff]
chrome/browser/ui/views/toolbar/browser_action_view.cc[diff]
chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc[diff]
chrome/browser/ui/webui/signin/user_manager_screen_handler.cc[diff]
chrome/chrome_tests.gypi[diff]
chrome/chrome_tests_unit.gypi[diff]
chromeos/ime/component_extension_ime_manager.cc[diff]
chromeos/ime/component_extension_ime_manager_unittest.cc[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/domain_reliability/util.cc[diff]
components/signin/core/common/profile_management_switches.cc[diff]
components/sync_driver/sync_prefs.cc[diff]
components/sync_driver/sync_prefs_unittest.cc[diff]
content/browser/renderer_host/render_view_host_delegate.cc[diff]
content/browser/renderer_host/render_view_host_delegate.h[diff]
content/browser/renderer_host/render_view_host_impl.cc[diff]
content/browser/renderer_host/render_widget_host_view_aura.cc[diff]
content/browser/web_contents/web_contents_impl.cc[diff]
content/browser/web_contents/web_contents_impl.h[diff]
content/common/gpu/OWNERS[diff]
content/common/gpu/image_transport_surface_calayer_mac.mm[diff]
content/common/gpu/image_transport_surface_fbo_mac.h[diff]
content/common/gpu/image_transport_surface_fbo_mac.mm[diff]
content/common/gpu/media/dxva_video_decode_accelerator.cc[diff]
content/content_tests.gypi[diff]
content/content_unittests.isolate[diff]
content/public/common/content_constants.cc[diff]
content/public/common/content_constants.h[diff]
content/renderer/media/media_stream_audio_processor.cc[diff]
content/renderer/media/media_stream_audio_processor_options.cc[diff]
media/audio/mac/audio_manager_mac.cc[diff]
media/audio/mac/audio_manager_mac.h[diff]
native_client_sdk/src/build_tools/build_sdk.py[diff]
sandbox/win/src/sandbox_policy_base.cc[diff]
third_party/libjingle/BUILD.gn[diff]
third_party/libjingle/libjingle.gyp[diff]
third_party/libjingle/overrides/init_webrtc.cc[diff]
third_party/libjingle/overrides/init_webrtc.h[diff]
third_party/libjingle/overrides/initialize_module.cc[diff]
tools/metrics/rappor/rappor.xml[diff]
ui/login/account_picker/user_pod_row.css[diff]
ui/login/account_picker/user_pod_row.js[diff]
ui/login/account_picker/user_pod_template.html[diff]
ui/views/controls/label.cc[diff]
ui/views/controls/label_unittest.cc[diff]

94 files changed