summaryrefslogtreecommitdiffstats
path: root/base/hmac.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-16 23:47:19 +0100
committerKristian Monsen <kristianm@google.com>2011-06-30 13:26:03 +0100
commit307470abbc6b789f999abb2e48ee43ba6df9e859 (patch)
tree86b1021419a2cbd676facb9c79375092ccd50f06 /base/hmac.h
parentf0af4af62b9fa1f710e6093949c8469ecb9b75c1 (diff)
downloadexternal_chromium-307470abbc6b789f999abb2e48ee43ba6df9e859.zip
external_chromium-307470abbc6b789f999abb2e48ee43ba6df9e859.tar.gz
external_chromium-307470abbc6b789f999abb2e48ee43ba6df9e859.tar.bz2
Merge Chromium at r11.0.696.0: Compile fix in profile_android.h
New functions added to profile.h GetExtensionSpecialStoragePolicy(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=76125&r2=76126 GetProtocolHandlerRegistry(): InitRegisteredProtocolHandlers(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=75680&r2=75681 GetPolicyConnector(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=75731&r2=75732 InitPromoResources(): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=75402&r2=75403 prerendermanager: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/profiles/profile.h?view=diff&pathrev=77261&r1=74936&r2=74937 Change-Id: I2956ac8ea00ab9b1b3572bb11ae0ffdb1eeae642
Diffstat (limited to 'base/hmac.h')
0 files changed, 0 insertions, 0 deletions