Commit 4cb204a7 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Revert GoogleAccountsCallback changes in WebLayer Shell.

The changes broke signin.

Bug: 11289611
Change-Id: Id39601cef6257eaffa3b4fb0a3b6fb2ddd22107f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418564Reviewed-by: default avatarClark DuVall <cduvall@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808394}
parent a1d80aaf
...@@ -12,11 +12,8 @@ import android.content.ClipboardManager; ...@@ -12,11 +12,8 @@ import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.KeyEvent; import android.view.KeyEvent;
...@@ -26,7 +23,6 @@ import android.view.MenuItem; ...@@ -26,7 +23,6 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup.LayoutParams; import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager; import android.view.WindowManager;
import android.webkit.ValueCallback;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -53,8 +49,6 @@ import org.chromium.weblayer.FaviconCallback; ...@@ -53,8 +49,6 @@ import org.chromium.weblayer.FaviconCallback;
import org.chromium.weblayer.FaviconFetcher; import org.chromium.weblayer.FaviconFetcher;
import org.chromium.weblayer.FindInPageCallback; import org.chromium.weblayer.FindInPageCallback;
import org.chromium.weblayer.FullscreenCallback; import org.chromium.weblayer.FullscreenCallback;
import org.chromium.weblayer.GoogleAccountsCallback;
import org.chromium.weblayer.GoogleAccountsParams;
import org.chromium.weblayer.NavigationCallback; import org.chromium.weblayer.NavigationCallback;
import org.chromium.weblayer.NavigationController; import org.chromium.weblayer.NavigationController;
import org.chromium.weblayer.NewTabCallback; import org.chromium.weblayer.NewTabCallback;
...@@ -559,30 +553,6 @@ public class WebLayerShellActivity extends AppCompatActivity { ...@@ -559,30 +553,6 @@ public class WebLayerShellActivity extends AppCompatActivity {
return true; return true;
} }
}); });
tab.setGoogleAccountsCallback(new GoogleAccountsCallback() {
@Override
public void onGoogleAccountsRequest(GoogleAccountsParams params) {}
@Override
public String getGaiaId() {
return "example.user@gmail.com";
}
@Override
public String getFullName() {
return "Jill Doe";
}
@Override
public void getAvatar(int desiredSize, ValueCallback<Bitmap> avatarLoadedCallback) {
// Simulate a delayed load.
final Handler handler = new Handler(Looper.getMainLooper());
handler.postDelayed(() -> {
avatarLoadedCallback.onReceiveValue(BitmapFactory.decodeResource(
getApplicationContext().getResources(), R.drawable.avatar_sunglasses));
}, 3000);
}
});
mTabToFaviconFetcher.put(tab, tab.createFaviconFetcher(new FaviconCallback() { mTabToFaviconFetcher.put(tab, tab.createFaviconFetcher(new FaviconCallback() {
@Override @Override
public void onFaviconChanged(Bitmap favicon) { public void onFaviconChanged(Bitmap favicon) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment