summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
Commit message (Collapse)AuthorAgeFilesLines
* Replace a bunch of hardcoded URLs with constants from url_constants.hbrettw@chromium.org2009-09-152-4/+5
| | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/193092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26263 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds a test to insure we are not regressing on http://crbug.com/19941jcampan@chromium.org2009-09-151-0/+4
| | | | | | | | | | | We would crash when an SSL error would happen on a page with no navigation entry. TEST=Run the test. BUG=http://crbug.com/19941 Review URL: http://codereview.chromium.org/196115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26224 0039d316-1c4b-4281-b951-d872f2087c98
* mac: drop NOTIMPLEMENTED in GotFocus()avi@chromium.org2009-09-152-2/+3
| | | | | | | | | | | See http://codereview.chromium.org/194109 for details. BUG=none TEST=none Review URL: http://codereview.chromium.org/196122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26220 0039d316-1c4b-4281-b951-d872f2087c98
* linux: drop NOTIMPLEMENTED in GotFocus()evan@chromium.org2009-09-151-1/+2
| | | | | | | | Leftover cruft. Review URL: http://codereview.chromium.org/194109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26187 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for bug 2932: Chrome should not trigger page reloading when turn off ↵jshin@chromium.org2009-09-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auto detect In order to fix the bug I added new interfaces to allow resetting the override encoding (including a new render message). The new logic is as follows: -) If the user turns auto-detect OFF, nothing happens (as requested in the bug description) -) If the user turns auto-detect ON, then the page is reloaded with an empty override encoding I.e., turning auto-detect on resets a previous override setting. The reverse is not true, however: specifiying a new override setting will not turn auto-detect off. BUG=2932 TEST=do the following steps, using the test file (encoding-gb18030.htm) attached to comment 14 of the original bug http://crbug.com/2932 : 1.) load the file while auto-detect is turned off -> garbage is displayed 2.) turn auto-detect on -> proper Chinese text should appear -> in the encoding menu, Chinese encoding should be highlighted 3.) turn auto-detect off -> proper Chinese text should remain -> in the encoding menu, Chinese encoding should remain highlighted 4.) choose any other encoding -> garbage is again displayed (in the new encoding) 5.) turn auto-detect on -> proper Chinese text should again appear -> in the encoding menu, Chinese should again be highlighted Original Review: http://codereview.chromium.org/173265 Patch by Roland Steiner (rolandsteiner@google.com) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26168 0039d316-1c4b-4281-b951-d872f2087c98
* linux: enable plugins by defaultevan@chromium.org2009-09-141-6/+0
| | | | | | | | This is long overdue. Review URL: http://codereview.chromium.org/193100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26129 0039d316-1c4b-4281-b951-d872f2087c98
* Try to fix build.thakis@chromium.org2009-09-122-0/+4
| | | | | | | TBR=pinkerton git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26076 0039d316-1c4b-4281-b951-d872f2087c98
* Let cmd-e write the selection into the find pasteboard.thakis@chromium.org2009-09-123-0/+9
| | | | | | | | | | | Note that chrome still does not support _reading_ from the find pasteboard, so hitting cmd-e followed by cmd-g in chrome still doesn't work. Also, cmd-f doesn't write to the find pasteboard yet either. BUG=14562 TEST=Select some text on a web page, hit cmd-e, go to the same web page in safari, hit cmd-g. Safari should search for the text you selected in chrome. Review URL: http://codereview.chromium.org/197035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26075 0039d316-1c4b-4281-b951-d872f2087c98
* First cut at implementation of FindBar for views / gtkdavemoore@chromium.org2009-09-092-2/+2
| | | | | | | Also had to implement change notification for TextField on views / gtk Review URL: http://codereview.chromium.org/200035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25819 0039d316-1c4b-4281-b951-d872f2087c98
* Adds support for the os x spelling panel to chromium. Users canpinkerton@chromium.org2009-09-091-0/+14
| | | | | | | | | | | now access it from the main menu and context menu and use it to perform spelling tasks. For more detail, see http://code.google.com/p/chromium/wiki/SpellingPanelPlanningDoc Patch from pwicks86@gmail.com (Paul Wicks). BUG=None TEST=The spelling panel should work in os x. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25786 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unused ATL headers.jhawkins@chromium.org2009-09-091-6/+0
| | | | | | | | BUG=5027 TEST=none Review URL: http://codereview.chromium.org/194051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25761 0039d316-1c4b-4281-b951-d872f2087c98
* Plumb the DragOperation through all the layers between the platform ↵snej@chromium.org2009-09-087-35/+84
| | | | | | | | | | | | | Drag-n-drop code and WebCore. This allows the HTML5 DataTransfer effectAllowed and dropEffect properties to be set correctly in JS handlers, as per the HTML5 spec. (The drag-dropeffect test isn't in WebKit yet -- it's part of a separate WebKit patch that's been in review for weeks.) R=darin,pink BUG=http://code.google.com/p/chromium/issues/detail?id=14654, http://code.google.com/p/chromium/issues/detail?id=20985 TEST=LayoutTests/fast/events/drag-dropeffect.html, LayoutTests/editing/pasteboard/files-during-page-drags.html Review URL: http://codereview.chromium.org/174364 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25629 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome side of the fix for http://b/issue?id=1694574, which is a bug caused ↵ananta@chromium.org2009-09-061-0/+5
| | | | | | | | | | | | | | | | | | | when a new automation client instance is launched and attempts to attach to an existing external tab. An example of where this could happen is javascript on a page attempting a window.open with target _blank. In this case the Chrome browser creates a TabContents instance which is attached to an ExternalTabContainer instance. The automation client then attaches to this ExternalTabContainer. This all works if the automation client is in the same client process. If a new process is launched a separate automation channel is created between the client and the chrome browser which causes this to not work as expected. Fix is have a floating ExternalTabContainer instance which is eventually connected to by the client. When we receive a notification from the client that it is about to connect to the ExternalTabContainer instance we setup the automation channel and other info in the underlying automation profile. The new TabContents is created with the same profile instance as the current TabContents. This does not work correctly if the underlying profile is an automation profile as its lifetime is tied to the ExternalTabContainer. To fix this I added a setter for the new policy to the NavigationController. Not doing this causes the browser to crash if the original ExternalTabContainer instance dies. There is a bigger issue here which is that all this profile sharing would cause session cookies to not work correctly if multiple automation clients are connected to the same Chrome browser instance over the same profile. I will file a separate bug to track this issue. Bug=1694574 Review URL: http://codereview.chromium.org/200003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25594 0039d316-1c4b-4281-b951-d872f2087c98
* Convert std::wstring encoding names to std::string in a bunch of files.tony@chromium.org2009-09-044-11/+12
| | | | | | | | | | | | | | | BUG=8647 (http://crbug.com/8647) TEST=run unit_tests.exe and ui_tests.exe Original patch by Thiago Farina <thiago.farina@gmail.com> at http://codereview.chromium.org/179057/show Some linux related fixes by me. Review URL: http://codereview.chromium.org/192017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25529 0039d316-1c4b-4281-b951-d872f2087c98
* NNTP: Updating the thumbnail size to match the size we use on the newarv@google.com2009-09-041-2/+2
| | | | | | | | | | | | | | | tab page. This should reduce the amount of work needed since the images do not need to be resized. BUG=17455 TEST=No visible changes Review URL: http://codereview.chromium.org/194028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25520 0039d316-1c4b-4281-b951-d872f2087c98
* Strip .plugin off of Mac plugin names when showing the crash info bar.stuartmorgan@google.com2009-09-041-1/+10
| | | | | | | | | BUG=21029 TEST=Kill a plugin process; the plugin crash info bar shouldn't have ".plugin" in the plugin name. Review URL: http://codereview.chromium.org/197018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25487 0039d316-1c4b-4281-b951-d872f2087c98
* Enable the XSSAuditor by default.abarth@chromium.org2009-09-041-1/+1
| | | | | | | R=dglazkov git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25486 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Revert "Allow DOMUI pages to call window.open(), giving DOMUI ↵mpcomplete@chromium.org2009-09-037-10/+48
| | | | | | | | | | | | privileges to the new"" Second attempt at r25250. The tests were broken in Release mode due to a race. Should be fixed. BUG=17636 Review URL: http://codereview.chromium.org/172120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25329 0039d316-1c4b-4281-b951-d872f2087c98
* Set the focus ring color to match the Gtk theme focus color.estade@chromium.org2009-09-031-0/+12
| | | | | | | | BUG=8540 Review URL: http://codereview.chromium.org/173642 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25278 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r25250: "Allow DOMUI pages to call window.open(), giving DOMUI ↵mpcomplete@chromium.org2009-09-027-48/+10
| | | | | | | | privileges to the new" Review URL: http://codereview.chromium.org/171127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25256 0039d316-1c4b-4281-b951-d872f2087c98
* Allow DOMUI pages to call window.open(), giving DOMUI privileges to the newmpcomplete@chromium.org2009-09-027-10/+48
| | | | | | | | | | | window (assuming it is on the same site instance). BUG=17636 TEST=no Review URL: http://codereview.chromium.org/173649 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25250 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the ability to load lazy URLs from the NavigationController. This is nobrettw@chromium.org2009-09-023-68/+5
| | | | | | | | | | | longer used (except for a test that doens't seem to need it). We used to use this feature for session restore, but it has since changed. TEST=none BUG=none Review URL: http://codereview.chromium.org/191008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25234 0039d316-1c4b-4281-b951-d872f2087c98
* Alias 'US-ASCII' to 'ISO-8859-1' in our UI without touching webkit.BUG=15801jnd@chromium.org2009-09-022-3/+7
| | | | | | | TEST=Add US-ASCII encoding to browser encoding test Review URL: http://codereview.chromium.org/178017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25168 0039d316-1c4b-4281-b951-d872f2087c98
* Revert accidental commits: r25115 and r25116mpcomplete@chromium.org2009-09-017-45/+6
| | | | | | Review URL: http://codereview.chromium.org/183045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25120 0039d316-1c4b-4281-b951-d872f2087c98
* Merge branch 'api' of /src/chrome/src into apimpcomplete@chromium.org2009-09-017-6/+45
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25115 0039d316-1c4b-4281-b951-d872f2087c98
* Gtk confirm form resubmission dialog.mattm@chromium.org2009-08-313-24/+5
| | | | | | | | | | | Refactor so that the dialog is shown by calling BrowserWindow::ShowRepostFormWarningDialog BUG=19761 TEST=see bug Review URL: http://codereview.chromium.org/174294 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24930 0039d316-1c4b-4281-b951-d872f2087c98
* Replace the RenderProcessHost.PID function that returns the OS-generatedbrettw@chromium.org2009-08-314-18/+15
| | | | | | | | | | | | | | | | | | | | process ID with an internally-generated id() function. This allows us the guarantee that the IDs are unique over the entire run of the application. This also cleans up some code associated with managing the PID. The main potentially interesting change is now the PID is set uniquely for every creation of RenderProcessHost. It used to be set cleared if the process went away, and re-set if the process was re-created. The ID generation is in ChildProcesInfo so it is also unique between workers and plugins. I had to change some significant things in resource_dispatcher_host_unittest to take into account this new generation of IDs. BUG=17828 TEST=none Review URL: http://codereview.chromium.org/160203 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24899 0039d316-1c4b-4281-b951-d872f2087c98
* Experiment with dislodging the Extension Shelf and having it only appear on ↵finnur@chromium.org2009-08-302-0/+24
| | | | | | | | | | | the New Tab page. BUG=http://crbug.com/20415 TEST=With the extension toolstrip visible, go to the New Tab page and press Ctrl + Alt + B. Watch the toolstrip merge into the New Tab page and back again into a separate toolstrip (when you press Ctrl + Alt + B again). Also, when you do this on a regular webpage (as opposed to NTP) this should toggle the toolstrip visiblity. Review URL: http://codereview.chromium.org/175017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24864 0039d316-1c4b-4281-b951-d872f2087c98
* Force databases and localstorage to be enabled extensions.aa@chromium.org2009-08-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We were already doing this, this change modifies the mechanism. Before we were relying on the presence of the --enable-extensions flag, but as we are getting ready to remove that on dev, we needed something else. This forces local storage and database to be enabled on chrome-extension:// pages. Also, change the way database enabling works in general to be more like the way local storage works, just for consistency. Will remove old, unnecessary WebKit API in an upstream change. erikkay: extensions stuff dumi: database stuff jorlow: local storage stuff BUG=19511 Review URL: http://codereview.chromium.org/173306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24841 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Gtk confirm form resubmission dialog." Broke linux views build.mattm@chromium.org2009-08-283-5/+24
| | | | | | | | | | This reverts commit e6ab23c81e56c6b9fbb062bbb090a648e6ebef12. TBR=beng Review URL: http://codereview.chromium.org/183006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24827 0039d316-1c4b-4281-b951-d872f2087c98
* Gtk confirm form resubmission dialog.mattm@chromium.org2009-08-283-24/+5
| | | | | | | | | | | Refactor so that the dialog is shown by calling BrowserWindow::ShowRepostFormWarningDialog BUG=19761 TEST=see bug Review URL: http://codereview.chromium.org/174294 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24826 0039d316-1c4b-4281-b951-d872f2087c98
* Adds a FaviconService class tied to the profile.arv@google.com2009-08-282-5/+6
| | | | | | | | | | | | | | | | | | | Original issue: http://codereview.chromium.org/115212/show The favicons service is the entry point to getting favicons. Make the DOMUIFactory handle the favicons of DOMUI pages so since DOMUI pages are never added to the history. BUG=5840 TEST=Open a new window and open history and downloads (Ctrl+H and Ctrl+J) in this window. Then close the window and open the NTP. The recently closed windows/tabs should show the favicons for the hsitroy and downloads page. Review URL: http://codereview.chromium.org/178001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24806 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Fix a ton of compiler warnings."tony@chromium.org2009-08-285-14/+4
| | | | | | | | | | | This reverts commit r24792. TBR=estade Review URL: http://codereview.chromium.org/179028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24796 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a ton of compiler warnings.estade@chromium.org2009-08-285-4/+14
| | | | | | | | | | | | | | | Most of these are classes with virtual methods lacking virtual destructors or NULL used in non-pointer context. BUG=none TEST=app_unittests && base_unittests --gtest_filter=-ConditionVariableTest.LargeFastTaskTest patch by Jacob Mandelson <jlmjlm [at] gmail> http://codereview.chromium.org/171028/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
* override chrome:// URLs via extensions.erikkay@chromium.org2009-08-281-1/+1
| | | | | | | | | | Overrides are declared in an extension's manifest. The last one installed wins. However, we keep a list of those installed per page so that priority is preserved and so that uninstall will revert to a previous state. Review URL: http://codereview.chromium.org/174277 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24791 0039d316-1c4b-4281-b951-d872f2087c98
* Fix 20398: PageAction icon disappears on reader.google.com when url includes ↵finnur@chromium.org2009-08-271-2/+9
| | | | | | | | | | | | | reference We now strip away the reference when comparing the url's (for the purpose of clearing the page action icons). BUG=20398 TEST=None Review URL: http://codereview.chromium.org/174613 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24654 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r24606-24607. The tree didn't like them. :(phajdan.jr@chromium.org2009-08-271-2/+4
| | | | | | | | TBR=darin Review URL: http://codereview.chromium.org/173574 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24608 0039d316-1c4b-4281-b951-d872f2087c98
* Mock the LinkDoctor for tests. Should greatly decrease ErrorPage test flakiness.phajdan.jr@chromium.org2009-08-271-4/+2
| | | | | | | | | | | Not getting rid of WaitForTitleMatching because I have to add few more calls to the automation framework (http://crbug.com/19395) to wait properly after navigating back and forward. TEST=Covered by ui_tests and browser_tests. http://crbug.com/18365, http://crbug.com/19361 Review URL: http://codereview.chromium.org/174179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24606 0039d316-1c4b-4281-b951-d872f2087c98
* Improves key event handing code of BrowserWindowGtk.suzhe@chromium.org2009-08-261-88/+1
| | | | | | | | | | | This CL improves the key event handing code of BrowserWindowGtk. Issue 20118 is also fixed. BUG=20118: Typing a colon (:) into the address bar causes the browser to freeze TEST=Run chrome with a XIM input method, chrome and x server's cpu usage shall be very low after pressing shift key (or any other modifier key) in omnibox. Review URL: http://codereview.chromium.org/173344 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24422 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r24223. Storage test is not working.aa@chromium.org2009-08-251-3/+5
| | | | | | TBR=mpcomplete@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24226 0039d316-1c4b-4281-b951-d872f2087c98
* Force databases and localstorage to be enabled extensions.aa@chromium.org2009-08-251-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We were already doing this, this change modifies the mechanism. Before we were relying on the presence of the --enable-extensions flag, but as we are getting ready to remove that on dev, we needed something else. This forces local storage and database to be enabled on chrome-extension:// pages. Also, change the way database enabling works in general to be more like the way local storage works, just for consistency. Will remove old, unnecessary WebKit API in an upstream change. erikkay: extensions stuff dumi: database stuff jorlow: local storage stuff BUG=19511 Review URL: http://codereview.chromium.org/173306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24223 0039d316-1c4b-4281-b951-d872f2087c98
* Enabling "Save as..." in view:source page.mhm@chromium.org2009-08-221-3/+12
| | | | | | | | | BUG=12748 (http://crbug.com/12748) TEST=Goes to view-source:http://www.google.com/ and see if the menu is enabled. Review URL: http://codereview.chromium.org/165068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24079 0039d316-1c4b-4281-b951-d872f2087c98
* Remove even more cruft from temp_scaffolding_stubs.h. This change also ↵jhawkins@chromium.org2009-08-221-10/+1
| | | | | | | | | | enables modal_html_dialog_delegate.cc for Mac and Linux, since it's already ported. Porting defines in tab_contents.cc were removed to reflect the current state of the ports. BUG=none TEST=none Review URL: http://codereview.chromium.org/174278 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24055 0039d316-1c4b-4281-b951-d872f2087c98
* Send notice for blackisted non-visual resourcesidanan@chromium.org2009-08-212-0/+6
| | | | | | | | | | | | | This is just the piping to call into the blocked_popup_container (which shall be later renamed and expanded to a generalized blocked resource container) from the browser's request context. BUG=16932 TEST=none Review URL: http://codereview.chromium.org/171109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23973 0039d316-1c4b-4281-b951-d872f2087c98
* Don't show "Inspect Element" in the context menu if we can't inspect.agl@chromium.org2009-08-211-2/+5
| | | | | | | | | | Ubuntu want to ship with the inspector files in a separate package and having menu items which are broken isn't nice. http://codereview.chromium.org/174162 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23927 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Mock the LinkDoctor for tests. Should greatly decrease ErrorPage ↵phajdan.jr@chromium.org2009-08-201-2/+4
| | | | | | | | | | test flakiness." TBR=darin Review URL: http://codereview.chromium.org/173165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23916 0039d316-1c4b-4281-b951-d872f2087c98
* Mock the LinkDoctor for tests. Should greatly decrease ErrorPage test flakiness.phajdan.jr@chromium.org2009-08-201-4/+2
| | | | | | | | | | | Not getting rid of WaitForTitleMatching because I have to add few more calls to the automation framework (http://crbug.com/19395) to wait properly after navigating back and forward. TEST=Covered by ui_tests and browser_tests. http://crbug.com/18365, http://crbug.com/19361 Review URL: http://codereview.chromium.org/174179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23906 0039d316-1c4b-4281-b951-d872f2087c98
* Disable mute/unmute when media does not have an audio track.scherkus@chromium.org2009-08-201-2/+7
| | | | | | | | | BUG=18970 TEST=test matrix videos ending in 0 should have mute context menu disabled Review URL: http://codereview.chromium.org/174018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23889 0039d316-1c4b-4281-b951-d872f2087c98
* Move MediaPlayerAction out of context_menu.h into webview.h since it's ↵ajwong@chromium.org2009-08-202-0/+2
| | | | | | | | really only used by webview. Review URL: http://codereview.chromium.org/174143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23850 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the compile for TOOLKIT_VIEWS.phajdan.jr@chromium.org2009-08-201-1/+1
| | | | | | | | TBR=tony Review URL: http://codereview.chromium.org/174146 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23829 0039d316-1c4b-4281-b951-d872f2087c98