summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 6.0.472.416.0.472.41gitdeps2014-04-071-286/+174
|
* Merge 56470 - Allow data URLs to load chrome-extension:// resources. Basicaa@chromium.org2010-08-182-16/+53
| | | | | | | | | | | | | | | | | | | | 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
* Landing r56438 to the M6 branch.jcivelli@chromium.org2010-08-181-5/+4
| | | | | | | | | | | | | | | | | | Original review: http://codereview.chromium.org/3158017 Every time a new autofill suggestion was received we would hide the autofill popup before showing a new one. This causes it to flash every time the user type a new key (as we get new suggestions for each key stroke). It is safe to hide the autofill only when there are no suggestions. If there are suggestions, the WebKit side takes care of resizing and potentially hiding the popup if necessary. BUG=49980 TEST=Trigger the AutoFill/Autocomplete popup. As you type characters in the text input, the popup should not flash. Test that it does not flash either when you press backspace. TBR=kerz Review URL: http://codereview.chromium.org/3165031 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56459 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56450 - Fix parentheses omission which led to tab misplacement in ↵pkasting@chromium.org2010-08-171-3/+3
| | | | | | | | | | | | | | maximized mode. Also remove an extra pair of parentheses that snuck in. TBR=jcivelli BUG=none TEST=When maximized with a custom theme, tabs should be at the top of the screen Review URL: http://codereview.chromium.org/3191006 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3169020 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56452 0039d316-1c4b-4281-b951-d872f2087c98
* The branch will need this change in order to compile.pkasting@chromium.org2010-08-171-0/+1
| | | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56443 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56434 - Fix a couple of bookmark bar problems:pkasting@chromium.org2010-08-176-17/+62
| | | | | | | | | | | | | | * With the new shorter toolbar, the attached bar overlapped the omnibox drop shadow. * The animation wasn't completely smooth and the contents would "bounce up" 1 px at the end of the "slide down" animation. BUG=none TEST=Attached bookmark bar doesn't overlap omnibox drop shadow Review URL: http://codereview.chromium.org/3136015 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3122022 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56441 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56431 - Sigh... in fixing the crash message for RTL, I broke LTR, due ↵pkasting@chromium.org2010-08-171-3/+3
| | | | | | | | | | | | | to AdjustStringForLocaleDirection() having stupid behavior. BUG=none TEST=Crashing in LTR mode produces a dialog box that isn't empty Review URL: http://codereview.chromium.org/3195002 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3196001 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56433 0039d316-1c4b-4281-b951-d872f2087c98
* Ensure that logos are always shown in search engine dialog when available.mirandac@chromium.org2010-08-173-12/+41
| | | | | | | | BUG=50699 TEST=First three (or two in Vietnam and Iran) search engine logos always available on import to fresh file in Chrome (not Chromium). Review URL: http://codereview.chromium.org/3130023 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56425 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56402 - Handle race to create histogram more cleanlyjar@chromium.org2010-08-171-4/+3
| | | | | | | | | | | | | | | | | | | | | Two threads are currently allowed to attempt to define the same histogram at the same time. A factory class sorts out which one was first, and ensures that only the winner remains registered. An old DCHECK used to assert that only one caller (constructor) could register a given histogram. This CL removes that DCHECK, and leaves the first to register as the winner. BUG=52394 r=eroman Review URL: http://codereview.chromium.org/3107018 TBR=jar@chromium.org Review URL: http://codereview.chromium.org/3173026 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56417 0039d316-1c4b-4281-b951-d872f2087c98
* Merging strings for 6.0kerz@chromium.org2010-08-17150-3389/+18163
| | | | | | Review URL: http://codereview.chromium.org/3187006 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56412 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56361 - Fix a crash during history deletion.amit@chromium.org2010-08-171-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens mainly in chrome frame where password manager or the web data service could be invalid due to failed sqllite initialization. The failure is due to chrome.exe running in low integrity mode while deleting browser history. This a temporary fix to avoid crash the right fix is to run chrome.exe at medium integrity and that involves some investigation. Now why chrome.exe runs in the low integrity mode is a long story. Chrome Frame implements IDeleteBrowsingHistory to participate in history/user data deletion. IE8 tries to be smart and invokes IDeleteBrowsingHistory methods in by launching a separate process, rundll32.exe. However, when npchrome_frame.dll's implementation is invoked the container rundll32.exe is in low integrity. IE's elevation policy does not work for us to elevate chrome_launcher.exe to medium in this case (since this is not IE). so we end up launching chrome.exe in low integrity. BUG=51949 TEST=load gcf:about:version in Chrome Frame with IE8 on Win7 and delete browsing history. Review URL: http://codereview.chromium.org/3133019 TBR=amit@chromium.org Review URL: http://codereview.chromium.org/3125016 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56408 0039d316-1c4b-4281-b951-d872f2087c98
* Landing r56367 to the M6 branch.jcivelli@chromium.org2010-08-172-10/+33
| | | | | | | | | | | | | | Original review: http://codereview.chromium.org/3164016 Don't show the extra "Always/never translate" buttons on the "before translate" infobar when in Incognito mode. BUG=52305 TEST=See bug. TBR=kerz Review URL: http://codereview.chromium.org/3146021 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56392 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56338 - [Mac] Widen the dialog to be a little more l10n friendly.thomasvl@chromium.org2010-08-171-42/+973
| | | | | | | | | | | BUG=51729 TEST=see bug Review URL: http://codereview.chromium.org/3145016 TBR=thomasvl@chromium.org Review URL: http://codereview.chromium.org/3185010 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56387 0039d316-1c4b-4281-b951-d872f2087c98
* Disable spree. Disable lots of apps tests on 472 because apps areaa@chromium.org2010-08-173-11/+11
| | | | | | | | permanently disabled there. Review URL: http://codereview.chromium.org/3175018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56382 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56360 - Acquire lock before iterating over list of field trialsjar@chromium.org2010-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | The itteration is performed in the browser process when the list of field-trial settings is passed to the renderer. I failed to acquire the lock prior to the itteration, and it appears that some code is deciding on a field trial VERY late in browser startup and racing against this render-spawn operation. The code in FieldTrial is wrong (but fixed here), but I'll still need to track down the racing thread that is performing such a late FieldTrial definition (the results of which will not be passed to some renderers). BUG=49409 R=huanr Review URL: http://codereview.chromium.org/3134015 TBR=jar@chromium.org Review URL: http://codereview.chromium.org/3169018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56381 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56379 - Turns out this code I'd removed is still necessary for the RTL ↵pkasting@chromium.org2010-08-171-0/+14
| | | | | | | | | | | | | | OTR avatar to not look broken. TBR=ben BUG=none TEST=Run in Aero with --lang=he, hit ctrl-shift-n, Incognito image should not be broken in two Review URL: http://codereview.chromium.org/3117016 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3152024 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56380 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56377 - Misc. clean up: Rewrap, simplify. Refactored two separate ↵pkasting@chromium.org2010-08-177-245/+172
| | | | | | | | | | | | | files' calls of TabStrip::SetBackgroundOffset() into a single call in a different place. BUG=none TEST=none Review URL: http://codereview.chromium.org/3107012 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3106019 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56378 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56090 - Rename the extension manifest key "unlimited_storage" to ↵asargent@chromium.org2010-08-178-9/+70
| | | | | | | | | | | | | | | | | | "unlimitedStorage" But, still accept the old value for backwards compatability. BUG=51970 TEST=Extensions should get unlimited storage quota for localStorage and web databases using either "unlimitedStorage" or "unlimited_storage" in their manifest's permissions key. Review URL: http://codereview.chromium.org/3109013 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56310 0039d316-1c4b-4281-b951-d872f2087c98
* Disable --enable-apps flag on beta branch.aa@chromium.org2010-08-172-6/+2
| | | | | | | | BUG=51324 Review URL: http://codereview.chromium.org/3130024 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56308 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55306, 55737, and 55817 - all changes to extension docs.asargent@chromium.org2010-08-1758-491/+4855
| | | | | | | | | | | | | | | Original code reviews at: http://codereview.chromium.org/3020076 http://codereview.chromium.org/3167003 http://codereview.chromium.org/3169004 BUG=49693 TEST=none Review URL: http://codereview.chromium.org/3181018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56303 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.40 to 472.41chrome-release@google.com2010-08-171-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56298 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55111 and 55132 - Adding auto-generated samples page to extensions docs.asargent@chromium.org2010-08-1710-348/+4076
| | | | | | | | | | | | | | | | I manually merged the relevant changes and re-ran the doc generation scripts. BUG=None TEST=None Original code reviews: http://codereview.chromium.org/3091010 http://codereview.chromium.org/3020076 Review URL: http://codereview.chromium.org/3173024 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56295 0039d316-1c4b-4281-b951-d872f2087c98
* This file was missed from r56215aa@chromium.org2010-08-171-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56287 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54841 - Allow specifying optional parameters to pass to the ↵asargent@chromium.org2010-08-176-34/+140
| | | | | | | | | | | | | | | | | | Authorization token URL. * For an example of such parameters, see http://code.google.com/apis/accounts/docs/OAuth_ref.html#GetAuth * Updates all samples which use the chrome_ex_oauth.js library to the most recent code. * Bumps the versions of all samples which got an updated OAuth library. BUG=None TEST=None Review URL: http://codereview.chromium.org/3039002 TBR=kurrik@chromium.org Review URL: http://codereview.chromium.org/3107017 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56270 0039d316-1c4b-4281-b951-d872f2087c98
* Manual merge of 53734 - Add boilerplate line for experimental api pagesasargent@chromium.org2010-08-1653-36/+247
| | | | | | | | | | | | | | | | | | | I manually merged the changes inside js/, static/, and template/ and then re-ran the docs generation script. BUG=48582 TEST=none TBR=rafaelw Original change here: http://src.chromium.org/viewvc/chrome?view=rev&revision=53734 Original codereview here: http://codereview.chromium.org/2881038 Review URL: http://codereview.chromium.org/3143021 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56265 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56258 - Preserve the correct number of visible browser actions across ↵pkasting@chromium.org2010-08-162-35/+44
| | | | | | | | | | | | | | | | | | restarts. The problem here was that in the case where the container was sized all the way open, we never saved the result, because we never called Animate(). Having the size saving happen at the end of animation seemed subtle, so this: * Saves at the beginning, not end, of animation (so shutdowns during animation don't forget the right size) * Renames Animate() to make it clearer that it's also saving the desired size * In general simplifies things by basing animation on a target number of icons instead of a target width BUG=51179 TEST=Size browser actions container to hide one action (and show the rest); restart; size to show all; restart. On both restarts, you should see the same number of visible actions as at shut down. Review URL: http://codereview.chromium.org/3114014 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3125012 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56260 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56257 - Cleanup: Rewrap lines, simplify code by using canvas mirroring ↵pkasting@chromium.org2010-08-161-53/+29
| | | | | | | | | | | | | instead of manual RTL position calculations. BUG=none TEST=none Review URL: http://codereview.chromium.org/3176013 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3173022 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56259 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56223 - Fix problem of identical search engine logos + names in search ↵mirandac@chromium.org2010-08-163-9/+14
| | | | | | | | | | | | | | | | | engine dialog. After discussion with Brian and the search engine group for EMEA, the decision was made to fix by adding the distinct logo for Yahoo, in the case of Canada, and allowing Bing to be represented by one search engine out of the three in the Arab states and BE. Because Bing, like Google, does not use distinct logos for different locales, and allows users to change language easily from the home page (based on market area), we treat Bing like Google, and have it represented by only a single search engine in the dialog of three choices. The Search Engine Dialog is populated by the top three search engines in the template_url_prepopulate_data.cc for each country, so to make this change, we move the second Bing language search engine out from the third into the fourth position. Thus both will still be available in the user's "manage search engines" options, but only one will appear in the dialog. BUG=51224 TEST=Search engine dialog has three separate search engines for each country -- especially BE, CA, DZ, MA, SY. Review URL: http://codereview.chromium.org/3110016 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/3145020 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56255 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 53258 - Adding some sample code showing usage of contextMenu API.asargent@chromium.org2010-08-163-0/+77
| | | | | | | | | | | | | BUG=49687 TEST=none TBR=rafaelw TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/3150018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56247 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56226 - I've gotten multiple crashes at shutdown due to my new ↵pkasting@chromium.org2010-08-161-4/+2
| | | | | | | | | | | | | DCHECKs. It seems it's possible to hit them with invalid button IDs. While the DCHECKs won't happen in release builds, what probably will happen is some sort of other problem due to invalid memory access. So just convert the DCHECKs to conditionals. BUG=none TEST=none Review URL: http://codereview.chromium.org/3155018 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3170021 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56228 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56146 - Made IsGalleryDownloadURL() compare based on spec and made it ainferno@chromium.org2010-08-162-9/+8
| | | | | | | | | | | | | | static function. BUG=52067 TEST=none Review URL: http://codereview.chromium.org/3175012 TBR=akalin@chromium.org Review URL: http://codereview.chromium.org/3131017 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56216 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55103, 55656, and 55909.aa@chromium.org2010-08-1622-115/+331
| | | | | | | | | | | This is a hand-merge of the above three files. I've verified the applicable unit tests and browser tests pass. BUG=45876 Review URL: http://codereview.chromium.org/3163014 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56215 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.39 to 472.40chrome-release@google.com2010-08-151-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56169 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56165 - Move some cleanup code to the destructor. If the user closes ↵mirandac@chromium.org2010-08-151-4/+1
| | | | | | | | | | | | | | | | | the Chrome browser window while the first run bubble is showing, the First Run Bubble will close before the cleanup code has had a chance to fire. This change fixes that. BUG=none TEST=none Review URL: http://codereview.chromium.org/3120013 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/3183011 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56166 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.38 to 472.39chrome-release@google.com2010-08-151-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56159 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.37 to 472.38chrome-release@google.com2010-08-141-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56127 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56115 - Noticed when I crashed while running in RTL mode that the ↵pkasting@chromium.org2010-08-141-10/+10
| | | | | | | | | | | | | crash string had its punctuation messed up. BUG=none TEST=Force a browser crash while running with --lang=he and look at the "Woah!" string in the popup Review URL: http://codereview.chromium.org/3187001 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3142010 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56117 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56083 - Update latest secure version of Quicktime for Windows. See ↵panayiotis@google.com2010-08-131-2/+1
| | | | | | | | | | | | | | http://support.apple.com/kb/HT4290 BUG=None TEST=unit_tests Review URL: http://codereview.chromium.org/3159016 TBR=panayiotis@google.com Review URL: http://codereview.chromium.org/3113015 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56109 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56103 - Fix some issues with the New Tab Page:pkasting@chromium.org2010-08-133-2/+4
| | | | | | | | | | | | | | | * In RTL, the options dropmarker button was still on the right (overlaying the Chrome logo and opposite where the dropdown menu would actually appear) * Missing a <head> tag * Made the "attribution" block at the bottom corner of the NTP be at the end rather than always on the right BUG=none TEST=Use NTP with --lang=he and check dropmarker and custom theme attribution position Review URL: http://codereview.chromium.org/3122015 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3135017 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56104 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 56078 - Stretch first run bubble linger time out to 3 seconds to avoid ↵mirandac@chromium.org2010-08-131-1/+2
| | | | | | | | | | | | | | | | | getting burned by page loading issues on slow Windows boxes. This only affects the "Search from the omnibox" bubble that appears on the very first install of Chrome. This solution came after a long discussion w/jcivelli yesterday. A perfect solution to this problem would be too complex for M6, because it would involve triggering only when all first run pages have actually finished loading in the browser; this solution manages to both avoid getting stepped on by loading in all but the slowest machines -- and, if it does get stepped on, to at least actually show the bubble for 3 seconds. BUG=51704 TEST=see bug Review URL: http://codereview.chromium.org/3141015 TBR=mirandac@google.com Review URL: http://codereview.chromium.org/3165018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56093 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55980 - Only use Browser::TYPE_NORMAL as the last-chance ↵rafaelw@chromium.org2010-08-131-1/+1
| | | | | | | | | | | | | | | | GetCurrentBrowser for Extension functions. It was previously accepting any browser type. This was problematic, in particular if the last active browser was a DEVTOOLS window. BUG=49111 TEST=Verify bug is no longer reproducible Review URL: http://codereview.chromium.org/3113010 TBR=rafaelw@chromium.org Review URL: http://codereview.chromium.org/3133013 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56092 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 53998 - Fix glitch in rendering of the stroke at the bottom of the ↵pkasting@chromium.org2010-08-132-6/+8
| | | | | | | | | | | | | | | | | | | | browser toolbar. The code that rendered this line was doing weird things (adding/removing kClientEdgeThickness from the edges?!) so I removed this and used toolbar_bounds.right() instead of toolbar_bounds.width() which is correct given that toolbar_bounds.x() > 0. I also got rid of the use of MirroredLeftPointForRect since the flipped version of a horizontal line is... the same horizontal line. I have also updated the glass frame not to subtract a pixel from the right edge which looks glitchy as well. http://crbug.com/48134 TEST=see bug Review URL: http://codereview.chromium.org/3056022 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/3173019 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56082 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 56059 - Merge 55103 - Refactored extension privilege enumeration and ↵aa@chromium.org2010-08-1312-151/+59
| | | | | | | | | | | | | | | | | | | | | | implemented URLPattern comparisons. This will allow checks on per origin extension resource access. Added origin check when loading extension resources. BUG=45876 TEST=ExtensionTest.IsPrivilegeIncrease TEST=ExtensionTest.EffectiveHostPermissions TEST=ExtensionBrowserTest.OriginPrivileges Review URL: http://codereview.chromium.org/2808051 TBR=cdn@chromium.org Review URL: http://codereview.chromium.org/3173018 TBR=aa@chromium.org Review URL: http://codereview.chromium.org/3116011 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56067 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 56061 - Merge 55656 - Allow chrome:// pages to load extension ↵aa@chromium.org2010-08-135-39/+6
| | | | | | | | | | | | | | | | resources. Also, lock down access from chrome-extension:// pages to the origin of the resource being requested. BUG=51702 Review URL: http://codereview.chromium.org/3121003 TBR=aa@chromium.org Review URL: http://codereview.chromium.org/3186001 TBR=aa@chromium.org Review URL: http://codereview.chromium.org/3106011 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56065 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55656 - Allow chrome:// pages to load extension resources. Also, lock ↵aa@chromium.org2010-08-135-6/+39
| | | | | | | | | | | | | down access from chrome-extension:// pages to the origin of the resource being requested. BUG=51702 Review URL: http://codereview.chromium.org/3121003 TBR=aa@chromium.org Review URL: http://codereview.chromium.org/3186001 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56061 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55103 - Refactored extension privilege enumeration and implemented ↵aa@chromium.org2010-08-1312-63/+155
| | | | | | | | | | | | | | | | | | | URLPattern comparisons. This will allow checks on per origin extension resource access. Added origin check when loading extension resources. BUG=45876 TEST=ExtensionTest.IsPrivilegeIncrease TEST=ExtensionTest.EffectiveHostPermissions TEST=ExtensionBrowserTest.OriginPrivileges Review URL: http://codereview.chromium.org/2808051 TBR=cdn@chromium.org Review URL: http://codereview.chromium.org/3173018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56059 0039d316-1c4b-4281-b951-d872f2087c98
* Cull more OS X 10.6-specific failures.dglazkov@chromium.org2010-08-131-0/+21
| | | | | | | | | | TBR=kerz TEST=none BUG=50464 Review URL: http://codereview.chromium.org/3156011 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56050 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55960 - [Mac] Removes artificial location padding logic to fix a bug ↵andybons@chromium.org2010-08-131-6/+2
| | | | | | | | | | | | | | with browser action transparency. BUG=51944 TEST=see bug. rightmost extension should not be transparent at all after resizing browser action container. Review URL: http://codereview.chromium.org/3179011 TBR=andybons@chromium.org Review URL: http://codereview.chromium.org/3185001 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56046 0039d316-1c4b-4281-b951-d872f2087c98
* Compile fix after merge.bauerb@chromium.org2010-08-131-5/+5
| | | | | | TBR: bauerb@chromium.org git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56012 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55732 - Display the description of the active plugin in a plugin group.bauerb@chromium.org2010-08-133-44/+103
| | | | | | | | | | | | | | | | | | The active plug-in is the one that would actually be loaded, i.e. the first enabled plug-in, or if all plugins are disabled, the very first plug-in in the group. BUG=48572,51728 TEST=PluginGroupTest.PluginGroupDescription Review URL: http://codereview.chromium.org/3142004 Conflicts: chrome/common/plugin_group.cc Review URL: http://codereview.chromium.org/3149009 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56010 0039d316-1c4b-4281-b951-d872f2087c98