summaryrefslogtreecommitdiffstats
path: root/chrome/browser
Commit message (Collapse)AuthorAgeFilesLines
* Remove dependency on SingleThreadedProxyResolver from ↵eroman@chromium.org2009-08-061-278/+130
| | | | | | | | | | | | | | resolve_proxy_msg_helper_unittest.cc. Extracts MockAsyncProxyResolver to "mock_proxy_resolver.h". This should be the last unittest that needs cleanup post r21631. BUG=http://crbug.com/11079 Review URL: http://codereview.chromium.org/160619 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22591 0039d316-1c4b-4281-b951-d872f2087c98
* Don't show themes in extension config UI. This fixes various bugsaa@chromium.org2009-08-063-22/+6
| | | | | | | | | | | | | | | | where the extension config UI doesn't work right with themes. This isn't ideal because users go to chrome://extensions/ expecting themes to be listed. If they aren't there, users might be confused. But I don't have an alternate solution. Also, this change removes the error listing from the top of chrome://extensions/. These errors are just getting noisy, I don't think they provide much value. BUG=13649,18456 Review URL: http://codereview.chromium.org/160631 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22578 0039d316-1c4b-4281-b951-d872f2087c98
* Don't run the SetProxyConfig task on the UI thread as it causes a bunch of ↵ananta@chromium.org2009-08-061-14/+2
| | | | | | | | | | DCHECKS to fire in the ProxyConfigService objects. Review URL: http://codereview.chromium.org/164013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22577 0039d316-1c4b-4281-b951-d872f2087c98
* Icon loader: respect delegate's response to NotifyDelegate call (false means ↵estade@chromium.org2009-08-061-2/+2
| | | | | | | | the delegate doesn't assume ownership). Review URL: http://codereview.chromium.org/164038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22575 0039d316-1c4b-4281-b951-d872f2087c98
* NNTP: Fix window tooltip so that it is not shown out of place.arv@google.com2009-08-061-11/+15
| | | | | | | | | | | BUG=18529 TEST=The bug is hard to reproduce but it involved moving the mouse fast over the link. Review URL: http://codereview.chromium.org/164012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22567 0039d316-1c4b-4281-b951-d872f2087c98
* NNTP: Minor tweak to make the Google chrome logo line up better.arv@google.com2009-08-061-1/+1
| | | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/165010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22566 0039d316-1c4b-4281-b951-d872f2087c98
* Bunch of Coverity fixes, rather minor severity.phajdan.jr@chromium.org2009-08-0620-28/+33
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/159862 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22559 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug where a download isn't canceled when the user requests it.paul@chromium.org2009-08-052-7/+21
| | | | | | | | | | | | | | | This particular bug only occurs when the user is prompted via save file dialog and then chooses cancel. In this case, the file selection code path for canceling was not the same as regular cancel case, so the network requests continued. BUG=18160 TEST=When prompted to save a download, choose cancel and notice that there is no further network traffic due to that download. Review URL: http://codereview.chromium.org/160627 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22557 0039d316-1c4b-4281-b951-d872f2087c98
* Safari Bookmark/Favicon import.jeremy@chromium.org2009-08-055-89/+344
| | | | | | Review URL: http://codereview.chromium.org/159750 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22556 0039d316-1c4b-4281-b951-d872f2087c98
* Fix include path for header file to fix sync build.tim@chromium.org2009-08-051-1/+1
| | | | | | | I'll hold off committing until Idan lets me know I didn't butcher anything else, too :) Review URL: http://codereview.chromium.org/165004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22546 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Fancy html5 draggy stuff.estade@chromium.org2009-08-052-60/+157
| | | | | | | | | | | | | | | | | | | | | Also, don't crash in release mode when the tab contents is deleted during a drag. 1) Source side: when the tab contents is going down, abort the current drag (if any). Initiate drags on a GtkInvisible (matching firefox, among other programs I assume). This lets us give up ownership of the drag widget and let the drag unwind. 2) Destination side: make a seemingly harmless GTK assert point to a crbug bug. This warrants further investigation. BUG=16249 TEST=drag around ntp thumbnails BUG=18557 In release mode, you should be able to do all the following without crashing or getting any asserts besides the two mentioned in 18557 TEST=drag something from gedit over a tab that closes TEST=drag something from the render view over a tab that closes TEST=drag something from the render view off of the browser from within a tab that closes TEST=repeat all the above with a tab that is being swapped out according to the repro steps in bug 16073 Review URL: http://codereview.chromium.org/159889 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22542 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 22517.rohitrao@chromium.org2009-08-0522-468/+426
| | | | | | Review URL: http://codereview.chromium.org/165001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22541 0039d316-1c4b-4281-b951-d872f2087c98
* Ensure that we never call into WebCore::Page static methods when Page ↵dglazkov@chromium.org2009-08-058-1/+22
| | | | | | | | | | | | | | | | constructor hasn't been called. This is a top crash for Mac right now. The crash occurs because the static table of all pages in the renderer is initialized in WebCore:: Page constructor, and if we attempt to access this table before the Page was created (i.e. before WebView::Create is called), we get into a crashy situation. I am really not sure how to reproduce this, but I can defend against the situation. BUG=17555 R=darin TEST=unable to repro, speculative fix. Review URL: http://codereview.chromium.org/159887 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22540 0039d316-1c4b-4281-b951-d872f2087c98
* Draw the theme overlay. I hadn't implemented this previously becausetc@google.com2009-08-051-7/+7
| | | | | | | | | | | | I didn't have an example theme that does this. TEST=Install the Folders theme from the theme gallery and you should see a paperclip and some paper in the theme. Review URL: http://codereview.chromium.org/165002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22539 0039d316-1c4b-4281-b951-d872f2087c98
* Add the anti-clockwise waiting throbber to app mode/popup windows.tc@google.com2009-08-053-24/+49
| | | | | | | | | BUG=18181 Review URL: http://codereview.chromium.org/160653 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22537 0039d316-1c4b-4281-b951-d872f2087c98
* Implement TabContentsViewMac::SizeContents(), so that the TabContentsViewjaphet@chromium.org2009-08-051-2/+5
| | | | | | | | | | | | gets sized properly on creation. BUG=619 BUG=15960 TEST=none Review URL: http://codereview.chromium.org/162016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22531 0039d316-1c4b-4281-b951-d872f2087c98
* Use a font size of 9pt in the tab titles. This is a bittc@google.com2009-08-051-5/+7
| | | | | | | | | | | bigger than before. This matches the font size used in Windows (the heights are the same), but on Linux, the text render a bit wider. BUG=17866 Review URL: http://codereview.chromium.org/160663 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22525 0039d316-1c4b-4281-b951-d872f2087c98
* extensions: clean up some code I saw while tracking down a bugevan@chromium.org2009-08-051-4/+3
| | | | | | | | The bug was already fixed, but this change shouldn't hurt too. Review URL: http://codereview.chromium.org/162020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22524 0039d316-1c4b-4281-b951-d872f2087c98
* linux: always show bookmarks bar on NTPevan@chromium.org2009-08-051-1/+1
| | | | | | | | BUG=16825 Review URL: http://codereview.chromium.org/159897 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22523 0039d316-1c4b-4281-b951-d872f2087c98
* Original change by Min-Yu Huang <minyu.huang@gmail.com> intc@google.com2009-08-053-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://codereview.chromium.org/160347 This is the very preliminary implementation to support printing on Linux and it has not been finished yet. For each page to be printed, we convert rendering actions on canvas into cairo APIs and generate a PS/PDF file. chrome/chrome.gyp: Include our newly added and renamed files. chrome/browser/browser.h: chrome/browser/browser.cc: Allow the user print the web page by hitting ctrl-p. chrome/browser/gtk/standard_menus.cc: Show "Print" in the menu. chrome/renderer/print_web_view_helper.cc: chrome/renderer/print_web_view_helper.h: chrome/renderer/print_web_view_helper_mac.cc chrome/renderer/print_web_view_helper_win.cc Move the class PrepareFrameAndViewForPrint to the header file and move platform dependent parts to their corresponding files. chrome/renderer/print_web_view_helper_linux.cc: Hard-coded parameters for printing. Only print the first page now. skia/ext/vector_canvas.cc: skia/ext/vector_canvas.h: skia/ext/vector_canvas_linux.cc: skia/ext/vector_canvas_win.cc: Move platform dependent parts to their corresponding files. skia/ext/vector_platform_device.h: skia/ext/vector_platform_device_linux.cc: skia/ext/vector_platform_device_linux.h We translate skia APIs into Cairo APIs here. A PDF file is also created and saved to the disk at this moment for testing purpose (you have to run chrome without the sandbox to save the file). There are still lots of bugs. skia/skia.gyp: Include our newly added files when compiling skia package on Linux. BUG=9847 Review URL: http://codereview.chromium.org/160673 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22522 0039d316-1c4b-4281-b951-d872f2087c98
* Add the sync files to chrome.gyp. They still don't result in anything ↵tim@chromium.org2009-08-052-2/+2
| | | | | | | | | | | | building because the files are wrapped in #ifdef CHROME_PERSONALIZATION which is not defined anywhere at the moment. Add live_sync to chrome\test and corresponding target to chrome.gyp Review URL: http://codereview.chromium.org/159902 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22521 0039d316-1c4b-4281-b951-d872f2087c98
* Rewrites the Mac view resizing logic to have the BrowserWindowControllerrohitrao@chromium.org2009-08-0522-426/+468
| | | | | | | | | | | | | | | | | | | directly resize and relayout its children views. Now when a view needs to be resized, it asks its resize delegate (typically its controller's parent) to perform the resize. BUG=http://crbug.com/17619 TEST=Make sure that views are laid out correctly, even when they change size. Open and close the bookmark bar. Trigger an infobar and then close it. Trigger the download shelf and then close it. Trigger a download shelf with the infobar open, or with the bookmark bar open. Switch to and from fullscreen with various bars open. Resize the browser window with various bars open. Start the browser with and without the bookmark bar open. Try all of the above in a popup window. Review URL: http://codereview.chromium.org/159776 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22517 0039d316-1c4b-4281-b951-d872f2087c98
* Add some spacing to titlebar buttons.estade@chromium.org2009-08-053-18/+52
| | | | | | Review URL: http://codereview.chromium.org/160593 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22515 0039d316-1c4b-4281-b951-d872f2087c98
* Adds a unit test for coverage of bug 15786.sky@chromium.org2009-08-051-1/+6
| | | | | | | | | BUG=15786 TEST=this is just a test change. Review URL: http://codereview.chromium.org/160651 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22514 0039d316-1c4b-4281-b951-d872f2087c98
* linux: rearrange widget layout in importer dialogevan@chromium.org2009-08-054-58/+55
| | | | | | | | | I'm not especially happy with how it looks now, though I think it's better than before. Review URL: http://codereview.chromium.org/160661 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22512 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up SavePage UI test, remove dead code.phajdan.jr@chromium.org2009-08-051-21/+2
| | | | | | | | | | | As most of the tests moved to the browser test, this is now unneeded. TEST=none BUG=none Review URL: http://codereview.chromium.org/160666 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22511 0039d316-1c4b-4281-b951-d872f2087c98
* Removes notification observers at the end of each CustomHomePagesModel unittest.rohitrao@chromium.org2009-08-051-0/+5
| | | | | | | | | | This gets rid of some scary warnings and may also fix a flaky test. BUG=http://crbug.com/17452 TEST=None Review URL: http://codereview.chromium.org/160643 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22501 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 22478.avi@chromium.org2009-08-0511-506/+5
| | | | | | | TBR=jar Review URL: http://codereview.chromium.org/160660 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22499 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: preload ffmpeg in the zygote.agl@chromium.org2009-08-052-0/+8
| | | | | | | | | | | | | | | | | | When using the sandbox, the renderer cannot load the ffmpeg shared objects from disk. So we load them in the zygote before the sandbox is started. (Note that this doesn't get media working, but it's a start.) BUG=18329 http://codereview.chromium.org/159841 (Note: relanding. Original landing in r22392, reverted in r22405 due to check-deps failure.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22492 0039d316-1c4b-4281-b951-d872f2087c98
* On bookmark edit, the OK button is now disabled if the entered URL isjrg@chromium.org2009-08-053-12/+61
| | | | | | | | | | | | | | | | | | invalid (e.g. is the empty string). The Cancel button is never disabled. BUG=http://crbug.com/17006 TEST=Right click on a bookmark button to edit it. Make sure OK is enabled. Set URL to "" (the empty string). Make sure OK is DISabled. Set URL to "x". Make sure OK is enabled. Review URL: http://codereview.chromium.org/160628 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22490 0039d316-1c4b-4281-b951-d872f2087c98
* Quick 'low-risk-for-the-next-release' fix to increase theme install/load ↵glen@chromium.org2009-08-051-1/+1
| | | | | | | | | | | perf (should be a 2-4x speedup). Bug should remain open until a better approach (background threads, perhaps) is used. BUG=17696 TEST=none Review URL: http://codereview.chromium.org/159903 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22487 0039d316-1c4b-4281-b951-d872f2087c98
* Add the WS_CLIPCHILDREN style to the external tab container window to ↵robertshield@chromium.org2009-08-051-1/+1
| | | | | | | | prevent massive visual flickering during resize. Review URL: http://codereview.chromium.org/160646 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22486 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a DCHECK hit inside the bookmark matching code.evan@chromium.org2009-08-051-9/+10
| | | | | | | | | | | | | | We do bookmark matching in two passes: first, a quick search for all the words, then a second filtering pass that obeys query syntax. We were hitting a DCHECK when the second pass would filter any matches out. For example, the query ["thi"] matches a bookmark [think], but it shouldn't match because quotes mean literal match. BUG=15786 Review URL: http://codereview.chromium.org/159905 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22485 0039d316-1c4b-4281-b951-d872f2087c98
* Implement back/forward toolbar menus on Mac (bug 13203).avi@chromium.org2009-08-0511-5/+506
| | | | | | | | | | | | | | | | | | | | | | | Note: The drop-down menu is actually a drag-down (activating on click-hold or on drag), working much like Safari's (and other Apple apps, such as Dictionary). This can be changed to a pop-down if that's what's desired. [The previously included fix to bug 17990 has been split off to CL 159864.] TODO: Show keyboard shortcut for "Show Full History". Patch by viettrungluu. BUG=http://crbug.com/13203 TEST=Navigate around, check out and use the menus; do so in multiple tabs and windows. Review URL: http://codereview.chromium.org/160496 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22478 0039d316-1c4b-4281-b951-d872f2087c98
* Another try to make Valgrind errors go away without figuring out how to do a ↵jorlow@chromium.org2009-08-051-0/+6
| | | | | | | | | | | suppression. TBR=darin TEST=none BUG=none Review URL: http://codereview.chromium.org/159909 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22470 0039d316-1c4b-4281-b951-d872f2087c98
* Temporarily disable DOM Storage tests since they are exposingjorlow@chromium.org2009-08-051-3/+3
| | | | | | | | | | | | | memory leaks in valgrind. DOM Storage is behind a flag, so it's ok to hide the symptoms until the problem can be solved. TBR=darin TEST=none BUG=none Review URL: http://codereview.chromium.org/159908 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22468 0039d316-1c4b-4281-b951-d872f2087c98
* Run the DOM Storage layout tests in the UI test framework since the test ↵jorlow@chromium.org2009-08-052-1/+75
| | | | | | | | | | | | | | | shell doesn't hit very much of the new code. I still plan to write unit tests and we're still goign to enable the layout tests in test shell, but this is still a good way for us to test the full stack ASAP. Workers has used this technique for a while now. This CL factors out the layout test running code from the workers ui test and moves arounds directories a bit so not everything is in the "workers" directory. Doing this via a v8 extension is the right way to go long term, but I ran into a couple snags, so I think this is a good first step. TEST=none BUG=none Review URL: http://codereview.chromium.org/159720 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22466 0039d316-1c4b-4281-b951-d872f2087c98
* Use the theme ID as as the cache-buster, making subsequent NNTP loads much ↵glen@chromium.org2009-08-051-2/+3
| | | | | | | | | | | faster. BUG=18427 TEST=Install a few themes, verify that the NNTP never gets out of sync with the installed theme. Review URL: http://codereview.chromium.org/159900 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22462 0039d316-1c4b-4281-b951-d872f2087c98
* Make the DOMUIThemeSource load and pass through a PNG, rather than relying ↵glen@chromium.org2009-08-054-24/+37
| | | | | | | | | | | on decode/encode. BUG=18427 TEST=Install a giant theme, load the NNTP, verify that you can type in the omnibox without delay while the page is loading. Review URL: http://codereview.chromium.org/159891 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22457 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: forward --log-level from the browser to the zygote.mdm@chromium.org2009-08-051-0/+13
| | | | | | | | | BUG=none TEST=pass --log-level=0 on startup, the setting will now be used in the renderers Review URL: http://codereview.chromium.org/159881 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22455 0039d316-1c4b-4281-b951-d872f2087c98
* Add files to browser/sync and tweak includes.tim@chromium.org2009-08-0543-21/+8316
| | | | | | | | | | | | | Create browser/sync/glue and /engine. Create sync watchlist and add a few folks. No GYP change here so no build changes should occur. chrome.gyp CL is coming shortly, as well as live_sync tests. Review URL: http://codereview.chromium.org/160598 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22454 0039d316-1c4b-4281-b951-d872f2087c98
* This CL is doing a bunch of Misc work to make LocalStorage data persist.jorlow@chromium.org2009-08-055-18/+36
| | | | | | | | | | | | | | | | | | | First of all, this allows WebKit clients to specify whether or not the VFS should be used. In the browser process, we never want it to be. Next, this allows WebKit clients to specify the behavior of WebKit's FileSystem code. By default, they should all be NOT_REACHED(). The browser process implements the two of these I need for LocalStorage, but it'll be really easy for the rest to be implemented as needed. Next, this adds a function that storage routines can call to ensure that lazily initialized stuff that must be initialized on the main WebKit thread is initialized. Right now, this is just used to initialize the UTF8 conversion tables, but I'm sure there'll be more overt time. Lastly, this uses the profile directory stored by webkit_context_ to derive the path LocalStorage should use. This CL also cleans up a few minor style issues as it goes. TEST=none BUG=4360 Review URL: http://codereview.chromium.org/159778 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22452 0039d316-1c4b-4281-b951-d872f2087c98
* Undo my bonehead mistake of checking in a modification to theaa@chromium.org2009-08-051-6/+0
| | | | | | | | hardcoded theme gallery URL. Review URL: http://codereview.chromium.org/159888 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22448 0039d316-1c4b-4281-b951-d872f2087c98
* Unpack extensions in-process in --single-process mode.mpcomplete@chromium.org2009-08-041-1/+3
| | | | | | | | | TEST=no BUG=no Review URL: http://codereview.chromium.org/159833 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22447 0039d316-1c4b-4281-b951-d872f2087c98
* linux: yet more polish for the new toolbar graphicsevan@chromium.org2009-08-041-2/+9
| | | | | | Review URL: http://codereview.chromium.org/159885 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22444 0039d316-1c4b-4281-b951-d872f2087c98
* Make extensions in the extension shelf render their content to a visible GTKphajdan.jr@chromium.org2009-08-044-16/+24
| | | | | | | | | | | widget. TEST=none http://crbug.com/16759 Review URL: http://codereview.chromium.org/160610 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22439 0039d316-1c4b-4281-b951-d872f2087c98
* GTK Theme: Fix location bar display on popup windows.erg@google.com2009-08-041-3/+5
| | | | | | Review URL: http://codereview.chromium.org/159879 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22437 0039d316-1c4b-4281-b951-d872f2087c98
* Better match IE's proxy settings.ericroman@google.com2009-08-041-1/+5
| | | | | | | | | | | | | | | | * When BOTH autodetect and custom PAC script are given, try both. * Use successful PAC parsing as the heuristic for determining when a script is valid (rather than first-request). * Only apply the proxy bypass list when using non-PAC. The high level explanation on how this works: http://sites.google.com/a/chromium.org/dev/developers/design-documents/proxy-settings-fallback BUG= http://crbug.com/18271, http://crbug.com/9985 TEST=unit tests. Review URL: http://codereview.chromium.org/160510 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22430 0039d316-1c4b-4281-b951-d872f2087c98
* NNTP: Update the position of the option menu.arv@google.com2009-08-041-3/+3
| | | | | | | | | | | | I forgot this one in issue 159817 BUG=17944 TEST=Open the option menu. It should be placed just below the button. Review URL: http://codereview.chromium.org/160606 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22428 0039d316-1c4b-4281-b951-d872f2087c98
* posix: remove unused ie7_logins database tableevan@chromium.org2009-08-041-1/+8
| | | | | | | | | | This will remain in existing users' profiles, but whatever. BUG=17268 Review URL: http://codereview.chromium.org/159870 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22425 0039d316-1c4b-4281-b951-d872f2087c98