summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cc: Switch RenderingStats collection in Layer::Update() to ↵egraether@chromium.org2013-03-2859-316/+280
| | | | | | | | | | | | | | RenderingStatsInstrumentation This change switches all of the remaining RenderingStats collection in composited mode to use RenderinStatsInstrumentation. BUG=181319 Review URL: https://chromiumcodereview.appspot.com/12426024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191086 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 190448 "Revert 189680 "Fix registry key reading bug""cpu@chromium.org2013-03-281-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out this is ok, we want this in m27. > Revert 189680 "Fix registry key reading bug" > > caused major hangs on canary. will reland when there's a fix for crbug.com/181665 > > > Fix registry key reading bug > > > > The current code succeeds even if the keys are not in the machine > > therefore dCute is detected and the videocard capabilities are > > downgraded > > > > BUG=181665 > > TEST=see bug > > Review URL: https://codereview.chromium.org/12534013 > > TBR=cpu@chromium.org > Review URL: https://codereview.chromium.org/12704020 TBR=karen@chromium.org Review URL: https://codereview.chromium.org/12906015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191079 0039d316-1c4b-4281-b951-d872f2087c98
* base: Move the rest of JSONValueSerializer unit tests from c/common to ↵tfarina@chromium.org2013-03-2811-145/+143
| | | | | | | | | | | | | | | | | | | | base/json. This is the follow up patch to r189315 - https://codereview.chromium.org/12910004 where we moved the half of tests that didn't depend on json test files. json_value_serializer_perftest.cc was not moved yet because it depends on chrome/common/logging_chrome.h TEST=base_unittests --gtest_filter=*JSON* TEST=perf_tests --gtest_filter=JSONValueSerializerTests* R=darin@chromium.org,bulach@chromium.org Review URL: https://chromiumcodereview.appspot.com/12481028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191077 0039d316-1c4b-4281-b951-d872f2087c98
* InstantExtended: fall back to offline NTP if Instant NTP not ready.samarth@chromium.org2013-03-288-64/+119
| | | | | | | | | BUG=190190 COLLABORATOR=shishir@chromium.org Review URL: https://chromiumcodereview.appspot.com/12578006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191076 0039d316-1c4b-4281-b951-d872f2087c98
* Add script to download SDK, system images and create and start AVDs for testing.navabi@google.com2013-03-285-74/+253
| | | | | | | | | BUG=164911 Review URL: https://chromiumcodereview.appspot.com/12407004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191075 0039d316-1c4b-4281-b951-d872f2087c98
* Completes BluetoothDeviceMac implementation.youngki@chromium.org2013-03-283-0/+40
| | | | | | | | | | | | | | I know we should probably change this file for the new API proposal, but I just wanted to submit this CL to complete the bluetooth app demo on Mac. With this CL I just demonstrated that the IOIO demo works on Chrome Mac. http://developer.chrome.com/apps/samples.html#65ebf6045d3cdd6c9d6dc506989d72b0 BUG=135472 Review URL: https://chromiumcodereview.appspot.com/12982011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191074 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor VirtualAudioInputStream to use FakeAudioConsumer.dalecurtis@google.com2013-03-282-41/+18
| | | | | | | | | | | | | We have too many different audio timing implementations, I've already merged FakeAudioOutputStream and NullAudioSink to use FakeAudioConsumer, time to bind the last one. BUG=none TEST=media_unittests. Review URL: https://codereview.chromium.org/13093009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191073 0039d316-1c4b-4281-b951-d872f2087c98
* views: Support bookmarks bar in immersive fullscreenjamescook@chromium.org2013-03-288-144/+143
| | | | | | | | | | | | | | | * Make bookmarks bar a child of TopContainerView * Reparent bookmarks bar to BrowserView at the NTP * Eliminate BrowserView::active_bookmark_bar_ in favor of checking BrowserView::bookmark_bar_view_ and its visibility BUG=163646 TEST=browser_tests BrowserViewTest, ImmersiveModeControllerTest R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/12634037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191072 0039d316-1c4b-4281-b951-d872f2087c98
* Fix erroneous edits to histogram enum.rpaquay@chromium.org2013-03-281-1/+1
| | | | | | | | | | | | | | | The following CL contained a partially incorrect fix: https://chromiumcodereview.appspot.com/12549027 Shifting an entries by one position restore correct order. BUG= Review URL: https://chromiumcodereview.appspot.com/12545077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191071 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-03-281-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191070 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit deps 146991:147013pdr@chromium.org2013-03-281-1/+1
| | | | | | Review URL: https://codereview.chromium.org/12928008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191069 0039d316-1c4b-4281-b951-d872f2087c98
* Tab audio indicator tweakssail@chromium.org2013-03-286-42/+71
| | | | | | | | | | | | | | | | | Some small tweaks to the tab audio indicator: - change the icon to be half the size (4 bars instead of 8 bars) - draw 2 columns instead of 3 - draw the icon at the bottom right - clip the favicon so that it doesn't obscure the equalizers screenshot: http://i.imgur.com/csAXHDx.png BUG=3541 Review URL: https://chromiumcodereview.appspot.com/13055002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191068 0039d316-1c4b-4281-b951-d872f2087c98
* Optimize SkColorFilters when drawing RenderPassQuadsclholgat@chromium.org2013-03-2814-42/+1185
| | | | | | | | | | | | | | Pull the color transformation matrix from the SkImageFilter if possible and apply with a shader. Handles all permutations of shaders. BUG=168719 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190786 Review URL: https://chromiumcodereview.appspot.com/12803003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191067 0039d316-1c4b-4281-b951-d872f2087c98
* Predex java librariescjhopman@chromium.org2013-03-276-49/+55
| | | | | | | | | | | | | dx supports merging of already dexed jars. This means we can dex jars as part of the library target and then just merge them when we build the apk. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/12913009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191063 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-03-271-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191062 0039d316-1c4b-4281-b951-d872f2087c98
* Roll swarm_client @ 191052.maruel@chromium.org2013-03-271-1/+1
| | | | | | | | | | | | | Includes one specific fix. R=jam@chromium.org NOTRY=true BUG=224432 Review URL: https://chromiumcodereview.appspot.com/12452015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191061 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the problem that docked panel flickers when Chrome just enters ↵jianli@chromium.org2013-03-273-6/+37
| | | | | | | | | | | | | fullscreen mode The fix is to skip isActiveSpace check in IsFullScreen when chrome just enters fullscreen. This is because the Chrome window has not been put on active space when it just enters fullscreen mode. BUG=223867 TEST=Manual test by opening a docked panel and making a chrome window enter fullscreen mode Review URL: https://codereview.chromium.org/13095012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191060 0039d316-1c4b-4281-b951-d872f2087c98
* fix x32 handling of Atomic64vapier@chromium.org2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | The x32 logic for the size of Atomic64 handles NaCL, but misses the Linux case. Check the standard __ILP32__ to handle that too. Upstream tracker: https://code.google.com/p/protobuf/issues/detail?id=474 BUG=chromium-os:36866 TEST=compiled the code for x86_64 (64bit) & x86_64 (x32) R=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/12380082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191058 0039d316-1c4b-4281-b951-d872f2087c98
* [android] Start displaying rAc notifications.aurimas@chromium.org2013-03-273-7/+42
| | | | | | | | | | | Start showing Autofill Dialog notifications. BUG=178536 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/13111003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191057 0039d316-1c4b-4281-b951-d872f2087c98
* Remove ManagedMode parsing from Extension Classrdevlin.cronin@chromium.org2013-03-279-77/+169
| | | | | | | | | | | TBR=ben@chromium.org, pam@chromium.org (ben - gypis, pam - c/b/managed_mode/) BUG=159265 Review URL: https://chromiumcodereview.appspot.com/13101003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191056 0039d316-1c4b-4281-b951-d872f2087c98
* History Manager: Add a workaround for the dropdown button size bug.arv@chromium.org2013-03-271-0/+2
| | | | | | | | | | | | | The flex box layout changed in such a way that empty buttons does not respect the width properly. BUG=223542 TEST=Open history, makes sure all the drop down arrows are the same size. Review URL: https://chromiumcodereview.appspot.com/12594030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191055 0039d316-1c4b-4281-b951-d872f2087c98
* Disable TabCaptureApiTest.ApiTests since it's flaky.jam@chromium.org2013-03-271-1/+3
| | | | | | | | BUG=224249 TBR=justinlin Review URL: https://codereview.chromium.org/13075004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191051 0039d316-1c4b-4281-b951-d872f2087c98
* Remove autorun values if it points to the same user data as service.vitalybuka@chromium.org2013-03-272-0/+40
| | | | | | | | | BUG=224219 Review URL: https://chromiumcodereview.appspot.com/13042016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191050 0039d316-1c4b-4281-b951-d872f2087c98
* Fix InputMethod Widget activation checks; cleanup, etc.msw@chromium.org2013-03-279-138/+63
| | | | | | | | | | | | | | | | | | | | | | | Remove InputMethodBase::On[Focus|Blur] and |widget_focused_|. Check widget()->IsActive() as needed instead of widget_focused_. ( this resolves improper init order firing DCHECKs in views_unittests ) ( fixes FocusManagerDtorTest.* with --enable-views-textfield ) Fix NativeTextfieldViewsTest widget activation and textfield focus. Rename virtual InputMethod::set_delegate() to SetDelegate(). Call the base Init from InputMethodBase::Init first. ( initializes |widget_| before it's used in OnInputLangChange ) Remove InputMethodBase's unnecessary NON_EXPORTED_BASE usage. Add empty MockInputMethod::On[Focus|Blur] implementations. Update comments for conciseness and clarity. BUG=131660 TEST=No input regressions; unit tests pass with --enable-views-textfield. R=sky@chromium.org,suzhe@chromium.org Review URL: https://chromiumcodereview.appspot.com/12902029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191049 0039d316-1c4b-4281-b951-d872f2087c98
* Alternate NTP Mac: Push down overlay in presentation modesail@chromium.org2013-03-275-28/+125
| | | | | | | | | | | | | | | | | | | | | | | In presentation mode the browser toolbar and bookmark bar are in a special floating view. This view obscures the instant overlay since the overlay is at the top of the screen. This CL pushes the overlay down so that it's not obscured when the floating toolbar view is shown. Test build: https://docs.google.com/file/d/0B0Odde3V7EhWTmtMTXBJYmtGS3M/edit?usp=sharing BUG=167185 TEST= Launched Chrome with instant extended enabled. Enter presentation mode and type in the omnibox. Verify that the omnibox popup is below the floating toolbar view. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190980 Review URL: https://chromiumcodereview.appspot.com/12594015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191048 0039d316-1c4b-4281-b951-d872f2087c98
* sync: Implementation of Priority Preferences.albertb@chromium.org2013-03-2724-66/+221
| | | | | | | | | | | | | Priority preferences are similar to normal preferences but are never encrypted and are synced ahead of other datatypes. Because they're never encrypted, on first sync, they can be synced immediately after login, before the user is prompted for a passphrase. Expected uses of priority preferences include hardware setting (eg. trackpad speed, scroll direction, etc.) as well as settings that could be 2-way synced with existing Google Account settings (eg. language). BUG=168648 Review URL: https://chromiumcodereview.appspot.com/12033093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191047 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-03-271-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191046 0039d316-1c4b-4281-b951-d872f2087c98
* Roll ANGLE 2001:2040.apatrick@chromium.org2013-03-271-1/+1
| | | | | | | There are only two changes on ANGLE trunk in this range: 2040 and 2002. Review URL: https://codereview.chromium.org/13044018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191045 0039d316-1c4b-4281-b951-d872f2087c98
* Passive login for Interactive Autofill dialog.aruslan@chromium.org2013-03-276-36/+191
| | | | | | | | | | | | | | | | | First pass on integration of passive login to Autofill dialog. Adds bool AutofillDialogController::ShouldShowSpinner() to be called by the views if they could show the spinner. Depends on https://chromiumcodereview.appspot.com/12810009/ BUG=171528,166717 NOTRY=True Review URL: https://chromiumcodereview.appspot.com/12920006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191044 0039d316-1c4b-4281-b951-d872f2087c98
* Enable configuralbe mergemanifest.enabled again. It's reverted on recent ↵jayjang@chromium.org2013-03-271-1/+5
| | | | | | | | | | | refactoring BUG=181470 Review URL: https://chromiumcodereview.appspot.com/13004007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191043 0039d316-1c4b-4281-b951-d872f2087c98
* Convert include paths for string_number_conversions in src/chrome and src/webkitbrettw@chromium.org2013-03-2749-49/+49
| | | | | | | | Converts from base/string_number_conversions.h to base/strings/... Review URL: https://codereview.chromium.org/13097008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191042 0039d316-1c4b-4281-b951-d872f2087c98
* Deflake ContentDetection tests.aruslan@chromium.org2013-03-274-43/+28
| | | | | | | | | | | | | | All pages used by the test have <meta viewport> tag, so we assert-wait till the compositor sends correct coordinates to the ContentViewCore (cf http://crbug.com/179511). BUG=172786, 167022 NOTRY=True Review URL: https://chromiumcodereview.appspot.com/12594042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191041 0039d316-1c4b-4281-b951-d872f2087c98
* Focus is displaying out of pane while dragging the bookmark folders.tom.cassiotis@gmail.com2013-03-275-567/+534
| | | | | | | | | | | | | | | | | | | | | | Refactored the drag and drop code for the bookmark manager and changed the method that the drag and drop indicator is displayed. The new method uses CSS styles instead of a div that is moved and sized in the appropriate position. Contributed by: tom.cassiotis@gmail.com BUG=177644 TEST=Basically everything to do with drag and dropping in the bookmark manager. DND within the folder list, within the bookmark list, from the bookmark list to the folder list, multiple selection (folders only, bookmarks only, folders and bookmarks) and between profiles. Special cases include dropping in a bookmark list (select a folder with no items) and dropping in the whitespace below the last item in the bookmark list. Review URL: https://chromiumcodereview.appspot.com/12330078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191040 0039d316-1c4b-4281-b951-d872f2087c98
* [Telemetry] Prevent one form of possible infinite recursion in GetChildPids.tonyg@chromium.org2013-03-271-0/+2
| | | | | | | | | | | | | | | | | | | The win bots are occassionally infinitely recursing on GetChildPids (see bug). I can't reproduce it locally, but this is one way I can think of it getting stuck. It should never be the case that one of the processes we are interested in is its own parent, but just in case I'm adding this check. If this doesn't fix it, the next step will be to add some logging. BUG=223108 TEST=moz page cycler on windows NOTRY=True Review URL: https://codereview.chromium.org/13004025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191039 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 191028 "[Sync] Disable unrecoverable error uploading."zea@chromium.org2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | Reverted on ToT (patch was merged to 27 branch) > [Sync] Disable unrecoverable error uploading. > > Disabling for 27 branch. > > BUG=134607 > TBR=rlarocque@chromium.org > > Review URL: https://codereview.chromium.org/12770030 TBR=zea@chromium.org Review URL: https://codereview.chromium.org/12710014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191038 0039d316-1c4b-4281-b951-d872f2087c98
* Minor cleanup of image transport surface creation.brettw@chromium.org2013-03-278-159/+129
| | | | | | | | | | | | This factors out the shared code for each platform into a cross-platform file, and just leaves the platform-specific native surfaces in the platform files. This renames the Linux file to X11 which is more specific to the use. BUG= Review URL: https://codereview.chromium.org/12619010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191037 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-03-271-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191036 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit deps 146978:146991pdr@chromium.org2013-03-271-1/+1
| | | | | | Review URL: https://codereview.chromium.org/12907026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191035 0039d316-1c4b-4281-b951-d872f2087c98
* tree.js: Prevent an exeption on key down when no item is selected.yoshiki@chromium.org2013-03-271-0/+2
| | | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/13116003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191034 0039d316-1c4b-4281-b951-d872f2087c98
* Andriod - use view port in chrome://net-export to make buttons bigger.rtenneti@chromium.org2013-03-271-0/+3
| | | | | | | | | | | R=mmenke@chromium.org,dbeam@chromium.org BUG=180230 nyquist@ had verified that the buttons are bigger. Review URL: https://chromiumcodereview.appspot.com/13108002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191033 0039d316-1c4b-4281-b951-d872f2087c98
* [Sync] Disable unrecoverable error uploading.zea@chromium.org2013-03-271-1/+1
| | | | | | | | | | | Disabling for 27 branch. BUG=134607 TBR=rlarocque@chromium.org Review URL: https://codereview.chromium.org/12770030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191028 0039d316-1c4b-4281-b951-d872f2087c98
* [Sync] Move Android enabled types logic into nativezea@chromium.org2013-03-2710-258/+165
| | | | | | | | | | | | This adds a JNI method to get the set of enabled types, which is then used in registering for invalidations. BUG=224144 Review URL: https://chromiumcodereview.appspot.com/13109002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191025 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the no password save issue for ajax login gcasto@chromium.org2013-03-276-0/+188
| | | | | | | | | | | | | The idea is that if a navigation is triggered by non-user gesture after a password form is submitted, then we assume that this navigation is related to the previous form submit and chrome should prompt for saving password if all criteria for provisionally saving password are met. The link between the previous form submit and the coming navigation is weak, so its possible for chrome to inherit password forms from previous state when it should not. However most false cases would be aborted at PasswordManager::ProvisionallySavePassword, which does a list of sanity checks for saving password, such as if the form is already seen on the current page. BUG=43219 Review URL: https://chromiumcodereview.appspot.com/12713007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191024 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Shorten long suite names in test reporting step.frankf@chromium.org2013-03-271-1/+3
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/12594038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191021 0039d316-1c4b-4281-b951-d872f2087c98
* Update device/bluetooth/OWNERSkeybuk@chromium.org2013-03-271-1/+1
| | | | | | | | | | | bryeung has handed the reins to youngki, who is now a full committer BUG=none TEST=none Review URL: https://codereview.chromium.org/12918034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191019 0039d316-1c4b-4281-b951-d872f2087c98
* Support multi touch on Windows 8 AURA and ASH.ananta@chromium.org2013-03-276-28/+50
| | | | | | | | | | | | | | | | | The touch events coming in from desktop chrome AURA and ASH have hardcoded touch ids which breaks the gesture recognizer as it is unable to figure out that multiple touch points are involved. Fix on desktop Chrome AURA is to use the OS generated touch id mapped to the gesture recognizer range. For ASH Windows 8 we pass in the mapped touch ids from the metro driver in the touch IPC messages. Fixes bug https://code.google.com/p/chromium/issues/detail?id=179977 BUG=179977 R=cpu,sky Review URL: https://codereview.chromium.org/13003004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191015 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-03-271-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191014 0039d316-1c4b-4281-b951-d872f2087c98
* Additional command line switches for logging and to disable some components.vitalybuka@chromium.org2013-03-275-2/+36
| | | | | | | | BUG= 224219 Review URL: https://chromiumcodereview.appspot.com/13119004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191013 0039d316-1c4b-4281-b951-d872f2087c98
* Roll swarm_client @ 191008.maruel@chromium.org2013-03-271-1/+1
| | | | | | | | | | | | | It includes one oneliner change and one test-only change. R=csharp@chromium.org BUG= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12594041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191012 0039d316-1c4b-4281-b951-d872f2087c98
* InstantExtended: Test omnibox navigation.jered@chromium.org2013-03-271-0/+98
| | | | | | | | | BUG=224080 Review URL: https://chromiumcodereview.appspot.com/13103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191011 0039d316-1c4b-4281-b951-d872f2087c98