7da551c69e84cdee501ba0193ee132bc3b5b2c1d - platform/external/chromium_org

commit	7da551c69e84cdee501ba0193ee132bc3b5b2c1d	[log] [tgz]
author	Torne (Richard Coles) <torne@google.com>	Thu Jan 30 10:51:06 2014 +0000
committer	Torne (Richard Coles) <torne@google.com>	Thu Jan 30 10:51:06 2014 +0000
tree	2a516b7c88b5343fd06275be1a6755757fead7fd
parent	1fda896a614c398733984435ef2070c96346898e [diff]

Merge from Chromium at DEPS revision 33.0.1750.58

This commit was generated by merge_to_master.py.

Change-Id: I28f293c6ddd80bb1e7f8aa5726c9ba44cbd5d3d3

DEPS[diff]
GypAndroid.darwin-arm64.mk[Added - diff]
GypAndroid.linux-arm64.mk[Added - diff]
ash/shelf/shelf_layout_manager.cc[diff]
ash/system/chromeos/power/power_status.cc[diff]
ash/system/chromeos/power/tray_power.cc[diff]
ash/system/chromeos/power/tray_power_unittest.cc[diff]
base/mac/sdk_forward_declarations.h[diff]
build/apk_test.gypi[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
chrome/VERSION[diff]
chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java[diff]
chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java[diff]
chrome/app/generated_resources.grd[diff]
chrome/browser/about_flags.cc[diff]
chrome/browser/android/chromium_application.cc[diff]
chrome/browser/android/chromium_application.h[diff]
chrome/browser/chrome_browser_field_trials_desktop.cc[diff]
chrome/browser/chrome_browser_field_trials_mobile.cc[diff]
chrome/browser/chromeos/app_mode/app_session_lifetime.cc[diff]
chrome/browser/chromeos/app_mode/startup_app_launcher.cc[diff]
chrome/browser/chromeos/app_mode/startup_app_launcher.h[diff]
chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc[diff]
chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc[diff]
chrome/browser/chromeos/extensions/file_manager/event_router.cc[diff]
chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc[diff]
chrome/browser/chromeos/login/captive_portal_window_browsertest.cc[diff]
chrome/browser/chromeos/login/merge_session_load_page.cc[diff]
chrome/browser/chromeos/login/merge_session_load_page.h[diff]
chrome/browser/chromeos/login/merge_session_load_page_unittest.cc[diff]
chrome/browser/chromeos/login/merge_session_throttle.cc[diff]
chrome/browser/chromeos/login/merge_session_throttle.h[diff]
chrome/browser/chromeos/login/merge_session_xhr_request_waiter.cc[Deleted - diff]
chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h[Deleted - diff]
chrome/browser/chromeos/login/multi_profile_user_controller.cc[diff]
chrome/browser/chromeos/login/multi_profile_user_controller_unittest.cc[diff]
chrome/browser/chromeos/login/simple_web_view_dialog.cc[diff]
chrome/browser/chromeos/login/user_manager.cc[diff]
chrome/browser/chromeos/login/user_manager_impl.cc[diff]
chrome/browser/chromeos/profiles/profile_helper.cc[diff]
chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc[diff]
chrome/browser/component_updater/widevine_cdm_component_installer.cc[diff]
chrome/browser/content_settings/tab_specific_content_settings.cc[diff]
chrome/browser/extensions/api/feedback_private/feedback_private_api.cc[diff]
chrome/browser/extensions/api/system_info/system_info_api.cc[diff]
chrome/browser/media/webrtc_log_uploader.cc[diff]
chrome/browser/media/webrtc_log_uploader.h[diff]
chrome/browser/media/webrtc_logging_handler_host.cc[diff]
chrome/browser/media/webrtc_logging_handler_host.h[diff]
chrome/browser/metrics/metrics_log_unittest.cc[diff]
chrome/browser/net/spdyproxy/proxy_advisor.cc[diff]
chrome/browser/notifications/message_center_settings_controller_unittest.cc[diff]
chrome/browser/prefs/incognito_mode_prefs.cc[diff]
chrome/browser/prefs/incognito_mode_prefs.h[diff]
chrome/browser/prerender/prerender_contents.cc[diff]
chrome/browser/prerender/prerender_contents.h[diff]
chrome/browser/prerender/prerender_histograms.cc[diff]
chrome/browser/prerender/prerender_histograms.h[diff]
chrome/browser/prerender/prerender_manager.cc[diff]
chrome/browser/prerender/prerender_manager.h[diff]
chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h[diff]
chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm[diff]
chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm[diff]
chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc[diff]
chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json[diff]
chrome/browser/resources/chromeos/merge_session_load.html[diff]
chrome/browser/resources/feedback/js/event_handler.js[diff]
chrome/browser/resources/file_manager/background/js/test_util.js[diff]
chrome/browser/resources/file_manager/foreground/js/file_manager.js[diff]
chrome/browser/resources/quick_office/manifest_editor.json[diff]
chrome/browser/resources/quick_office/manifest_viewing.json[diff]
chrome/browser/sessions/better_session_restore_browsertest.cc[diff]
chrome/browser/sessions/session_service.cc[diff]
chrome/browser/sessions/session_service.h[diff]
chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc[diff]
chrome/browser/ui/cocoa/history_overlay_controller.mm[diff]
chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm[diff]
chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc[diff]
chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc[diff]
chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h[diff]
chrome/browser/ui/webui/options/browser_options_handler.cc[diff]
chrome/chrome_browser_chromeos.gypi[diff]
chrome/chrome_tests_unit.gypi[diff]
chrome/common/media/webrtc_logging_messages.h[diff]
chrome/renderer/media/chrome_webrtc_log_message_delegate.cc[diff]
chrome/renderer/media/chrome_webrtc_log_message_delegate.h[diff]
chrome/renderer/media/chrome_webrtc_log_message_delegate_unittest.cc[diff]
chrome/renderer/media/mock_webrtc_logging_message_filter.cc[Added - diff]
chrome/renderer/media/mock_webrtc_logging_message_filter.h[Added - diff]
chrome/renderer/media/webrtc_logging_message_filter.cc[diff]
chrome/renderer/media/webrtc_logging_message_filter.h[diff]
chrome/renderer/pepper/ppb_pdf_impl.cc[diff]
chrome/test/android/unit_tests_apk/AndroidManifest.xml[Copied from testing/android/AndroidManifest.xml - diff]
chrome/test/android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java[Added - diff]
chrome/utility/local_discovery/service_discovery_client_impl.cc[diff]
chrome/utility/local_discovery/service_discovery_client_impl.h[diff]
chrome/utility/local_discovery/service_discovery_client_unittest.cc[diff]
chromeos/chromeos_switches.cc[diff]
chromeos/chromeos_switches.h[diff]
content/browser/aura/gpu_process_transport_factory.cc[diff]
content/browser/ppapi_plugin_process_host.cc[diff]
content/browser/renderer_host/compositing_iosurface_layer_mac.mm[diff]
content/browser/renderer_host/compositing_iosurface_mac.h[diff]
content/browser/renderer_host/compositing_iosurface_mac.mm[diff]
content/browser/renderer_host/render_widget_host_view_mac.mm[diff]
content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java[diff]
content/public/common/content_constants.cc[diff]
content/public/common/content_constants.h[diff]
content/renderer/media/android/webmediaplayer_android.cc[diff]
content/renderer/media/media_stream_dependency_factory.cc[diff]
net/http/transport_security_state_static.h[diff]
net/http/transport_security_state_static.json[diff]
net/http/transport_security_state_unittest.cc[diff]
net/socket/ssl_client_socket_openssl.cc[diff]
testing/android/java/AndroidManifest.xml[Renamed from testing/android/AndroidManifest.xml - diff]
ui/compositor/compositor_constants.h[Added - diff]
ui/events/win/events_win.cc[diff]
ui/gfx/win/dpi.cc[diff]
ui/views/widget/desktop_aura/desktop_root_window_host_win.cc[diff]
ui/views/widget/widget.cc[diff]
ui/views/widget/widget_unittest.cc[diff]
ui/views/win/hwnd_message_handler.cc[diff]
ui/views/win/hwnd_message_handler.h[diff]

124 files changed