summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 6.0.472.306.0.472.30gitdeps2014-04-071-286/+174
|
* Merge 55361 - Mac: Fix kill button and selection in task managerthakis@chromium.org2010-08-084-15/+88
| | | | | | | | | | | | BUG=51488,51486 TEST=Sort on a changing column such as %cpu or goats teleported. The selection should follow the selected rows (i.e. if the "maps" process jumps from row 2 to row 4, the selected row should follow). "Kill process" should kill the currently selected process, not the process that's at that index when no sorting is happening. Review URL: http://codereview.chromium.org/3047055 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/3041056 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55365 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.29 to 472.30chrome-release@google.com2010-08-081-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55364 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.28 to 472.29chrome-release@google.com2010-08-071-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55335 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 53552 - Surface the "Set up sync" button on ChromiumOS when sync is ↵nick@chromium.org2010-08-076-24/+51
| | | | | | | | | | | | | | | stopped permanently. I need this to be LGTMed again since the last time I tried to commit this it caused a gitsplosion. BUG=49402 Review URL: http://codereview.chromium.org/3033025 TBR=skrul@chromium.org Review URL: http://codereview.chromium.org/3023047 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55325 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 53080 - If the default theme is synced to the server, make new sync ↵nick@chromium.org2010-08-074-59/+58
| | | | | | | | | | | | | | clients with custom themes "win" at model association time. BUG=48155 TEST=manually tested Review URL: http://codereview.chromium.org/2856040 TBR=albertb@chromium.org Review URL: http://codereview.chromium.org/3023046 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55324 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.27 to 472.28chrome-release@google.com2010-08-071-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55322 0039d316-1c4b-4281-b951-d872f2087c98
* Merge joth's change:chocobo@chromium.org2010-08-062-7/+6
| | | | | | | | | | | Speculative fix for chromium-os:4706 - use singleton NetworkLibrary rather than create our own BUG=chromium-os:4706 TEST=open chrome os, go to maps.google.com click my location, check it doesn't crash. TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/2883066 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55315 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55305 - [Mac] Don't fade text on bookmark items if we don't have to.jeremy@chromium.org2010-08-061-1/+1
| | | | | | | | | | | | | | Fix a float <-> int comparison so items whose width is fractionally larger than the width of the cell aren't truncated. BUG=51183 TEST=See bug Review URL: http://codereview.chromium.org/3096007 TBR=jeremy@chromium.org Review URL: http://codereview.chromium.org/2868118 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55309 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54983 - Play WebM live streamhclam@chromium.org2010-08-063-2/+16
| | | | | | | | | | | | | | | | | | | | | BUG=44891 TEST=Can play live stream http://195.10.10.75:8800/live.webm This patch allows a live WebM stream to be played. After demuxing by FFmpeg, the duration was set to an invalid value. This makes the video pipeline to set duration to 0, and so WebKit never allows us to play because currentTime == duration all the time. This patch sets duration to an infinite value when duration is reported as invalid in FFmpeg. Review URL: http://codereview.chromium.org/3031036 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/2808109 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55295 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55240 - Fixes to separators in context menu items added by extensions.asargent@chromium.org2010-08-068-37/+208
| | | | | | | | | | | | | | | | | | | | This fixes two problems: -While the API let you add your own separator items, we weren't actually displaying those. -There is some logic about automatically inserting separators for groups of radio items, but it didn't work correctly (it inserted one if the very first item was a radio item). BUG=49730 TEST=Steps are outlined in bug. Also the browser test added should hopefully cover the relevant cases. Review URL: http://codereview.chromium.org/3026056 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/3052042 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55290 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55282 - Prevent browser actions toolbar's overflow button from being ↵suzhe@chromium.org2010-08-061-0/+1
| | | | | | | | | | | | | | shown unexpectedly. BUG=51268 TEST=See bug report. Review URL: http://codereview.chromium.org/3073035 TBR=suzhe@chromium.org Review URL: http://codereview.chromium.org/3005061 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55283 0039d316-1c4b-4281-b951-d872f2087c98
* Merge trunk r55272 to the 472 branch:mark@chromium.org2010-08-061-1/+1
| | | | | | | | | | | | Update Breakpad to r639. BUG=none TEST=none Review URL: http://codereview.chromium.org/3092013 Review URL: http://codereview.chromium.org/3007042 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55277 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55238 - NULL-check the weak RenderView pointer before unregistering ↵stuartmorgan@chromium.org2010-08-061-1/+2
| | | | | | | | | | | | | | plugin delegates BUG=50963 TEST=See bug. Review URL: http://codereview.chromium.org/3073028 TBR=stuartmorgan@chromium.org Review URL: http://codereview.chromium.org/2873105 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55269 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55234 - Make status bubble behave properly in RTL languages.mirandac@chromium.org2010-08-061-13/+14
| | | | | | | | | | | | | BUG=49913 TEST= In RTL language, cause many status bubbles to appear. Hover over some to cause expansion. Bubble behaves correctly. Review URL: http://codereview.chromium.org/3085018 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/2868115 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55267 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55261 - Fixes regression the resulted in not showing window after ↵sky@chromium.org2010-08-061-0/+1
| | | | | | | | | | | | | | | | | | doing a tab restore in some situations. BUG=51255 TEST=create a new window with one tab, press control-w to close the window, restore the window by way of control-shift-t and make sure you can see the window. Review URL: http://codereview.chromium.org/3091012 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/3073036 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55266 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55253 - GTK toolbar -estade@chromium.org2010-08-062-2/+9
| | | | | | | | | | | | | | | - fix vertical height in gtk theme mode - fix reload button showing two images when switching from gtk to chrome theme mode BUG=51325 TEST=1) switch from gtk to chrome theme mode, look at stop/reload 2) change desktop document font size from 10 to 18 in gtk theme mode, the omnibox should size appropriately for each font. Review URL: http://codereview.chromium.org/3086021 TBR=erg Review URL: http://codereview.chromium.org/3097001 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55256 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54145 - Update omnibox_c.png to remove garbage in middle.estade@chromium.org2010-08-061-0/+0
| | | | | | | | | | | | TBR=estade BUG=50107 TEST=none Review URL: http://codereview.chromium.org/3056030 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/3073034 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55255 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55165 - [Mac] Prevent a crash with the DownloadStartedAnimation.rsesek@chromium.org2010-08-061-1/+5
| | | | | | | | | | | | | | | The initializer for the class can sometimes return nil. If so, do not try to access an ivar directly. BUG=51307 TEST=none Review URL: http://codereview.chromium.org/3060047 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/3018044 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55251 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54979 - Protect against receiving different ↵stoyan@chromium.org2010-08-061-1/+15
| | | | | | | | | | | BINDSTATUS_MIMETYPEAVAILABLE multiple times. Review URL: http://codereview.chromium.org/3038049 TBR=stoyan@chromium.org Review URL: http://codereview.chromium.org/2883065 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55249 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55164 - Allow search engine dialog to have only two choices (Vietnam ↵mirandac@chromium.org2010-08-062-10/+19
| | | | | | | | | | | | | | | | | and Iran have only two listed in template_url_prepopulate_data). Fix invalid search URL in in.gr search engine. BUG= 51295 TEST= Vietnam and Iran search engine dialogs work fine, searching with in.gr (from Greek default search engine choices) works. Review URL: http://codereview.chromium.org/3007032 TBR=mirandac@chromium.org, kerz Review URL: http://codereview.chromium.org/3084021 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55233 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55043 - Fix WebSocket crash bug.ukai@chromium.org2010-08-063-24/+60
| | | | | | | | | | | | | | | | | | | | | | | If SocketStream closes while waiting ResolveProxy, it badly calls DoResolveProxyComplete from DoLoop invoked by SocketStream::Close, and real callback of ResolveProxy failed to call SocketStream::OnIOCompleted. So, don't run DoLoop when closed, if SocketStream is calling APIs of proxy_service or resolver. Check closing_ after the API calls back and closes the SocketStream. r54707 broke SocketStreamTest::CloseFlushPendingWrite. This CL fixes this by not closing socket if it is still writing on the socket. BUG=50394, 46750 TEST=websocket/tests doesn't crash, and net_unittests passes Review URL: http://codereview.chromium.org/3076024 TBR=ukai@chromium.org Review URL: http://codereview.chromium.org/3071025 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55198 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55185 - Fix some instances where the string desc does not use In Title ↵mal@chromium.org2010-08-061-6/+6
| | | | | | | | | | | | | | | | Case properly. This causes two strings (Title, non-title) to hash to the same value and we only get one translation in the .xtb. BUG= http://crbug.com/44539 Review URL: http://codereview.chromium.org/3072027 TBR=mal@chromium.org Review URL: http://codereview.chromium.org/3029063 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55186 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.26 to 472.27chrome-release@google.com2010-08-061-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55184 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55159 - [GTK] undo more toolbar destruction - unbreak GTK+ theme mode ↵estade@chromium.org2010-08-061-1/+2
| | | | | | | | | | | | | | home button BUG=51325 TEST=showing home button in gtk+ should work Review URL: http://codereview.chromium.org/3083018 TBR=estade@chromium.org Review URL: http://codereview.chromium.org/3041053 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55161 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.25 to 472.26chrome-release@google.com2010-08-051-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55158 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55067 - Fixes bug in tab dragging when rtl where the dragged tab wassky@chromium.org2010-08-051-0/+2
| | | | | | | | | | | | | | incorrectly positioned. BUG=51219 TEST=see bug Review URL: http://codereview.chromium.org/3091008 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/3031051 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55147 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55112 - AutoFill: Add a re-sized generic CC icon.jhawkins@chromium.org2010-08-051-0/+0
| | | | | | | | | | | | BUG=51077 TEST=none Review URL: http://codereview.chromium.org/3036047 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/3030051 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55113 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55104 - Change top of search engine dialog to reflect newest omnibox.mirandac@chromium.org2010-08-051-0/+0
| | | | | | | | | | | BUG= 50095 TEST= new search engine dialog looks like current omnibox. Review URL: http://codereview.chromium.org/3018041 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/3081017 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55106 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54965,55096 - Don't delete npapi plugins copied into ↵tony@chromium.org2010-08-051-4/+6
| | | | | | | | | | | | | | | | | | | | | <(PRODUCT_DIR)/plugins during UI tests. The layout test plugin is copied over via a build step and needed when running the layout tests. If you run the UI tests before the layout tests, the npapi layout test plugin is deleted and causes layout tests to fail. Seems like it's safe to keep the plugins even after the UI tests end. and Better fix for Windows test failure. Delete the old file before trying to copy the plugin files over. Review URL: http://codereview.chromium.org/3026051 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55098 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 55083 - Don't sync prefs::kAutoFillAuxiliaryProfilesEnabled on non-macskrul@chromium.org2010-08-051-0/+2
| | | | | | | | | | | BUG=51209 Review URL: http://codereview.chromium.org/3040037 TBR=skrul@chromium.org Review URL: http://codereview.chromium.org/3026050 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55089 0039d316-1c4b-4281-b951-d872f2087c98
* Update test expectations to include all failures, expected for OS X 10.6.dglazkov@chromium.org2010-08-051-0/+2803
| | | | | | | | | | | | | This was done by running tests on trunk vs. branch, then comparing the differences, and visual inspection of test results. Whew. TBR=kerz TEST=none BUG=none Review URL: http://codereview.chromium.org/3051037 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55084 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54999 - Update the names of some parameters passed to contextMenu ↵asargent@chromium.org2010-08-052-6/+6
| | | | | | | | | | | | | | | | | | | onclick handlers. This changes the mediaType parameter values to be lowercase (eg "audio" instead of "AUDIO"), and changes mainFrameUrl to be pageUrl as the design doc had intended. BUG=49725 TEST=In onclick handlers, values for mediaType should be lowercase and there should be a pageUrl property matching the url of the page. Review URL: http://codereview.chromium.org/3017056 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/3053047 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55079 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 53850 - Add URL filter to trigger punycode for Japanese homographic ↵inferno@chromium.org2010-08-052-2/+47
| | | | | | | | | | | | sequences. BUG=37201 TEST=net_unittests.exe --gtest_filter=NetUtilTest.IDNToUnicode* Review URL: http://codereview.chromium.org/3011012 Review URL: http://codereview.chromium.org/3015056 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55076 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.24 to 472.25chrome-release@google.com2010-08-051-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@55024 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bad conflict resolution in r54985estade@chromium.org2010-08-041-1/+1
| | | | | | Review URL: http://codereview.chromium.org/3013059 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54998 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54911 - Use the "tabIndex" property on the wizard iframes to prevent ↵skrul@chromium.org2010-08-041-5/+13
| | | | | | | | | | | | | tabbing between iframes. BUG=48138 Review URL: http://codereview.chromium.org/2819089 TBR=skrul@chromium.org Review URL: http://codereview.chromium.org/3081016 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54992 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54954 - GTK: unbreak extension badges.estade@chromium.org2010-08-042-15/+27
| | | | | | | | | | | | BUG=50682 TEST=load make_page_red, you can see the badge; dragging still works, clicking still works, removing icons still works Review URL: http://codereview.chromium.org/3064039 TBR=estade@chromium.org Review URL: http://codereview.chromium.org/3085011 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54988 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54928 - GTK: Fix upgrade notification dot.estade@chromium.org2010-08-042-17/+18
| | | | | | | | | | | | | | Changing the wrench menu to a custom button broke it. BUG=50682 TEST=visual Review URL: http://codereview.chromium.org/3058041 TBR=estade@chromium.org Review URL: http://codereview.chromium.org/3051032 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54987 0039d316-1c4b-4281-b951-d872f2087c98
* Merge r54850:estade@chromium.org2010-08-048-183/+234
| | | | | | | | | | | | | | | | | | r54648 | estade@chromium.org | 2010-08-02 17:54:31 -0700 (Mon, 02 Aug 2010) | 10 lines [GTK] fix up spacing in upper chrome. These changes mirror pkasting's work on windows for milestone6. TODO (in a follow up patch): convert the wrench menu into a CustomDrawButton (you will notice that currently it is too wide and has the wrong sort of background hover appearance). BUG=50682 TEST=look of upper chrome Review URL: http://codereview.chromium.org/3007018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54985 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54628 - Make sure we fully remove child context menu items when ↵asargent@chromium.org2010-08-043-20/+91
| | | | | | | | | | | | | | deleting a parent. BUG=49742 TEST=Follow steps in the bug report Review URL: http://codereview.chromium.org/3081009 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/3017057 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54975 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 54514 - Set a max limit on extension items' labels in context menus.asargent@chromium.org2010-08-0418-94/+360
| | | | | | | | | | | | | | | | Also do some cleanup of context menu tests, including adding a generic mechanism to let javascript pass a test message and have C++ test code wait for and retrieve those messages. BUG=49744 TEST=Follow steps in bug report Review URL: http://codereview.chromium.org/3017047 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/3084016 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54973 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 53051 - Add some histograms to help measure extension context menu ↵asargent@chromium.org2010-08-041-0/+9
| | | | | | | | | | | | | | performance BUG=49560 TEST=none (no user-visible changes) Review URL: http://codereview.chromium.org/3022013 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/3093003 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54972 0039d316-1c4b-4281-b951-d872f2087c98
* Remove linux text expectations. We'll just track regressionstony@chromium.org2010-08-041-227/+0
| | | | | | | | | | on the "google chrome linux beta x64" build slave. BUG=50463 TBR=kerz Review URL: http://codereview.chromium.org/3044046 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54971 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.23 to 472.24chrome-release@google.com2010-08-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54939 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Firefox import lock dialog on Windows.mirandac@chromium.org2010-08-045-20/+27
| | | | | | | | | | Merging change 54920 to 492 branch (patch is slightly different because of conflicts between ToT and 472). TBR: kerz Review URL: http://codereview.chromium.org/3081015 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54926 0039d316-1c4b-4281-b951-d872f2087c98
* few more tests on linux failing trying to get us to at least orange, one ↵kerz@chromium.org2010-08-041-0/+2
| | | | | | more time, for official build failures too git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54877 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping from 472.22 to 472.23chrome-release@google.com2010-08-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54875 0039d316-1c4b-4281-b951-d872f2087c98
* few more tests on linux failing trying to get us to at least orangekerz@chromium.org2010-08-041-1/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54872 0039d316-1c4b-4281-b951-d872f2087c98
* fix dupskerz@chromium.org2010-08-041-4/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54852 0039d316-1c4b-4281-b951-d872f2087c98