Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: remoting/android/java/src/org/chromium/chromoting/Chromoting.java

Issue 1369903002: Android Chromoting: Add hooks for the official account-switcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add hooks for Google Play Services connection errors. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcher.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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),
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcher.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698