----- 66152 15.11.2010 20:35:24, by oshima@chromium.org Merge 66131 - Grab input after toplevel screen locker window is shown. BUG=chromium-os:8999 TEST=lock screen using power key. chrome log should not report WARNING "Failed to grab inputs". Review URL: http://codereview.chromium.org/4903002 TBR=oshima@chromium.org Review URL: http://codereview.chromium.org/4971002 M /branches/552/src/chrome/browser/chromeos/login/screen_locker.cc ----- 66154 15.11.2010 20:45:25, by xiyuan@chromium.org Merge 63770 - Use browser::CreateViewsWindow for ExtensionInstallUI. This should put extension uninstall UI into bubble frame. BUG=chromium-os:7729 TEST=Verify extension uninstall UI is in a bubble window per chromium-os:7729. Review URL: http://codereview.chromium.org/3983008 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/4974005 M /branches/552/src/chrome/browser/views/extensions/extension_install_prompt.cc ----- 66171 15.11.2010 22:21:54, by kerz@chromium.org Merge strings for M8 Review URL: http://codereview.chromium.org/5037002 M /branches/552/src/app/resources/app_strings_ro.xtb M /branches/552/src/chrome/app/resources/generated_resources_am.xtb M /branches/552/src/chrome/app/resources/generated_resources_ar.xtb M /branches/552/src/chrome/app/resources/generated_resources_bg.xtb M /branches/552/src/chrome/app/resources/generated_resources_bn.xtb M /branches/552/src/chrome/app/resources/generated_resources_ca.xtb M /branches/552/src/chrome/app/resources/generated_resources_cs.xtb M /branches/552/src/chrome/app/resources/generated_resources_da.xtb M /branches/552/src/chrome/app/resources/generated_resources_de.xtb M /branches/552/src/chrome/app/resources/generated_resources_el.xtb And 144 more ----- 66203 16.11.2010 01:39:03, by evan@chromium.org Merge 66066 - linux: fix cache corruption when using multiple --user-data-dir This regressed in r59021. I think I can fix it in a cleaner way with some refactoring, but for now since I want to cherry-pick this onto older branches let's revert some of r59021 to fix this in the simplest way possible. BUG=59824 TEST=manual (will write a test in my followup that refactors it) Review URL: http://codereview.chromium.org/4911002 TBR=evan@chromium.org Review URL: http://codereview.chromium.org/5061001 M /branches/552/src/base/path_service.cc M /branches/552/src/base/path_service.h M /branches/552/src/chrome/browser/profile_impl.cc git-svn-id: svn://svn.chromium.org/chrome/branches/552d/src@66238 0039d316-1c4b-4281-b951-d872f2087c98