f7ee355ed2561fedcd0e7b298de85903154969e9 - platform/external/chromium_org

commit	f7ee355ed2561fedcd0e7b298de85903154969e9	[log] [tgz]
author	Torne (Richard Coles) <torne@google.com>	Thu Aug 28 11:20:40 2014 +0100
committer	Torne (Richard Coles) <torne@google.com>	Thu Aug 28 11:20:40 2014 +0100
tree	4d7a7c82442c982c7069514b4ee3fe6760d3bbb0
parent	5b5755f51e60c56f517a0665801546a32e59d3f8 [diff]

Merge from Chromium at DEPS revision 38.0.2125.24

This commit was generated by merge_to_master.py.

Change-Id: I7deb2c4175ea2b0cbcf69db8b091dead60740f1a

android_webview/browser/hardware_renderer.cc[diff]
android_webview/browser/shared_renderer_state.cc[diff]
android_webview/browser/shared_renderer_state.h[diff]
ash/display/display_manager.cc[diff]
ash/display/display_manager.h[diff]
ash/display/display_manager_unittest.cc[diff]
ash/shell.cc[diff]
base/win/scoped_handle.h[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
build/whitespace_file.txt[diff]
cc/input/input_handler.h[diff]
cc/trees/layer_tree_host_impl.cc[diff]
cc/trees/layer_tree_host_unittest_scroll.cc[diff]
chrome/VERSION[diff]
chrome/android/java/res/values-v17/styles.xml[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/ContentWrapperView.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java[diff]
chrome/app/generated_resources.grd[diff]
chrome/browser/android/thumbnail/thumbnail_store.cc[diff]
chrome/browser/chromeos/chromeos_utils.cc[diff]
chrome/browser/chromeos/chromeos_utils.h[diff]
chrome/browser/chromeos/input_method/input_method_engine.cc[diff]
chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc[diff]
chrome/browser/chromeos/login/chrome_restart_request.cc[diff]
chrome/browser/chromeos/options/wifi_config_view.cc[diff]
chrome/browser/google/google_update_settings_posix.cc[diff]
chrome/browser/google/google_update_settings_unittest.cc[diff]
chrome/browser/profiles/gaia_info_update_service_unittest.cc[diff]
chrome/browser/profiles/profile_impl.cc[diff]
chrome/browser/profiles/profile_info_cache.cc[diff]
chrome/browser/profiles/profile_info_cache.h[diff]
chrome/browser/profiles/profile_info_cache_unittest.cc[diff]
chrome/browser/profiles/profile_manager_unittest.cc[diff]
chrome/browser/profiles/profile_metrics.cc[diff]
chrome/browser/profiles/profile_window.cc[diff]
chrome/browser/profiles/profiles_state.cc[diff]
chrome/browser/profiles/profiles_state.h[diff]
chrome/browser/resources/chromeos/chromevox/common/key_sequence.js[diff]
chrome/browser/resources/chromeos/input_method/google_input_tools_manifest.json[diff]
chrome/browser/resources/cryptotoken/gnubby.js[diff]
chrome/browser/resources/local_ntp/most_visited_thumbnail.css[diff]
chrome/browser/resources/local_ntp/most_visited_title.css[diff]
chrome/browser/resources/local_ntp/most_visited_util.js[diff]
chrome/browser/resources/options/browser_options.css[diff]
chrome/browser/resources/options/browser_options.html[diff]
chrome/browser/resources/options/browser_options.js[diff]
chrome/browser/resources/options/content_settings.js[diff]
chrome/browser/resources/options/manage_profile_overlay.js[diff]
chrome/browser/resources/options/options.html[diff]
chrome/browser/resources/options/search_page.js[diff]
chrome/browser/resources/options/supervised_user_learn_more.css[diff]
chrome/browser/resources/user_manager/user_manager.js[diff]
chrome/browser/signin/chrome_signin_client.cc[diff]
chrome/browser/signin/chrome_signin_client.h[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/signin_header_helper.cc[diff]
chrome/browser/signin/signin_header_helper.h[diff]
chrome/browser/signin/signin_manager_unittest.cc[diff]
chrome/browser/signin/signin_ui_util.cc[diff]
chrome/browser/signin/signin_ui_util.h[diff]
chrome/browser/sync/glue/non_frontend_data_type_controller.cc[diff]
chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc[diff]
chrome/browser/ui/app_list/app_list_service_views_browsertest.cc[diff]
chrome/browser/ui/app_list/app_list_shower_views.cc[diff]
chrome/browser/ui/app_list/app_list_shower_views.h[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_controller_private.mm[diff]
chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm[diff]
chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm[diff]
chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm[diff]
chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm[diff]
chrome/browser/ui/cocoa/profiles/user_manager_mac.mm[diff]
chrome/browser/ui/sync/one_click_signin_helper.cc[diff]
chrome/browser/ui/sync/one_click_signin_helper.h[diff]
chrome/browser/ui/sync/one_click_signin_sync_starter.cc[diff]
chrome/browser/ui/toolbar/wrench_menu_model.cc[diff]
chrome/browser/ui/views/frame/system_menu_model_delegate.cc[diff]
chrome/browser/ui/views/profiles/new_avatar_button.cc[diff]
chrome/browser/ui/views/profiles/new_avatar_button.h[diff]
chrome/browser/ui/views/profiles/profile_chooser_view.cc[diff]
chrome/browser/ui/views/profiles/profile_chooser_view.h[diff]
chrome/browser/ui/views/profiles/user_manager_view.cc[diff]
chrome/browser/ui/views/profiles/user_manager_view.h[diff]
chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc[diff]
chrome/browser/ui/views/website_settings/website_settings_popup_view.cc[diff]
chrome/browser/ui/webui/options/browser_options_handler.cc[diff]
chrome/browser/ui/webui/options/manage_profile_handler.cc[diff]
chrome/browser/ui/webui/options/startup_pages_handler.cc[diff]
chrome/browser/ui/webui/signin/inline_login_handler_impl.cc[diff]
chrome/browser/ui/webui/signin/login_ui_service.cc[diff]
chrome/browser/ui/webui/signin/login_ui_service.h[diff]
chrome/browser/ui/webui/signin/user_manager_screen_handler.cc[diff]
chrome/common/pref_names.cc[diff]
chrome/common/pref_names.h[diff]
chrome/tools/build/win/FILES.cfg[diff]
chromeos/dbus/cryptohome_client.cc[diff]
chromeos/dbus/fake_shill_manager_client.cc[diff]
chromeos/network/client_cert_util.cc[diff]
chromeos/network/client_cert_util.h[diff]
chromeos/network/network_cert_migrator.cc[diff]
chromeos/network/network_cert_migrator.h[diff]
chromeos/network/network_cert_migrator_unittest.cc[diff]
chromeos/network/onc/onc_translator_shill_to_onc.cc[diff]
codereview.settings[diff]
components/signin/core/browser/signin_client.h[diff]
components/signin/core/browser/signin_manager.cc[diff]
components/signin/core/browser/signin_metrics.cc[diff]
components/signin/core/browser/signin_metrics.h[diff]
components/signin/core/browser/test_signin_client.cc[diff]
components/signin/core/browser/test_signin_client.h[diff]
components/sync_driver/fake_data_type_controller.cc[diff]
components/sync_driver/model_association_manager_unittest.cc[diff]
components/sync_driver/non_ui_data_type_controller.cc[diff]
components/sync_driver/non_ui_data_type_controller_unittest.cc[diff]
content/browser/android/edge_effect.cc[diff]
content/browser/android/edge_effect.h[diff]
content/browser/android/edge_effect_base.h[Added - diff]
content/browser/android/edge_effect_l.cc[Added - diff]
content/browser/android/edge_effect_l.h[Added - diff]
content/browser/android/overscroll_glow.cc[diff]
content/browser/android/overscroll_glow.h[diff]
content/browser/android/system_ui_resource_manager_impl.cc[diff]
content/browser/android/system_ui_resource_manager_impl.h[diff]
content/browser/frame_host/navigation_controller_impl_unittest.cc[diff]
content/browser/frame_host/render_frame_host_impl.cc[diff]
content/browser/renderer_host/input/motion_event_web.cc[diff]
content/browser/renderer_host/overscroll_controller.cc[diff]
content/browser/renderer_host/overscroll_controller.h[diff]
content/browser/renderer_host/overscroll_controller_delegate.h[diff]
content/browser/renderer_host/render_view_host_impl.cc[diff]
content/browser/renderer_host/render_view_host_impl.h[diff]
content/browser/renderer_host/render_view_host_unittest.cc[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_unittest.cc[diff]
content/browser/web_contents/aura/gesture_nav_simple.cc[diff]
content/browser/web_contents/aura/gesture_nav_simple.h[diff]
content/browser/web_contents/web_contents_view_aura.cc[diff]
content/browser/web_contents/web_contents_view_aura.h[diff]
content/browser/web_contents/web_contents_view_aura_browsertest.cc[diff]
content/common/input/did_overscroll_params.cc[Added - diff]
content/common/input/did_overscroll_params.h[diff]
content/common/input_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/content_browser.gypi[diff]
content/content_browser.target.darwin-arm.mk[diff]
content/content_browser.target.darwin-arm64.mk[diff]
content/content_browser.target.darwin-mips.mk[diff]
content/content_browser.target.darwin-x86.mk[diff]
content/content_browser.target.darwin-x86_64.mk[diff]
content/content_browser.target.linux-arm.mk[diff]
content/content_browser.target.linux-arm64.mk[diff]
content/content_browser.target.linux-mips.mk[diff]
content/content_browser.target.linux-x86.mk[diff]
content/content_browser.target.linux-x86_64.mk[diff]
content/content_common.gypi[diff]
content/content_common.target.darwin-arm.mk[diff]
content/content_common.target.darwin-arm64.mk[diff]
content/content_common.target.darwin-mips.mk[diff]
content/content_common.target.darwin-x86.mk[diff]
content/content_common.target.darwin-x86_64.mk[diff]
content/content_common.target.linux-arm.mk[diff]
content/content_common.target.linux-arm64.mk[diff]
content/content_common.target.linux-mips.mk[diff]
content/content_common.target.linux-x86.mk[diff]
content/content_common.target.linux-x86_64.mk[diff]
content/renderer/input/input_event_filter.cc[diff]
content/renderer/input/input_handler_proxy.cc[diff]
content/renderer/input/input_handler_proxy.h[diff]
content/renderer/input/input_handler_proxy_unittest.cc[diff]
content/test/data/overscroll_navigation.html[diff]
content/test/test_render_view_host.cc[diff]
content/test/test_render_view_host.h[diff]
device/bluetooth/bluetooth_socket_chromeos.cc[diff]
device/hid/hid_connection.cc[diff]
device/hid/hid_connection.h[diff]
device/hid/hid_connection_linux.cc[diff]
device/hid/hid_connection_mac.cc[diff]
device/hid/hid_connection_win.cc[diff]
device/hid/hid_service_win.cc[diff]
extensions/browser/api/hid/hid_api.cc[diff]
gpu/command_buffer/service/gles2_cmd_decoder.cc[diff]
gpu/config/gpu_driver_bug_list_json.cc[diff]
gpu/config/software_rendering_list_json.cc[diff]
media/cdm/ppapi/cdm_wrapper.h[diff]
net/http/http_network_session.cc[diff]
net/http/http_response_body_drainer_unittest.cc[diff]
net/quic/quic_client_session.cc[diff]
net/quic/quic_client_session.h[diff]
net/quic/quic_client_session_test.cc[diff]
net/quic/quic_http_stream_test.cc[diff]
net/quic/quic_stream_factory.cc[diff]
net/quic/quic_stream_factory.h[diff]
net/quic/quic_stream_factory_test.cc[diff]
net/socket/ssl_client_socket_pool_unittest.cc[diff]
net/spdy/spdy_session.cc[diff]
net/spdy/spdy_session.h[diff]
net/spdy/spdy_session_pool.cc[diff]
net/spdy/spdy_session_pool.h[diff]
net/spdy/spdy_session_unittest.cc[diff]
net/spdy/spdy_test_utils.cc[diff]
net/spdy/spdy_test_utils.h[diff]
third_party/android_opengl/etc1/etc1.cpp[diff]
third_party/android_opengl/etc1/etc1.h[diff]
tools/metrics/histograms/histograms.xml[diff]
ui/aura/gestures/gesture_recognizer_unittest.cc[diff]
ui/aura/window_event_dispatcher.cc[diff]
ui/base/android/system_ui_resource_manager.h[diff]
ui/events/gestures/motion_event_aura.cc[diff]
ui/events/gestures/motion_event_aura_unittest.cc[diff]
ui/file_manager/file_manager/background/js/device_handler.js[diff]
ui/file_manager/file_manager/foreground/css/file_manager.css[diff]
ui/file_manager/file_manager/foreground/js/file_manager.js[diff]
ui/file_manager/file_manager/foreground/js/ui/progress_center_panel.js[diff]
ui/file_manager/gallery/js/gallery.js[diff]
ui/file_manager/gallery/js/gallery_item.js[diff]
ui/file_manager/gallery/js/image_editor/image_editor.js[diff]
ui/gfx/font_render_params.h[diff]
ui/gfx/font_render_params_linux.cc[diff]
ui/gfx/font_render_params_linux_unittest.cc[diff]
ui/gfx/switches.cc[diff]
ui/gfx/switches.h[diff]
ui/gl/gl_fence_egl.cc[diff]
ui/login/OWNERS[diff]
ui/login/account_picker/screen_account_picker.js[diff]
ui/login/account_picker/user_pod_row.js[diff]
ui/views/controls/button/label_button.cc[diff]
ui/views/window/dialog_delegate.cc[diff]
ui/views/window/dialog_delegate.h[diff]

244 files changed