| Index: remoting/android/java/src/org/chromium/chromoting/Chromoting.java
|
| diff --git a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
|
| index 28c9e0940694ee1c6d35c4076038c54c65681f95..9a146c921343b29a8d8a3fd9d2c832f99a988555 100644
|
| --- a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
|
| +++ b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java
|
| @@ -301,11 +301,14 @@ public class Chromoting extends AppCompatActivity implements JniInterface.Connec
|
| public void onDestroy() {
|
| super.onDestroy();
|
| JniInterface.disconnectFromHost();
|
| + mAccountSwitcher.destroy();
|
| }
|
|
|
| /** Called when a child Activity exits and sends a result back to this Activity. */
|
| @Override
|
| public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
| + mAccountSwitcher.onActivityResult(requestCode, resultCode, data);
|
| +
|
| if (requestCode == OAuthTokenFetcher.REQUEST_CODE_RECOVER_FROM_OAUTH_ERROR) {
|
| if (resultCode == RESULT_OK) {
|
| // User gave OAuth permission to this app (or recovered from any OAuth failure),
|
|
|