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 3ffdeeeedd6b97294b3889ba6e8ee99c8155dfcf..bab3d17711992347e12c9f5af811f9240ea3d365 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,29 @@ public class Shell extends LinearLayout { |
super(context, attrs); |
} |
+ public void setSurfaceView(View surfaceView) { |
Ted C
2012/07/27 20:31:15
javadoc for these public methods...even if it simp
no sievers
2012/07/31 01:28:44
Done.
|
+ 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(); |
klobag.chromium
2012/07/27 19:42:22
I don't think we need to move this line as it just
no sievers
2012/07/31 01:28:44
Done.
|
initializeNavigationButtons(); |
} |
- private void initilizeUrlField() { |
+ public void onSurfaceCreated() { |
+ initializeUrlField(); |
+ loadUrl("http://www.google.com"); |
Satish
2012/07/27 09:49:24
is this required or was it test code to be removed
klobag.chromium
2012/07/27 19:42:22
You may not want to do it for every onSurfaceCreat
Ted C
2012/07/27 20:31:15
loadUrl happens as part of shell creation during s
no sievers
2012/07/31 01:28:44
Required for now since we have to create the UI gr
|
+ } |
+ |
+ private void initializeUrlField() { |
mUrlTextView = (EditText) findViewById(R.id.url); |
mUrlTextView.setOnEditorActionListener(new OnEditorActionListener() { |
@Override |