summaryrefslogtreecommitdiffstats
path: root/chromium/chrome
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> Make localized_error work for usPierre Rossi2014-07-302-0/+16
| | | | | | | | Essentially cutting away the unnecessary part that depends on extensions. Change-Id: I8adbc77dca393ab8480e9cdea3c5c953b52c8aef Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add files to the snapshot for error pages supportPierre Rossi2014-07-304-0/+998
| | | | | | | As we'll be using a few more files from the chrome layer. Change-Id: I8008b44d0dba42d7531e6c8fbc0ec050ecca736a Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update Chromium snapshot to stable version 33.0.1750.170Andras Becsi2014-06-041-1/+1
| | | | | | | | | | | | | | | This is meant as a baseline commit hence it does not include the patches we need to apply for QtWebEngine. All patches should be rebased on top of this commit so we can get rid of the external patches directory. In future these baseline commits always have to include the exact Chromium version returned by version_resolver.py's currentVersion() in their first line, so that we can retrieve the patches on top to apply on the upstream repository. This also includes a ninja update. Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add files needed for WebRTC to the snapshot.Pierre Rossi2014-04-293-0/+199
| | | | | | | | | The desktop/screen capture in WebRTC is implemented in a self contained way in the chrome layer, and there is no point in copying it. We just need to ensure we ship it in our snapshot. Change-Id: Ia17b905317fb0c2b142c672a0c79d33e0ee01f68 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update to new stable branch 1750Andras Becsi2014-03-205050-2601/+684064
| | | | | | | | | This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* [Backport] InstantExtended: Send search URLs to renderers.jered@chromium.org2014-02-124-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, navigations initiated by an instant renderer were bounced to the browser to be rebucketed into an instant or non-instant renderer. But navigations from non-instant renderers to instant URLs (i.e. privileged search page URLs) were not rebucketed, because the renderer had no knowledge of which URLs were instant URLs, and it would be too expensive to bounce ALL URLs. As a result, non-instant pages like google.com/setprefs could not redirect to instant pages like google.com/search. This change has InstantService tell renderers about URLs associated with the default search engine, and uses this knowledge to bounce renderer-initiated navigations to likely instant URLs from non-instant processes back into the browser for rebucketing. So now link clicks from non-instant pages to instant pages will put the destination pages into an instant process. Unfortunately, though, redirects are still broken. For example, 0. User clicks "Set preferences" button on an instant page. 1. Instant renderer bounces google.com/setprefs to the browser. 2. Browser says google.com/setprefs is not an instant URL, and assigns it to a non-instant renderer. 3. After rebucketing to the non-instant renderer, google.com/setprefs is marked as a browser initiated request(!) 4. /setprefs redirects to /search, which _is_ an instant URL, but because /setprefs is marked as browser initiated the non-instant renderer does not get a chance to bounce it back to the browser. I tried working around this by giving redirects a chance to bounce back to the browser in step #4, but this broke the signin process model in a scary way that I don't fully understand. It seems like the right fix here is going to need to EITHER follow the redirect chain in step #2 when determining if an URL is an instant URL, OR somehow flag the bounced redirect request for further inspection in step #3. This change also includes a small side benefit. Since renderers now know about instant URLs, we can suppress a flash of a baked-in error page in the event of an error while loading the InstantExtended new tab page. TEST=manual,unit,browsertest BUG=271088,223754 Review URL: https://codereview.chromium.org/23455047 Change-Id: I8a552e7d51d480c09efbfe77f5a2786f56d471ad git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226103 0039d316-1c4b-4281-b951-d872f2087c98 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add the VERSION file to the snapshotPierre Rossi2014-02-111-0/+4
| | | | | | | | | | We should rely on this in order to expose the chromium version in our user agent. This should be added with later snapshots through the script, but this is just so that our current snapshot supports it already. Change-Id: I78c429ca21a4f4146303bbe6e471bcd8588236b7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update Chromium to branch 1650 (31.0.1650.63)Andras Becsi2013-12-1330-1210/+1464
| | | | | Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update chromium to branch 1599.Zeno Albisser2013-11-2911-43/+44
| | | | | Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Initial import.Zeno Albisser2013-08-1561-0/+24858