~oxide-developers/oxide/+git/chromium:oxide/dev/2564

Last commit made on 2015-12-09
Get this branch:
git clone -b oxide/dev/2564 https://git.launchpad.net/~oxide-developers/oxide/+git/chromium
Members of Oxide Developers can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
oxide/dev/2564
Repository:
lp:~oxide-developers/oxide/+git/chromium

Recent commits

bb14a50... by Chris Coulson

Allow Oxide to supplement the existing VideoCaptureDeviceFactory

0fcc174... by Chris Coulson

Merge upstream 48.0.2564.22 in to oxide/dev/2564

d4f504b... by chrome-tpm <email address hidden>

Publish DEPS for Chromium 48.0.2564.22

6efba69... by chrome-tpm <email address hidden>

Incrementing VERSION to 48.0.2564.22

Cr-Commit-Position: refs/branch-heads/2564@{#172}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

4ebe853... by chrome-tpm <email address hidden>

Incrementing VERSION to 48.0.2564.21

Cr-Commit-Position: refs/branch-heads/2564@{#171}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

a51ec9d... by Krishna Govind <email address hidden>

Updating XTBs based on .GRDs from branch 2564

Cr-Commit-Position: refs/branch-heads/2564@{#170}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

4126e65... by Rouslan Solomakhin <email address hidden>

Merge to M48: Handle server profile/card disappearing while launching editor.

Sync can remove the server card or server profile while launching the
card/profile editor. This patch checks whether the data is still
available. If sync deleted the data, then the user sees the refreshed
list of cards and profiles.

Local profiles are not affected by this change. Editing a non-existent
profile is how you can create a new local profile.

Local cards are not affected by this change either. Editing a
non-existent card is how you can create a new local card. Also, local
cards are not synced.

BUG=560467

Review URL: https://codereview.chromium.org/1483063003

Cr-Commit-Position: refs/heads/master@{#362255}
(cherry picked from commit c6055bf304d5d81b649435ef8255be766f1c969f)

Review URL: https://codereview.chromium.org/1483233002 .

Cr-Commit-Position: refs/branch-heads/2564@{#169}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

5ea1816... by Donn Denman <email address hidden>

[Contextual Search] Fix NPE when no Search Term.

BUG=558521

Review URL: https://codereview.chromium.org/1459783006

Cr-Commit-Position: refs/heads/master@{#360888}
(cherry picked from commit 199a9933d119e1b3eb7e735ec249fa5cfeecbcb9)

Review URL: https://codereview.chromium.org/1487923002 .

Cr-Commit-Position: refs/branch-heads/2564@{#168}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

cc4fc01... by Filip Gorski <email address hidden>

[Offline pages] Making sure visit button works on tablet

Per suggestion from kkimlabs@ this patch:
* Moves a piece of logic responsible for opening bookmarks from
  EnhancedBookmarkManager to EnhancedBookmarkUtils
* Calls EnhancedBookmarkUtils#openBookmark from EnhancedBookmarkEditActivity
  when handling the Visit button.

BUG=560133
<email address hidden>

Review URL: https://codereview.chromium.org/1475513008

Cr-Commit-Position: refs/heads/master@{#361809}
(cherry picked from commit 34b66e5f77f6efa3708efda9d0fc099881b1fedf)

Review URL: https://codereview.chromium.org/1484983002 .

Cr-Commit-Position: refs/branch-heads/2564@{#167}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

130d38b... by Filip Gorski <email address hidden>

[Offline pages] Fixing crashes caused by access to offline pages marked for deletion

This patch fixes the problems caused by:
* HasOfflinePages
* GetPageByBookmarkId
* GetPageByOfflineURL
* GetPageByOnlineURL
All of which allow for access to the offline page that is marked for
deletion, which means there is no valid bookmark corresponding to them.
This leads to crashes in the bookmark UI, as well as exposing
functionality that should not work.

BUG=560424

Review URL: https://codereview.chromium.org/1475883003

Cr-Commit-Position: refs/heads/master@{#361746}
(cherry picked from commit 1a6c2e1840f8b64c242ddb680b7de34ba27520c6)

Review URL: https://codereview.chromium.org/1487913002 .

Cr-Commit-Position: refs/branch-heads/2564@{#166}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}