summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 37.0.2062.11937.0.2062.119chrome-tpm2014-08-282-862/+910
|
* Incrementing VERSION to 37.0.2062.119chrome-tpm2014-08-291-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#585} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Incrementing VERSION to 37.0.2062.118chrome-tpm2014-08-281-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#584} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Incrementing VERSION to 37.0.2062.117chrome-tpm2014-08-271-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#583} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* cc: Don't infinitely throttle large raster tasksAdrienne Walker2014-08-272-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a raster task had a resource size that was larger than the throttling limit for the raster worker, that task would never get scheduled. This leads to starvation for that task, preventing tree activation, and causing freezes. The fix is to always allow such large tasks if it is the first task. This also fixes the compile failure in raster_worker_pool_unittest.cc due to TextureHintImmutable which does not exist in this branch. TBR=reveman@chromium.org BUG=403446 Review URL: https://codereview.chromium.org/489293002 Cr-Commit-Position: refs/heads/master@{#291484} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291484 0039d316-1c4b-4281-b951-d872f2087c98 (cherry picked from commit 604e202d3548b701900c3771f9517103bb91486c) Review URL: https://codereview.chromium.org/513953002 Cr-Commit-Position: refs/branch-heads/2062@{#582} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Fix reload of a tab that crashed in background.Przemyslaw Pietrzkiewicz2014-08-272-1/+15
| | | | | | | | | | | | | | | | | | | This patch fixes a trivial mistake that made the fix in https://codereview.chromium.org/459613007 a noop, and adds a regression unit-test. BUG=401859 TBR=aelias@chromium.org Review URL: https://codereview.chromium.org/498293002 Cr-Commit-Position: refs/heads/master@{#291765} (cherry picked from commit 7017a81991de983e12ab50dfc071c70e06979531) Review URL: https://codereview.chromium.org/516583002 Cr-Commit-Position: refs/branch-heads/2062@{#581} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Revert "cc: Don't infinitely throttle large raster tasks"Jason Kersey2014-08-272-35/+6
| | | | | | | This reverts commit b6719b58b7fdf11ba13a8a3381fcecac725b7b04. Cr-Commit-Position: refs/branch-heads/2062@{#580} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* cc: Don't infinitely throttle large raster tasksJason Kersey2014-08-272-6/+35
| | | | | | | | | | | | | | | | | | | | Previously, if a raster task had a resource size that was larger than the throttling limit for the raster worker, that task would never get scheduled. This leads to starvation for that task, preventing tree activation, and causing freezes. The fix is to always allow such large tasks if it is the first task. R=reveman@chromium.org BUG=403446 Review URL: https://codereview.chromium.org/489293002 (cherry picked from commit 604e202d3548b701900c3771f9517103bb91486c) Cr-Original-Commit-Position: refs/heads/master@{#291484} Cr-Commit-Position: refs/branch-heads/2062@{#579} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Incrementing VERSION to 37.0.2062.116chrome-tpm2014-08-261-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#578} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Merge: Fix the way debug_daemon_log_source gets the list of profile dirsToni Barzic2014-08-262-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of getting profiles using ProfileManager::GetLastOpenedProfiles, use combination of UserManager::GetLoggedInUsers and ProfileHelper::GetProfilePathByUserIdHash. The former does not necesary return the list of profiles that are open in the session, and can start adding profile for a non-logged in user (e.g. in guest session, where the LastOpenedProfiles list will contain the list of profiles at the previous session's shutdown), causing crash. Further more, the list does not include profiles that do not have any opened browser windows. BUG=378672 TEST= 1. Login as a regular user 2. Make sure a browser window is opened in the session 3. Log out and log in as guest 4.1.1. Launch feedback app (e.g. Ctrl-Alt-I) 4.1.2. Verify a feedback app window is shown and there is no browser crash 4.2.1 Open chrome://system 4.2.2 Verify the system logs are displayed and there is no crash Review URL: https://codereview.chromium.org/493883003 Cr-Commit-Position: refs/heads/master@{#290994} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290994 0039d316-1c4b-4281-b951-d872f2087c98 (cherry picked from commit 09b485080e38543aebd157fd2314394a0087b341) Conflicts: chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc TBR=tbarzic Review URL: https://codereview.chromium.org/508493002 Cr-Commit-Position: refs/branch-heads/2062@{#577} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Make 64-bit Chrome stable report as CHANNEL_STABLEWill Harris2014-08-264-2/+19
| | | | | | | | | | | | | | | | BUG=407204 TEST=installer_util_unittests TEST=install x64 stable. Check chrome://chrome shows 'm' and not 'unknown-m'. Review URL: https://codereview.chromium.org/467303004 Cr-Commit-Position: refs/heads/master@{#291791} (cherry picked from commit 7ebc2c47bb7683224f8978f21f83fba4e1851ab0) Review URL: https://codereview.chromium.org/503223002 Cr-Commit-Position: refs/branch-heads/2062@{#576} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Android: Extend Mali egl fence sync blacklist to all ES2 driversDaniel Sievers2014-08-251-4/+9
| | | | | | | | | | | | | | | | BUG=398964 NOTRY=True Review URL: https://codereview.chromium.org/490613003 Cr-Commit-Position: refs/heads/master@{#290680} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290680 0039d316-1c4b-4281-b951-d872f2087c98 (cherry picked from commit 848e2f1a7d4ac7f21dfc36c3d26915dc335fbe4a) Review URL: https://codereview.chromium.org/508463002 Cr-Commit-Position: refs/branch-heads/2062@{#575} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* gpu: Handle EGL_KHR_fence_sync test failureDaniel Sievers2014-08-251-1/+4
| | | | | | | | | | | | | | | | BUG=398964 NOTRY=True Review URL: https://codereview.chromium.org/492513002 Cr-Commit-Position: refs/heads/master@{#290679} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290679 0039d316-1c4b-4281-b951-d872f2087c98 (cherry picked from commit 1b7e26c7c69df0b0f4a0c8274e8e15b1d180e028) Review URL: https://codereview.chromium.org/488173005 Cr-Commit-Position: refs/branch-heads/2062@{#574} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Incrementing VERSION to 37.0.2062.115chrome-tpm2014-08-251-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#573} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Increase DBus timeout in cryptohome calls to 2 minutes.Pavel Sergeev2014-08-251-29/+34
| | | | | | | | | | | | | | | | | | BUG=378338 Review URL: https://codereview.chromium.org/491913002 Cr-Commit-Position: refs/heads/master@{#291080} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291080 0039d316-1c4b-4281-b951-d872f2087c98 (cherry picked from commit 347c06e12684f5c2c82049950b1a94448e14e30f) Conflicts: chromeos/dbus/cryptohome_client.cc Review URL: https://codereview.chromium.org/505523004 Cr-Commit-Position: refs/branch-heads/2062@{#572} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Incrementing VERSION to 37.0.2062.114chrome-tpm2014-08-241-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#571} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Switch codereview.settings to git.Robert Iannucci2014-08-241-1/+2
| | | | | | | | | | | | | R=vadimsh@chromium.org BUG=263848 Review URL: https://codereview.chromium.org/505433003 (cherry picked from commit 42a2ff8eb8b7167353587c52f4e06e67f87d4b60) Cr-Original-Commit-Position: refs/heads/master@{#291562} Cr-Commit-Position: refs/branch-heads/2062@{#570} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Add numbering information for 2062.Robert Iannucci2014-08-230-0/+0
| | | | | Cr-Commit-Position: refs/branch-heads/2062@{#569} Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
* Incrementing VERSION to 37.0.2062.113chrome-release@google.com2014-08-221-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291551 0039d316-1c4b-4281-b951-d872f2087c98
* Manual merging of r288326dgrogan@chromium.org2014-08-221-1/+1
| | | | | | | | See http://crrev.com/449383002 for original codereview Review URL: https://codereview.chromium.org/499683002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291482 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 291233 "Set default multi-profile policy to not-allowed."atwilson@chromium.org2014-08-223-5/+5
| | | | | | | | | | | | | | | | | > Set default multi-profile policy to not-allowed. > > Delaying launch of multi-profile for managed accounts to M38, so setting > the default policy to "not-allowed". > > BUG=405983 > > Review URL: https://codereview.chromium.org/469003010 TBR=atwilson@chromium.org Review URL: https://codereview.chromium.org/490813003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291479 0039d316-1c4b-4281-b951-d872f2087c98
* Setting version to MAJOR=37chrome-release@google.com2014-08-221-1/+1
| | | | | | | | | MINOR=0 BUILD=2062 PATCH=112 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291450 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290367 "Use SkBitmap::readPixels to perform copy to 4444."feng@chromium.org2014-08-221-18/+9
| | | | | | | | | | | | | | | | | > Use SkBitmap::readPixels to perform copy to 4444. > > readPixels allows specifying the rowBytes, which is important for > this caller, who wants them to be 4-byte aligned. > > BUG=chromium:390782 > > Review URL: https://codereview.chromium.org/386743002 TBR=scroggo@google.com Review URL: https://codereview.chromium.org/496373002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291418 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 285893 "[android_webview] Don't unconditionally add pak fi..."mkosiba@chromium.org2014-08-222-0/+99
| | | | | | | | | | | | | | | | | | > [android_webview] Don't unconditionally add pak files to system image. > > The make rules we have make it impossible to not include the > android_webview pak files in the system image. > > BUG=396741 > R=primiano@chromium.org > > Review URL: https://codereview.chromium.org/414823002 TBR=mkosiba@chromium.org Review URL: https://codereview.chromium.org/477153004 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291364 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build on 2062 branch after r291285.thestig@chromium.org2014-08-221-1/+1
| | | | | | | | BUG=383003 Review URL: https://codereview.chromium.org/493323002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291320 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290486 "ChromeOS: Fix the permission for the collect stats..."thestig@chromium.org2014-08-222-9/+45
| | | | | | | | | | | | | | > ChromeOS: Fix the permission for the collect stats consent file to be world readable. > > BUG=383003 > > Review URL: https://codereview.chromium.org/487633002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/493213003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291285 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 291193 "Fix OEM menu issue"dtrainor@chromium.org2014-08-211-11/+23
| | | | | | | | | | | | | | | | | > Fix OEM menu issue > > - Some OEMs don't let us change the background, so the padding is incorrect. > - Also including sizing the menu too large causes clipping. > > BUG=398837 > > Review URL: https://codereview.chromium.org/469673006 TBR=dtrainor@chromium.org Review URL: https://codereview.chromium.org/493263002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291229 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290773 "[Android] Fix overflow menu enter tablet animation"dtrainor@chromium.org2014-08-214-6/+10
| | | | | | | | | | | | | | | | | | | > [Android] Fix overflow menu enter tablet animation > > - On tablets the new anchor point was 6dp off due to the new shadow assets. To fix > this add a 6dp translate to the enter animation that will move the asset into the > correct location as the scale animation runs. This effectively mimics the old > animation but allows the offset to be included. > > BUG=405352 > > Review URL: https://codereview.chromium.org/488863002 TBR=dtrainor@chromium.org Review URL: https://codereview.chromium.org/487583003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291225 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 37.0.2062.97chrome-release@google.com2014-08-211-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291205 0039d316-1c4b-4281-b951-d872f2087c98
* Amend 289844 "Simplify android_webview wrap_contents mode."mkosiba@chromium.org2014-08-211-0/+1
| | | | | | | | | | | | | When merging r288992 I accidentally omitted the one line from web_preferences due to a conflicting rename of that file in trunk. This CL fixes the mistake. BUG=392460 TBR=mkosiba@chromium.org Review URL: https://codereview.chromium.org/466353003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@291100 0039d316-1c4b-4281-b951-d872f2087c98
* [Branch 2062] Video Player: Show the titlebar in case of erroryoshiki@chromium.org2014-08-211-1/+2
| | | | | | | | | | | | | | This fixed the issue of titlebar in case of playback error. This patch is extracted from the original change r279370 to commit this to M37 branch. BUG=chrome-os-partner:30418 TEST=manually tested R=fukino@chromium.org Review URL: https://codereview.chromium.org/490893002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290991 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290506 "Generate correct key string to IME extensions for ..."shuchen@chromium.org2014-08-211-1/+37
| | | | | | | | | | | | | | | | | | | | | | This is the 2nd attempt for merge, the 1st attempt caused compiling errors due to changes in browser_tests. This 2nd attempt drops the changes in browser_tests. BUG=405431 > Generate correct key string to IME extensions for media keys. > > BUG=402935 > TEST=Verified on linux_chromeos & Pixel. > > Review URL: https://codereview.chromium.org/486693003 TBR=shuchen@chromium.org Review URL: https://codereview.chromium.org/490063002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290975 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 290568 "Merge 290506 "Generate correct key string to IME ..."dharani@google.com2014-08-202-85/+1
| | | | | | | | | | | | | | | | | | | | | | | Check bug 405431 for details. > Merge 290506 "Generate correct key string to IME extensions for ..." > > > Generate correct key string to IME extensions for media keys. > > > > BUG=402935 > > TEST=Verified on linux_chromeos & Pixel. > > > > Review URL: https://codereview.chromium.org/486693003 > > TBR=shuchen@chromium.org > > Review URL: https://codereview.chromium.org/489513003 TBR=shuchen@chromium.org Review URL: https://codereview.chromium.org/485463004 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290868 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290158 "Prevent invalidating refresh token on transient er..."pavely@chromium.org2014-08-203-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Prevent invalidating refresh token on transient errors. > > Problem: > When access token request fails with unexpected errors those get > translated to "invalid credentials". In response auth_sync_observer.cc > marks refresh token as invalid which prevents offline auth on next startup. > > oauth2_access_token_fetcher_impl.cc: > - Handle all 5xx http codes as transient errors. > - Log error for unexpected codes. > > profile_sync_service.cc: > - handle REQUEST_CANCELLED and SERVICE_ERROR as transient error, retry instead of > notifying observers. > - Log error for unexpected auth errors. > > BUG=394939 > R=rogerta@chromium.org,zea@chromium.org > > Review URL: https://codereview.chromium.org/472403002 TBR=pavely@chromium.org Review URL: https://codereview.chromium.org/493733002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290854 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 37.0.2062.96chrome-release@google.com2014-08-201-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290847 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290379 "[Android] Make ApplicationStatus thread safe"dtrainor@chromium.org2014-08-191-5/+11
| | | | | | | | | | | | | | | | > [Android] Make ApplicationStatus thread safe > > - Make sActivityInfo a ConcurrentHashMap instead of just a HashMap. > > BUG=403951 > > Review URL: https://codereview.chromium.org/479603003 TBR=dtrainor@chromium.org Review URL: https://codereview.chromium.org/490703002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290658 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 37.0.2062.95chrome-release@google.com2014-08-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290643 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 37.0.2062.94chrome-release@google.com2014-08-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290621 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 290560 "Merge 290367 "Use SkBitmap::readPixels to perform..."amineer@chromium.org2014-08-191-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | This broke the build. See logs at: http://master.chrome.corp.google.com:8011/builders/win%20stable/builds/1148/steps/compile/logs/stdio > Merge 290367 "Use SkBitmap::readPixels to perform copy to 4444." > > > Use SkBitmap::readPixels to perform copy to 4444. > > > > readPixels allows specifying the rowBytes, which is important for > > this caller, who wants them to be 4-byte aligned. > > > > BUG=chromium:390782 > > > > Review URL: https://codereview.chromium.org/386743002 > > TBR=scroggo@google.com > > Review URL: https://codereview.chromium.org/490543002 TBR=feng@chromium.org Review URL: https://codereview.chromium.org/486423002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290616 0039d316-1c4b-4281-b951-d872f2087c98
* updated string to prevent settings page from disappearingamineer@chromium.org2014-08-191-2/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290613 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 289116 "Chrome OS: Fix tab mergeability with cursor compos..."hshi@chromium.org2014-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | > Chrome OS: Fix tab mergeability with cursor compositing. > > Ash GetLocalProcessWindowAtPointImpl should ignore windows in the > mouse cursor container. > > BUG=399309 > R=oshima@chromium.org, sky@chromium.org > TBR=sky@chromium.org > TEST=verify that tab merging works with large cursors. > > Review URL: https://codereview.chromium.org/468603002 TBR=hshi@chromium.org Review URL: https://codereview.chromium.org/473673005 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290584 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 288347 "Only switch draw buffers if the extension is suppo..."zmo@chromium.org2014-08-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | > Only switch draw buffers if the extension is supported > > Otherwise it's possible to end up crashing when calling a null function > pointer, if a framebuffer does not have a color buffer attached. > > This bug applies to at least some GLES3 platforms, where DrawBuffers > function is not bound (which is reasonable, since core version of the > function behaves subtly differently than DrawBuffersEXT in relation to > GLSL ES 1.0 shaders, if the EXT_draw_buffers extension is missing). Also > possibly GLES2 platforms which implement OES_depth_texture but not > EXT_draw_buffers. > > BUG=401645 > TEST=gpu_unittests, WebGL conformance tests > > Review URL: https://codereview.chromium.org/448223002 TBR=oetuaho@nvidia.com Review URL: https://codereview.chromium.org/489533002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290575 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 287309 "Use the display name on ChromeOS instead of the pr..."akuegel@chromium.org2014-08-192-1/+17
| | | | | | | | | | | | | | | | | > Use the display name on ChromeOS instead of the profile name. > > Add a method to determine the name of a supervised user. So far, we used > the profile name, but this doesn't work on ChromeOS. > > BUG=399320 > > Review URL: https://codereview.chromium.org/431893004 TBR=akuegel@chromium.org Review URL: https://codereview.chromium.org/490493003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290569 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290506 "Generate correct key string to IME extensions for ..."shuchen@chromium.org2014-08-192-1/+85
| | | | | | | | | | | | | | | > Generate correct key string to IME extensions for media keys. > > BUG=402935 > TEST=Verified on linux_chromeos & Pixel. > > Review URL: https://codereview.chromium.org/486693003 TBR=shuchen@chromium.org Review URL: https://codereview.chromium.org/489513003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290568 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 289565 "Set correct DOM key code string for functional keys."shuchen@chromium.org2014-08-193-6/+31
| | | | | | | | | | | | | | | > Set correct DOM key code string for functional keys. > > BUG=402935 > TEST=Verified on Pixel. > > Review URL: https://codereview.chromium.org/466223004 TBR=shuchen@chromium.org Review URL: https://codereview.chromium.org/489523002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290566 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290367 "Use SkBitmap::readPixels to perform copy to 4444."feng@chromium.org2014-08-191-18/+9
| | | | | | | | | | | | | | | | | > Use SkBitmap::readPixels to perform copy to 4444. > > readPixels allows specifying the rowBytes, which is important for > this caller, who wants them to be 4-byte aligned. > > BUG=chromium:390782 > > Review URL: https://codereview.chromium.org/386743002 TBR=scroggo@google.com Review URL: https://codereview.chromium.org/490543002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290560 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 37.0.2062.93chrome-release@google.com2014-08-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290557 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 289964 "[Profiles] Downloading high res avatars should do ..."noms@chromium.org2014-08-192-0/+8
| | | | | | | | | | | | | | > [Profiles] Downloading high res avatars should do nothing on non-desktop > > BUG=404066 > > Review URL: https://codereview.chromium.org/476133002 TBR=noms@chromium.org Review URL: https://codereview.chromium.org/483303003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290553 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 281706 "DisableDemoMode flag check added for HID detection..."merkulova@chromium.org2014-08-191-1/+4
| | | | | | | | | | | | | | > DisableDemoMode flag check added for HID detection screen. > > BUG=389621 > > Review URL: https://codereview.chromium.org/376853002 TBR=merkulova@chromium.org Review URL: https://codereview.chromium.org/487173002 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290520 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 290515 "Port the fix to bug 391008 to the copy of ChromeVo..."dmazzoni@google.com2014-08-193-3/+3
| | | | | | | | | | | | | | | | | | > Port the fix to bug 391008 to the copy of ChromeVox in chrome/third_party > > Chrome 37 uses ChromeVox out of chrome/third_party, so that's the version > we need to update to fully merge the fix. > > BUG=391008 > TBR=dtseng > > Review URL: https://codereview.chromium.org/476593003 TBR=dmazzoni@chromium.org Review URL: https://codereview.chromium.org/486113003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290516 0039d316-1c4b-4281-b951-d872f2087c98