summaryrefslogtreecommitdiffstats
path: root/chrome/app
Commit message (Collapse)AuthorAgeFilesLines
* Added TranslateVariablesInPolicy to the policy toolkit.pastarmovj@chromium.org2011-02-252-131/+5
| | | | | | | | | | | | This function was implemented for mac and win in the chrome_main_xxx files because it was used only by the UserDataDir policy until now. However we need this in the DownloadDirectory policy too so I extracted in in a more global way in the policy::path_parser namespace. BUG=None TEST=unit_tests:PolicyPathParser.* Review URL: http://codereview.chromium.org/6469081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76045 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented policy to disable plugin finder.pastarmovj@chromium.org2011-02-251-1/+12
| | | | | | | | | BUG=49597 TEST=Set the policy to true and the default plugin should not offer to install missing plugins. Review URL: http://codereview.chromium.org/6475011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76043 0039d316-1c4b-4281-b951-d872f2087c98
* OOL code in CarbonPluginWindowTracker.erg@google.com2011-02-241-0/+2
| | | | | | | | | BUG=carnitas TEST=compiles Review URL: http://codereview.chromium.org/6581038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75968 0039d316-1c4b-4281-b951-d872f2087c98
* Add caching of the InMemoryURLIndex (part of the HistoryQuickProvider) part ↵mrossetti@chromium.org2011-02-241-0/+6
| | | | | | | | | | | | | | 1. (Transactions will be introduced in the next submission.) Fixed a problem in the caching of search results as the user types each character in a search term. Updated the unit test associated with that code. Added (temporary) flag which can be used to turn on the HQP (enable-history-quick-provider); also added it to about:flags. Previously reviewed as http://codereview.chromium.org/6286029/. BUG=19736, 60107 TEST=Added unit tests. Review URL: http://codereview.chromium.org/6578018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75912 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 75882 - Add caching of the InMemoryURLIndex (part of the ↵mrossetti@chromium.org2011-02-241-6/+0
| | | | | | | | | | | | | | | | | | HistoryQuickProvider) part 1. (Transactions will be introduced in the next submission.) Fixed a problem in the caching of search results as the user types each character in a search term. Updated the unit test associated with that code. Added (temporary) flag which can be used to turn on the HQP (enable-history-quick-provider); also added it to about:flags. Previously reviewed as http://codereview.chromium.org/6286029/. BUG=19736,60107 TEST=Added unit tests. Review URL: http://codereview.chromium.org/6581024 TBR=mrossetti@chromium.org Review URL: http://codereview.chromium.org/6575032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75883 0039d316-1c4b-4281-b951-d872f2087c98
* Add caching of the InMemoryURLIndex (part of the HistoryQuickProvider) part ↵mrossetti@chromium.org2011-02-241-0/+6
| | | | | | | | | | | | | | | 1. (Transactions will be introduced in the next submission.) Fixed a problem in the caching of search results as the user types each character in a search term. Updated the unit test associated with that code. Added (temporary) flag which can be used to turn on the HQP (enable-history-quick-provider); also added it to about:flags. Previously reviewed as http://codereview.chromium.org/6286029/. BUG=19736,60107 TEST=Added unit tests. Review URL: http://codereview.chromium.org/6581024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75882 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Japanese fallback fontname.kochi@chromium.org2011-02-241-1/+1
| | | | | | | | | | | | | | | The fallback font name 'Droid Sans Fallback Japanese' should be 'Droid Sans Japanese' according 'fc-list' command output. Jungshik, is this a typo when you did this change? http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb?r1=36849&r2=49236 BUG=none TEST=none Review URL: http://codereview.chromium.org/6523021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75873 0039d316-1c4b-4281-b951-d872f2087c98
* Update stock NTP thumbnails.estade@chromium.org2011-02-243-0/+0
| | | | | | | | | | | These thumbnails showed screenshots from previous iterations of the chrome store, themes gallery, and welcome page. They were also encoded as JPEGs (even though they were named *.png). I've updated the screenshots, plus encoded them as PNGs. BUG=none TEST=launching chrome with fresh user data dir Review URL: http://codereview.chromium.org/6469063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75842 0039d316-1c4b-4281-b951-d872f2087c98
* Adds navigator.registerProtocolHandler.tony@chromium.org2011-02-231-0/+21
| | | | | | | | | BUG=11359 TEST=None at the moment Review URL: http://codereview.chromium.org/6410115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75681 0039d316-1c4b-4281-b951-d872f2087c98
* This patch adds the necessary plumbing to Chromium to support a command-line ↵wjmaclean@chromium.org2011-02-221-0/+6
| | | | | | | | | | | flag for turning on composite-to-texture behaviour. This will facilitate running GPU tests against both composite-to-display and composite-to-texture. BUG=none TEST=none Review URL: http://codereview.chromium.org/6134012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75640 0039d316-1c4b-4281-b951-d872f2087c98
* Add an icon to the omnibox when a page is prerendered.cbentzel@chromium.org2011-02-222-0/+5
| | | | | | | | | | | | | This will only show up for users who have prerendering enabled (mainly via about:flags) This CL does not include the logic for displaying whether prerender failed on the referring page. BUG=73065 TEST=Start Chrome with prerendering enabled, go to a page with a <link rel=prefetch> element, navigate to the referred page, and see icon appear. Review URL: http://codereview.chromium.org/6529031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75621 0039d316-1c4b-4281-b951-d872f2087c98
* This is a small warning icon for safebrowsing.lzheng@chromium.org2011-02-221-0/+0
| | | | | | | | | TEST=none BUG=60822 Review URL: http://codereview.chromium.org/6549018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75619 0039d316-1c4b-4281-b951-d872f2087c98
* Fix "--fix" mode of syntax_check_policy_template_json.pyjkummerow@chromium.org2011-02-211-6/+9
| | | | | | | | | | | The auto-fix mode of the syntax checker had a small bug that caused it to be unable to replace tabs and fix indentation in the same run (making a second invocation necessary). This CL fixes this. BUG=None TEST=Run "syntax_check_policy_template_json.py --fix --backup policy_templates.json" for a policy_templates.json file containing lines indented with tabs, observe that fixing such indentation now works as it should Review URL: http://codereview.chromium.org/6550001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75554 0039d316-1c4b-4281-b951-d872f2087c98
* Reduce size of all PNGs with pngcrush.estade@chromium.org2011-02-18264-0/+0
| | | | | | | | | BUG=73100 TEST=trybots Review URL: http://codereview.chromium.org/6538008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75434 0039d316-1c4b-4281-b951-d872f2087c98
* Implement chrome://crashesstuartmorgan@chromium.org2011-02-183-0/+31
| | | | | | | | | | | | | Creates a new internal page for listing recent reported crashes, to make it easier for users to report crashes, or get crash IDs when asked in bug reports. Won't yet display any crashes on Windows, since the breakpad side is not yet done on Windows. BUG=41106 TEST=Visit chrome://crashes; depending on the build type, platform, and metric pref state, it should display crashes or an informative message. Review URL: http://codereview.chromium.org/6545001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75433 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented a policy to match the ClearSiteDataOnExit pref.pastarmovj@chromium.org2011-02-182-3/+36
| | | | | | | | | | | | | When set this policy overrides the user settings for that pref. No UI changes have been made to ContentSettings.xib only wired the enabled flag to the managed property of the underlaying pref. BUG=59775 TEST=Manually set the policy and check if the corresponding UI element is disabled and correspond to the policy state. Review URL: http://codereview.chromium.org/6534021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75383 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the string of the location icon tooltip.tfarina@chromium.org2011-02-171-1/+1
| | | | | | | | | BUG=41073 TEST=hover the icon in the omnibox, you should see "View site information". Review URL: http://codereview.chromium.org/6531033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75326 0039d316-1c4b-4281-b951-d872f2087c98
* Begin the DCHECK() cleanup. Starting off with /src/chrome/a* and ↵rsesek@chromium.org2011-02-172-2/+2
| | | | | | | | | | | /src/chrome/browser/a* BUG=58409 Review URL: http://codereview.chromium.org/6539002 Patch from Kushal Pisavadia <kushi.p@gmail.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75314 0039d316-1c4b-4281-b951-d872f2087c98
* Breakpad Linux: Log crashes.thestig@chromium.org2011-02-171-4/+37
| | | | | | | | BUG=41106 TEST=none Review URL: http://codereview.chromium.org/6526010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75303 0039d316-1c4b-4281-b951-d872f2087c98
* New policy protobuf protocol.jkummerow@chromium.org2011-02-174-113/+334
| | | | | | | | | | | | | | | (Third attempt to land http://codereview.chromium.org/6409040/ -- now without memory leaks) - cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf also autogenerated from policy_templates.json - changed policy fetching mechanism to fetch new-style policy protobufs BUG=68309, chromium-os:11253, chromium-os:11255 TEST=CloudPolicyCacheTest.*; also manual test against python testserver Review URL: http://codereview.chromium.org/6532019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75259 0039d316-1c4b-4281-b951-d872f2087c98
* Implement the DownloadDirectory policy.pastarmovj@chromium.org2011-02-172-9/+70
| | | | | | | | | | | | | | | This policy allows for locking the user to download files only to the specified location. When the policy is set the UI elements should be inactive and the save dialog should never appear. Changes in the Preferences.xib file only wire the enabled status of the download location and save prompt checkbox elements to a variable that tracks the managed state of the DefaultDownloadDir pref. No UI elements were harmed in this change. BUG=59768 TEST=All old download manager tests shouldn't break. UI should behave correctly when policy is set. Review URL: http://codereview.chromium.org/6525054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75255 0039d316-1c4b-4281-b951-d872f2087c98
* New icons for prerender notification in omnibox.cbentzel@chromium.org2011-02-162-0/+0
| | | | | | | | | BUG=73065 TEST=None Review URL: http://codereview.chromium.org/6533004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75177 0039d316-1c4b-4281-b951-d872f2087c98
* Re-alphabetize this file and add a comment about it because apparently ↵pkasting@chromium.org2011-02-161-47/+60
| | | | | | | | | | people cannot figure it out for themselves. BUG=none TEST=none Review URL: http://codereview.chromium.org/6525060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75176 0039d316-1c4b-4281-b951-d872f2087c98
* Fix text that refers to menu entries under Linux.mmenke@chromium.org2011-02-161-1/+1
| | | | | | | | | BUG=73058 TEST=none Review URL: http://codereview.chromium.org/6523037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75118 0039d316-1c4b-4281-b951-d872f2087c98
* Added new network technology badge icons for Chrome OS.ers@chromium.org2011-02-167-0/+5
| | | | | | | | | | | | | | This is logically part of http://codereview.chromium.org/6314019, but for whatever reason, the try server fails because it thinks the new PNGs can't be found when it tries to compile theme_resources.grd. I'm working around this by uploading the icons and .grd in this separate CL. BUG=chromium-os:11292 TEST=same tests described in the referenced CL TBR=chocobo@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75116 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 75106 - New policy protobuf protocol.jkummerow@chromium.org2011-02-164-331/+113
| | | | | | | | | | | | | | | | | (Second attempt to land http://codereview.chromium.org/6409040/) - cloud_policy.proto autogenerated from policy_templats.json - C++ method decoding the protobuf also autogenerated from policy_templates.json - changed policy fetching mechanism to fetch new-style policy protobufs BUG=68309, chromium-os:11253, chromium-os:11255 TEST=CloudPolicyCacheTest.*; also manual test against python testserver Review URL: http://codereview.chromium.org/6523058 TBR=jkummerow@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75115 0039d316-1c4b-4281-b951-d872f2087c98
* New policy protobuf protocol.jkummerow@chromium.org2011-02-164-113/+331
| | | | | | | | | | | | | | | (Second attempt to land http://codereview.chromium.org/6409040/) - cloud_policy.proto autogenerated from policy_templats.json - C++ method decoding the protobuf also autogenerated from policy_templates.json - changed policy fetching mechanism to fetch new-style policy protobufs BUG=68309, chromium-os:11253, chromium-os:11255 TEST=CloudPolicyCacheTest.*; also manual test against python testserver Review URL: http://codereview.chromium.org/6523058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75106 0039d316-1c4b-4281-b951-d872f2087c98
* Forgotten to extend the 'supported_on' list of UserDataDir for mac.pastarmovj@chromium.org2011-02-161-2/+2
| | | | | | | | | BUG=49601 TEST=None Review URL: http://codereview.chromium.org/6526045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75103 0039d316-1c4b-4281-b951-d872f2087c98
* [cros] Support guest mode disabled case for captive portal, update msg text.nkostylev@chromium.org2011-02-161-2/+5
| | | | | | | | | BUG=chromium-os:3281 TEST=manual Review URL: http://codereview.chromium.org/6523024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75099 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 75082 - New policy protobuf protocol.jkummerow@chromium.org2011-02-164-328/+113
| | | | | | | | | | | | | | | - cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf autogenerated from policy_templates.json - changed policy fetching mechanism to fetch new-style policy protobufs BUG=68309, chromium-os:11253, chromium-os:11255 TEST=CloudPolicyCacheTest.*; also manual test against python testserver Review URL: http://codereview.chromium.org/6409040 TBR=jkummerow@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75084 0039d316-1c4b-4281-b951-d872f2087c98
* New policy protobuf protocol.jkummerow@chromium.org2011-02-164-113/+328
| | | | | | | | | | | | | - cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf autogenerated from policy_templates.json - changed policy fetching mechanism to fetch new-style policy protobufs BUG=68309, chromium-os:11253, chromium-os:11255 TEST=CloudPolicyCacheTest.*; also manual test against python testserver Review URL: http://codereview.chromium.org/6409040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75082 0039d316-1c4b-4281-b951-d872f2087c98
* Set the Chevron (or Off-The-Side bookmark button) as a larger bordered ↵hansl@chromium.org2011-02-151-3/+3
| | | | | | | | | | | button. This fixes a visual bug when using PDF as the image in the icon. BUG=51444 TEST=Compile and run, check that when pressing the button with the mouse left button, the grey area doesn't get outside the button itself. Review URL: http://codereview.chromium.org/6523033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75020 0039d316-1c4b-4281-b951-d872f2087c98
* Update pdf infobar stringsjam@chromium.org2011-02-151-2/+9
| | | | | | Review URL: http://codereview.chromium.org/6523007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75011 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Confirm-to-quit: show the right key combo if it has been remapped.rsesek@chromium.org2011-02-152-5/+24
| | | | | | | | | BUG=65209 TEST=Add a custom keyboard shortcut to override the "Quit Chromium" menu item in System Prefs. Run with --enable-confirm-to-quit. Hit the key combination and the panel now shows the right key combination. Review URL: http://codereview.chromium.org/6525001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74954 0039d316-1c4b-4281-b951-d872f2087c98
* Augment the comment for blacklisted extensions to make it clear they will ↵finnur@chromium.org2011-02-151-1/+1
| | | | | | | | | | | get removed if already installed. BUG=72445 TEST=None Review URL: http://codereview.chromium.org/6474036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74929 0039d316-1c4b-4281-b951-d872f2087c98
* Change a resource string from 'Control+Alt+/' to 'Escape'.mazda@chromium.org2011-02-151-1/+1
| | | | | | | | | | | The purpose of this change is to reflect the actual behavior. BUG=chromium-os:12111 TEST=manually on the netbook Review URL: http://codereview.chromium.org/6529011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74928 0039d316-1c4b-4281-b951-d872f2087c98
* Added code to restart the service process in the event of a crash.sanjeevr@chromium.org2011-02-153-13/+29
| | | | | | | | | BUG=None. TEST=A crash in the cloud print proxy should prompt the user for a restart. Review URL: http://codereview.chromium.org/6474030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74886 0039d316-1c4b-4281-b951-d872f2087c98
* Retry r74860, which broke chromeosestade@chromium.org2011-02-141-0/+1
| | | | | | | | | | | | | | | | DOM UI options handler cleanup: - improve StripColon - remove superfluous parens (clang would catch these if they weren't inside ifdefs) - move a couple more files to the abbreviated string definition style - use SetBoolean rather than SetString("true") BUG=none TEST=trybots Review URL: http://codereview.chromium.org/6484046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74880 0039d316-1c4b-4281-b951-d872f2087c98
* Pre-populating export bookamrks filename field with "bookmarks.html".vandebo@chromium.org2011-02-141-0/+3
| | | | | | | | | BUG=40831 TEST= see bug description Review URL: http://codereview.chromium.org/6474001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74873 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r74860 as it broke arm:estade@chromium.org2011-02-141-1/+0
| | | | | | | | | | | | | | | | DOM UI options handler cleanup: - improve StripColon - remove superfluous parens (clang would catch these if they weren't inside ifdefs) - move a couple more files to the abbreviated string definition style - use SetBoolean rather than SetString("true") BUG=none TEST=trybots Review URL: http://codereview.chromium.org/6525005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74861 0039d316-1c4b-4281-b951-d872f2087c98
* DOM UI options handler cleanup:estade@chromium.org2011-02-141-0/+1
| | | | | | | | | | | | | | - improve StripColon - remove superfluous parens (clang would catch these if they weren't inside ifdefs) - move a couple more files to the abbreviated string definition style - use SetBoolean rather than SetString("true") BUG=none TEST=trybots Review URL: http://codereview.chromium.org/6490016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74860 0039d316-1c4b-4281-b951-d872f2087c98
* "Update and Restart" should read "Update and Relaunch"dhollowa@chromium.org2011-02-143-32/+32
| | | | | | | | | | | Wording change from "Restart" to "Relaunch" when pertaining to relaunchinging the application after an update. The word "Restart" is specific to restarting the machine as a whole, and "Relaunch" pertains to relaunching a particular application. Making this change across platforms. BUG=69998 TEST=Visual inspection Review URL: http://codereview.chromium.org/6510009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74820 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed leaky code in the UserDataDir policy code for mac.pastarmovj@chromium.org2011-02-141-13/+9
| | | | | | | | | BUG=72741 TEST=Valgrind bots should be happy again. Review URL: http://codereview.chromium.org/6475008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74814 0039d316-1c4b-4281-b951-d872f2087c98
* Updated about_flags and command-line switch handling for prerender/prefetchgavinp@chromium.org2011-02-121-3/+12
| | | | | | | | | | | | | | | The second half of http://codereview.chromium.org/6410082/ , which cbentzel suggested be landed in two halves. This upload addresses comments from that review (improved description, unified options, no more contradictory option possibilities). BUG=70610 TEST=lots of manual testing, http://browserspy.dk/prefetch.php Review URL: http://codereview.chromium.org/6480002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74740 0039d316-1c4b-4281-b951-d872f2087c98
* [cros] Report captive portal message when we suspect that might be the case.nkostylev@chromium.org2011-02-111-0/+6
| | | | | | | | | | | Update shutdown button default color. BUG=chromium-os:3281, chromium-os:9941 TEST=Manual Review URL: http://codereview.chromium.org/6469027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74608 0039d316-1c4b-4281-b951-d872f2087c98
* Introduced better UI for the Omaha policy to disable updates for Chrome.pastarmovj@chromium.org2011-02-111-0/+3
| | | | | | | | | | | In case the policy is set the generic error message is replaced by a more concrete message stating that updates are disabled by the administrator. BUG=61056 TEST=Set the Omaha policy to disable updates, go the About Chrome box and check the message in the lower part of the window. Review URL: http://codereview.chromium.org/6482022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74606 0039d316-1c4b-4281-b951-d872f2087c98
* Mac implementation of the UserDataDir policy.pastarmovj@chromium.org2011-02-113-1/+100
| | | | | | | | | BUG=49601 TEST=Manual. Set the policy in the plist file and it should be equivalent to using the --user-data-dir option. Review URL: http://codereview.chromium.org/6349082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74602 0039d316-1c4b-4281-b951-d872f2087c98
* Clear size flag on checkbox to remove build error.maf@chromium.org2011-02-111-7/+7
| | | | | | | | BUG=none TEST=no warning when building with xcode Review URL: http://codereview.chromium.org/6456012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74544 0039d316-1c4b-4281-b951-d872f2087c98
* change tab titles for tabbed options based on subpage that is showingestade@chromium.org2011-02-111-0/+6
| | | | | | | | | BUG=72274 TEST=no visible change for now Review URL: http://codereview.chromium.org/6461012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74533 0039d316-1c4b-4281-b951-d872f2087c98
* Use a struct instead of a union for SandboxInterfaceInfocpu@chromium.org2011-02-101-2/+2
| | | | | | | | | | BUG=72496 TEST=see bug Review URL: http://codereview.chromium.org/6483006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74514 0039d316-1c4b-4281-b951-d872f2087c98