08fd22434aed8d58d4e04bbbc0df2a942440bcc5 - platform/external/chromium_org

commit	08fd22434aed8d58d4e04bbbc0df2a942440bcc5	[log] [tgz]
author	Bo Liu <boliu@google.com>	Tue Jul 22 10:52:14 2014 -0700
committer	Bo Liu <boliu@google.com>	Tue Jul 22 10:52:14 2014 -0700
tree	64f60ee41c29cbaecc46f2d28884dc5a14150f29
parent	9299e8f1ca56cb2fdd22228e668f3685c3ff88a5 [diff]

Merge from Chromium at DEPS revision 37.0.2062.34

This commit was generated by merge_to_master.py.

Change-Id: Iace2841ff698138e27700e5b50490b4b5c5f5ab9

DEPS[diff]
android_webview/common/aw_switches.cc[diff]
android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java[diff]
android_webview/lib/main/aw_main_delegate.cc[diff]
android_webview/native/aw_contents_statics.cc[diff]
ash/system/user/user_view.cc[diff]
ash/wm/overview/window_grid.cc[diff]
ash/wm/overview/window_grid.h[diff]
ash/wm/overview/window_selector.cc[diff]
base/debug/tsan_suppressions.cc[diff]
base/memory/discardable_memory.h[diff]
base/memory/discardable_memory_android.cc[diff]
base/memory/discardable_memory_emulated.cc[diff]
base/memory/discardable_memory_emulated.h[diff]
base/memory/discardable_memory_linux.cc[diff]
base/memory/discardable_memory_mac.cc[diff]
base/memory/discardable_memory_manager.cc[diff]
base/memory/discardable_memory_manager.h[diff]
base/memory/discardable_memory_manager_unittest.cc[diff]
base/memory/discardable_memory_win.cc[diff]
base/sys_info_android.cc[diff]
build/android/gyp/generate_v14_compatible_resources.py[diff]
build/android/gyp/proguard.py[diff]
build/android/pylib/constants.py[diff]
build/android/pylib/instrumentation/test_jar.py[diff]
build/common.gypi[diff]
build/config/android/config.gni[diff]
build/java.gypi[diff]
build/java_apk.gypi[diff]
build/java_prebuilt.gypi[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
chrome/VERSION[diff]
chrome/android/java/res/drawable-hdpi/dismiss.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_autofill.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_autofill_cc.png[Added - diff]
chrome/android/java/res/drawable-hdpi/infobar_autologin.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_blocked_popups.png[diff]
chrome/android/java/res/drawable-hdpi/infobar_button_normal_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_button_normal_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_button_warning_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_button_warning_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_camera.png[diff]
chrome/android/java/res/drawable-hdpi/infobar_close_button.png[Added - diff]
chrome/android/java/res/drawable-hdpi/infobar_cookie.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_desktop_notifications.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_didyoumean.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_geolocation.png[diff]
chrome/android/java/res/drawable-hdpi/infobar_microphone.png[diff]
chrome/android/java/res/drawable-hdpi/infobar_midi.png[Added - diff]
chrome/android/java/res/drawable-hdpi/infobar_multiple_downloads.png[diff]
chrome/android/java/res/drawable-hdpi/infobar_plugin.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_plugin_crashed.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_protected_media_identifier.png[Added - diff]
chrome/android/java/res/drawable-hdpi/infobar_restore.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_savepassword.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_savepassword_autologin.png[Added - diff]
chrome/android/java/res/drawable-hdpi/infobar_theme.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_translate.png[diff]
chrome/android/java/res/drawable-hdpi/infobar_update_uma.png[Deleted - diff]
chrome/android/java/res/drawable-hdpi/infobar_warning.png[diff]
chrome/android/java/res/drawable-hdpi/warning.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/dismiss.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_autofill.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_autofill_cc.png[Added - diff]
chrome/android/java/res/drawable-mdpi/infobar_autologin.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_blocked_popups.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_button_normal_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_button_normal_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_button_warning_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_button_warning_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_camera.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_close_button.png[Added - diff]
chrome/android/java/res/drawable-mdpi/infobar_cookie.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_desktop_notifications.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_didyoumean.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_geolocation.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_microphone.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_midi.png[Added - diff]
chrome/android/java/res/drawable-mdpi/infobar_multiple_downloads.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_plugin.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_plugin_crashed.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_protected_media_identifier.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_restore.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_savepassword.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_savepassword_autologin.png[Added - diff]
chrome/android/java/res/drawable-mdpi/infobar_theme.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_translate.png[diff]
chrome/android/java/res/drawable-mdpi/infobar_update_uma.png[Deleted - diff]
chrome/android/java/res/drawable-mdpi/infobar_warning.png[diff]
chrome/android/java/res/drawable-mdpi/warning.png[Deleted - diff]
chrome/android/java/res/drawable-tvdpi/infobar_button_normal_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-tvdpi/infobar_button_normal_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-tvdpi/infobar_button_warning_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-tvdpi/infobar_button_warning_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-tvdpi/infobar_update_uma.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/dismiss.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_autofill.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_autofill_cc.png[Added - diff]
chrome/android/java/res/drawable-xhdpi/infobar_autologin.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_blocked_popups.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_button_normal_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_button_normal_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_button_warning_floating_enabled.9.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_button_warning_floating_pressed.9.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_camera.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_close_button.png[Added - diff]
chrome/android/java/res/drawable-xhdpi/infobar_cookie.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_desktop_notifications.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_didyoumean.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_geolocation.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_microphone.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_midi.png[Added - diff]
chrome/android/java/res/drawable-xhdpi/infobar_multiple_downloads.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_plugin.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_plugin_crashed.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_protected_media_identifier.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_restore.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_savepassword.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_savepassword_autologin.png[Added - diff]
chrome/android/java/res/drawable-xhdpi/infobar_theme.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_translate.png[diff]
chrome/android/java/res/drawable-xhdpi/infobar_update_uma.png[Deleted - diff]
chrome/android/java/res/drawable-xhdpi/infobar_warning.png[diff]
chrome/android/java/res/drawable-xhdpi/warning.png[Deleted - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_autofill_cc.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_blocked_popups.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_camera.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_close_button.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_geolocation.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_microphone.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_midi.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_multiple_downloads.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_protected_media_identifier.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_savepassword_autologin.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_translate.png[Added - diff]
chrome/android/java/res/drawable-xxhdpi/infobar_warning.png[Added - diff]
chrome/android/java/res/drawable/btn_infobar_blue.xml[Added - diff]
chrome/android/java/res/drawable/infobar_button_normal_floating.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_button_normal_full_left.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_button_normal_full_right.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_button_warning_floating.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_button_warning_full_left.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_button_warning_full_right.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_close_bg.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_close_button_focused.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_close_button_pressed.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_info_background.xml[Deleted - diff]
chrome/android/java/res/drawable/infobar_midi.png[Deleted - diff]
chrome/android/java/res/drawable/infobar_warning_background.xml[Deleted - diff]
chrome/android/java/res/layout/app_banner_view.xml[diff]
chrome/android/java/res/layout/infobar_button.xml[diff]
chrome/android/java/res/layout/infobar_text.xml[diff]
chrome/android/java/res/values/colors.xml[diff]
chrome/android/java/res/values/dimens.xml[diff]
chrome/android/java/res/values/values.xml[diff]
chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/Tab.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/ContentWrapperView.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarView.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/MessageInfoBar.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateAlwaysPanel.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateCheckBox.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateLanguagePanel.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateNeverPanel.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/infobar/TwoButtonInfoBar.java[Deleted - diff]
chrome/app/generated_resources.grd[diff]
chrome/app/theme/default_100_percent/common/infobar_autofill_cc.png[Renamed from chrome/app/theme/default_100_percent/common/infobar_autofill.png - diff]
chrome/app/theme/default_200_percent/common/infobar_autofill_cc.png[Renamed from chrome/app/theme/default_200_percent/common/infobar_autofill.png - diff]
chrome/app/theme/theme_resources.grd[diff]
chrome/browser/android/resource_id.h[diff]
chrome/browser/android/signin/signin_manager_android.cc[diff]
chrome/browser/autofill/autofill_cc_infobar_delegate.cc[diff]
chrome/browser/chromeos/input_method/input_method_engine.cc[diff]
chrome/browser/chromeos/input_method/input_method_engine.h[diff]
chrome/browser/chromeos/input_method/input_method_engine_interface.h[diff]
chrome/browser/chromeos/input_method/mock_input_method_engine.cc[diff]
chrome/browser/chromeos/input_method/mock_input_method_engine.h[diff]
chrome/browser/download/chrome_download_manager_delegate.cc[diff]
chrome/browser/download/chrome_download_manager_delegate.h[diff]
chrome/browser/download/download_prefs.cc[diff]
chrome/browser/download/download_prefs.h[diff]
chrome/browser/download/download_shelf_context_menu.cc[diff]
chrome/browser/download/download_shelf_context_menu.h[diff]
chrome/browser/download/download_target_determiner.cc[diff]
chrome/browser/download/download_target_determiner.h[diff]
chrome/browser/extensions/api/identity/account_tracker_unittest.cc[diff]
chrome/browser/extensions/api/input_ime/input_ime_api.cc[diff]
chrome/browser/extensions/extension_gcm_app_handler_unittest.cc[diff]
chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc[diff]
chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc[diff]
chrome/browser/profiles/gaia_info_update_service_unittest.cc[diff]
chrome/browser/resources/chromeos/about_os_credits.html[diff]
chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js[diff]
chrome/browser/safe_browsing/environment_data_collection_win.cc[diff]
chrome/browser/safe_browsing/environment_data_collection_win.h[diff]
chrome/browser/safe_browsing/environment_data_collection_win_unittest.cc[Added - diff]
chrome/browser/safe_browsing/path_sanitizer.cc[Added - diff]
chrome/browser/safe_browsing/path_sanitizer.h[Added - diff]
chrome/browser/safe_browsing/path_sanitizer_unittest.cc[Added - diff]
chrome/browser/services/gcm/fake_signin_manager.cc[diff]
chrome/browser/services/gcm/fake_signin_manager.h[diff]
chrome/browser/signin/account_reconcilor_unittest.cc[diff]
chrome/browser/signin/android_profile_oauth2_token_service.cc[diff]
chrome/browser/signin/fake_signin_manager.cc[diff]
chrome/browser/signin/fake_signin_manager.h[diff]
chrome/browser/signin/signin_manager_unittest.cc[diff]
chrome/browser/signin/signin_names_io_thread_unittest.cc[diff]
chrome/browser/sync/profile_sync_service.cc[diff]
chrome/browser/sync/profile_sync_service_unittest.cc[diff]
chrome/browser/ui/app_list/app_list_controller_browsertest.cc[diff]
chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc[diff]
chrome/browser/ui/app_list/app_list_service_views_browsertest.cc[diff]
chrome/browser/ui/app_list/app_list_syncable_service.cc[diff]
chrome/browser/ui/app_list/app_list_syncable_service.h[diff]
chrome/browser/ui/app_list/app_list_view_delegate.cc[diff]
chrome/browser/ui/app_list/app_list_view_delegate.h[diff]
chrome/browser/ui/app_list/test/chrome_app_list_test_support.cc[diff]
chrome/browser/ui/app_list/test/chrome_app_list_test_support.h[diff]
chrome/browser/ui/pdf/adobe_reader_info_win.h[Added - diff]
chrome/browser/ui/pdf/pdf_unsupported_feature.cc[diff]
chrome/browser/ui/sync/one_click_signin_sync_starter.cc[diff]
chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc[diff]
chrome/browser/ui/webui/sync_setup_handler.cc[diff]
chrome/browser/ui/webui/sync_setup_handler_unittest.cc[diff]
chrome/chrome_browser.gypi[diff]
chrome/chrome_browser_ui.gypi[diff]
chrome/chrome_tests_unit.gypi[diff]
chrome/common/pref_names.cc[diff]
chrome/common/pref_names.h[diff]
chrome/common/safe_browsing/csd.proto[diff]
chrome/renderer/printing/print_web_view_helper.cc[diff]
chrome_elf/blacklist/blacklist.cc[diff]
components/signin/core/browser/signin_manager.cc[diff]
components/signin/core/browser/signin_manager.h[diff]
components/signin/core/browser/signin_metrics.cc[diff]
components/signin/core/browser/signin_metrics.h[diff]
content/browser/android/in_process/synchronous_compositor_factory_impl.cc[diff]
content/browser/android/in_process/synchronous_compositor_factory_impl.h[diff]
content/browser/android/in_process/synchronous_compositor_impl.cc[diff]
content/browser/android/web_contents_observer_android.cc[diff]
content/browser/android/web_contents_observer_android.h[diff]
content/browser/devtools/devtools_browser_target.cc[diff]
content/browser/devtools/devtools_http_handler_impl.cc[diff]
content/browser/devtools/devtools_http_handler_impl.h[diff]
content/browser/devtools/devtools_protocol.cc[diff]
content/browser/devtools/devtools_protocol.h[diff]
content/browser/web_contents/web_contents_impl.cc[diff]
content/browser/web_contents/web_contents_impl.h[diff]
content/child/webcrypto/platform_crypto_nss.cc[diff]
content/child/webcrypto/shared_crypto_unittest.cc[diff]
content/common/frame_messages.h[diff]
content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java[diff]
content/public/browser/android/synchronous_compositor.h[diff]
content/public/browser/web_contents_observer.h[diff]
content/renderer/browser_plugin/browser_plugin.cc[diff]
content/renderer/pepper/pepper_video_decoder_host.cc[diff]
content/renderer/pepper/video_decoder_shim.cc[diff]
content/renderer/render_frame_impl.cc[diff]
content/renderer/render_frame_impl.h[diff]
content/renderer/render_thread_impl.cc[diff]
gpu/config/gpu_driver_bug_list_json.cc[diff]
media/audio/sounds/audio_stream_handler.cc[diff]
media/base/audio_splicer.cc[diff]
media/base/audio_splicer.h[diff]
media/base/audio_splicer_unittest.cc[diff]
media/cdm/ppapi/cdm_adapter.cc[diff]
media/cdm/ppapi/cdm_helpers.cc[diff]
media/cdm/ppapi/cdm_helpers.h[diff]
pdf/pdfium/pdfium_engine.cc[diff]
ppapi/api/ppb_video_decoder.idl[diff]
ppapi/c/ppb_video_decoder.h[diff]
ppapi/cpp/video_decoder.h[diff]
ppapi/examples/video_decode/video_decode.cc[diff]
ppapi/proxy/video_decoder_resource.cc[diff]
remoting/android/java/AndroidManifest.xml.jinja2[diff]
remoting/android/java/src/org/chromium/chromoting/Desktop.java[diff]
remoting/android/java/src/org/chromium/chromoting/ThirdPartyTokenFetcher.java[diff]
remoting/client/jni/chromoting_jni_instance.cc[diff]
remoting/webapp/client_session.js[diff]
remoting/webapp/fullscreen_v2.js[diff]
remoting/webapp/window_frame.js[diff]
third_party/android_platform/development/scripts/symbol.py[diff]
tools/metrics/histograms/histograms.xml[diff]
ui/aura/window_event_dispatcher.cc[diff]
ui/aura/window_event_dispatcher_unittest.cc[diff]
ui/events/event.cc[diff]
ui/events/event_unittest.cc[diff]
ui/events/keycodes/keyboard_code_conversion_x.cc[diff]
ui/views/controls/textfield/textfield.cc[diff]

300 files changed