929504d - platform/external/chromium_org

commit	929504d64b38e05de7355e162311d6791ad6f54d	[log] [tgz]
author	Bo Liu <boliu@google.com>	Tue Aug 19 14:17:39 2014 -0700
committer	Bo Liu <boliu@google.com>	Tue Aug 19 14:17:39 2014 -0700
tree	9d9d89a236e177e432398b637df701a7918f7d90
parent	49f41a86fdde37b0b72618fb80be6d43e64c36e0 [diff]

Merge from Chromium at DEPS revision 37.0.2062.95

This commit was generated by merge_to_master.py.

Change-Id: I3f9f26ef388c68b51c867e1f7d1565494e623c61

android_webview/DEPS[diff]
android_webview/android_webview.gyp[diff]
android_webview/android_webview_common.target.darwin-arm.mk[diff]
android_webview/android_webview_common.target.darwin-arm64.mk[diff]
android_webview/android_webview_common.target.darwin-mips.mk[diff]
android_webview/android_webview_common.target.darwin-x86.mk[diff]
android_webview/android_webview_common.target.darwin-x86_64.mk[diff]
android_webview/android_webview_common.target.linux-arm.mk[diff]
android_webview/android_webview_common.target.linux-arm64.mk[diff]
android_webview/android_webview_common.target.linux-mips.mk[diff]
android_webview/android_webview_common.target.linux-x86.mk[diff]
android_webview/android_webview_common.target.linux-x86_64.mk[diff]
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_tests.gypi[diff]
android_webview/browser/renderer_host/aw_render_view_host_ext.cc[diff]
android_webview/browser/renderer_host/aw_render_view_host_ext.h[diff]
android_webview/common/render_view_messages.h[diff]
android_webview/java/src/org/chromium/android_webview/AwContents.java[diff]
android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java[diff]
android_webview/java/src/org/chromium/android_webview/AwSettings.java[diff]
android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java[diff]
android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java[diff]
android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java[diff]
android_webview/lib/main/aw_main_delegate.cc[diff]
android_webview/native/DEPS[diff]
android_webview/native/aw_contents.cc[diff]
android_webview/native/aw_contents.h[diff]
android_webview/native/aw_media_url_interceptor.cc[Added - diff]
android_webview/native/aw_media_url_interceptor.h[Added - diff]
android_webview/native/aw_media_url_interceptor_unittest.cc[Added - diff]
android_webview/native/aw_settings.cc[diff]
android_webview/native/aw_web_contents_delegate.cc[diff]
android_webview/native/webview_native.gyp[diff]
android_webview/native/webview_native.target.darwin-arm.mk[diff]
android_webview/native/webview_native.target.darwin-arm64.mk[diff]
android_webview/native/webview_native.target.darwin-mips.mk[diff]
android_webview/native/webview_native.target.darwin-x86.mk[diff]
android_webview/native/webview_native.target.darwin-x86_64.mk[diff]
android_webview/native/webview_native.target.linux-arm.mk[diff]
android_webview/native/webview_native.target.linux-arm64.mk[diff]
android_webview/native/webview_native.target.linux-mips.mk[diff]
android_webview/native/webview_native.target.linux-x86.mk[diff]
android_webview/native/webview_native.target.linux-x86_64.mk[diff]
android_webview/renderer/aw_render_view_ext.cc[diff]
android_webview/renderer/aw_render_view_ext.h[diff]
android_webview/test/unittest/assets/asset_file.ogg[Added - diff]
ash/strings/ash_strings_ar.xtb[diff]
ash/strings/ash_strings_fil.xtb[diff]
ash/strings/ash_strings_fr.xtb[diff]
ash/strings/ash_strings_gu.xtb[diff]
ash/strings/ash_strings_hr.xtb[diff]
ash/strings/ash_strings_id.xtb[diff]
ash/strings/ash_strings_it.xtb[diff]
ash/strings/ash_strings_iw.xtb[diff]
ash/strings/ash_strings_kn.xtb[diff]
ash/strings/ash_strings_ko.xtb[diff]
ash/strings/ash_strings_nl.xtb[diff]
ash/wm/toplevel_window_event_handler.cc[diff]
ash/wm/toplevel_window_event_handler_unittest.cc[diff]
base/android/java/src/org/chromium/base/ContentUriUtils.java[diff]
base/win/iat_patch_function.cc[diff]
base/win/iat_patch_function.h[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
chrome/VERSION[diff]
chrome/android/java/res/drawable-hdpi/pageinfo_bad.png[diff]
chrome/android/java/res/drawable-hdpi/pageinfo_enterprise_managed.png[diff]
chrome/android/java/res/drawable-hdpi/pageinfo_good.png[diff]
chrome/android/java/res/drawable-hdpi/pageinfo_info.png[diff]
chrome/android/java/res/drawable-hdpi/pageinfo_warning_minor.png[diff]
chrome/android/java/res/drawable-ldrtl-sw600dp-hdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-ldrtl-sw600dp-mdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-ldrtl-sw600dp-xhdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-ldrtl-sw600dp-xxhdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-mdpi/pageinfo_bad.png[diff]
chrome/android/java/res/drawable-mdpi/pageinfo_enterprise_managed.png[diff]
chrome/android/java/res/drawable-mdpi/pageinfo_good.png[diff]
chrome/android/java/res/drawable-mdpi/pageinfo_info.png[diff]
chrome/android/java/res/drawable-mdpi/pageinfo_warning_minor.png[diff]
chrome/android/java/res/drawable-sw600dp-hdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-sw600dp-mdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-sw600dp-xhdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-sw600dp-xxhdpi/edge_menu_bg.9.png[Added - diff]
chrome/android/java/res/drawable-xhdpi/pageinfo_bad.png[diff]
chrome/android/java/res/drawable-xhdpi/pageinfo_enterprise_managed.png[diff]
chrome/android/java/res/drawable-xhdpi/pageinfo_good.png[diff]
chrome/android/java/res/drawable-xhdpi/pageinfo_info.png[diff]
chrome/android/java/res/drawable-xhdpi/pageinfo_warning_minor.png[diff]
chrome/android/java/res/drawable-xxhdpi/pageinfo_bad.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/pageinfo_good.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/pageinfo_info.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/pageinfo_warning_minor.png[Added - diff]
chrome/android/java/res/layout/website_settings.xml[diff]
chrome/android/java/res/values-sw600dp/dimens.xml[Added - diff]
chrome/android/java/res/values/colors.xml[diff]
chrome/android/java/res/values/dimens.xml[diff]
chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java[diff]
chrome/android/javatests/src/org/chromium/chrome/browser/SmartClipProviderTest.java[Added - diff]
chrome/android/shell/java/AndroidManifest.xml[diff]
chrome/app/resources/generated_resources_ar.xtb[diff]
chrome/app/resources/generated_resources_fil.xtb[diff]
chrome/app/resources/generated_resources_fr.xtb[diff]
chrome/app/resources/generated_resources_gu.xtb[diff]
chrome/app/resources/generated_resources_hr.xtb[diff]
chrome/app/resources/generated_resources_id.xtb[diff]
chrome/app/resources/generated_resources_it.xtb[diff]
chrome/app/resources/generated_resources_iw.xtb[diff]
chrome/app/resources/generated_resources_kn.xtb[diff]
chrome/app/resources/generated_resources_ko.xtb[diff]
chrome/app/resources/generated_resources_nl.xtb[diff]
chrome/app/resources/generated_resources_sr.xtb[diff]
chrome/app/resources/generated_resources_ta.xtb[diff]
chrome/app/resources/generated_resources_zh-TW.xtb[diff]
chrome/browser/android/most_visited_sites.cc[diff]
chrome/browser/chromeos/app_mode/kiosk_app_data.cc[diff]
chrome/browser/chromeos/app_mode/kiosk_app_manager.cc[diff]
chrome/browser/chromeos/app_mode/kiosk_app_manager.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/ui/user_adding_screen.cc[diff]
chrome/browser/extensions/api/system_cpu/cpu_info_provider_linux.cc[diff]
chrome/browser/extensions/webstore_data_fetcher.cc[diff]
chrome/browser/extensions/webstore_data_fetcher.h[diff]
chrome/browser/history/in_memory_url_index.cc[diff]
chrome/browser/history/in_memory_url_index.h[diff]
chrome/browser/profiles/profile_info_cache.cc[diff]
chrome/browser/profiles/profile_info_cache_unittest.cc[diff]
chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js[diff]
chrome/browser/resources/chromeos/login/oobe_screen_hid_detection.css[diff]
chrome/browser/resources/hotword_helper/manifest.json[diff]
chrome/browser/supervised_user/supervised_user_service.cc[diff]
chrome/browser/supervised_user/supervised_user_service.h[diff]
chrome/browser/ui/android/website_settings_popup_android.cc[diff]
chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc[diff]
chrome/browser/ui/views/tabs/tab.cc[diff]
chrome/browser/ui/views/tabs/window_finder_ash.cc[diff]
chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc[diff]
chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc[diff]
chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h[diff]
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc[diff]
chrome/third_party/chromevox/chromeVoxChromeBackgroundScript.js[diff]
chrome/third_party/chromevox/chromeVoxChromeOptionsScript.js[diff]
chrome/third_party/chromevox/chromeVoxChromePageScript.js[diff]
chrome_elf/blacklist/blacklist.cc[diff]
components/policy/resources/policy_templates_fa.xtb[diff]
components/policy/resources/policy_templates_id.xtb[diff]
components/strings/components_strings_sr.xtb[diff]
content/browser/android/content_view_core_impl.cc[diff]
content/browser/android/content_view_core_impl.h[diff]
content/browser/android/in_process/synchronous_compositor_factory_impl.cc[diff]
content/browser/media/android/browser_media_player_manager.cc[diff]
content/browser/media/android/browser_media_player_manager.h[diff]
content/browser/media/android/media_resource_getter_impl.cc[diff]
content/browser/media/android/media_resource_getter_impl.h[diff]
content/browser/renderer_host/input/gesture_text_selector.cc[Added - diff]
content/browser/renderer_host/input/gesture_text_selector.h[Added - diff]
content/browser/renderer_host/input/gesture_text_selector_unittest.cc[Added - diff]
content/browser/renderer_host/input/motion_event_android.cc[diff]
content/browser/renderer_host/input/motion_event_android.h[diff]
content/browser/renderer_host/input/motion_event_web.cc[diff]
content/browser/renderer_host/input/motion_event_web.h[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/web_contents/web_contents_android.cc[diff]
content/browser/web_contents/web_contents_android.h[diff]
content/common/media/media_player_messages_android.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/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_renderer.gypi[diff]
content/content_tests.gypi[diff]
content/public/OWNERS[Added - diff]
content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png[diff]
content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png[diff]
content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png[diff]
content/public/android/java/res/drawable-xxhdpi/pageinfo_warning_major.png[Added - diff]
content/public/android/java/src/org/chromium/content/browser/ContentView.java[diff]
content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java[diff]
content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java[diff]
content/public/android/java/src/org/chromium/content/browser/SmartClipProvider.java[Added - diff]
content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java[diff]
content/public/android/java/src/org/chromium/content_public/browser/WebContents.java[diff]
content/public/android/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java[diff]
content/public/common/common_param_traits_macros.h[diff]
content/renderer/OWNERS[diff]
content/renderer/media/android/media_info_loader.cc[diff]
content/renderer/media/android/media_info_loader.h[diff]
content/renderer/media/android/media_info_loader_unittest.cc[diff]
content/renderer/media/android/renderer_media_player_manager.cc[diff]
content/renderer/media/android/renderer_media_player_manager.h[diff]
content/renderer/media/android/webmediaplayer_android.cc[diff]
content/renderer/media/android/webmediaplayer_android.h[diff]
content/renderer/render_font_warmup_win.cc[Added - diff]
content/renderer/render_view_impl_android.cc[diff]
content/renderer/renderer_font_platform_win.cc[Added - diff]
content/renderer/renderer_font_platform_win.h[Added - diff]
content/shell/android/shell_apk/AndroidManifest.xml[diff]
google_apis/gcm/engine/gcm_store_impl.cc[diff]
google_apis/gcm/engine/gcm_store_impl_unittest.cc[diff]
gpu/command_buffer/service/gles2_cmd_decoder.cc[diff]
gpu/config/gpu_driver_bug_list_json.cc[diff]
media/audio/pulse/pulse_output.cc[diff]
media/audio/pulse/pulse_util.cc[diff]
media/audio/win/audio_device_listener_win.cc[diff]
media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java[diff]
media/base/android/media_player_bridge.cc[diff]
media/base/android/media_player_bridge.h[diff]
media/base/android/media_player_manager.h[diff]
media/base/android/media_resource_getter.h[diff]
media/base/android/media_source_player_unittest.cc[diff]
media/base/android/media_url_interceptor.h[Added - diff]
media/filters/ffmpeg_demuxer.cc[diff]
media/filters/ffmpeg_demuxer.h[diff]
media/media.gyp[diff]
net/android/java/src/org/chromium/net/ProxyChangeListener.java[diff]
ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java[diff]
ui/aura/window_event_dispatcher.cc[diff]
ui/aura/window_event_dispatcher_unittest.cc[diff]
ui/base/ime/chromeos/ime_keymap.cc[diff]
ui/base/ime/chromeos/ime_keymap.h[diff]
ui/events/BUILD.gn[diff]
ui/events/events.gyp[diff]
ui/events/gesture_detection/gesture_provider_unittest.cc[diff]
ui/events/gesture_detection/motion_event.h[diff]
ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc[diff]
ui/events/gesture_detection/velocity_tracker_unittest.cc[diff]
ui/events/gestures/motion_event_aura.cc[diff]
ui/events/gestures/motion_event_aura.h[diff]
ui/events/test/mock_motion_event.cc[Renamed from ui/events/gesture_detection/mock_motion_event.cc - diff]
ui/events/test/mock_motion_event.h[Renamed from ui/events/gesture_detection/mock_motion_event.h - diff]
webkit/common/webpreferences.cc[diff]
webkit/common/webpreferences.h[diff]
webkit/glue/resources/webkit_strings_sr.xtb[diff]

269 files changed