03339f79c3d8d49edd8f774b930bea09594c9a79 - platform/external/chromium_org

commit	03339f79c3d8d49edd8f774b930bea09594c9a79	[log] [tgz]
author	Ben Murdoch <benm@google.com>	Wed Feb 05 10:40:39 2014 +0000
committer	Ben Murdoch <benm@google.com>	Wed Feb 05 10:40:39 2014 +0000
tree	1aeaa92df856a53b51c98dd0fdfac141ade66acd
parent	644f6e134ba2860685475f322387b114418a269c [diff]

Merge from Chromium at DEPS revision 33.0.1750.68

This commit was generated by merge_to_master.py.

Change-Id: Id5b157193ca431586fbf7615bf4a7a152aab3ff9

android_webview/java/src/org/chromium/android_webview/AwContents.java[diff]
android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java[diff]
android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java[diff]
android_webview/java/src/org/chromium/android_webview/AwSettings.java[diff]
android_webview/native/aw_settings.cc[diff]
android_webview/native/aw_settings.h[diff]
ash/accelerators/accelerator_table.cc[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
chrome/VERSION[diff]
chrome/browser/browser_process_platform_part_aurawin.cc[diff]
chrome/browser/browser_process_platform_part_aurawin.h[diff]
chrome/browser/chrome_content_browser_client.cc[diff]
chrome/browser/chrome_plugin_browsertest.cc[diff]
chrome/browser/component_updater/background_downloader_win.cc[diff]
chrome/browser/component_updater/component_updater_ping_manager.cc[diff]
chrome/browser/component_updater/crx_downloader.cc[diff]
chrome/browser/component_updater/crx_downloader.h[diff]
chrome/browser/component_updater/url_fetcher_downloader.cc[diff]
chrome/browser/component_updater/url_fetcher_downloader.h[diff]
chrome/browser/extensions/api/music_manager_private/device_id.cc[diff]
chrome/browser/extensions/api/music_manager_private/device_id.h[diff]
chrome/browser/extensions/api/music_manager_private/device_id_chromeos.cc[diff]
chrome/browser/extensions/api/music_manager_private/device_id_linux.cc[diff]
chrome/browser/extensions/api/music_manager_private/device_id_mac.cc[diff]
chrome/browser/extensions/api/music_manager_private/device_id_win.cc[diff]
chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc[diff]
chrome/browser/extensions/extension_function_dispatcher.cc[diff]
chrome/browser/extensions/extension_messages_apitest.cc[diff]
chrome/browser/lifetime/browser_close_manager.cc[diff]
chrome/browser/local_discovery/privet_http_impl.cc[diff]
chrome/browser/local_discovery/privet_http_unittest.cc[diff]
chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc[diff]
chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc[diff]
chrome/browser/resources/file_manager/foreground/js/file_manager.js[diff]
chrome/browser/ui/views/apps/native_app_window_views.cc[diff]
chrome/browser/ui/views/color_chooser_aura.cc[diff]
chrome/chrome_tests.gypi[diff]
chrome/common/extensions/api/_api_features.json[diff]
chrome/common/extensions/features/simple_feature.cc[diff]
chrome/common/extensions/features/simple_feature_unittest.cc[diff]
chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc[diff]
chrome/renderer/chrome_content_renderer_client.cc[diff]
chrome/renderer/extensions/chrome_v8_context.cc[diff]
chrome/renderer/extensions/dispatcher.cc[diff]
chrome/renderer/extensions/dispatcher.h[diff]
chrome/renderer/extensions/runtime_custom_bindings.cc[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/web_contents/web_contents_view_aura.cc[diff]
content/child/npapi/webplugin_delegate_impl.cc[diff]
content/test/plugin/plugin_test_factory.cc[diff]
content/test/plugin/plugin_windowed_test.cc[diff]
extensions/common/features/feature.h[diff]
net/net.gyp[diff]
remoting/host/desktop_resizer_mac.cc[diff]
remoting/host/remoting_me2me_host.cc[diff]
remoting/jingle_glue/chromium_socket_factory.cc[diff]
remoting/protocol/me2me_host_authenticator_factory.cc[diff]
remoting/protocol/me2me_host_authenticator_factory.h[diff]
ui/app_list/views/search_result_actions_view.cc[diff]
ui/app_list/views/search_result_actions_view.h[diff]
ui/app_list/views/search_result_list_view.cc[diff]
ui/app_list/views/search_result_view.cc[diff]
ui/app_list/views/search_result_view.h[diff]
ui/aura/remote_root_window_host_win.cc[diff]
ui/aura/remote_root_window_host_win.h[diff]
ui/metro_viewer/metro_viewer_messages.h[diff]
ui/views/win/hwnd_message_handler.cc[diff]
win8/metro_driver/chrome_app_view_ash.cc[diff]

70 files changed