summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Increment VERSION to 12.0.742.54chrome-release@google.com2011-05-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85236 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85152 - Change the writting to the 'did run' registry to better ↵cpu@chromium.org2011-05-134-46/+80
| | | | | | | | | | | | | | | | | account actives Now we not just call it from chrome.exe (chrome/app) but it is also called periodically from chrome.dll itself BUG=82180 TEST=see bug Review URL: http://codereview.chromium.org/7005008 TBR=cpu@chromium.org Review URL: http://codereview.chromium.org/7015035 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85232 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85221 - Remove unused projects in the official builder target.nsylvain@chromium.org2011-05-131-4/+0
| | | | | | | | | Review URL: http://codereview.chromium.org/7011028 TBR=nsylvain@chromium.org Review URL: http://codereview.chromium.org/6969056 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85225 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85185 - Fixed generating of urls of the local file system entries.zelidrag@chromium.org2011-05-122-11/+47
| | | | | | | | | | | BUG=chromium-os:15256 TEST=added new test cases that utilize Entry.toURL() to FileSystemExtensionApiTest.FileBrowserTest Review URL: http://codereview.chromium.org/7015023 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/7012023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85198 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85193 - Sync: Disable the input elements of the 'Customize Sync ↵jhawkins@chromium.org2011-05-121-0/+17
| | | | | | | | | | | | | | | | | | Preferences' screen once the user has confirmed the preferences. BUG=82376 TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/7015030 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7012022 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85194 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85169 - CrOS - Fix file selection dialog not respawning after closing ↵jamescook@chromium.org2011-05-128-1/+29
| | | | | | | | | | | | | | | | with esc (3) When the user hits escape, we need to call FileSelectionCanceled on the listener. Added OnWindowClosed() to HtmlDialogUIDelegate so we can catch this case. BUG=chromium-os:14698 TEST=Find or make a web page with a <input type=file /> element. Click on it to select a file. Cancel the file browser dialog with the escape key. Click on it again. Verify that the file browser reopens and works normally. Review URL: http://codereview.chromium.org/7014007 TBR=jamescook@chromium.org Review URL: http://codereview.chromium.org/7016023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85182 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85166 - Options: Notify overlays that they will be closed if the ↵jhawkins@chromium.org2011-05-122-0/+14
| | | | | | | | | | | | | | | | | | | | options tab is closed. This fixes an issue with the Sync setup UI where closing the tab in the middle of a setup operation would hose the setup UI because the backend thought a setup operation was still in progress. BUG=81564 TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/6973031 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/6973033 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85167 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84973 - Crashing and hanging of Page info bubble fixedglotov@google.com2011-05-122-5/+14
| | | | | | | | | | | | BUG=chromium-os:13858 TEST=manual Review URL: http://codereview.chromium.org/6932043 TBR=glotov@google.com Review URL: http://codereview.chromium.org/6969033 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85117 0039d316-1c4b-4281-b951-d872f2087c98
* Merge trunk r84979 to the 742 branch (M12)mark@chromium.org2011-05-121-1/+2
| | | | | | | | | | | | | | | | | | | Treat TERMINATION_STATUS_ABNORMAL_TERMINATION in browser child processes as crashes. Child processes on the Mac that are Breakpad-enabled will not appear to have crashed according to the logic in base::GetTerminationStatus, they'll show up as TERMINATION_STATUS_ABNORMAL_TERMINATION instead of TERMINATION_STATUS_PROCESS_CRASHED. This happens because they exit from their crash handler to suppress the system's redundant crash handler. This broke in r69082, which introduced the TerminationStatus enum to replace a simpler did_crash boolean value set by logic treating both death by signal and nonzero exit status as a crash. BUG=82172 TEST=Mac plugin crash count Review URL: http://codereview.chromium.org/7002032 Review URL: http://codereview.chromium.org/7012008 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85097 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.53chrome-release@google.com2011-05-121-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85089 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85011 - Fix for chrome://crashes on Chrome OSrkc@chromium.org2011-05-111-1/+7
| | | | | | | | | | | | | | | | | Chrome OS doesn't use the local state flag to indicate whether crash reporting is allowed or not. Instead it uses the cros metrics settings provider. Changed the chrome://crashes page to check that setting instead of the local_state flag. R=zelidrag@chromium.org,arv@chromium.org,estade@chromium.org BUG=chromium-os:14668 TEST=Tested with turning on crash reporting and using about:crash to generate crashes to confirm that they show up on the chrome://crashes page Review URL: http://codereview.chromium.org/7003018 TBR=rkc@chromium.org Review URL: http://codereview.chromium.org/7015014 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85069 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85031 - Only block the GPU process if WebGL, compositing or Canvas2D ↵vangelis@google.com2011-05-111-1/+9
| | | | | | | | | | | | | are blacklisted (but not if multisampling is blacklisted). This allows us to run on Mac's with AMD GPUs. (manual merge as the file moved around) BUG=82104 TBR=vangelis@chromium.org Review URL: http://codereview.chromium.org/7011008 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85066 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84996 - Allow the Firefox lock to be deleted on the main thread during ↵mirandac@chromium.org2011-05-111-0/+4
| | | | | | | | | | | | | import. BUG=77777 TEST=import tests don't complain. Review URL: http://codereview.chromium.org/6995051 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/6969021 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85065 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85061 - Allow the first-run bubble to be shown on organic first runs.ben@chromium.org2011-05-112-6/+13
| | | | | | | | | | | | | | | The code had some mysterious chokepoint that prevented the bubble from being shown if the attached parent window wasn't active. However the first run bubble is shown from the browser window's construction/init pass, before it's ever shown, so it can't be active. It turns out the chokepoint was to prevent the bubble from being shown later as the TemplateURLModel is loaded, so I moved the active check to that part of the code so that the initial display could work. http://crbug.com/78878 TEST=run chrome with --user-data-dir=c:\temp\test --first-run --organic (the user-data-dir MUST be empty!) - first run bubble should appear. also, browser window should render as active for at least 5-10 seconds after displaying. this code fixes a bug where running with just --first-run would have the browser appear inactive after about 3 seconds. Review URL: http://codereview.chromium.org/6973012 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/7015011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85063 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 85033 - [cros] Show data plan info only when cellular network supports ↵nkostylev@chromium.org2011-05-115-7/+13
| | | | | | | | | | | | | | that. BUG=chrome-os-partner:3556 TEST=Manual. No messages like "No data plan" should be shown for GSM networks like AT&T. Review URL: http://codereview.chromium.org/7003027 TBR=nkostylev@chromium.org Review URL: http://codereview.chromium.org/6969020 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85050 0039d316-1c4b-4281-b951-d872f2087c98
* one more test fixkerz@chromium.org2011-05-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85015 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.52chrome-release@google.com2011-05-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84986 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84268 - Trim whitespace and ignore empty lines.dilmah@chromium.org2011-05-111-1/+4
| | | | | | | | | | | | BUG=chromium-os:12829 TEST=Manual Review URL: http://codereview.chromium.org/6928034 TBR=dilmah@chromium.org Review URL: http://codereview.chromium.org/7005028 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84982 0039d316-1c4b-4281-b951-d872f2087c98
* one more try at greenkerz@chromium.org2011-05-111-3/+5
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84946 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.51chrome-release@google.com2011-05-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84943 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.50chrome-release@google.com2011-05-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84940 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84931 - Fix compiler warning.ers@chromium.org2011-05-111-2/+2
| | | | | | | | | | | | BUG=chromium-os:14180 TEST=it compiles without warning Review URL: http://codereview.chromium.org/7000020 TBR=ers@chromium.org Review URL: http://codereview.chromium.org/7001023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84938 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84926 - chromeos: refetch device properties when cellular modem powers on.ers@chromium.org2011-05-116-29/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the system starts up, chrome fetches the device properties for all network devices. However, for cellular devices, many of the Cellular.XXX properties don't become defined until the modem is enabled. Since chrome doesn't refetch the properties, nor are any property change signals sent out from flimflam for these properties (because generally speaking they are ones that don't change), chrome's cached copies are empty. The result is that when the Device tab is brought up in the internet settings page, all the fields are blank. Chrome now refetches device properties when it sees the value of the Powered property change. Also, I removed the LastUpdate item from the device tab. That property hasn't existed in flimflam for several months. BUG=chromium-os:14180 TEST=To demonstrate the problem without this fix, reboot the machine, go to internet settings, click "Options" for the cellular service, and go to the device tab. The fields should be blank. Log out and log back in, and the fields in the device tab should be populated, because chrome restarted and thus fetched the properties again. With this fix in place, the fields should be populated first time, every time. R=nkostylev@chromium.org,zel@chromium.org Review URL: http://codereview.chromium.org/6903080 TBR=ers@chromium.org Review URL: http://codereview.chromium.org/7005024 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84937 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84889 - Let CancelableRequest Execute callbacks which do delete this.scr@chromium.org2011-05-111-3/+5
| | | | | | | | | | | | | | | | | | By checking canceled() again before calling NotifyCompleted, we avoid assumptions that we're not canceled from the callback. This solves 2 issues: 1) The NOTREACHED in the provider which tries to remove the pending_request. 2) Trying to call DidExecute on a deleted consumer_. BUG=77777, 82156 R=sky@chromium.org TEST=python chrome/test/functional/imports.py imports.ImportsTest.testImportFirefoxDataTwice Review URL: http://codereview.chromium.org/7001015 TBR=scr@chromium.org Review URL: http://codereview.chromium.org/7002023 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84925 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.49chrome-release@google.com2011-05-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84909 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84904 - Disable context menu in screen lockeroshima@google.com2011-05-112-7/+31
| | | | | | | | | | | | | | Don't show image behind screen locker. BUG=chromium-os:14985, chromium-os:13154 TEST=lock the screen, and alt-click or right click passworld field. Review URL: http://codereview.chromium.org/6997007 TBR=oshima@google.com Review URL: http://codereview.chromium.org/7003017 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84905 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84890 - harfbuzz: Add Behdad's patch to fix Thai crashes on Linux.derat@chromium.org2011-05-101-0/+14
| | | | | | | | | | | | | | | This appears to prevent some renderer crashes that are fairly easy to trigger with Thai pages on Chrome OS. BUG=chromium:75210,chromium-os:15103 TEST=manual: built chromeos-chrome and checked that http://www.pungame.com/sale.html and http://happy.teenee.com/game/ no longer cause crashes Review URL: http://codereview.chromium.org/7000012 TBR=derat@chromium.org Review URL: http://codereview.chromium.org/7000017 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84891 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84864 - Fixed unmount event notification and its handling on UI side.zelidrag@chromium.org2011-05-102-3/+43
| | | | | | | | | | | BUG=chromium-os:15099 TEST=make sure we don't stay in unmounted directory once SD card is pulled out of the machine Review URL: http://codereview.chromium.org/6999015 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6995035 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84879 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84648 - Fix failure to update history to reflect new COMPLETE state ↵rdsmith@chromium.org2011-05-104-21/+123
| | | | | | | | | | | | | | | meaning. BUG=81014 TEST=New DownloadHistoryCheck test. Review URL: http://codereview.chromium.org/6911036 TBR=rdsmith@chromium.org Review URL: http://codereview.chromium.org/6982012 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84876 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 84866 - Merge 84648 - Fix failure to update history to reflect new ↵rdsmith@chromium.org2011-05-104-122/+20
| | | | | | | | | | | | | | | | | | COMPLETE state meaning. BUG=81014 TEST=New DownloadHistoryCheck test. Review URL: http://codereview.chromium.org/6911036 TBR=rdsmith@chromium.org Review URL: http://codereview.chromium.org/7004009 TBR=rdsmith@chromium.org Review URL: http://codereview.chromium.org/7003012 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84874 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84723 - Options: Disconnect the Instant option from the search engine ↵jhawkins@chromium.org2011-05-102-5/+0
| | | | | | | | | | | | | | | | select. BUG=81356 TEST=none R=sky@chromium.org Review URL: http://codereview.chromium.org/6980010 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/7002010 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84868 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84648 - Fix failure to update history to reflect new COMPLETE state ↵rdsmith@chromium.org2011-05-104-20/+122
| | | | | | | | | | | | | | | meaning. BUG=81014 TEST=New DownloadHistoryCheck test. Review URL: http://codereview.chromium.org/6911036 TBR=rdsmith@chromium.org Review URL: http://codereview.chromium.org/7004009 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84866 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84852 - Update cros scrollbar imagesdavemoore@chromium.org2011-05-1012-0/+0
| | | | | | | | | | | | BUG=chromium-os:15149 TEST=None Review URL: http://codereview.chromium.org/7001008 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/7004008 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84854 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84845 - Have List redraw on sort.achuith@chromium.org2011-05-103-3/+42
| | | | | | | | | | | BUG=chromium-os:14920 TEST=Click breadcrumbs to cd into a directory with some files, while in thumbnail mode. Double click on a file - the correct file should launch. Review URL: http://codereview.chromium.org/6997012 TBR=achuith@chromium.org Review URL: http://codereview.chromium.org/6995033 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84848 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84660 - Add uma stats for touchpaddavemoore@chromium.org2011-05-101-5/+17
| | | | | | | | | | | | BUG=chromium-os:14220 TEST=None Review URL: http://codereview.chromium.org/6871042 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/6982008 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84846 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84662 - Add shutdown trace functionsdavemoore@chromium.org2011-05-102-2/+29
| | | | | | | | | | | | BUG=chromium-os:14737 TEST=None Review URL: http://codereview.chromium.org/6943001 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/7001009 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84844 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84655 - [Mac] Mark BrowserWindowController's window as non-restorable.rsesek@chromium.org2011-05-101-3/+11
| | | | | | | | | | | | BUG=79113 TEST=On FutureCat, browse around for a few minutes, opening multiple tabs and switching applications. Try to quit Chromium. It quits. Review URL: http://codereview.chromium.org/6971002 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/7001002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84830 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84734 - AppCache fallback override. A means of overriding the fallback ↵michaeln@google.com2011-05-102-6/+109
| | | | | | | | | | | | | | | behavior from the server-side by adding a particular response header. Error responses containing the header/value pair will not trigger the fallback behavior. x-chromium-appcache-fallback-override: disallow-fallback BUG=82066 TEST=appcache_request_handler_unittest.cc Review URL: http://codereview.chromium.org/6969006 TBR=michaeln@google.com Review URL: http://codereview.chromium.org/7005001 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84818 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84762 - Do not assume that the initial XKB layout on Chrome startup is ↵yusukes@google.com2011-05-105-25/+37
| | | | | | | | | | | | | | | | | | always US-qwerty. The assumption might not be true e.g. when Chrome crashes and then restarts. BUG=chromium-os:14410 TEST=manually done Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84530 Review URL: http://codereview.chromium.org/6954005 TBR=yusukes@google.com Review URL: http://codereview.chromium.org/7003002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84815 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84706 - This fixes a NULL dereference when reading malformed history ↵gspencer@google.com2011-05-101-3/+3
| | | | | | | | | | | | | | | | items. Approved for merge by zelidrag BUG=chromium-os:14992 TEST=Artificially caused failure in reading history item and observed no crash. Review URL: http://codereview.chromium.org/6969004 TBR=gspencer@google.com Review URL: http://codereview.chromium.org/7004001 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84807 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84793 - [ChromeOS] Move help and feedback button into wrench menu.xiyuan@chromium.org2011-05-106-53/+15
| | | | | | | | | | | | | | | | | - Remove feedback button from toolbar; - Remove feedback entry in "Tools" submenu and put it into top-tier wrench menu for ChromeOS; - Remove help app icon by removing "brwoser_action" from its manifest; - Add an icon for help menu; BUG=chromium-os:11435 TEST=Verify fix for chromium-os:11435 Review URL: http://codereview.chromium.org/6992001 TBR=zelidrag@chromium.org Review URL: http://codereview.chromium.org/6993011 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84794 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84775 - [cros] all images on changePicture page, capture and pick are ↵avayvod@chromium.org2011-05-1011-102/+111
| | | | | | | | | | | | | | | | | first Fixed layout on image screen. Fixed html layout on changePicture page. BUG=chromiumos:14618 TEST=Check that all images on both OOBE image screen and change picture page are aligned. Verify that all 17 avatars are visible and selectable on the page. Review URL: http://codereview.chromium.org/6968006 TBR=avayvod@chromium.org Review URL: http://codereview.chromium.org/6993010 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84785 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84778 - Use Cellular.SupportNetworkScan instead of IMSI to show scan ↵dpolukhin@chromium.org2011-05-104-11/+16
| | | | | | | | | | | | | | mobile network BUG=chromium-os:14773 TEST=manual Review URL: http://codereview.chromium.org/6995014 TBR=dpolukhin@chromium.org Review URL: http://codereview.chromium.org/6991008 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84784 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84602 - Enable client-side phishing detection only for canary, dev and ↵noelutz@google.com2011-05-101-1/+6
| | | | | | | | | | | | | | | beta builds. BUG=81625 TEST=NONE Review URL: http://codereview.chromium.org/6932023 TBR=noelutz@google.com Review URL: http://codereview.chromium.org/6991004 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84764 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.48chrome-release@google.com2011-05-101-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84755 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84751 - Keep a reference to the module when handling PPB_Flash::Navigatepiman@google.com2011-05-103-8/+12
| | | | | | | | | | | | | | | | | This is needed because Navigate can end up destroying the last instance, but the dispatcher is still needed to send the reply. This also cleans up a typo in a safeguard, and an incorrect assumption. BUG=chromium-os:15044 TEST=http://nmd.mcd06514.orl.wayport.net/index.adp?MacAddr=48%3a5D%3a60%3a77%3a53%3a2A&IpAddr=192%2e168%2e6%2e84&vsgpId=&vsgId=60982&UserAgent=&ProxyHost= Review URL: http://codereview.chromium.org/6999006 TBR=piman@google.com Review URL: http://codereview.chromium.org/6991003 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84752 0039d316-1c4b-4281-b951-d872f2087c98
* Increment VERSION to 12.0.742.47chrome-release@google.com2011-05-101-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84738 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84104 - Update Reader version in the plug-in metadata.cevans@chromium.org2011-05-101-1/+3
| | | | | | | | | | | | | | (Split out from http://codereview.chromium.org/6909006, as the Flash part had issues) BUG=81293 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/6932012 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/6998004 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84736 0039d316-1c4b-4281-b951-d872f2087c98
* For 742: Sync: Fix the JS ID reference for custom passphrase.jhawkins@chromium.org2011-05-101-1/+1
| | | | | | | | | | | BUG=81761 TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/6994002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84718 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 84689 - Don't send Graphics3DContextLost after the instance is destroyedpiman@google.com2011-05-091-0/+5
| | | | | | | | | | | | BUG=chromium-os:15057 TEST=manual Review URL: http://codereview.chromium.org/6969011 TBR=piman@google.com Review URL: http://codereview.chromium.org/6999002 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84717 0039d316-1c4b-4281-b951-d872f2087c98