diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 00:54:56 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 00:54:56 +0000 |
| commit | d7cd4bd77aef73c0042a860c7ea47855f533ba72 (patch) | |
| tree | 6ff9c8e353facc4fd12779d403db11d765b25951 /app/animation.cc | |
| parent | 7e0492d70168d38ab66e3719415b283828587a9f (diff) | |
| download | chromium_src-d7cd4bd77aef73c0042a860c7ea47855f533ba72.zip chromium_src-d7cd4bd77aef73c0042a860c7ea47855f533ba72.tar.gz chromium_src-d7cd4bd77aef73c0042a860c7ea47855f533ba72.tar.bz2 | |
Merge 56470 - Allow data URLs to load chrome-extension:// resources. Basic
notifications use data: URLs internally so this was required
to support that.
Also rejigger the logic in this area again to clarify and fix
an issue where the incognito window check did not have high
enough priority.
Also add back a null-pointer check that was previously in this code and is apparently necessary with a comment.
BUG=52313,52374
Review URL: http://codereview.chromium.org/3159019
TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/3184012
git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/animation.cc')
0 files changed, 0 insertions, 0 deletions