summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 23.0.1271.9523.0.1271.95gitdeps2014-04-072-641/+580
|
* Incrementing VERSION to 23.0.1271.95chrome-tpm@google.com2012-11-271-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@169798 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168692 - Apply missing kParentDirectory checkcevans@chromium.org2012-11-272-30/+81
| | | | | | | | | | | BUG=161564 Review URL: https://chromiumcodereview.appspot.com/11414046 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/11316208 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@169793 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 169680 - Merge 168798 - Don't add an extension tab twice when it has ↵karen@chromium.org2012-11-271-1/+0
| | | | | | | | | | | | | | | | | | | | an associated tab contents This was deleted by accident in https://chromiumcodereview.appspot.com/10868116/ BUG=161854 R=finnur@chromium.org Review URL: https://chromiumcodereview.appspot.com/11348150 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/11299205 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/11348260 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@169786 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 167977 - Merge 167552 - ChromeOS needs UTF-8 appended to locale.karen@chromium.org2012-11-271-1/+1
| | | | | | | | | | | | | | | TEST=Song Pop, Farmville 2, HBOgo. BUG=134911, 153966, 155396 Review URL: https://chromiumcodereview.appspot.com/11377113 TBR=ihf@chromium.org Review URL: https://codereview.chromium.org/11420012 TBR=ihf@chromium.org Review URL: https://codereview.chromium.org/11414193 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@169785 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168798 - Don't add an extension tab twice when it has an associated ↵jochen@chromium.org2012-11-271-0/+1
| | | | | | | | | | | | | | | | | tab contents This was deleted by accident in https://chromiumcodereview.appspot.com/10868116/ BUG=161854 R=finnur@chromium.org Review URL: https://chromiumcodereview.appspot.com/11348150 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/11299205 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@169680 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.94chrome-release@google.com2012-11-211-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168983 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168255 - Do not 'defocus' user pod when there's only 1 user shown.nkostylev@chromium.org2012-11-201-4/+27
| | | | | | | | | | | | | Fix bug with tooltips not showing up after user is removed. BUG=135647,156677 Review URL: https://codereview.chromium.org/11420038 TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/11419097 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168832 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 168825 - Merge 168209 - Add UI for MOUNT_ERROR_TPM_NEEDS_REBOOTnkostylev@chromium.org2012-11-2021-204/+2
| | | | | | | | | | | | | | | | BUG=chromium-os:35966 TEST=Tested with cryptohome patch (see issue). TBR=sky Review URL: https://codereview.chromium.org/11417008 TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/11348155 TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/11419096 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168826 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168209 - Add UI for MOUNT_ERROR_TPM_NEEDS_REBOOTnkostylev@chromium.org2012-11-2021-2/+204
| | | | | | | | | | | | | BUG=chromium-os:35966 TEST=Tested with cryptohome patch (see issue). TBR=sky Review URL: https://codereview.chromium.org/11417008 TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/11348155 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168825 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168193 - Add critical error image asset.nkostylev@chromium.org2012-11-202-0/+0
| | | | | | | | | | | | BUG=chromium-os:35966 TBR=ivankr Review URL: https://codereview.chromium.org/11417030 TBR=nkostylev@chromium.org Review URL: https://codereview.chromium.org/11280093 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168820 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.93chrome-release@google.com2012-11-201-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168710 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168645 - Extensions Docs Server: Samples filter was not ignoring "chrome"cduvall@chromium.org2012-11-202-2/+2
| | | | | | | | | | | | | | | | When a filter was clicked on the samples page, nothing would show up, because none of the API call tags started with "chrome". Now all the API call tags start with "chrome.". BUG=161611 Review URL: https://codereview.chromium.org/11416080 TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/11348142 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168646 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 168588 - Extensions Docs Server: Content changes for ↵cduvall@chromium.org2012-11-1913-62/+391
| | | | | | | | | | | | | | | | https://codereview.chromium.org/11185020/ These are just template changes split from https://codereview.chromium.org/11185020/. TBR=kalman@chromium.org BUG=144291 Review URL: https://codereview.chromium.org/11364116 TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/11280066 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168596 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 167367 - Detect duplicated wallpaper loading request and drop the ↵bshe@chromium.org2012-11-163-3/+27
| | | | | | | | | | | | | latter one BUG=158383,160330 Review URL: https://chromiumcodereview.appspot.com/11358082 TBR=bshe@chromium.org Review URL: https://codereview.chromium.org/11419040 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168246 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.92chrome-release@google.com2012-11-151-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@168008 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 167552 - ChromeOS needs UTF-8 appended to locale.ihf@chromium.org2012-11-151-1/+1
| | | | | | | | | | | | TEST=Song Pop, Farmville 2, HBOgo. BUG=134911, 153966, 155396 Review URL: https://chromiumcodereview.appspot.com/11377113 TBR=ihf@chromium.org Review URL: https://codereview.chromium.org/11420012 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167977 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.91chrome-release@google.com2012-11-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167501 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.90chrome-release@google.com2012-11-131-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167495 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 167018 - Fix extension action badges with long text.tbarzic@chromium.org2012-11-131-1/+1
| | | | | | | | | | | | BUG=160069 TEST=manual Review URL: https://codereview.chromium.org/11364185 TBR=tbarzic@chromium.org Review URL: https://codereview.chromium.org/11275294 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167480 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 167271 - Moved AlphaBlend rasterization to renderer process like it ↵karen@chromium.org2012-11-132-8/+8
| | | | | | | | | | | | | | | | | | was before 152681. 152681 moved all rasterization from renderer to browser process and introduced bug 152204. The bug was fixed by 161954, CL returns AlphaBlend rasterization to similar algorithm as it was before 152681, but I still keeps AlphaBlend in browser process. For some unknown reasons AlphaBlend rasterization on XP works only in renderer process. BUG=160154 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11410051 TBR=vitalybuka@chromium.org Review URL: https://codereview.chromium.org/11275287 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167412 0039d316-1c4b-4281-b951-d872f2087c98
* Fix merge of 164040 - Delegate installation of multi-install products to a ↵grt@chromium.org2012-11-121-1/+1
| | | | | | | | | | | | | | | | pre-existing higher version of the binaries if there is one. Updates are not modified. In so doing, the archive is now extracted into a unique directory so that the two setup.exe invocations don't unpack into the same dir. BUG=157410 TEST=install multi-install GCF version N (possibly not including this change) then try to install Chrome version N-M (including this change). Review URL: https://chromiumcodereview.appspot.com/11272003 TBR=grt@chromium.org Review URL: https://codereview.chromium.org/11363205 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167237 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 162756 - Fix a crash when a line containing the length of an HTTPcevans@chromium.org2012-11-123-12/+72
| | | | | | | | | | | | | | chunk-encoded response is too long. R=willchan@chromium.org BUG=155711 Review URL: https://chromiumcodereview.appspot.com/11191003 TBR=mmenke@chromium.org Review URL: https://codereview.chromium.org/11362212 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167233 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166261 - Disable multisampling for Intel GPUs on Maccevans@chromium.org2012-11-121-1/+13
| | | | | | | | | | | | | | It causes corrupted rendering. BUG=137303 TEST=content_unittests TBR=kbr Review URL: https://codereview.chromium.org/11293123 TBR=zmo@google.com Review URL: https://codereview.chromium.org/11363204 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167229 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 165821 - Guard against the same PrintWebViewHelper being re-entered.cevans@chromium.org2012-11-122-1/+14
| | | | | | | | | | | BUG=159165 Review URL: https://chromiumcodereview.appspot.com/11367076 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/11358201 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167225 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 164867 - Add a check to prevent len from going negative in ↵cevans@chromium.org2012-11-122-1/+2
| | | | | | | | | | | | | | xmlParseAttValueComplex. BUG=158249 Review URL: https://chromiumcodereview.appspot.com/11343029 TBR=aedla@chromium.org Review URL: https://codereview.chromium.org/11410039 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167215 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 164040 - Delegate installation of multi-install products to a ↵grt@chromium.org2012-11-128-13/+230
| | | | | | | | | | | | | | | | pre-existing higher version of the binaries if there is one. Updates are not modified. In so doing, the archive is now extracted into a unique directory so that the two setup.exe invocations don't unpack into the same dir. BUG=157410 TEST=install multi-install GCF version N (possibly not including this change) then try to install Chrome version N-M (including this change). Review URL: https://chromiumcodereview.appspot.com/11272003 TBR=grt@chromium.org Review URL: https://codereview.chromium.org/11365204 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167213 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 159632 - Improve error handling in ApplyProcessMitigationsToCurrentProcessjschuh@chromium.org2012-11-121-7/+15
| | | | | | | | | | BUG=153399 Review URL: https://codereview.chromium.org/11036009 TBR=jschuh@chromium.org Review URL: https://codereview.chromium.org/11275262 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167208 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 165131 - Don't use CanonicalCookie::Create method for creating ↵markusheintz@chromium.org2012-11-122-8/+121
| | | | | | | | | | | | | canonical cookies in the BrowsingDataCookieHelper. This results in wrong default values if no cookie-domain attribute is given in the cookie-string. BUG=158448 Review URL: https://codereview.chromium.org/11338043 TBR=markusheintz@chromium.org Review URL: https://codereview.chromium.org/11363198 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167203 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 162306 - fix position of close buttons in linux tabsestade@chromium.org2012-11-121-9/+10
| | | | | | | | | | | | | I don't know what has caused the recent regression, but this fixes it. The position of the close button is not consistent between windows and mac, I chose to follow mac. BUG=none Review URL: https://codereview.chromium.org/11034002 TBR=estade@chromium.org Review URL: https://codereview.chromium.org/11359162 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167201 0039d316-1c4b-4281-b951-d872f2087c98
* Merge trunk r166585 to the 23.0.1271 branch.mark@chromium.org2012-11-125-14/+109
| | | | | | | | | | | Add a histogram enum to determine the cat's flavor and how many bits there are in it. BUG=159886 Review URL: https://codereview.chromium.org/11391002 Review URL: https://codereview.chromium.org/11364203 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167198 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.89chrome-release@google.com2012-11-121-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167132 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166749 - Don't use web intents to handle downloaded office files on ↵satorux@chromium.org2012-11-122-54/+4
| | | | | | | | | | | | | | | Chrome OS. BUG=159743 TEST=see bug Review URL: https://chromiumcodereview.appspot.com/11365127 TBR=tbarzic@chromium.org Review URL: https://codereview.chromium.org/11293222 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167130 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 167100 - Extensions Docs Server: Remove border on tables in the ↵cduvall@chromium.org2012-11-101-0/+4
| | | | | | | | | | | | | | | | samples pages The blue border is ugly. It should be removed. TBR=kalman@chromium.org BUG=159907 Review URL: https://codereview.chromium.org/11377093 TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/11366189 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167103 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166444 - Don't disable keyboard input at the OOBE UI if ↵joaodasilva@chromium.org2012-11-102-3/+20
| | | | | | | | | | | | | | auto-enrollment is going to be performed. BUG=159472 Review URL: https://chromiumcodereview.appspot.com/11312121 TBR=joaodasilva@chromium.org Review URL: https://codereview.chromium.org/11360182 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167085 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.88chrome-release@google.com2012-11-101-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167034 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 165663 - Merge 161320 - Let TouchFactory use master pointer events ↵davemoore@chromium.org2012-11-103-13/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whenever available The CL fixes the problem where the button state of one pointer device is not available to another one. For example, if you click the left button of one mouse and move another mouse, you should be able to select the text, which is not happening right now. The CL lets TouchFactory use the master pointer events if it is available to the client. The master pointer events have the global button state information so they won't have such problems. It also removes CheckXEventForConsistency since it is not necessary anymore. Contributed by sheckylin@chromium.org BUG=chromium:133846 TEST=tested on lumpy and link. Change-Id: Ifcedf3f6bd091153bba47081b131d93abe1124a2 Review URL: https://chromiumcodereview.appspot.com/10983034 TBR=sheckylin@chromium.org Review URL: https://codereview.chromium.org/11360058 TBR=karen@chromium.org Review URL: https://codereview.chromium.org/11377094 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167033 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166140 - Crash fix in ExtensionInstallUIDefault::OnInstallSuccess().zelidrag@chromium.org2012-11-091-0/+7
| | | | | | | | | | | | | BUG=159437 TEST=existing ExtensionInstallUIBrowserTest.* Review URL: https://chromiumcodereview.appspot.com/11363090 TBR=zelidrag@chromium.org Review URL: https://codereview.chromium.org/11410018 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167009 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 164862 - [Chrome OS ECHO]: In Kiosk/Retail mode return an empty codekaren@chromium.org2012-11-091-4/+9
| | | | | | | | | | | | | | | | This effectively disables the Chrome OS registration API while running in Kiosk/Retail mode. BUG=chromium-os:35832 TEST=manually verified with and without --enable-kiosk-mode flag. Review URL: https://chromiumcodereview.appspot.com/11336026 TBR=gauravsh@chromium.org Review URL: https://codereview.chromium.org/11364187 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166997 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 164850 - Seccomp-BPF: relax failure in probe process setupjln@chromium.org2012-11-091-24/+52
| | | | | | | | | | | | | | | | | | | When we set-up the probe process to test seccomp-bpf availability, setting a pipe on stderr can sometimes fail. Presumably if this descriptor is backed by a file on a file system that will return an error on close(). We don't consider not being able to set-up the pipe on stderr as a fatal error anymore. BUG=152530 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11300014 TBR=jln@chromium.org Review URL: https://codereview.chromium.org/11369167 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166990 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166703 - Fix the issue that battery icon image does not match the ↵jennyz@chromium.org2012-11-091-4/+0
| | | | | | | | | | | | | battery percentage, which may happen at the beginning of each session or after resuming from sleeping state. BUG=158343 Review URL: https://codereview.chromium.org/11359094 TBR=jennyz@chromium.org Review URL: https://codereview.chromium.org/11312173 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166981 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 165581 - Don't attempt optimized scaled updates on GTK and Windowsjbauman@chromium.org2012-11-091-0/+6
| | | | | | | | | | | | | | | | | They haven't been implemented yet. BUG=154417 Review URL: https://chromiumcodereview.appspot.com/11269056 TBR=jbauman@chromium.org BUG=160107 Review URL: https://codereview.chromium.org/11369162 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166959 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166784 - Check for login screen availibility before showing spinner.zelidrag@chromium.org2012-11-091-18/+23
| | | | | | | | | | | | | | | | In retail mode, if for any reason, the login UI underneath the screensaver goes away (possibly due to a login happening while the screensaver was still starting up), we currently crash. Instead in that case, we want to just not try to show a spinner and close the screensaver and log the user in instead. R=nkostylev@chromium.org BUG=159433 Review URL: https://chromiumcodereview.appspot.com/11363109 TBR=rkc@chromium.org Review URL: https://codereview.chromium.org/11361187 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166935 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166414 - Fix black screen if guest login and logout before first user ↵zelidrag@chromium.org2012-11-091-9/+7
| | | | | | | | | | | | | | login BUG=152964 Review URL: https://chromiumcodereview.appspot.com/11362108 TBR=bshe@chromium.org Review URL: https://codereview.chromium.org/11359137 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166934 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 162773 - Create a ShellWindowRegistry in incognito mode.jamescook@chromium.org2012-11-083-0/+23
| | | | | | | | | | | | | | | | This registry is specific to the incognito profile in use. Without this apps cannot be used in incognito mode. Merge note: Avoids a top-crash on Chrome OS with Calculator app. BUG=155130,159849 Review URL: https://chromiumcodereview.appspot.com/11171003 TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/11377064 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166742 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.87chrome-release@google.com2012-11-081-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166737 0039d316-1c4b-4281-b951-d872f2087c98
* Make channel mixing checks explicit.dalecurtis@google.com2012-11-081-13/+15
| | | | | | | | | | | The existing checks were not strong enough and would pass through certain up mixing situations which are not supported. BUG=159924 TEST=none Review URL: https://codereview.chromium.org/11408002 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166714 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 23.0.1271.86chrome-release@google.com2012-11-081-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166606 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 166292 - Fix VisitFilterTest.GetVisitScore so it doesn't fail during ↵karen@chromium.org2012-11-081-3/+4
| | | | | | | | | | | | | | | | | DST transitions. Changed the test to use a fixed date instead of the current day. BUG=159384 Review URL: https://chromiumcodereview.appspot.com/11369086 TBR=rfevang@chromium.org Review URL: https://codereview.chromium.org/11360141 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166564 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 165910 - Disable VisitFilterTest.GetVisitScore.karen@chromium.org2012-11-081-1/+2
| | | | | | | | | | | | | | This change temporarily disables VisitFilterTest.GetVisitScore because it is not DST-safe. TBR=rfevang BUG=159384 TEST=make unit_tests green. Review URL: https://codereview.chromium.org/11367089 TBR=hbono@chromium.org Review URL: https://codereview.chromium.org/11364143 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166563 0039d316-1c4b-4281-b951-d872f2087c98