summaryrefslogtreecommitdiffstats
path: root/printing
Commit message (Collapse)AuthorAgeFilesLines
* CUPS printing: Define CUPS_PRINTER_SCANNER for Linux if CUPS is < 1.4chrelad@gmail.com2011-09-221-5/+8
| | | | | | | | | | BUG=97409 TEST=Try compiling on Linux with CUPS < 1.4 Review URL: http://codereview.chromium.org/7980036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102248 0039d316-1c4b-4281-b951-d872f2087c98
* Fix print preview workflow to reflect settings of selected printer.arthurhsu@chromium.org2011-09-222-2/+7
| | | | | | | | | | BUG=95110 TEST=none Review URL: http://codereview.chromium.org/7831041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102242 0039d316-1c4b-4281-b951-d872f2087c98
* printing: Convert some wstrings to string16s.thestig@chromium.org2011-09-203-14/+13
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7967004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101915 0039d316-1c4b-4281-b951-d872f2087c98
* Remove dead cairo code.abodenha@chromium.org2011-09-085-437/+0
| | | | | | | | | | BUG= TEST=No visible changes. Review URL: http://codereview.chromium.org/7847002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100281 0039d316-1c4b-4281-b951-d872f2087c98
* Reland 100233 PrintPreview: Added code to identify the printer default ↵kmadhusu@chromium.org2011-09-083-2/+7
| | | | | | | | | | | | | | | | | | duplex value. Added code to identify the printer default duplex value. If we are unable to get the default value, hide the two sided option in the preview tab. BUG=89204 TEST=Please refer to bug description. Original Commit: http://src.chromium.org/viewvc/chrome?view=rev&revision=100233 Try bot results are in http://codereview.chromium.org/7817013/ patch set 13. Original Review URL: http://codereview.chromium.org/7817013/ Review URL: http://codereview.chromium.org/7859007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100256 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 100233 - PrintPreview: Added code to identify the printer default ↵kmadhusu@chromium.org2011-09-083-7/+2
| | | | | | | | | | | | | | | | | duplex value. Added code to identify the printer default duplex value. If we are unable to get the default value, hide the two sided option in the preview tab. BUG=89204 TEST=Please refer to bug description. Review URL: http://codereview.chromium.org/7817013 TBR=kmadhusu@chromium.org Review URL: http://codereview.chromium.org/7828106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100234 0039d316-1c4b-4281-b951-d872f2087c98
* PrintPreview: Added code to identify the printer default duplex value.kmadhusu@chromium.org2011-09-083-2/+7
| | | | | | | | | | | | Added code to identify the printer default duplex value. If we are unable to get the default value, hide the two sided option in the preview tab. BUG=89204 TEST=Please refer to bug description. Review URL: http://codereview.chromium.org/7817013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100233 0039d316-1c4b-4281-b951-d872f2087c98
* Fix memory leak in unit testarthurhsu@chromium.org2011-09-081-0/+1
| | | | | | | | | | BUG=70388 TEST=PrintingContextTest.PrintAll Review URL: http://codereview.chromium.org/7795031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100102 0039d316-1c4b-4281-b951-d872f2087c98
* PrintPreview: Remove unwanted member variable initializations.kmadhusu@chromium.org2011-09-081-3/+0
| | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7737029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100077 0039d316-1c4b-4281-b951-d872f2087c98
* Fix handle leak and unfreed global locksarthurhsu@chromium.org2011-09-071-13/+48
| | | | | | | | | | BUG=70389 TEST=PrintingContextTest.PrintAll Review URL: http://codereview.chromium.org/7795033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100048 0039d316-1c4b-4281-b951-d872f2087c98
* Get chrome to link with USE_AURAben@chromium.org2011-09-072-6/+2
| | | | | | | | | | http://crbug.com/93947 TEST=none R=sadrul TBR=jabdelmalek for the content/webkit stubs Review URL: http://codereview.chromium.org/7841012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99993 0039d316-1c4b-4281-b951-d872f2087c98
* Get the rest of the chrome target to build (but not link) with USE_AURA.ben@chromium.org2011-09-062-1/+7
| | | | | | | | | | http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7839002 Review URL: http://codereview.chromium.org/7839002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99830 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 99810 - Get the rest of the chrome target to build (but not link) ↵ben@chromium.org2011-09-062-7/+1
| | | | | | | | | | | | | with USE_AURA. http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7839002 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/7840010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99813 0039d316-1c4b-4281-b951-d872f2087c98
* Get the rest of the chrome target to build (but not link) with USE_AURA.ben@chromium.org2011-09-062-1/+7
| | | | | | | | http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7839002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99810 0039d316-1c4b-4281-b951-d872f2087c98
* PrintPreview: Fixed RICOH MP C3501 color print job issues.kmadhusu@chromium.org2011-09-044-9/+25
| | | | | | | | | BUG=92358 TEST=Please refer to bug description. Review URL: http://codereview.chromium.org/7826040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99615 0039d316-1c4b-4281-b951-d872f2087c98
* Switch the native print path on Linux and ChromeOS to use Skia instead of Cairoabodenha@chromium.org2011-09-021-1/+1
| | | | | | | | | | BUG= TEST=Pages printed via cloud print to raster based printers should successfully print images. Review URL: http://codereview.chromium.org/7817007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99318 0039d316-1c4b-4281-b951-d872f2087c98
* Add printing.dll to the component build.darin@chromium.org2011-09-0130-93/+146
| | | | | | | R=rvargas,thestig Review URL: http://codereview.chromium.org/7799003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99144 0039d316-1c4b-4281-b951-d872f2087c98
* Print preview page selection should not require a rerendering of draft pages.kmadhusu@chromium.org2011-08-312-0/+4
| | | | | | | | | | | | | On page selection, regenerate the complete document with the selection, but preserve the existing draft pages and simply display a subset of them. Added a new param |clear all preview data| to |PrintHostMsg_DidGetPreviewPageCount|. BUG=84383 TEST=print preview works after code changes. Review URL: http://codereview.chromium.org/7647010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98926 0039d316-1c4b-4281-b951-d872f2087c98
* CL removing inheritance of SkDevice from PlatformDevice. twiz@google.com2011-08-281-7/+4
| | | | | | | | | | | | | PlatformDevice is now a base interface, which is implemented by the various flavours of BitmapPlatformDevice, and VectorPlatformDevice. The BitmapPlatformDevice and VectorPlatformDevice classes now inherit directly from SkDevice, or SkPDFDevice, as appropriate. PlatformDevice helper functions access the PlatformDevice interface attached to a SkDevice via meta-data on the SkDevice. BUG=none TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=98230 Review URL: http://codereview.chromium.org/7633040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98585 0039d316-1c4b-4281-b951-d872f2087c98
* Printing Backend: Check the results from a DocumentProperties() call.thestig@chromium.org2011-08-251-2/+3
| | | | | | | | | BUG=94138 TEST=Print preview works again on vandebo's machine. Review URL: http://codereview.chromium.org/7741003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98330 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 98230 - CL removing inheritance of SkDevice from PlatformDevice. twiz@chromium.org2011-08-251-4/+7
| | | | | | | | | | | | | | | PlatformDevice is now a base interface, which is implemented by the various flavours of BitmapPlatformDevice, and VectorPlatformDevice. The BitmapPlatformDevice and VectorPlatformDevice classes now inherit directly from SkDevice, or SkPDFDevice, as appropriate. PlatformDevice helper functions access the PlatformDevice interface attached to a SkDevice via meta-data on the SkDevice. BUG=none TEST=none Review URL: http://codereview.chromium.org/7633040 TBR=twiz@chromium.org,jbates@chromium.org, dpolukhin@chromium.org, sanjeevr@chromium.org Review URL: http://codereview.chromium.org/7754001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98233 0039d316-1c4b-4281-b951-d872f2087c98
* CL removing inheritance of SkDevice from PlatformDevice. twiz@chromium.org2011-08-251-7/+4
| | | | | | | | | | | | PlatformDevice is now a base interface, which is implemented by the various flavours of BitmapPlatformDevice, and VectorPlatformDevice. The BitmapPlatformDevice and VectorPlatformDevice classes now inherit directly from SkDevice, or SkPDFDevice, as appropriate. PlatformDevice helper functions access the PlatformDevice interface attached to a SkDevice via meta-data on the SkDevice. BUG=none TEST=none Review URL: http://codereview.chromium.org/7633040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98230 0039d316-1c4b-4281-b951-d872f2087c98
* Backend changes for custom margins.aayushkumar@chromium.org2011-08-234-0/+58
| | | | | | | | | | | | The UI for margin options are hidden by default. BUG=69337 TEST= There is currently minimal UI for testing this. The custom margins option does nothing. You can however click the no margins option to see the page print without margins. Review URL: http://codereview.chromium.org/7552033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97901 0039d316-1c4b-4281-b951-d872f2087c98
* Print Preview: Go from event driven print preview back to print preview with ↵thestig@chromium.org2011-08-232-4/+5
| | | | | | | | | | sync messages. The sync messages now go to the IO thread to avoid the potential deadlock on Windows. BUG=91057, and probably a few more. TEST=included. Review URL: http://codereview.chromium.org/7621087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97820 0039d316-1c4b-4281-b951-d872f2087c98
* PrintPreview: Initialize header footer member variables in |PrintSettings| ↵kmadhusu@chromium.org2011-08-231-0/+8
| | | | | | | | | | | class. BUG=none TEST=none Review URL: http://codereview.chromium.org/7713027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97787 0039d316-1c4b-4281-b951-d872f2087c98
* Added Headers and Footers support for Core Graphics on Macaayushkumar@chromium.org2011-08-192-0/+5
| | | | | | | | | BUG=67514 TEST=In the preview tab, note added options for printing headers and footers. Toggle with the checkbox and ensure that the correct headers and footers are displayed. Review URL: http://codereview.chromium.org/7544006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97501 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 4)thestig@chromium.org2011-08-181-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7670016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97286 0039d316-1c4b-4281-b951-d872f2087c98
* Added Header and Footer support in Linux, Windows and Mac for Skiaaayushkumar@chromium.org2011-08-1716-13/+225
| | | | | | | | | | | | BUG=67514 TEST= In the preview tab, note added options for printing headers and footers. Toggle with the checkbox and ensure that the correct headers and footers are displayed. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=97219 Review URL: http://codereview.chromium.org/7348010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97233 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 97219 - Added Header and Footer support in Linux, Windows and Mac for ↵aayushkumar@chromium.org2011-08-1716-225/+13
| | | | | | | | | | | | | | | Skia BUG=67514 TEST= In the preview tab, note added options for printing headers and footers. Toggle with the checkbox and ensure that the correct headers and footers are displayed. Review URL: http://codereview.chromium.org/7348010 TBR=aayushkumar@chromium.org Review URL: http://codereview.chromium.org/7670045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97226 0039d316-1c4b-4281-b951-d872f2087c98
* Added Header and Footer support in Linux, Windows and Mac for Skiaaayushkumar@chromium.org2011-08-1716-13/+225
| | | | | | | | | | BUG=67514 TEST= In the preview tab, note added options for printing headers and footers. Toggle with the checkbox and ensure that the correct headers and footers are displayed. Review URL: http://codereview.chromium.org/7348010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97219 0039d316-1c4b-4281-b951-d872f2087c98
* cups-helper: split on newlines in cups helperevan@chromium.org2011-08-151-1/+1
| | | | | | | | | | | | | We want to split on both spaces and newlines, not just spaces, for the case when cups-config does have proper output. Speculative fix for the bug, untested on a system it affects. BUG=92772 Review URL: http://codereview.chromium.org/7647025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96811 0039d316-1c4b-4281-b951-d872f2087c98
* cups: parse cups-config output to reduce flags spewevan@chromium.org2011-08-122-1/+59
| | | | | | | | | | On both Lucid and Natty, cups-config --libs includes cflags and other unneeded output. Parse the cups-config output to emit only the relevant subsets of flags. Review URL: http://codereview.chromium.org/7633022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96635 0039d316-1c4b-4281-b951-d872f2087c98
* Print Preview: Fixing behavior of event listeners.dpapad@chromium.org2011-08-122-0/+4
| | | | | | | | | | | | | | | Now that pending preview requests are being canceled when a new request is issued, the event listeners of the printing controls should not check for |hasPendingPreviewRequest| before issuing new requests, instead they should immediately request a new preview so that the previous one is canceled. Also all functions that are associated with a specific print request should get the requestID as a parameter, in order to ignore obsolete responses. I found out that when the print preview tab is reloaded, responses from requests before the reload are reaching the ui code. If reloading the preview tab repeatedly all these request have id=0 and are not being ignored as they should. Therefore I changed the id of the initial request to have a random variable. BUG=91556, 91769 TEST=See bug description Review URL: http://codereview.chromium.org/7550022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96634 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 96567 - Reland 96406 - Print preview page selection should not ↵kmadhusu@chromium.org2011-08-122-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | require a rerendering of draft pages. On page selection, regenerate the complete document with the selection, but preserve the existing draft pages and simply display a subset of them. 1. Added a new param |clear all preview data| to |PrintHostMsg_DidGetPreviewPageCount|. 2. Removed |requested_preview_page_index| from |PrintMsg_ContinuePreview| Review URL: http://codereview.chromium.org/7544018 Original Commit: http://src.chromium.org/viewvc/chrome?view=rev&revision=96406 Revert Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96414 BUG=84383 TEST=print preview works after code changes. Review URL: http://codereview.chromium.org/7628019 TBR=kmadhusu@chromium.org Review URL: http://codereview.chromium.org/7639023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96581 0039d316-1c4b-4281-b951-d872f2087c98
* Reland 96406 - Print preview page selection should not require a rerendering ↵kmadhusu@chromium.org2011-08-122-0/+4
| | | | | | | | | | | | | | | | | | | | | | of draft pages. On page selection, regenerate the complete document with the selection, but preserve the existing draft pages and simply display a subset of them. 1. Added a new param |clear all preview data| to |PrintHostMsg_DidGetPreviewPageCount|. 2. Removed |requested_preview_page_index| from |PrintMsg_ContinuePreview| Review URL: http://codereview.chromium.org/7544018 Original Commit: http://src.chromium.org/viewvc/chrome?view=rev&revision=96406 Revert Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96414 BUG=84383 TEST=print preview works after code changes. Review URL: http://codereview.chromium.org/7628019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96567 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 96406 - Print preview page selection should not require a rerendering ↵kmadhusu@chromium.org2011-08-112-4/+0
| | | | | | | | | | | | | | | | | | | of draft pages. On page selection, regenerate the complete document with the selection, but preserve the existing draft pages and simply display a subset of them. 1. Added a new param |clear all preview data| to |PrintHostMsg_DidGetPreviewPageCount|. 2. Removed |requested_preview_page_index| from |PrintMsg_ContinuePreview| BUG=84383 TEST=print preview works after code changes. Review URL: http://codereview.chromium.org/7544018 TBR=kmadhusu@chromium.org Review URL: http://codereview.chromium.org/7618014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96414 0039d316-1c4b-4281-b951-d872f2087c98
* Print preview page selection should not require a rerendering of draft pages.kmadhusu@chromium.org2011-08-112-0/+4
| | | | | | | | | | | | | | On page selection, regenerate the complete document with the selection, but preserve the existing draft pages and simply display a subset of them. 1. Added a new param |clear all preview data| to |PrintHostMsg_DidGetPreviewPageCount|. 2. Removed |requested_preview_page_index| from |PrintMsg_ContinuePreview| BUG=84383 TEST=print preview works after code changes. Review URL: http://codereview.chromium.org/7544018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96406 0039d316-1c4b-4281-b951-d872f2087c98
* Printing: Remove unused PageOverlay since header/footers are drawn in ↵thestig@chromium.org2011-08-0912-637/+2
| | | | | | | | | | | PrintWebViewHelper. BUG=none TEST=none Review URL: http://codereview.chromium.org/7585015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95951 0039d316-1c4b-4281-b951-d872f2087c98
* CUPS printing: Do not add scanners to the printer list.thestig@chromium.org2011-08-091-4/+24
| | | | | | | | | BUG=91755 TEST=see bug Review URL: http://codereview.chromium.org/7569028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95949 0039d316-1c4b-4281-b951-d872f2087c98
* PrintPreview: Remove |page_number| from StartPageForVectorCanvas function ↵kmadhusu@chromium.org2011-08-029-28/+20
| | | | | | | | | | | | | and |page_slot| from PrintMsg_PrintPage_Params. We will not add preview pages to the complete metafile in out of order fashion. BUG=none TEST=print preview works after code changes. Review URL: http://codereview.chromium.org/7549001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95092 0039d316-1c4b-4281-b951-d872f2087c98
* Added SetDraftMode() and GetDraftMode() functions to |MetafileSkiaWrapper| ↵kmadhusu@chromium.org2011-08-022-1/+21
| | | | | | | | | | | | class. BUG=none TEST=none Review URL: http://codereview.chromium.org/7537042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95033 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug in which the margin sizes vary (depending on the scale factor) ↵aayushkumar@chromium.org2011-07-261-3/+3
| | | | | | | | | | | | while printing on the mac. BUG=none TEST=Ensure that the margin sizes while printing are consistent across different web pages on mac. Review URL: http://codereview.chromium.org/7471052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94144 0039d316-1c4b-4281-b951-d872f2087c98
* PrintPreview: backend changes to support pipelining.vandebo@chromium.org2011-07-262-0/+10
| | | | | | | | | | | | | Previous review comments: http://codereview.chromium.org/7395016/ http://codereview.chromium.org/7210042/ BUG=88762 TEST=NONE Review URL: http://codereview.chromium.org/7495003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94066 0039d316-1c4b-4281-b951-d872f2087c98
* Make Metafile::StartPageForVectorCanvas take the page number as an argument.vandebo@chromium.org2011-07-239-25/+30
| | | | | | | | | | | | | This will let us add pages to a metafile out of order for print preview. Also, make PdfMetafileSkia::GetMetafileForCurrentPage use draft mode, now that it's available. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/7481019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93763 0039d316-1c4b-4281-b951-d872f2087c98
* Fix issues with cloud printers only getting first page of a doc in print ↵abodenha@chromium.org2011-07-233-3/+17
| | | | | | | | | | | | | | | | | | preview. Restructures settings handling code to share more code with the traditional print path. Modifies backends to treat cloud printers the same as printing to PDF. This change also (incidently) causes parsing of page ranges to work correctly. BUG=http://code.google.com/p/chromium-os/issues/detail?id=16082 TEST=Load print preview dialog with cloud print enabled on a document with multiple pages. All pages should appear in the preview when a GCP printer is selected. Review URL: http://codereview.chromium.org/7490001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93750 0039d316-1c4b-4281-b951-d872f2087c98
* roll skia to 1919reed@google.com2011-07-211-2/+2
| | | | | | Review URL: http://codereview.chromium.org/7459008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93394 0039d316-1c4b-4281-b951-d872f2087c98
* some cleanup for base/stl_utildilmah@chromium.org2011-07-191-2/+3
| | | | | | | | | | | | | removed unused/irrelevant functions removed irrelevant comments Moved stl_util-inl.h => stl_util.h BUG=None TEST=None Review URL: http://codereview.chromium.org/7342047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93110 0039d316-1c4b-4281-b951-d872f2087c98
* base: Put md5.* into base namespace.tfarina@chromium.org2011-07-181-2/+2
| | | | | | | | | | | BUG=89274 TEST=None R=evan@chromium.org Review URL: http://codereview.chromium.org/7395021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92861 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce ui.dll / libui.so for the component build.darin@chromium.org2011-07-171-1/+1
| | | | | | | R=ben@chromium.org Review URL: http://codereview.chromium.org/7328011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92819 0039d316-1c4b-4281-b951-d872f2087c98
* Print Preview: Associating preview requests and responses using an identifierdpapad@chromium.org2011-07-132-0/+4
| | | | | | | | | | BUG=88807, 89106 TEST=NONE Review URL: http://codereview.chromium.org/7313035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92402 0039d316-1c4b-4281-b951-d872f2087c98