Copy PassphraseActivity upstream.

Copy PassphraseActivity upstream.

No changes aside from package/imports.

BUG=428882
Committed: https://crrev.com/98bfcc82979e3257b73d8a6dbe5170efe2eaed37
Cr-Commit-Position: refs/heads/master@{#321270}

[maxbogue, 2015-03-18 20:25:51]

maxbogue@chromium.org changed reviewers:
+ newt@chromium.org, nyquist@chromium.org

[maxbogue, 2015-03-18 20:25:51]

PTAL!

[newt (away), 2015-03-18 20:34:23]

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/res...
File chrome/android/java/res/layout/sync_passphrase_activity.xml (right):

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/sync_passphrase_activity.xml:1: <?xml
version="1.0" encoding="utf-8"?>
This layout isn't needed.

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java
(right):

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java:52:
setContentView(R.layout.sync_passphrase_activity);
Do you need to call setContentView() at all? If so, you could just do:

    setContentView(new View());

[maxbogue, 2015-03-18 21:05:57]

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/res...
File chrome/android/java/res/layout/sync_passphrase_activity.xml (right):

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/sync_passphrase_activity.xml:1: <?xml
version="1.0" encoding="utf-8"?>
On 2015/03/18 20:34:23, newt wrote:
> This layout isn't needed.

Done.

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java
(right):

https://codereview.chromium.org/1017783004/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java:52:
setContentView(R.layout.sync_passphrase_activity);
On 2015/03/18 20:34:23, newt wrote:
> Do you need to call setContentView() at all? If so, you could just do:
> 
>     setContentView(new View());

Doesn't seem to be needed. Removed.

[newt (away), 2015-03-18 21:12:31]

lgtm

[nyquist, 2015-03-18 22:07:51]

The CQ bit was checked by nyquist@chromium.org

[nyquist, 2015-03-18 22:07:52]

lgtm

[commit-bot: I haz the power, 2015-03-18 22:08:23]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1017783004/40001

[commit-bot: I haz the power, 2015-03-19 02:09:09]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-19 02:09:10]

Try jobs failed on following builders:
  linux_chromium_clobber_rel_ng on tryserver.chromium.linux (JOB_TIMED_OUT, no
build URL)
Timed out jobs are not retried to avoid causing additional load on the builders
with large pending queues.

[maxbogue, 2015-03-19 02:11:47]

The CQ bit was checked by maxbogue@chromium.org

[commit-bot: I haz the power, 2015-03-19 02:11:57]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1017783004/40001

[commit-bot: I haz the power, 2015-03-19 02:17:53]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-19 02:18:20]

Patchset 3 (id:??) landed as
https://crrev.com/98bfcc82979e3257b73d8a6dbe5170efe2eaed37
Cr-Commit-Position: refs/heads/master@{#321270}