summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 12.0.742.6812.0.742.68gitdeps2014-04-041-352/+208
|
* Increment VERSION to 12.0.742.68chrome-release@google.com2011-05-251-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86550 0039d316-1c4b-4281-b951-d872f2087c98
* Updating XTBs based on .GRDs from branch 742kerz@chromium.org2011-05-25101-682/+4570
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86541 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86524 - Also enable client-side phishing detection for multi-user installsbryner@chromium.org2011-05-251-1/+5
| | | | | | | | | | | | | | on Windows. BUG=83803 TEST=None Review URL: http://codereview.chromium.org/6992045 TBR=noelutz@google.com Review URL: http://codereview.chromium.org/6966045 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86529 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86509 - Make DetectEncoding() failed when ucsdet_detect() returls NULL.yoshiki@chromium.org2011-05-241-0/+2
| | | | | | | | | | | | | | | | In some cases, DetectEncoding() crashes and the reason may be becasue ucsdet_detect() returns NULL with no error status. (cf. http://crosbug.com/15691) BUG=http://crosbug.com/15691 TEST=none Review URL: http://codereview.chromium.org/7064039 TBR=yoshiki@chromium.org Review URL: http://codereview.chromium.org/6990070 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86515 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86141 - This adds a Flush to the session backend to help with data ↵gspencer@google.com2011-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | corruption at ChromeOS shutdown. We're seeing crashes due to corrupted history items in the session data on ChromeOS, and this is a bandaid to help reduce them. It's not the real solution, which is to have more corruption-robust history item storage and recovery, but it shouldn't cause any harm. Our supposition here is that corruption is occurring because we shutdown while session data hasn't been flushed to the disk, thus corrupting the history data, which is fragile, and we crash the next time we read in the session. This CL will help because we flush after appending system data. Other CLs will help to clean up the bad history data, and be more robust in the case of corruption. BUG=chromium-os:15478, chromium-os:15350 TEST=Loaded existing current state, exited, reloaded, ran unit test. Review URL: http://codereview.chromium.org/7044018 TBR=zelidrag@google.com Review URL: http://codereview.chromium.org/7063027 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86506 0039d316-1c4b-4281-b951-d872f2087c98
* update testskerz@chromium.org2011-05-241-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86473 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86453 - Don't re-enter when destroying FlashNetConnectorpiman@google.com2011-05-241-2/+17
| | | | | | | | | | | | BUG=chromium-os:15439, chromium-os:15353 TEST=grooveshark with Pepper Flash Review URL: http://codereview.chromium.org/7067014 TBR=piman@google.com Review URL: http://codereview.chromium.org/7063026 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86455 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.67chrome-release@google.com2011-05-241-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86432 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.66chrome-release@google.com2011-05-241-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86386 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86380 - Fix glitch in title fading codesail@chromium.org2011-05-241-1/+1
| | | | | | | | | | | | | | | Green or blue tab titles would draw incorrectly. The problem was a typo in my drawing code that swapped the blue and green values. BUG=82233 TEST=Ran and verified that the tab title color were correct. Review URL: http://codereview.chromium.org/6990053 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/7067010 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86381 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86371 - Remove prefix elidingsail@chromium.org2011-05-2415-480/+1
| | | | | | | | | | | | | | | For M12 we experimented with eliding common prefixes in tab titles. After lots of feedback we've decided to remove this feature. BUG=83668 TEST=Testing Review URL: http://codereview.chromium.org/7067007 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/6992013 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86375 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86164inferno@chromium.org2011-05-232-0/+159
| | | | | | | BUG=83010 Review URL: http://codereview.chromium.org/6966015 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86315 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86146 - dom-ui settings: Stop observing an existing BrowserDataRemover ↵cdn@chromium.org2011-05-231-2/+6
| | | | | | | | | | | before creating a new one. BUG=81916 TEST=Follow repro setps in bug report, verify that crash no longer occurs. Review URL: http://codereview.chromium.org/7050031 Review URL: http://codereview.chromium.org/7064003 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86314 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 82297 - Make sure that extensions can launch web urls with web safe ↵cdn@chromium.org2011-05-235-3/+27
| | | | | | | | | | | | | schemes only. Reviewed in http://codereview.chromium.org/6879047. BUG=79862 TEST=ExtensionManifestTest.AppLaunchURL Review URL: http://codereview.chromium.org/6879077 Review URL: http://codereview.chromium.org/6990039 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86313 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84665 - Update artwork for forward buttonkerz@chromium.org2011-05-232-0/+0
| | | | | | | | | | | | | | The last icon drop didn't have the correct hover effect for the forward button. This change fixes that with the correct icon. BUG=81920 TEST=None Review URL: http://codereview.chromium.org/6980002 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/7059020 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86296 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.65chrome-release@google.com2011-05-221-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86238 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.64chrome-release@google.com2011-05-221-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86231 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.63chrome-release@google.com2011-05-211-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86195 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86162 - Fixed media file API urls that are handed over to media player.zelidrag@chromium.org2011-05-201-2/+10
| | | | | | | | | | | BUG=chromeos-partner:3744, chromium-os:15270 TEST=make sure we can play content from file shelf with the media player Review URL: http://codereview.chromium.org/7058001 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/7054026 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86169 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85855 - Roll out v1 of the client-side phishing detection model, to ↵bryner@chromium.org2011-05-203-3/+17
| | | | | | | | | | | | | | replace v0. BUG=82984 TEST=none Review URL: http://codereview.chromium.org/7017032 TBR=bryner@chromium.org Review URL: http://codereview.chromium.org/7054019 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86143 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86112 - Tweak captureVisibleTab description.kathyw@chromium.org2011-05-202-2/+2
| | | | | | | | | | | TEST=none BUG=72523 Review URL: http://codereview.chromium.org/7038039 TBR=kathyw@chromium.org Review URL: http://codereview.chromium.org/7057018 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86119 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86101 - Reflect new restriction on tab.captureVisibleTab().kathyw@chromium.org2011-05-204-5/+32
| | | | | | | | | | | TEST=none BUG=72523 Review URL: http://codereview.chromium.org/7004038 TBR=kathyw@chromium.org Review URL: http://codereview.chromium.org/7057017 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86117 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 86019 - Call makeContextCurrent in places that are missing it.gman@chromium.org2011-05-201-0/+7
| | | | | | | | | | | | | | | This is NDuca's patch but security wants it NOW for M11 update. The original patch is here http://codereview.chromium.org/7050024 BUG=82873 TEST=ran a long time in debugger with case that crashed before this patch TBR=nduca@chromium.org TBR=gman@chromium.org Review URL: http://codereview.chromium.org/6961026 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86111 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.62chrome-release@google.com2011-05-201-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86036 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85779 - Added ChromeOS-specific NetworkChangeNotifier specialization ↵zelidrag@chromium.org2011-05-194-1/+153
| | | | | | | | | | | | | | | | | that is wired directly to flimflam. This implementation will help us detect more networking issues than the regular Linux version that was based on netlink. In addition to service/ip changes, we can now raise network change notification for connectivity changes (i.e. captive portal state changes). BUG=chromium-os:15327 TEST=make sure SPDY and Proxy settings are properly invalidated once we resume ChromeOS session Review URL: http://codereview.chromium.org/7029019 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/7047025 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@86017 0039d316-1c4b-4281-b951-d872f2087c98
* Show error in the bookmarks bar if passphrase is not valid.lipalani@chromium.org2011-05-191-2/+5
| | | | | | | | | | | BUG=81492 TEST= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=85721 Review URL: http://codereview.chromium.org/7019023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85962 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85719 - Make NotifyHeadersComplete the last call in the function.inferno@chromium.org2011-05-191-2/+2
| | | | | | | | BUG=82903 Review URL: http://codereview.chromium.org/7038017 Review URL: http://codereview.chromium.org/7050015 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85939 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84251, 85083, 85188, 85375.wtc@chromium.org2011-05-196-88/+578
| | | | | | | | | | | | | | | | | | | Add a fallback socket connect() for IPv6. When a hostname has both IPv6 and IPv4 addresses, and the IPv6 address is listed first, we start a timer (300ms) (deliberately chosen to be different from the backup connect job). If the timer fires, that means the IPv6 connect() hasn't completed yet, and we start a second socket connect() where we give it the same AddressList, except we move all IPv6 addresses that are in front of the first IPv4 address to the end. That way, we will use the first IPv4 address. We will race these two connect()s and pass the first one to complete to ConnectJob::set_socket(). Adds 4 new TCP connection latency histograms to assess the new behavior: IPv6 raceable (includes both when it races and doesn't, which are distinguished by whether or not the samples exceed the race timeout of 300ms) IPv6 solo (no IPv4 addresses to race against) IPv4 no race (IPv4 is the first address, so we're not racing) IPv4 wins race (IPv4 raced and won, even though it started behind). BUG=81686 TEST=On Linux, drop ip6 packets via `sudo ip6tables -A OUTPUT -p tcp -j DROP`. Then test against a site with both IPv6 and IPv4 addresses (such as www.ripe.net). It should load without hitting 20s connect() timeouts on the IPv6 addresses. Review URL: http://codereview.chromium.org/7029049 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85934 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85925 - harfbuzz: Actually apply patch to fix Thai crashes. :-(derat@chromium.org2011-05-192-2/+12
| | | | | | | | | | | | | | | | | | | | | This appears to prevent some renderer crashes that are fairly easy to trigger with Thai pages on Chrome OS. (http://codereview.chromium.org/7000012/ previously added this to chromium.patch, which I mistakenly assumed would get applied on top of the source during the build process. I guess it's instead just a record of our changes from upstream?) BUG=chromium:75210,chromium-os:15103 TEST=visited pungame.com/sale.html many times and checked that it no longer triggers a renderer crash Review URL: http://codereview.chromium.org/7045021 TBR=derat@chromium.org Review URL: http://codereview.chromium.org/7049011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85927 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85877 - Replace GetStarted component extension with URLdpolukhin@chromium.org2011-05-194-28/+10
| | | | | | | | | | | | BUG=chromium-os:14485 TEST=manual Review URL: http://codereview.chromium.org/6930033 TBR=dpolukhin@chromium.org Review URL: http://codereview.chromium.org/7047002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85918 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85630 - Do not use US layout on the login screen even if ↵yusukes@google.com2011-05-192-1/+9
| | | | | | | | | | | | | | | | kPreferredKeyboardLayout is not specified. We should use the hardware layout when it's not specified. We should not pass an empty string to EnableInputMethods() since the function does not change the current keyboard layout from the X's default (i.e. US) when "" is passed. BUG=chromium-os:15380 TEST=boot a device with a French hardware keyboard, finish OOBE process, confirm that the initial keyboard layout on the login scrren is FR, long-press the power button and reboot, confirm the keyboard layout on the login scrren is still FR (not US). Review URL: http://codereview.chromium.org/7020002 TBR=yusukes@google.com Review URL: http://codereview.chromium.org/7050001 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85891 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.61chrome-release@google.com2011-05-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85858 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84861 - Include full redirect chain in downloads safebrowsing ping.mattm@chromium.org2011-05-196-14/+35
| | | | | | | | | | | | BUG=80097 TEST=tcpdump Review URL: http://codereview.chromium.org/6935032 TBR=mattm@chromium.org Review URL: http://codereview.chromium.org/7043019 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85847 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 85790 - Merge 85721 - Show error in the bookmarks bar if passphrase ↵lipalani@chromium.org2011-05-181-5/+2
| | | | | | | | | | | | | | | | | is not valid. BUG=81492 TEST= Review URL: http://codereview.chromium.org/7019023 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/7029035 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/7042014 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85811 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85800 - Sync: Check for NULL |flow_| as it's possible it's NULL if the ↵jhawkins@chromium.org2011-05-181-2/+4
| | | | | | | | | | | | | | | | | | Sync setup UI has not been initialized yet. BUG=82841 TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/7045013 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7034034 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85804 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85528:ben@chromium.org2011-05-184-2/+8
| | | | | | | We were returning the wrong value of ShouldUseNativeFrame for popup windows when a theme is installed and the rest of the desktop is in glass mode. We were returning false instead of true, even though themes are applied only to tabbed browser windows. This means that even though the window was rendered using the glass frame (due to a correct check somewhere else) the widget calculated the client size incorrectly. http://crbug.com/80774 TEST=none Review URL: http://codereview.chromium.org/7015057 Review URL: http://codereview.chromium.org/7030024 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85802 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85784 - Fix a Chrome browser crash which occurs when running the ↵ben@chromium.org2011-05-181-0/+5
| | | | | | | | | | | | | | | | browser as part of ChromeFrame. The crash occurs while casting the GWLP_USERDATA pointer from a window owned by IE to a WidgetWin pointer and dereferencing it. We arrive at the IE window while enumerating the parents of the ExternalTabContainer window. BUG=none TEST=chrome frame tests should not crash Review URL: http://codereview.chromium.org/7043008 TBR=ananta@chromium.org Review URL: http://codereview.chromium.org/7039046 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85801 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85721 - Show error in the bookmarks bar if passphrase is not valid.lipalani@chromium.org2011-05-181-2/+5
| | | | | | | | | | | | BUG=81492 TEST= Review URL: http://codereview.chromium.org/7019023 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/7029035 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85790 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85722 - Ensure new gaia password gets picked up as the new passphrase.lipalani@chromium.org2011-05-181-6/+10
| | | | | | | | | | | | BUG=76128 TEST= Review URL: http://codereview.chromium.org/7029023 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/7034032 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85789 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.60chrome-release@google.com2011-05-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85714 0039d316-1c4b-4281-b951-d872f2087c98
* build triggerkerz@chromium.org2011-05-171-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85680 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85652 - Fix for crash in feedback.rkc@chromium.org2011-05-171-1/+2
| | | | | | | | | | | | | | | | | On sending the report, sometimes feedback seems to crash. It seems like the crash is happening in ClobberScreenshotSource, when we try to access tab_. Right before we call ClobberScreenshotSource, we CloseTabContents on the tab_ object; this probably isn't crashing in the majority case since the browser completely unloads the tab async, allowing ClobberScreenshotSource enough time to access the still valid tab_ object. There is no real reason to Clobber after the tab is closed, hence moving the call to before we actually close the tab and we're gauranteed to have a valid object in tab_ R=stevenjb@chromium.org,zelidrag@chromium.org BUG=15253 TEST=There is no repro for this crash, so we'll have to see if this gets fixed once we push this out to users. Review URL: http://codereview.chromium.org/7036013 TBR=rkc@chromium.org Review URL: http://codereview.chromium.org/7039015 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85655 0039d316-1c4b-4281-b951-d872f2087c98
* greeningkerz@chromium.org2011-05-171-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85653 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85606 - [cros] Update default avatars and guest iconavayvod@chromium.org2011-05-1725-4/+25
| | | | | | | | | | | | | R=nkostylev@chromium.org BUG=chromium-os:14618 TEST=Verify that images have changed. Review URL: http://codereview.chromium.org/7015041 TBR=avayvod@chromium.org Review URL: http://codereview.chromium.org/7012045 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85614 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.59chrome-release@google.com2011-05-171-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85601 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85589 - Display non-ASCII Wifi SSID correctly.yoshiki@chromium.org2011-05-1710-22/+196
| | | | | | | | | | | | BUG=chromium-os:8563 TEST=manually, generating latain-1 SSID with stub and UTF-8 SSID with real AP Review URL: http://codereview.chromium.org/6973021 TBR=yoshiki@chromium.org Review URL: http://codereview.chromium.org/7019006 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85597 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85581 - Workaround for clipping problems in Mac and Linux infobarsail@chromium.org2011-05-172-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | Currently some infobar images are clipped. The problem is that the infobar image view is 26x26 but some infobar images are large. For M12 I'm working around this by doing the following: - Mac: change the image view in InfoBar.xip to be 32x32 and scale the image down if necessary - Linux: remove code that forces the image view to be 26 pixels wide I've also asked Cole to update the infobar icons to all be 26x26. Once the new icons are checked in I'll revert this change. Also see r81798 and r77328. BUG=80432 TEST=Testing Review URL: http://codereview.chromium.org/7034002 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/7037002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85585 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85004 - Try GAIA password for the sync passphrase before trying the ↵lipalani@chromium.org2011-05-173-1/+18
| | | | | | | | | | | | | | custom passphrase. Otherwise if the user has an account encrypted with gaia password and he sets up a different machine with a custom passphrase we will prompt him to reenter his gaia password. Now we will use the gaia password and if it suceeds and then re-encrypt everything using the user supplied password. BUG=76128 TEST= Review URL: http://codereview.chromium.org/6982015 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/7017003 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85582 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.58chrome-release@google.com2011-05-171-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85579 0039d316-1c4b-4281-b951-d872f2087c98