| Index: content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| index b9eb8f0ea1e6215716ca5cbc06454d46a9a345b8..69414cd5372c5e68f9b5a5c5cdc05b8e89d23fc6 100644
|
| --- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| +++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| @@ -46,6 +46,8 @@ public class Shell extends LinearLayout {
|
|
|
| private ClipDrawable mProgressDrawable;
|
|
|
| + private View mSurfaceView;
|
| +
|
| /**
|
| * Constructor for inflating via XML.
|
| */
|
| @@ -53,17 +55,27 @@ public class Shell extends LinearLayout {
|
| super(context, attrs);
|
| }
|
|
|
| + /**
|
| + * Set the SurfaceView being renderered to as soon as it is available.
|
| + */
|
| + public void setSurfaceView(View surfaceView) {
|
| + mSurfaceView = surfaceView;
|
| + ((FrameLayout) findViewById(R.id.contentview_holder)).addView(mSurfaceView,
|
| + new FrameLayout.LayoutParams(
|
| + FrameLayout.LayoutParams.MATCH_PARENT,
|
| + FrameLayout.LayoutParams.MATCH_PARENT));
|
| + }
|
| +
|
| @Override
|
| protected void onFinishInflate() {
|
| super.onFinishInflate();
|
|
|
| mProgressDrawable = (ClipDrawable) findViewById(R.id.toolbar).getBackground();
|
| -
|
| - initilizeUrlField();
|
| + initializeUrlField();
|
| initializeNavigationButtons();
|
| }
|
|
|
| - private void initilizeUrlField() {
|
| + private void initializeUrlField() {
|
| mUrlTextView = (EditText) findViewById(R.id.url);
|
| mUrlTextView.setOnEditorActionListener(new OnEditorActionListener() {
|
| @Override
|
|
|