summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 9.0.597.769.0.597.76gitdeps2014-04-071-303/+190
|
* Merge 71728 - Extension - Docs - Fix broken link to theme resource.kathyw@chromium.org2011-01-192-8/+8
| | | | | | | | | | | | | | | | | | The location of: /chrome/browser/browser_theme_provider.cc Changed to: /chrome/browser/themes/browser_theme_provider.cc BUG=None TEST=Visit the link now, it will work. Review URL: http://codereview.chromium.org/6338007 TBR=mhm@chromium.org Review URL: http://codereview.chromium.org/6248009 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71851 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 68743 - Updating omnibox sample to use new XML formatting method.laforge@chromium.org2011-01-193-71/+29
| | | | | | | | | | | | BUG=65684 TEST=None Review URL: http://codereview.chromium.org/5638002 TBR=kurrik@chromium.org Review URL: http://codereview.chromium.org/6359006 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71826 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 70791 - Fix for a plugin crasher which occurs in the context of ↵laforge@chromium.org2011-01-191-14/+7
| | | | | | | | | | | | | | | | | | NPP_Destroy. The plugin invokes NPN_MemFree in this context and we crash while invoking the destructor of the PluginHost as the reference count of the PluginHost object is 0. It is not clear as to why this happens as the PluginHost object is implemented as a singleton with a static scoped_refptr object around to ensure that the ref count is at least 1 until the CRT is around. From the dump it appears that CRT is still valid. In any case we don't need to validate the host pointers in NPN_MemAlloc and NPN_MemFree. Will look further in the code to see if there is any misuse of the PluginHost pointer. Review URL: http://codereview.chromium.org/6332007 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71823 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71481 - Fix preconnect crash on synchronous socket error.willchan@chromium.org2011-01-192-2/+13
| | | | | | | | | | | | | | GetAdditionalErrorState() was being called, which stores the error state into the ClientSocketHandle. When we preconnect, we never have a ClientSocketHandle, so don't bother tryiing to store the error state nor get the error socket. BUG=69214 TEST=net_unittests Review URL: http://codereview.chromium.org/6293005 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/6334008 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71817 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.75 to 597.76chrome-release@google.com2011-01-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71753 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.74 to 597.75chrome-release@google.com2011-01-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71713 0039d316-1c4b-4281-b951-d872f2087c98
* One more fix to a bad merge of a fix to another bad merge... Hope this one ↵mad@chromium.org2011-01-181-4/+1
| | | | | | | | | | | | is right... TBR=laforge BUG=69718 TEST=Just compile... :-( Review URL: http://codereview.chromium.org/6359004 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71710 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.73 to 597.74chrome-release@google.com2011-01-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71704 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a build break caused by a weird merge problem introduced in ↵mad@chromium.org2011-01-181-6/+10
| | | | | | | | | | | http://src.chromium.org/viewvc/chrome?view=rev&revision=71510. BUG=69718 TEST=Just compile... Review URL: http://codereview.chromium.org/6292005 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71694 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.72 to 597.73chrome-release@google.com2011-01-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71619 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.71 to 597.72chrome-release@google.com2011-01-161-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71576 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.70 to 597.71chrome-release@google.com2011-01-161-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71565 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.69 to 597.70chrome-release@google.com2011-01-151-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71541 0039d316-1c4b-4281-b951-d872f2087c98
* Manually update static docs on beta branch. Drover wasn't loving theaa@chromium.org2011-01-158-927/+233
| | | | | | | zip files. git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71538 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 69457 - Added string to VERSIONINFO.mad@chromium.org2011-01-143-0/+6
| | | | | | | | | | | | | | | "Official Build" to fix UMA issue. "LastChange" for convinience. BUG=67195 TEST=none Review URL: http://codereview.chromium.org/5860001 TBR=vitalybuka@chromium.org Review URL: http://codereview.chromium.org/6358004 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71515 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 68951 - Added refreshing of elevation policy on first run of new ↵mad@chromium.org2011-01-148-16/+89
| | | | | | | | | | | | | | version for all users. BUG=69718 TEST=none Review URL: http://codereview.chromium.org/5720004 TBR=vitalybuka@chromium.org Review URL: http://codereview.chromium.org/6295006 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71510 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 69867 - Prevent App extensions to be returned by ↵mad@chromium.org2011-01-142-6/+7
| | | | | | | | | | | | | | | | | | AutomationProvider::GetEnabledExtensions(). These are not useful for testing and are causing CEEE problems, since it expects a single extension being installed. A better fix might be to not have any default extension installed with Chromium and only have them with a branded Chrome so that they don't show up in Chrome Frame or CEEE installs... Maybe... Started a conversation with the Chrome Apps and Extensions team to discuss that. BUG=69707 TEST=None Review URL: http://codereview.chromium.org/6008004 TBR=mad@google.com Review URL: http://codereview.chromium.org/6329003 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71496 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 71479 - Merge 70909 - Make accelerated plugin support aware of the ↵nirnimesh@chromium.org2011-01-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | requirement to use the real OpenGL implementation rather than the Mesa software renderer. If not using desktop GL, then do not advertise Core Animation support, and make accelerated surface initialization fail. Reverting since the merge did not include both the files. BUG=68751 TEST=none (ran reliability_tests with these changes) Review URL: http://codereview.chromium.org/6166003 TBR=kbr@google.com Review URL: http://codereview.chromium.org/6259003 TBR=nirnimesh@chromium.org Review URL: http://codereview.chromium.org/6365002 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71486 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 70909 - Make accelerated plugin support aware of the requirement to ↵nirnimesh@chromium.org2011-01-141-0/+5
| | | | | | | | | | | | | | | | | | use the real OpenGL implementation rather than the Mesa software renderer. If not using desktop GL, then do not advertise Core Animation support, and make accelerated surface initialization fail. BUG=68751 TEST=none (ran reliability_tests with these changes) Review URL: http://codereview.chromium.org/6166003 TBR=kbr@google.com Review URL: http://codereview.chromium.org/6259003 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71479 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.68 to 597.69chrome-release@google.com2011-01-141-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71412 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.67 to 597.68chrome-release@google.com2011-01-141-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71399 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for a UI glitch/tab hang in XP.rkc@chromium.org2011-01-141-0/+1
| | | | | | Review URL: http://codereview.chromium.org/6312003 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71395 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71383 - Password Autofill disables auto-completed textfieldlaforge@chromium.org2011-01-142-7/+16
| | | | | | | | | | | | | | This change fixes an issue where the password completion, when the tab key is used to cycle focus, was causing focus to get lost. BUG=67888 TEST=PasswordAutocompleteManagerTest.*, and manual tests according to bug. Review URL: http://codereview.chromium.org/6280003 TBR=dhollowa@chromium.org Review URL: http://codereview.chromium.org/6247004 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71393 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 71093 - Merging revision 68447laforge@chromium.org2011-01-132-16/+37
| | | | | | | | | | | BUG=63732 TEST=None Review URL: http://codereview.chromium.org/6234001 TBR=cdn@google.com Review URL: http://codereview.chromium.org/6334002 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71386 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71378 - net: add a number of Brocade hosts to the False Start blacklist.agl@chromium.org2011-01-131-0/+12
| | | | | | | | | | | | | These are new hosts, but Brocade should be issuing a fix soon (hopefully). Therefore I'm ok adding them to the blacklist. BUG=69379 TEST=none TBR=agl@chromium.org Review URL: http://codereview.chromium.org/6261008 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71380 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 70438 - Reverse flag for Flash sandboxinglaforge@chromium.org2011-01-133-5/+6
| | | | | | | | Review URL: http://codereview.chromium.org/6092008 TBR=laforge@chromium.org git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71376 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 70786 - Merge 70785 - Disable sandboxed plugin for WinXPlaforge@chromium.org2011-01-131-1/+0
| | | | | | | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/6131002 TBR=cpu@chromium.org Review URL: http://codereview.chromium.org/6103004 TBR=laforge@chromium.org Review URL: http://codereview.chromium.org/6264002 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71375 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71354 - net: add cybs.rogers.com to the False Start blacklistagl@chromium.org2011-01-131-0/+1
| | | | | | | | | | BUG=69440 TEST=none TBR=agl@chromium.org Review URL: http://codereview.chromium.org/6326001 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71355 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71236 - Adding more entries into gpu blacklist.zmo@google.com2011-01-131-2/+22
| | | | | | | | | | | | TEST=none BUG=67345,67939,66718 Review URL: http://codereview.chromium.org/6110008 TBR=zmo@google.com Review URL: http://codereview.chromium.org/6312001 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71329 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.66 to 597.67chrome-release@google.com2011-01-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71300 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.65 to 597.66chrome-release@google.com2011-01-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71297 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.64 to 597.65chrome-release@google.com2011-01-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71288 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71286 - Avoid a possible race between entry deletion and a command, in ↵cevans@chromium.org2011-01-131-2/+2
| | | | | | | | | | | | | | | | the event a renderer was sending out-of-order messages. BUG=69195 TEST=media Review URL: http://codereview.chromium.org/6227003 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/6285001 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71287 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.63 to 597.64chrome-release@google.com2011-01-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71278 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 69445 - Confirm all extension and app installs in a normal window, ↵laforge@chromium.org2011-01-131-5/+3
| | | | | | | | | | | | | | even if they were installed in an incognito window. BUG=62752 TEST=Install extension and app in incognito and normal modes. Review URL: http://codereview.chromium.org/5942001 TBR=tessamac@google.com Review URL: http://codereview.chromium.org/6248002 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71269 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 70686 - Store previous theme in ExtensionInstallUI constructor (rather ↵aa@chromium.org2011-01-131-15/+16
| | | | | | | | | | | | | | than ConfirmInstall) to ensure it always happens. BUG=65867 TEST=ui_tests and interactive_ui_tests and browser_tests Review URL: http://codereview.chromium.org/6092009 TBR=tessamac@google.com Review URL: http://codereview.chromium.org/6256001 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71267 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 70858 - Disable SSL renegotiation on OS X when using system SSL and on ↵rsleevi@chromium.org2011-01-131-0/+26
| | | | | | | | | | | | | | 10.5.x. By default, system SSL is disabled unless --use-system-ssl is passed via the command-line. BUG=66931 TEST=none Review URL: http://codereview.chromium.org/6051013 TBR=rsleevi@chromium.org Review URL: http://codereview.chromium.org/6250001 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71264 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71127 - Add UMA histogram recording instances of GPU process blocking ↵vangelis@chromium.org2011-01-132-6/+23
| | | | | | | | | | | | due to blacklist matches. BUG=69172 Review URL: http://codereview.chromium.org/6111005 TBR=vangelis@chromium.org Review URL: http://codereview.chromium.org/6249001 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71260 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71141 - replace memcmp with MagicCmp that supports '.' for single ↵fbarchard@chromium.org2011-01-121-3/+19
| | | | | | | | | | | | | | character of anything and add webp BUG=67987 TEST=omnibox can show webp from filer or harddrive when mimetype or extension is wrong Review URL: http://codereview.chromium.org/6124007 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/6137004 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71235 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71211 - Use the lock when accessing the buffer object.cevans@chromium.org2011-01-121-0/+1
| | | | | | | | | | | | BUG=69195 TEST=play Z-Type for hours :) Review URL: http://codereview.chromium.org/6157007 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/6215007 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71225 0039d316-1c4b-4281-b951-d872f2087c98
* Merge.. The last on was missing a header. If speech input is disabled and we ↵cdn@google.com2011-01-124-26/+54
| | | | | | | | | | | receive IPC calls, terminate the renderer. BUG=68666 TEST=none Review URL: http://codereview.chromium.org/6232002 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71224 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 71221 - Merge 70858 - Disable SSL renegotiation on OS X when using ↵cevans@chromium.org2011-01-121-25/+0
| | | | | | | | | | | | | | | | | system SSL and on 10.5.x. By default, system SSL is disabled unless --use-system-ssl is passed via the command-line. BUG=66931 TEST=none Review URL: http://codereview.chromium.org/6051013 TBR=rsleevi@chromium.org Review URL: http://codereview.chromium.org/6184004 TBR=rsleevi@chromium.org Review URL: http://codereview.chromium.org/6188006 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71223 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 597.62 to 597.63chrome-release@google.com2011-01-121-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71222 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 70858 - Disable SSL renegotiation on OS X when using system SSL and on ↵cevans@chromium.org2011-01-121-0/+25
| | | | | | | | | | | | | | 10.5.x. By default, system SSL is disabled unless --use-system-ssl is passed via the command-line. BUG=66931 TEST=none Review URL: http://codereview.chromium.org/6051013 TBR=rsleevi@chromium.org Review URL: http://codereview.chromium.org/6184004 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71221 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71096 - net: Disable False Start and clear the SSL client auth cache ↵rch@chromium.org2011-01-122-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | for HTTPS proxies on failure. When performing TLS client auth with an HTTPS proxy, disable TLS false start to better handle SSL handshake failures, such as the HTTPS proxy requiring a client certificate. In addition, when an HTTPS proxy fails, ensure that it is removed from the SSL client auth cache, so that if the failure was due to an invalid client certificate, the user can be prompted to select one again. Depends on: http://codereview.chromium.org/6017010 Patch by: Ryan Sleevi BUG=66424 TEST=HttpNetworkTransactionTest.Proxy_ClientAuthCertCache TBR=agl@chromium.org Review URL: http://codereview.chromium.org/6098010 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71201 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71071 - net: Ensure that when using False Start + client auth, bad ↵rch@chromium.org2011-01-129-63/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | client certificates are not cached. If an SSL handshake fails when client certificates are used, ensure that the client certificate selected is removed from the SSL client auth cache. This ensures that the user is prompted to select a certificate again, as the cause of the failure may have been due to selecting the wrong certificate or selecting no certificate when one is required. The existing logic worked when TLS False Start was disabled, but could fail when False Start was used or when the peer requests renegotiation. This changes ensures the client certificate is removed from the cache by moving the cache removal layer from the HttpStreamRequest to the HttpNetworkTransaction. Patch by: Ryan Sleevi BUG=66424 TEST=HttpNetworkTransactionTest.ClientAuthCertCache* TBR=agl@chromium.org Review URL: http://codereview.chromium.org/6199006 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71200 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71182 - Fixed crash caused by ResourceDispatcher::OnReceivedRedirect() ↵zelidrag@chromium.org2011-01-121-0/+5
| | | | | | | | | | | | | | indirectly running a nested mesage loop in request_info->peer->OnReceivedRedirect() call. The loop might kill the instance of PendingRequestInfo what caused this crash. The fix simply checks for validity of PendingRequestInfo one more time within this OnReceivedRedirect() method. BUG=chromium:65345, chromium-os:10721 TEST=sign up with gmail, try to switch account to another one - there should be no crash. see http://crosbug.com/10721 for more detailed repro steps Review URL: http://codereview.chromium.org/6211005 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6152005 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71199 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 71051 - Windows: Fix crash in SSLClientSocketNSS::SaveSnapStartInfo() ↵agl@chromium.org2011-01-121-2/+3
| | | | | | | | | | | | | | when hello_data_len == 0 BUG=69247 TEST=no crash Review URL: http://codereview.chromium.org/6106012 TBR=marshall@chromium.org Review URL: http://codereview.chromium.org/6215006 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71191 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 68968 - Fix memory leak in gpu_blacklist.cc.zmo@google.com2011-01-121-0/+2
| | | | | | | | | | | | BUG=66608 TEST=none TBR=kbr,vangelis TBR=zmo@google.com Review URL: http://codereview.chromium.org/6179007 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@71190 0039d316-1c4b-4281-b951-d872f2087c98