summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 28.0.1500.4528.0.1500.45gitdeps2014-04-072-693/+589
|
* Incrementing VERSION to 28.0.1500.45chrome-release@google.com2013-06-121-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205727 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205316 "[Android] Tweak style of net error pages."newt@chromium.org2013-06-121-11/+40
| | | | | | | | | | | | | | | | | | | > [Android] Tweak style of net error pages. > > Changes: > - The page cannot be zoomed > - The buttons have solid, Android-specific background colors > - Buttons have rounded corners and bold text > > BUG=239912 > > Review URL: https://chromiumcodereview.appspot.com/16557005 TBR=newt@chromium.org Review URL: https://codereview.chromium.org/16275005 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205701 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205587 "Get the Windows 8 metro incognito/normal browser w..."ananta@chromium.org2013-06-124-9/+123
| | | | | | | | | | | | | | | | | | | | | | | | > Get the Windows 8 metro incognito/normal browser window switcher button working again. > > This regressed recently in revision 187458 which basically added the TopContainerView as a child view to > BrowserView. The incognito switcher button is added in the ctor of the BrowserFrameWin class which is much > before the TopContainerView is added as a child view. The Views framework looks for a handler the mouse event > backwards, i.e the view added last gets the first chance to process it and so on. > > Fix is to add the switcher button in the BrowserView::InitViews function after the other child views are > added. With Chrome ASH the switcher button would not be needed anymore. > > BUG=244378 > R=cpu@chromium.org, sky@chromium.org > TEST=Covered by unittest BrowserViewIncognitoSwitcherEventHandlerTest. > > Review URL: https://codereview.chromium.org/16348005 TBR=ananta@chromium.org Review URL: https://codereview.chromium.org/16765010 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205698 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205322 "Fix stack overflow in confirmTouchEvent()"wangxianzhu@chromium.org2013-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | > Fix stack overflow in confirmTouchEvent() > > confirmTouchEvent() may be called synchronously before sendTouchEvent() > returns. In the PENDING_ACK_ORIGINAL_EVENT state of TouchEventTimeoutHandler, > the Java stack will overflow if confirmTouchEvent() is called synchronously. > > Set state before send the event. > > NOTRY=true > BUG=247683 > R=yusufo@chromium.org > TBR=tedchoc@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/16739014 TBR=wangxianzhu@chromium.org Review URL: https://codereview.chromium.org/16347018 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205683 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 28.0.1500.44chrome-release@google.com2013-06-121-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205678 0039d316-1c4b-4281-b951-d872f2087c98
* Fix compile errors by reverting to older variant of the ViewHierarchyChanged ↵laforge@chromium.org2013-06-112-5/+7
| | | | | | | | method. Review URL: https://codereview.chromium.org/16225008 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205648 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205080 "Changing the URL for the help center when conflict..."finnur@chromium.org2013-06-111-1/+1
| | | | | | | | | | | | | | | | > Changing the URL for the help center when conflicts are detected. > > TBR=cpu > BUG=238378 > (see also b/9280252). > > Review URL: https://chromiumcodereview.appspot.com/16692002 TBR=finnur@chromium.org Review URL: https://codereview.chromium.org/16610005 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205630 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204505 "Warn by default when certain DLL conflicts exist o..."finnur@chromium.org2013-06-1117-94/+597
| | | | | | | | | | | | | | | > Warn by default when certain DLL conflicts exist on XP. > > BUG=238378 > R=cpu@chromium.org, jhawkins@chromium.org, sky@chromium.org > > Review URL: https://codereview.chromium.org/15969017 TBR=finnur@chromium.org Review URL: https://codereview.chromium.org/16788004 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205629 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205366 "Ensure that the AURA/ASH way of display the Window..."ananta@chromium.org2013-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | > Ensure that the AURA/ASH way of display the Windows 8 on screen keyboard does not interfere with non AURA chrome. > > In non AURA chrome on Windows 8 the OSK is displayed by the OS when the accessibility interfaces on fields return information > on whether it is editable etc. In AURA/ASH chrome we display the OSK programmatically. This is done in the ChromeViewHostMsg_FocusedNodeTouched > IPC handler in chrome\browser. This code also executes for non AURA chrome which causes the OSK to popup and vanish. > > Fix is to display the OSK only if USE_AURA is defined. > > BUG=234934 > TBR=cpu@chromium.org > > Review URL: https://codereview.chromium.org/16347007 TBR=ananta@chromium.org Review URL: https://codereview.chromium.org/16677009 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205599 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203022 "Fix the problem that the minimized docked panel is..."jianli@chromium.org2013-06-111-2/+2
| | | | | | | | | | | | | | | | | > Fix the problem that the minimized docked panel is not unsqueezed back to its original size when the restore button is clicked > > The fix is to make Panel::OnRestoreButtonClicked call Panel::OnTitlebarClicked such that the logic provided in OnTitlebarClicked can take effect > > BUG=244781 > TEST=Manual test by following repro steps as in the bug > > Review URL: https://chromiumcodereview.appspot.com/15807006 TBR=jianli@chromium.org Review URL: https://codereview.chromium.org/16658009 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205569 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204337 "Let NetworkConfigurationUpdater wait for PolicySer..."pneubeck@chromium.org2013-06-112-2/+65
| | | | | | | | | | | | | | | | | | | > Let NetworkConfigurationUpdater wait for PolicyService::IsInitializationComplete. > > This fixes a race between policy initialization and the NetworkConfigurationUpdater applying an empty user policy. > > This change is on purpose made as local as possible to be mergeable to R28. > In a follow-up change, the observer will be integrated into the NetworkConfigurationUpdater. > > BUG=236094, 242668, 246753 > > Review URL: https://chromiumcodereview.appspot.com/16439007 TBR=pneubeck@chromium.org Review URL: https://codereview.chromium.org/16123035 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205461 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203940 "In DownloadOperation use locally modified file inf..."kinaba@chromium.org2013-06-112-0/+34
| | | | | | | | | | | | | | | | This is a manual merge of the following patch. > In DownloadOperation use locally modified file info if dirty Drive cache exists. > > BUG=245693 > > Review URL: https://chromiumcodereview.appspot.com/16278006 TBR=hashimoto@chromium.org Review URL: https://codereview.chromium.org/15981020 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205448 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 202384 "Replace sets with vectors when storing file handlers."mtomasz@chromium.org2013-06-116-126/+100
| | | | | | | | | | | | | | | | | > Replace sets with vectors when storing file handlers. > > This caused undeterministic behavior in setting the default task, especially on ASAN bots. Moreover, it sounds reasonable to use order of handlers as priorities. > > TEST=browser_tests on Linux ChromeOS ASAN pass. > BUG=243611, 242615 > > Review URL: https://chromiumcodereview.appspot.com/15975004 TBR=mtomasz@chromium.org Review URL: https://codereview.chromium.org/16652010 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205426 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 205380 "Merge 202384 "Replace sets with vectors when stor..."mtomasz@chromium.org2013-06-115-98/+123
| | | | | | | | | | | | | | | | | | | | | | | > Merge 202384 "Replace sets with vectors when storing file handlers." > > > Replace sets with vectors when storing file handlers. > > > > This caused undeterministic behavior in setting the default task, especially on ASAN bots. Moreover, it sounds reasonable to use order of handlers as priorities. > > > > TEST=browser_tests on Linux ChromeOS ASAN pass. > > BUG=243611, 242615 > > > > Review URL: https://chromiumcodereview.appspot.com/15975004 > > TBR=mtomasz@chromium.org > > Review URL: https://codereview.chromium.org/16024012 TBR=mtomasz@chromium.org Review URL: https://codereview.chromium.org/15703016 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205425 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204509 "Allow WebUI URLRequests not associated with any re..."vsevik@chromium.org2013-06-111-0/+1
| | | | | | | | | | | | | | | | | | > Allow WebUI URLRequests not associated with any renderer. > > DevTools uses WebUI as a proxy for remote frontend loading. > Remote frontend uses application cache. > Application cache manifest is loaded with URLRequest that is not associated with any renderer. > > BUG=241727 > > Review URL: https://chromiumcodereview.appspot.com/15984009 TBR=vsevik@chromium.org Review URL: https://codereview.chromium.org/16768002 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205424 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 202927 "net: don't process truncated headers on HTTPS conn..."cevans@chromium.org2013-06-115-15/+142
| | | | | | | | | | | | | | | | | > net: don't process truncated headers on HTTPS connections. > > This change causes us to not process any headers unless they are correctly > terminated with a \r\n\r\n sequence. > > BUG=244260 > > Review URL: https://chromiumcodereview.appspot.com/15688012 TBR=agl@chromium.org Review URL: https://codereview.chromium.org/16599019 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205382 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203935 "Protect WebURLLoaderImpl::Context while receiving ..."cevans@chromium.org2013-06-113-0/+22
| | | | | | | | | | | | | | | | | | | | | | | > Protect WebURLLoaderImpl::Context while receiving responses. > > A client's didReceiveResponse can cancel a request; by protecting the > Context we avoid a use after free in this case. > > Interestingly, we really had very good warning about this problem, see > https://codereview.chromium.org/11900002/ back in January. > > R=darin > BUG=241139 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202821 > > Review URL: https://chromiumcodereview.appspot.com/15738007 TBR=gavinp@chromium.org Review URL: https://codereview.chromium.org/16758006 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205381 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 202384 "Replace sets with vectors when storing file handlers."mtomasz@chromium.org2013-06-115-123/+98
| | | | | | | | | | | | | | | | | > Replace sets with vectors when storing file handlers. > > This caused undeterministic behavior in setting the default task, especially on ASAN bots. Moreover, it sounds reasonable to use order of handlers as priorities. > > TEST=browser_tests on Linux ChromeOS ASAN pass. > BUG=243611, 242615 > > Review URL: https://chromiumcodereview.appspot.com/15975004 TBR=mtomasz@chromium.org Review URL: https://codereview.chromium.org/16024012 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205380 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203556 "Fix a crash when loading the fileSystem API from a..."benwells@chromium.org2013-06-111-2/+4
| | | | | | | | | | | | | | | | | | | | | > Fix a crash when loading the fileSystem API from an extension. > > This works around an issue where there is no background page by treating > the current page as the background page if no background page is loaded, > which only occurs some of the time with extensions and never with apps. > It also postpones requiring entryIdManager until the background page's > fileSystem API is loaded so it can always safely requireNative the > background page's file_system_natives. > > BUG=243709,242157 > > Review URL: https://chromiumcodereview.appspot.com/16253002 TBR=sammc@chromium.org Review URL: https://codereview.chromium.org/16663004 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205357 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205016 "Fixed crash when installing extension with chrome:..."asargent@chromium.org2013-06-112-9/+27
| | | | | | | | | | | | | | | | | | | > Fixed crash when installing extension with chrome://[anything-else-than-favicon] > Can be reproduced with this extension: https://chrome.google.com/webstore/detail/%D0%BD%D0%BE%D0%B2%D0%B0%D1%8F-%D0%B2%D0%BA%D0%BB%D0%B0%D0%B4%D0%BA%D0%B0/khopmbdjffemhegeeobelklnbglcdgfh > - Don't crash any more when anything else than a URL with a chrome:// scheme has any host other than. > - Added unit tests to avoid that kind of regression. > > BUG=246314,247624 > TESTED=It crashes when I install the extension with Chrome Canary. > It does not crash with the fix. > > Review URL: https://chromiumcodereview.appspot.com/15716018 TBR=dvh@chromium.org Review URL: https://codereview.chromium.org/16373011 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205355 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 28.0.1500.43chrome-release@google.com2013-06-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205354 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 202965 "Remember the initial checked state of {radiobutton..."isherman@chromium.org2013-06-102-1/+4
| | | | | | | | | | | | | | > Remember the initial checked state of {radiobutton|checkbox}. If autofill flow is not autocheckout, autofilling a form should just use remembered values for checkable elements. > > BUG=244645 > > Review URL: https://chromiumcodereview.appspot.com/15659015 TBR=ramankk@chromium.org Review URL: https://codereview.chromium.org/15724017 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205344 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204717 "Check dangerous Android file extensions on authent..."bengr@chromium.org2013-06-101-5/+5
| | | | | | | | | | | | | | | | | > Check dangerous Android file extensions on authenticated download > > This fixes a bug that looked at POSIX file extensions instead > on Android ones when on the Android platform. > > BUG=247031 > > Review URL: https://chromiumcodereview.appspot.com/15778014 TBR=bengr@chromium.org Review URL: https://codereview.chromium.org/16434009 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205332 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 205320 "Update to the manifest-v1 deprecation schedule, pu..."jyasskin@chromium.org2013-06-103-14/+60
| | | | | | | | | | | | | | > Update to the manifest-v1 deprecation schedule, pushing some deadlines out. > > R=joemarini@google.com, pludwig@google.com, yoz@chromium.org > > Review URL: https://codereview.chromium.org/15931010 TBR=jyasskin@chromium.org Review URL: https://codereview.chromium.org/16703010 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205330 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 198272 "cc: Move canvas clear from picture to picture_pil..."trchen@chromium.org2013-06-104-23/+31
| | | | | | | | | | | | | | | | | | | > cc: Move canvas clear from picture to picture_pile_impl > > This moves a clear per picture into a clear-to-background color > per picture pile. We need this to ensure that a solid color > page in low res is considered solid, since all the draws are > of the same color. > > BUG=233622 > > Review URL: https://chromiumcodereview.appspot.com/14322017 TBR=vmpstr@chromium.org Review URL: https://codereview.chromium.org/16667017 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205298 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 199914 "app_list: Remove v1 app arrow overlay for cros."xiyuan@chromium.org2013-06-101-0/+4
| | | | | | | | | | | | | | > app_list: Remove v1 app arrow overlay for cros. > > BUG=240408 > > Review URL: https://chromiumcodereview.appspot.com/14980011 TBR=xiyuan@chromium.org Review URL: https://codereview.chromium.org/16755003 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205296 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 202684 "Field's server type mapping (using Autofill server..."abodenha@chromium.org2013-06-103-10/+69
| | | | | | | | | | | | | | > Field's server type mapping (using Autofill server response) for forms with checkable elements/password fields is off > > BUG=244290 > > Review URL: https://chromiumcodereview.appspot.com/16164003 TBR=ramankk@chromium.org Review URL: https://codereview.chromium.org/16384006 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205294 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203245 "Fix handling for the case when the DXVA decoder on..."danakj@chromium.org2013-06-101-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | > Fix handling for the case when the DXVA decoder on Windows 7 and above has enough input data to produce output > > The decoder returns the MF_E_NOTACCEPTING which we handle today by retrieving an output sample and attempting > to process the input again. If the decoder again returns MF_E_NOTACCEPTING then we bail out if we don't have > an output sample. > > This is a valid case which we need to handle as the decoder may have data to produce more than one output sample. > > The proposed fix is to add the input sample to the pending queue and post a task to process it if we > don't have any output samples. > > Should fix https://code.google.com/p/chromium/issues/detail?id=241400 > > BUG=241400 > R=scherkus@chromium.org > > Review URL: https://codereview.chromium.org/16007012 TBR=ananta@chromium.org Review URL: https://codereview.chromium.org/16404011 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205292 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 201665 "Partial revert of "GPU: Reduce MakeCurrent calls t..."sievers@chromium.org2013-06-101-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Partial revert of "GPU: Reduce MakeCurrent calls to fix Orange San Diego" > > GPU: Reduce MakeCurrent calls to fix Orange San Diego > > We have hit several separate issues resulting from calling > MakeCurrent to change surfaces (when using virtual contexts). > > This removes most cases of MakeCurrent that aren't needed, > and enables virtual contexts for Orange San Diego. > > Original code review: https://codereview.chromium.org/14069008/ > > The last remaining case is ReleaseCurrent which isn't needed > for the Orange San Diego fix, and will be done in a follow up CL. > > BUG=179250, 229643, 230896 > NOTRY=true > > Reason for revert: > Flakiness on content_shell tests. Appears to be caused by this change. Example breakage:http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests%20%28dbg%29&number=10928 > > Original cl: https://chromiumcodereview.appspot.com/14069008 > > TBR=sievers@chromium.org > > Review URL: https://codereview.chromium.org/15796002 TBR=yfriedman@chromium.org Review URL: https://codereview.chromium.org/15734024 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205291 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 205207 "Merge 204571 "Add workaround for Mali-400 zero-si..."bsalomon@google.com2013-06-102-12/+2
| | | | | | | | | | | | | | | | | | | | | > Merge 204571 "Add workaround for Mali-400 zero-sized buffer bug." > > > Add workaround for Mali-400 zero-sized buffer bug. > > > > BUG=231082 > > R=apatrick@chromium.org, gman@chromium.org > > > > Review URL: https://codereview.chromium.org/16043008 > > TBR=bsalomon@google.com > > Review URL: https://codereview.chromium.org/16739003 TBR=bsalomon@google.com Review URL: https://codereview.chromium.org/16690007 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205231 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204571 "Add workaround for Mali-400 zero-sized buffer bug."bsalomon@google.com2013-06-102-2/+12
| | | | | | | | | | | | | | | > Add workaround for Mali-400 zero-sized buffer bug. > > BUG=231082 > R=apatrick@chromium.org, gman@chromium.org > > Review URL: https://codereview.chromium.org/16043008 TBR=bsalomon@google.com Review URL: https://codereview.chromium.org/16739003 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205207 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 28.0.1500.42chrome-release@google.com2013-06-091-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205090 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 28.0.1500.41chrome-release@google.com2013-06-081-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205067 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 204972 "Merge 202927 "net: don't process truncated header..."laforge@chromium.org2013-06-085-142/+15
| | | | | | | | | | | | | | | | | | | | | | | > Merge 202927 "net: don't process truncated headers on HTTPS conn..." > > > net: don't process truncated headers on HTTPS connections. > > > > This change causes us to not process any headers unless they are correctly > > terminated with a \r\n\r\n sequence. > > > > BUG=244260 > > > > Review URL: https://chromiumcodereview.appspot.com/15688012 > > TBR=agl@chromium.org > > Review URL: https://codereview.chromium.org/16677005 TBR=cevans@chromium.org Review URL: https://codereview.chromium.org/16195010 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@205066 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 28.0.1500.40chrome-release@google.com2013-06-081-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204983 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 202927 "net: don't process truncated headers on HTTPS conn..."cevans@chromium.org2013-06-075-15/+142
| | | | | | | | | | | | | | | | | > net: don't process truncated headers on HTTPS connections. > > This change causes us to not process any headers unless they are correctly > terminated with a \r\n\r\n sequence. > > BUG=244260 > > Review URL: https://chromiumcodereview.appspot.com/15688012 TBR=agl@chromium.org Review URL: https://codereview.chromium.org/16677005 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204972 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203569 "Reject ResourceHostMsg_Request with invalid priority."cevans@chromium.org2013-06-071-0/+8
| | | | | | | | | | | | | | | > Reject ResourceHostMsg_Request with invalid priority. > > BUG=243875 > TBR=simonjam@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/16144004 TBR=szym@chromium.org Review URL: https://codereview.chromium.org/16159014 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204968 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204575 "Add timeout for touch handler"wangxianzhu@chromium.org2013-06-073-2/+169
| | | | | | | | | | | | | | | | > Add timeout for touch handler > > This is a short term solution for the scrolling performance issue. > > BUG=244740 > > Review URL: https://chromiumcodereview.appspot.com/15772017 TBR=wangxianzhu@chromium.org Review URL: https://codereview.chromium.org/16667007 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204940 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204682 "Add use_spring_wallpaper flag for Spring default w..."bshe@chromium.org2013-06-072-8/+19
| | | | | | | | | | | | | | | > Add use_spring_wallpaper flag for Spring default wallpaper > > > BUG=247072 > > Review URL: https://chromiumcodereview.appspot.com/16544004 TBR=bshe@chromium.org Review URL: https://codereview.chromium.org/16515009 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204908 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 200935 "Also archive official interactive_ui_tests.exe for..."mmoss@chromium.org2013-06-071-2/+2
| | | | | | | | | | | | | | | > Also archive official interactive_ui_tests.exe for QA. > > R=tap@google.com > BUG=238827 > > Review URL: https://codereview.chromium.org/15131004 TBR=mmoss@chromium.org Review URL: https://codereview.chromium.org/16099010 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204887 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 199086 "Add interactive_ui_tests.exe to archive for QA."mmoss@chromium.org2013-06-071-1/+6
| | | | | | | | | | | | | | | > Add interactive_ui_tests.exe to archive for QA. > > R=sreeram@chromium.org > BUG=238827 > > Review URL: https://codereview.chromium.org/14997004 TBR=mmoss@chromium.org Review URL: https://codereview.chromium.org/16599006 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204886 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204845 "Docserver: fix an error in refactoring that change..."kalman@chromium.org2013-06-076-9/+9
| | | | | | | | | | | | | | | | | > Docserver: fix an error in refactoring that changed the ids of methods from 'method-Type' > to 'function-Type', breaking links, including those in the table of contents. > > R=kalman@chromium.org > > Review URL: https://codereview.chromium.org/16576010 > > Patch from Jared Shumway <jaredshumway94@gmail.com>. TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/16234007 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204850 0039d316-1c4b-4281-b951-d872f2087c98
* DOCS ONLY.kalman@chromium.org2013-06-0720-66/+128
| | | | | | | | | | | | | | | | Merge 204215 "Docserver: inline return and item types. Fix a cou..." > Docserver: inline return and item types. Fix a couple of bugs. > > BUG=187494 > > Review URL: https://chromiumcodereview.appspot.com/15637003 TBR=jaredshumway94@gmail.com Review URL: https://codereview.chromium.org/16042020 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204847 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 203435 "Extension docs: Include sidenav in 404 pages"kalman@chromium.org2013-06-0715-162/+301
| | | | | | | | | | | | | | | | | > Extension docs: Include sidenav in 404 pages > > Include sidenav in 404 pages of extension/app docs to make them easy to > navigate away from and look consistent with other pages. > > BUG=223579 > > Review URL: https://chromiumcodereview.appspot.com/12521030 TBR=fangjue23303@gmail.com Review URL: https://codereview.chromium.org/16515005 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204838 0039d316-1c4b-4281-b951-d872f2087c98
* Manual merge of 202948 "Support web contents modal dialogs within SimpleWe..."wittman@chromium.org2013-06-074-2/+158
| | | | | | | | | | | | | | | | | | | | > Support web contents modal dialogs within SimpleWebViewDialog and WebUILoginView > > These two dialogs host web contents modal dialogs on their WebContents, > so they need to implement the WebContentsModalDialogManagerDelegate > and WebContentsModalDialogHost interfaces to provide dialog host view > and positioning. > > BUG=244173 > > Review URL: https://chromiumcodereview.appspot.com/15879007 BUG=244173 TBR=wittman@chromium.org Review URL: https://codereview.chromium.org/16268019 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204702 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 28.0.1500.39chrome-release@google.com2013-06-071-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204665 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204453 "kStayInSameRootWindowKey must be set when shelf wi..."oshima@chromium.org2013-06-062-2/+1
| | | | | | | | | | | | | | | | > kStayInSameRootWindowKey must be set when shelf widget is created > > Looks like this is regressed in https://chromiumcodereview.appspot.com/12313118/. > > BUG=241321 > > Review URL: https://chromiumcodereview.appspot.com/15645008 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/16525010 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204643 0039d316-1c4b-4281-b951-d872f2087c98
* Second piece of Merge 204595 "cros: Update charging not reliable battery status"jamescook@chromium.org2013-06-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | This file was missed by drover because it has moved to another directory. The patch applies cleanly to the file in the old location. > cros: Update charging not reliable battery status > > Don't display the "charging not reliable" battery status in the > non-charging-non-discharging state, as that can happen normally in > some circumstances. Also, update the string to be more human-friendly. > > BUG=246336 > TEST=manual, see bug > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203952 > > R=derat@chromium.org > > Review URL: https://codereview.chromium.org/16057022 TBR=jamescook@chromium.org Review URL: https://codereview.chromium.org/16410012 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204602 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 204595 "cros: Update charging not reliable battery status"jamescook@chromium.org2013-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | > cros: Update charging not reliable battery status > > Don't display the "charging not reliable" battery status in the > non-charging-non-discharging state, as that can happen normally in > some circumstances. Also, update the string to be more human-friendly. > > BUG=246336 > TEST=manual, see bug > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203952 > > R=derat@chromium.org > > Review URL: https://codereview.chromium.org/16057022 TBR=jamescook@chromium.org Review URL: https://codereview.chromium.org/16571006 git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204597 0039d316-1c4b-4281-b951-d872f2087c98