summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 31.0.1650.1231.0.1650.12gitdeps2014-04-072-629/+495
|
* Incrementing VERSION to 31.0.1650.12chrome-release@google.com2013-10-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226901 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226886 "Linux: fix issue with wrong path to user data dir ..."phajdan.jr@chromium.org2013-10-032-16/+16
| | | | | | | | | | | | | | | > Linux: fix issue with wrong path to user data dir being used. > > BUG=303917 > R=iannucci@chromium.org > > Review URL: https://codereview.chromium.org/25897003 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/25869005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226898 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226864 "Linux: sync RPM package with recent DEB changes."phajdan.jr@chromium.org2013-10-032-9/+47
| | | | | | | | | | | | | | | > Linux: sync RPM package with recent DEB changes. > > BUG=303850 > R=mmoss@chromium.org > > Review URL: https://codereview.chromium.org/25920002 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/25395005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226897 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226856 "Linux: fix .desktop file lookup ("again")."phajdan.jr@chromium.org2013-10-031-10/+1
| | | | | | | | | | | | | | | > Linux: fix .desktop file lookup ("again"). > > BUG=303878 > R=erg@chromium.org > > Review URL: https://codereview.chromium.org/25737008 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/25768003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226896 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226453 "Fix an uninitialized field in the fileSystem.retai..."sammc@chromium.org2013-10-032-3/+2
| | | | | | | | | | | | | | | | | > Fix an uninitialized field in the fileSystem.retainEntry implementation. > > This caused files to be sometimes retained as directories, making it > impossible to restore access to them. > > BUG=301692 > > Review URL: https://codereview.chromium.org/25443008 TBR=sammc@chromium.org Review URL: https://codereview.chromium.org/25886004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226889 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226443 "Always tear down the OSX app list signin view, whe..."tapted@chromium.org2013-10-031-4/+3
| | | | | | | | | | | | | | | | | | | | | > Always tear down the OSX app list signin view, when the signin status changes. > > This improves a fix in r218251, after which the signinDelegate on the > signin view would not be replaced when the model changes, but when > both models were signed out. > > BUG=297437 > TEST=Have the OSX App Launcher enabled and a single, signed out profile. > Delete the profile from chrome://settings, then click sign in on the app > launcher. Chrome should not crash. > > Review URL: https://codereview.chromium.org/25649004 TBR=tapted@chromium.org Review URL: https://codereview.chromium.org/25569005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226885 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226435 "Fix rebuilding the profile selector on the OSX App..."tapted@chromium.org2013-10-034-10/+44
| | | | | | | | | | | | | | | | | | | | | > Fix rebuilding the profile selector on the OSX App Launcher. > > rebuildMenu was only rebuilding the NSMenu, not the menu Model. Do both. > > Also add tests, and remove the unused AppListMenu::CURRENT_USER, to fix > a broken test related to the test not observing the user model properly. > > BUG=302882 > TEST=Open the App Launcher on OSX. Go to chrome://settings and add a > user. The new user should appear in the App Lanucher profile selctor. > > Review URL: https://codereview.chromium.org/25535006 TBR=tapted@chromium.org Review URL: https://codereview.chromium.org/25951002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226883 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226626 "Remove disable-gpu-vsync about:flags entry"jamesr@chromium.org2013-10-031-7/+0
| | | | | | | | | | | | | | | | | > Remove disable-gpu-vsync about:flags entry > > This entry completely breaks Chrome and has for a while. > > BUG=303293 > R=jbauman@chromium.org > > Review URL: https://codereview.chromium.org/25814003 TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/25863004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226840 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226557 "Fix the DCHECK when calling MediaSourcePlayer::Set..."qinmin@chromium.org2013-10-032-20/+50
| | | | | | | | | | | | | | | | | > Fix the DCHECK when calling MediaSourcePlayer::SetVideoSurface() > > SetVideoSurface() can happen when is previous call is waiting for decoder job to finish. > Don't add it to the pending queue if it is already there. > > BUG=285950 > > Review URL: https://codereview.chromium.org/25432002 TBR=qinmin@chromium.org Review URL: https://codereview.chromium.org/25437006 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226773 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225646 "Add Remoting Apps v2 test apps to whitelist."wez@chromium.org2013-10-031-1/+5
| | | | | | | | | | | | | | > Add Remoting Apps v2 test apps to whitelist. > > BUG=252878, 276739 > > Review URL: https://codereview.chromium.org/24842002 TBR=wez@chromium.org Review URL: https://codereview.chromium.org/25855003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226736 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225395 "Allow the Chrome Remote Desktop Viewer to be used ..."wez@chromium.org2013-10-034-5/+39
| | | | | | | | | | | | | | | | | | > Allow the Chrome Remote Desktop Viewer to be used by the v2 Chrome Remote Desktop app. > > This is required to allow the CRD Viewer plugin to be used by the Chrome Remote Desktop v2 applications, since v2 Apps cannot normally load "trusted" PPAPI plugins. > > This work-around will be removed once the Remoting Viewer plugin has been migrated to NaCl. > > BUG=252878,134216 > > Review URL: https://codereview.chromium.org/20905002 TBR=wez@chromium.org Review URL: https://codereview.chromium.org/25413003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226735 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225438 "cc: Re-enable LayerTreeHostTestStartPageScaleAnima..."brianderson@chromium.org2013-10-031-4/+3
| | | | | | | | | | | | | | | | | > cc: Re-enable LayerTreeHostTestStartPageScaleAnimation unit test > > Recent changes appear to make the previous flakiness go away. > I can not reproduce it locally any more. > > BUG=280508 > > Review URL: https://codereview.chromium.org/24497003 TBR=brianderson@chromium.org Review URL: https://codereview.chromium.org/25867002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226734 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225487 "cc: Initialize PageScaleAnimation's start time on ..."brianderson@chromium.org2013-10-038-28/+41
| | | | | | | | | | | | | | | | | | > cc: Initialize PageScaleAnimation's start time on first animation > > This removes the possibility that creating a PageScaleAnimation > will initialize the animation time before the BeginFrame on the > impl thread arrives, introducing unwanted jitter. > > BUG=297631 > > Review URL: https://codereview.chromium.org/24502002 TBR=brianderson@chromium.org Review URL: https://codereview.chromium.org/25804004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226733 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225088 "cc: Use real animation time to start the page scal..."brianderson@chromium.org2013-10-031-1/+1
| | | | | | | | | | | | | | | | | | | > cc: Use real animation time to start the page scale animation. > > The current code uses base::TimeTicks::Now(), which might be sampled > after the animation time used for the first frame with the deadline > scheduler. > > NOTRY=true > BUG=297631 > > Review URL: https://chromiumcodereview.appspot.com/24463002 TBR=brianderson@chromium.org Review URL: https://codereview.chromium.org/25865002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226732 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 31.0.1650.11chrome-release@google.com2013-10-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226662 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225938 "Add check to see if profile has disappeared"felt@chromium.org2013-10-031-0/+4
| | | | | | | | | | | | | | | | > Add check to see if profile has disappeared > > There's a report of a crash in AddActionToExtensionActivityLog. I suspect it's happening when the profile* disappears during shutdown. I added a check to try to prevent this from causing a crash. > > BUG=298652 > > Review URL: https://codereview.chromium.org/24831002 TBR=felt@chromium.org Review URL: https://codereview.chromium.org/25509008 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226644 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225922 "Change profile shortcut icon to badge profile icon..."calamity@chromium.org2013-10-032-6/+26
| | | | | | | | | | | | | | | | | | | | > Change profile shortcut icon to badge profile icon where runtime badging does. > > This CL moves the profile shortcut icon generation to match the runtime badging > position and size. This fixes an issue where the shortcut avatar was offset > from the runtime avatar icon. > > This CL bumps kProfileIconVersion to 2. > > BUG=297356 > > Review URL: https://codereview.chromium.org/24504003 TBR=calamity@chromium.org Review URL: https://codereview.chromium.org/25730005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226641 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 31.0.1650.10chrome-release@google.com2013-10-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226624 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225813 "Fix screenshot size."rkc@chromium.org2013-10-021-1/+7
| | | | | | | | | | | | | | | | | > Fix screenshot size. > Not providing a maxWidth/maxHeight defaults GetUserMedia to a width of 640 pixels, making all our screenshots 640 pixels wide. > Specify a large upper limit to be able to take screenshots of the actual screen size. Not making this int_max to keep a sanity check on the screenshot size. > > R=xiyuan@chromium.org > BUG=299289 > > Review URL: https://codereview.chromium.org/24895003 TBR=rkc@chromium.org Review URL: https://codereview.chromium.org/25668007 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226621 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225000 "Mac: fix sensor data fetcher bug when acceleromete..."timvolodine@chromium.org2013-10-021-2/+2
| | | | | | | | | | | | | | | | | | | > Mac: fix sensor data fetcher bug when accelerometer sensor is not available. > > Return false from the Start() method when the SuddenMotionSensor > initialization fails on the Mac plaform. > > BUG=297451 > NOTRY=true > TBR=mvanouwerkerk@chromium.org, bulach@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/24360018 TBR=timvolodine@chromium.org Review URL: https://codereview.chromium.org/25660006 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226576 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226485 "Disable Stage3D when force compositing mode is dis..."jbauman@chromium.org2013-10-021-1/+7
| | | | | | | | | | | | | | | | > Disable Stage3D when force compositing mode is disabled > > This makes the behavior identical to that in aura. > > BUG=302738 > > Review URL: https://codereview.chromium.org/25602002 TBR=jbauman@chromium.org Review URL: https://codereview.chromium.org/25609005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226558 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 224930 "[InstantExtended] Investigate crash from check for..."nkostylev@chromium.org2013-10-021-1/+6
| | | | | | | | | | | | | | | | > [InstantExtended] Investigate crash from check for search results page in TemplateURLRef::ExtractSearchTermsFromURL(..) > > I suspect this crash is occuring from an invalid NavigationEntry and that GetURL() gets inlined which is why the crash is occurring much higher up the stack. However, I can't determine a good reason why that would be null. Adding a CHECK to see if we can get more information on why this crash is occurring. > > BUG=291348 > > Review URL: https://chromiumcodereview.appspot.com/24255012 TBR=rlp@chromium.org Review URL: https://codereview.chromium.org/25721004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226553 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226225 "Handle managed users in a specific way"nkostylev@chromium.org2013-10-027-1/+42
| | | | | | | | | | | | | | | | > Handle managed users in a specific way > > BUG=295164 > R=nkostylev@chromium.org > NOTRY=true > > Review URL: https://codereview.chromium.org/25080002 TBR=antrim@chromium.org Review URL: https://codereview.chromium.org/25763003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226549 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226261 "Set proper dialog size for captive portal window"nkostylev@chromium.org2013-10-022-12/+8
| | | | | | | | | | | | | | | > Set proper dialog size for captive portal window > > BUG=297575 > NOTRY=true > > Review URL: https://codereview.chromium.org/25522002 TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/25539007 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226548 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226339 "When an audio track is disabled, still pass the da..."jiayl@google.com2013-10-021-7/+5
| | | | | | | | | | | | | | | | > When an audio track is disabled, still pass the data to webrtc for audio processing. > The remote side will not get the real audio because webrtc will replace the frames with silence. > > > BUG=299007 > > Review URL: https://codereview.chromium.org/24742007 TBR=jiayl@chromium.org Review URL: https://codereview.chromium.org/25781002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226522 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226329 "gpu: Disables EXT_discard_framebuffer extension on..."kaanb@chromium.org2013-10-022-4/+22
| | | | | | | | | | | | | | | | > gpu: Disables EXT_discard_framebuffer extension on Vivante GPUs. > > Discarding framebuffer doesn't accept trivial attachments which causes GL errors. On a debug build these errors cause the browser to hang. > > BUG=299494 > > Review URL: https://codereview.chromium.org/25416002 TBR=kaanb@chromium.org Review URL: https://codereview.chromium.org/25622004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226518 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226312 "Linux: use the same path for Chrome package as pre..."phajdan.jr@chromium.org2013-10-021-2/+9
| | | | | | | | | | | | | | | | | | | | > Linux: use the same path for Chrome package as previous major versions > > This is a workaround for a bug that makes the browser try to load > resources from disk instead of using the zygote. > > Also see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/DBEqOORaRiw/pE0bNI6h0kcJ . > > BUG=295103, 22703 > R=mmoss@chromium.org > > Review URL: https://codereview.chromium.org/25575003 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/25667003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226510 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226270 "Linux: provide /usr/bin/google-chrome using Debian..."phajdan.jr@chromium.org2013-10-027-11/+23
| | | | | | | | | | | | | | | | | | | > Linux: provide /usr/bin/google-chrome using Debian Alternatives > > This will also give us good path forward when enabling SxS > to allow the user to choose where google-chrome points to > (which channel). > > BUG=300144 > R=mmoss@chromium.org > > Review URL: https://codereview.chromium.org/25121005 TBR=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/25666007 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226508 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226073 "Set the category tag to performance for feedback r..."zork@chromium.org2013-10-021-0/+3
| | | | | | | | | | | | | | > Set the category tag to performance for feedback reports that contain tracing data > > BUG=299014 > > Review URL: https://codereview.chromium.org/25116003 TBR=zork@chromium.org Review URL: https://codereview.chromium.org/25770003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226505 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225468 "Limit oom-bound renderers to 1 at a time on low-me..."ppi@chromium.org2013-10-022-13/+75
| | | | | | | | | | | | | | | | | | | | > Limit oom-bound renderers to 1 at a time on low-memory devices. > > This patch makes ChildProcessLauncher/BindingManager drop the oom bindings for > the renderer that was most recently oom-bound when a new renderer is started, > ensuring that only one renderer process at a time is oom-bound. This makes us > release the oom bindings early in the cross-site navigation renderer swap > scenario. > > BUG=289540 > > Review URL: https://codereview.chromium.org/23532056 TBR=ppi@chromium.org Review URL: https://codereview.chromium.org/25762002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226493 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225728 [NaCl SDK] nacl_io: Fix two issues with TCP sockets.sbc@chromium.org2013-10-024-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | > Firstly ensure that the event state is > updated on TCP read/write. Without this the > socket says readable even after all the data > is read. > > Secondly, make sure the RECVING flag is > cleared after a read completes so that next > one can be scheduled. > > TEST=build and run libcurl in naclports > > Review URL: https://codereview.chromium.org/24364007 TEST=build and run libcurl in naclports R=noelallen@chromium.org BUG=301841 Review URL: https://codereview.chromium.org/25270003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226486 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225904 "Request new data after receiving an aborted access..."qinmin@chromium.org2013-10-023-1/+39
| | | | | | | | | | | | | | | | | | | > Request new data after receiving an aborted access unit > > Currently when decoder job has no data, it will call requestData(). > When requestData() returns the new data, we immediately started decoding it by calling DecodeNextAccessUnit(). > However, if the status of the access unit is kAborted, we treat it as an EOS. > This is wrong. Instead, we should ignore this access unit and pause the MediaSourcePlayer. > > BUG=300078 > > Review URL: https://codereview.chromium.org/25142002 TBR=qinmin@chromium.org Review URL: https://codereview.chromium.org/25456003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226480 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225354 "Limit image decoded size on low end Android devices"wangxianzhu@chromium.org2013-10-022-0/+14
| | | | | | | | | | | | | | | | | > Limit image decoded size on low end Android devices > > Limit decoded size to 3M pixels on low end Android devices. > The image decoder may downsample the images to meet the limit. > > BUG=276666 > > Review URL: https://codereview.chromium.org/23600067 TBR=wangxianzhu@chromium.org Review URL: https://codereview.chromium.org/25415005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226479 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 226249 "Merge 225904 "Request new data after receiving an..."qinmin@chromium.org2013-10-023-39/+1
| | | | | | | | | | | | | | | | | | | | | | | | | > Merge 225904 "Request new data after receiving an aborted access..." > > > Request new data after receiving an aborted access unit > > > > Currently when decoder job has no data, it will call requestData(). > > When requestData() returns the new data, we immediately started decoding it by calling DecodeNextAccessUnit(). > > However, if the status of the access unit is kAborted, we treat it as an EOS. > > This is wrong. Instead, we should ignore this access unit and pause the MediaSourcePlayer. > > > > BUG=300078 > > > > Review URL: https://codereview.chromium.org/25142002 > > TBR=qinmin@chromium.org > > Review URL: https://codereview.chromium.org/25537003 TBR=qinmin@chromium.org Review URL: https://codereview.chromium.org/25708005 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226478 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226217 "Show menu after selection change"arv@chromium.org2013-10-021-0/+14
| | | | | | | | | | | | | | | | | | | > Show menu after selection change > > Delay showing the context menu shown from the context menu button. This > is so that the selection changes before the menu is shown and the update > of the menu items is done in the correct order. > > BUG=301584 > R=dbeam@chromium.org > > Review URL: https://codereview.chromium.org/25174005 TBR=arv@chromium.org Review URL: https://codereview.chromium.org/25415004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226475 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225810 "Ensure that pending PNaCl translations are cleaned..."dschuff@chromium.org2013-10-023-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | > Ensure that pending PNaCl translations are cleaned up on plugin destruction > > The PnaclCoordinator in the plugin sends a TranslationFinished message to the > PnaclHost in the browser when translations are aborted for various errors it can > detect, but on surfaway (or when the embed tag is removed) the plugin simply > gets destroyed. This CL adds an explicit state to indicate that the translation > has finished and been reported to the browser, and if the coordinator is prematurely > destroyed, it sends TranslationFinished so the browser can clean up. > > This is tested by hooking the progress events and removing and re-adding the > embed. > > R=jvoung@chromium.org, ncbray@chromium.org > BUG=297644 > TEST= browser_tests --gtest_filter=NaClBrowserTestPnacl.PnaclErrorHandling > > Review URL: https://codereview.chromium.org/23522072 TBR=dschuff@chromium.org Review URL: https://codereview.chromium.org/25653006 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226472 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225614 "Add experimental AGC to default audio constraints."niklase@chromium.org2013-10-021-0/+2
| | | | | | | | | | | | | | > Add experimental AGC to default audio constraints. > > TESTED=Experimental AGC was enabled in apprtc. > > Review URL: https://codereview.chromium.org/24516002 TBR=ajm@chromium.org Review URL: https://codereview.chromium.org/25747002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226465 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225345 "NSS: don't advertise TLS 1.2-only ciphersuites in ..."agl@chromium.org2013-10-024-25/+213
| | | | | | | | | | | | | | | | | | | | | > NSS: don't advertise TLS 1.2-only ciphersuites in a TLS 1.1 ClientHello. > > Chrome is advertising SHA256 ciphersuites with a TLS 1.1 ClientHello. This > breaks PolarSSL servers because they also have a bug: they accept the SHA256 > ciphersuite and then break because they negotiated TLS 1.1 > > This change causes NSS not to advertise cipher suites that aren't applicable to > the version being negotiated. > > BUG=297151 > > Review URL: https://codereview.chromium.org/23928007 TBR=agl@chromium.org Review URL: https://codereview.chromium.org/25552004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226464 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 218097 "Merge 191028 "[Sync] Disable unrecoverable error u..."laforge@chromium.org2013-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | > Merge 191028 "[Sync] Disable unrecoverable error uploading." > > > [Sync] Disable unrecoverable error uploading. > > > > Disabling for 30 branch. > > > > BUG=235583 > > TBR=rlarocque@chromium.org > > > > Review URL: https://codereview.chromium.org/12770030 > > TBR=zea@chromium.org > > Review URL: https://codereview.chromium.org/22867019 TBR=zea@chromium.org Review URL: https://codereview.chromium.org/25741002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226463 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226203 "Removed the experimental flag for Chromecast suppo..."avayvod@chromium.org2013-10-022-17/+0
| | | | | | | | | | | | | | | | > Removed the experimental flag for Chromecast support and the corresponding strings. > > BUG=299971 > > NOTRY=true > > Review URL: https://codereview.chromium.org/25266002 TBR=maybelle@chromium.org Review URL: https://codereview.chromium.org/25717002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226458 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226207 "Translate: Disable offer-to-translate checkboxes w..."hajimehoshi@chromium.org2013-10-021-7/+40
| | | | | | | | | | | | | | | | > Translate: Disable offer-to-translate checkboxes when Translate is disabled > > When the user disables Translate feature, "Offer to translate..." checkboxes should be disabled and unchecked because the checking state doesn't make sense in this case. > > BUG=298321 > > Review URL: https://codereview.chromium.org/24983004 TBR=hajimehoshi@chromium.org Review URL: https://codereview.chromium.org/25571004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226432 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226109 "Allows Kiosk mode app to store display preferences."mukai@chromium.org2013-10-021-1/+2
| | | | | | | | | | | | | | | | | > Allows Kiosk mode app to store display preferences. > > Some kiosk app provides the UI to edit the display preferences and > the edit result should be stored. > > R=oshima@chromium.org > > Review URL: https://codereview.chromium.org/24923002 TBR=mukai@chromium.org Review URL: https://codereview.chromium.org/25685002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226397 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226123 "Use production Wallet service URL by default."dbeam@chromium.org2013-10-028-36/+89
| | | | | | | | | | | | | | | | | | | > Use production Wallet service URL by default. > > Also change --wallet-service-use-prod to --wallet-service-use-sandbox instead > (and update about:flags description). > > BUG=299902 > R=estade@chromium.org > TEST=unit_tests, no developer warning/real generated cards by default > > Review URL: https://codereview.chromium.org/25127002 TBR=dbeam@chromium.org Review URL: https://codereview.chromium.org/25656004 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226396 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226051 "Fix a threading bug in the brlapi basec braille co..."dtseng@chromium.org2013-10-023-14/+36
| | | | | | | | | | | | | | | | | | > Fix a threading bug in the brlapi basec braille controller > > BUG=178559 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=225008 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=225398 > > Review URL: https://codereview.chromium.org/24325002 TBR=plundblad@chromium.org Review URL: https://codereview.chromium.org/25652002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226363 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 31.0.1650.9chrome-release@google.com2013-10-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226353 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225201 "Remove missing .js file from unit test."jamiewalch@chromium.org2013-10-011-1/+0
| | | | | | | | | | | | | | | | | > Remove missing .js file from unit test. > > This was causing remoting_unittests to fail in Release builds. > > BUG=297970 > TBR=rmsousa@chromium.org > > Review URL: https://codereview.chromium.org/24620002 TBR=jamiewalch@chromium.org Review URL: https://codereview.chromium.org/25567003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226263 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 226048 "Make the local discovery UI update itself based on..."noamsml@chromium.org2013-10-013-2/+32
| | | | | | | | | | | | | | | | | > Make the local discovery UI update itself based on whether the user is logged in > > Update chrome://devices/ as the user's login state changes, refresh the printer > list, and add/remove login promos. > > BUG=299963 > > Review URL: https://codereview.chromium.org/24996006 TBR=noamsml@chromium.org Review URL: https://codereview.chromium.org/25564002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226252 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225904 "Request new data after receiving an aborted access..."qinmin@chromium.org2013-10-013-1/+39
| | | | | | | | | | | | | | | | | | | > Request new data after receiving an aborted access unit > > Currently when decoder job has no data, it will call requestData(). > When requestData() returns the new data, we immediately started decoding it by calling DecodeNextAccessUnit(). > However, if the status of the access unit is kAborted, we treat it as an EOS. > This is wrong. Instead, we should ignore this access unit and pause the MediaSourcePlayer. > > BUG=300078 > > Review URL: https://codereview.chromium.org/25142002 TBR=qinmin@chromium.org Review URL: https://codereview.chromium.org/25537003 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226249 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 225064 "Fix crash when showing error in wrench menu"sail@chromium.org2013-10-013-7/+16
| | | | | | | | | | | | | | | | | | | | | | | > Fix crash when showing error in wrench menu > > This is speculative fix for a crash in > WrenchMenuModel::AddGlobalErrorMenuItems(). My guess is that we're > modifying a list while iterating over it. Fix is to move the modifying > call out of the loop. > > BUG=278543 > TEST=Can't repro the crash. Just built and ran Chrome. > NOTRY=true > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=224987 > > Review URL: https://chromiumcodereview.appspot.com/23435011 TBR=sail@chromium.org Review URL: https://codereview.chromium.org/25555002 git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@226244 0039d316-1c4b-4281-b951-d872f2087c98