diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 21:24:01 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 18:49:51 +0100 |
| commit | cfb4826edae011aed657a813297687800ed85e17 (patch) | |
| tree | e1ab4eb17b5308084438d3e6b04e042b5bf66682 /CHROMIUM_MERGE_REVISION | |
| parent | d26447072f93114b19c75ae32e18a68487125c0c (diff) | |
| download | external_chromium-cfb4826edae011aed657a813297687800ed85e17.zip external_chromium-cfb4826edae011aed657a813297687800ed85e17.tar.gz external_chromium-cfb4826edae011aed657a813297687800ed85e17.tar.bz2 | |
Merge Chromium at r12.0.742.93: All autofill fixes
URLRequestContextGetter moved to net and the net
namespace, http://codereview.chromium.org/6778025:
profile_android.cc
profile_android.h
autofill_download.cc
Files moved from base/ to base/memory,
http://codereview.chromium.org/6714032:
profile_android.h
New functions in profile.h:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=78300&r2=78301
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=81769&r2=81770
profile_android.h
autofill_country.cc: Removed code where we had
local changes:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_country.cc?r1=77402&r2=77780&pathrev=88489
AutoFill -> Autofill renaming:
autofill_download.cc
autofill_manager.cc
autofill_manager.h
personal_data_manager.cc
credit_card.cc
Method with local change removed upstream, part of
the removed code added to an existing method.
http://codereview.chromium.org/6690038
autofill_manager.cc
Using TabContentsWrapper:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=88489&r1=79171&r2=79172
OnShowAutofillDialog is ifdef out by Android, so
taking upstream.
IsAutofillEnabled, Android has just ifdef return true, so taking upstream.
Change-Id: I87bfd814592aaed074d00716df355fba7be3984d
Diffstat (limited to 'CHROMIUM_MERGE_REVISION')
0 files changed, 0 insertions, 0 deletions