Commit 7bfcc8b7 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

weblayer: minor rename

RemoteFragmentClient -> BrowserFragment

BUG=none
TEST=none

Change-Id: I7560db41694f766b71bf13c9f6f687d587b93b6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825569Reviewed-by: default avatarPavel Shmakov <pshmakov@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699878}
parent 06d2fb06
...@@ -21,8 +21,8 @@ android_resources("client_resources") { ...@@ -21,8 +21,8 @@ android_resources("client_resources") {
android_library("java") { android_library("java") {
java_files = [ java_files = [
"org/chromium/weblayer/RemoteFragmentClient.java",
"org/chromium/weblayer/BrowserController.java", "org/chromium/weblayer/BrowserController.java",
"org/chromium/weblayer/BrowserFragment.java",
"org/chromium/weblayer/BrowserFragmentController.java", "org/chromium/weblayer/BrowserFragmentController.java",
"org/chromium/weblayer/BrowserObserver.java", "org/chromium/weblayer/BrowserObserver.java",
"org/chromium/weblayer/Callback.java", "org/chromium/weblayer/Callback.java",
......
...@@ -19,74 +19,68 @@ import org.chromium.weblayer_private.aidl.IRemoteFragmentClient; ...@@ -19,74 +19,68 @@ import org.chromium.weblayer_private.aidl.IRemoteFragmentClient;
import org.chromium.weblayer_private.aidl.ObjectWrapper; import org.chromium.weblayer_private.aidl.ObjectWrapper;
/** /**
* Hosts a "remote fragment" (represented by {@link IRemoteFragment}) that lives in another * WebLayer's fragment implementation.
* ClassLoader. The remote fragment has all the actual logic (e.g. handling lifecycle events), while
* this class actually extends {@link Fragment}, forwarding the calls to and from the remote
* fragment. Thus it is "hosting" the fragment implemented elsewhere.
*/ */
public final class RemoteFragmentClient extends Fragment { public final class BrowserFragment extends Fragment {
private final IRemoteFragmentClient mClientImpl = new IRemoteFragmentClient.Stub() { private final IRemoteFragmentClient mClientImpl = new IRemoteFragmentClient.Stub() {
@Override @Override
public void superOnCreate(IObjectWrapper savedInstanceState) { public void superOnCreate(IObjectWrapper savedInstanceState) {
RemoteFragmentClient.super.onCreate(ObjectWrapper.unwrap(savedInstanceState, BrowserFragment.super.onCreate(ObjectWrapper.unwrap(savedInstanceState, Bundle.class));
Bundle.class));
} }
@Override @Override
public void superOnAttach(IObjectWrapper context) { public void superOnAttach(IObjectWrapper context) {
RemoteFragmentClient.super.onAttach(ObjectWrapper.unwrap(context, Context.class)); BrowserFragment.super.onAttach(ObjectWrapper.unwrap(context, Context.class));
} }
@Override @Override
public void superOnActivityCreated(IObjectWrapper savedInstanceState) { public void superOnActivityCreated(IObjectWrapper savedInstanceState) {
RemoteFragmentClient.super.onCreate(ObjectWrapper.unwrap(savedInstanceState, BrowserFragment.super.onCreate(ObjectWrapper.unwrap(savedInstanceState, Bundle.class));
Bundle.class));
} }
@Override @Override
public void superOnStart() { public void superOnStart() {
RemoteFragmentClient.super.onStart(); BrowserFragment.super.onStart();
} }
@Override @Override
public void superOnResume() { public void superOnResume() {
RemoteFragmentClient.super.onResume(); BrowserFragment.super.onResume();
} }
@Override @Override
public void superOnPause() { public void superOnPause() {
RemoteFragmentClient.super.onPause(); BrowserFragment.super.onPause();
} }
@Override @Override
public void superOnStop() { public void superOnStop() {
RemoteFragmentClient.super.onStop(); BrowserFragment.super.onStop();
} }
@Override @Override
public void superOnDestroyView() { public void superOnDestroyView() {
RemoteFragmentClient.super.onDestroyView(); BrowserFragment.super.onDestroyView();
} }
@Override @Override
public void superOnDetach() { public void superOnDetach() {
RemoteFragmentClient.super.onDetach(); BrowserFragment.super.onDetach();
} }
@Override @Override
public void superOnDestroy() { public void superOnDestroy() {
RemoteFragmentClient.super.onDestroy(); BrowserFragment.super.onDestroy();
} }
@Override @Override
public void superOnSaveInstanceState(IObjectWrapper outState) { public void superOnSaveInstanceState(IObjectWrapper outState) {
RemoteFragmentClient.super.onSaveInstanceState(ObjectWrapper.unwrap(outState, BrowserFragment.super.onSaveInstanceState(ObjectWrapper.unwrap(outState, Bundle.class));
Bundle.class));
} }
@Override @Override
public IObjectWrapper getActivity() { public IObjectWrapper getActivity() {
return ObjectWrapper.wrap(RemoteFragmentClient.this.getActivity()); return ObjectWrapper.wrap(BrowserFragment.this.getActivity());
} }
}; };
...@@ -102,8 +96,8 @@ public final class RemoteFragmentClient extends Fragment { ...@@ -102,8 +96,8 @@ public final class RemoteFragmentClient extends Fragment {
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(
Bundle savedInstanceState) { LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
try { try {
return ObjectWrapper.unwrap(mRemoteFragment.handleOnCreateView(), View.class); return ObjectWrapper.unwrap(mRemoteFragment.handleOnCreateView(), View.class);
} catch (RemoteException e) { } catch (RemoteException e) {
......
...@@ -18,10 +18,10 @@ import org.chromium.weblayer_private.aidl.ObjectWrapper; ...@@ -18,10 +18,10 @@ import org.chromium.weblayer_private.aidl.ObjectWrapper;
*/ */
public final class BrowserFragmentController { public final class BrowserFragmentController {
private final IBrowserFragmentController mImpl; private final IBrowserFragmentController mImpl;
private final RemoteFragmentClient mFragment; private final BrowserFragment mFragment;
private BrowserController mController; private BrowserController mController;
BrowserFragmentController(IBrowserFragmentController impl, RemoteFragmentClient fragment) { BrowserFragmentController(IBrowserFragmentController impl, BrowserFragment fragment) {
mImpl = impl; mImpl = impl;
mFragment = fragment; mFragment = fragment;
} }
......
...@@ -46,12 +46,12 @@ public final class Profile { ...@@ -46,12 +46,12 @@ public final class Profile {
public BrowserFragmentController createBrowserFragmentController(Context context) { public BrowserFragmentController createBrowserFragmentController(Context context) {
try { try {
RemoteFragmentClient fragmentClient = new RemoteFragmentClient(); BrowserFragment fragment = new BrowserFragment();
IBrowserFragmentController browserFragmentImpl = mImpl.createBrowserFragmentController( IBrowserFragmentController browserFragmentImpl =
fragmentClient.asIRemoteFragmentClient(), mImpl.createBrowserFragmentController(fragment.asIRemoteFragmentClient(),
ObjectWrapper.wrap(WebLayer.createRemoteContext(context))); ObjectWrapper.wrap(WebLayer.createRemoteContext(context)));
fragmentClient.setRemoteFragment(browserFragmentImpl.getRemoteFragment()); fragment.setRemoteFragment(browserFragmentImpl.getRemoteFragment());
return new BrowserFragmentController(browserFragmentImpl, fragmentClient); return new BrowserFragmentController(browserFragmentImpl, fragment);
} catch (RemoteException e) { } catch (RemoteException e) {
throw new APICallException(e); throw new APICallException(e);
} }
......
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