Chromium Code Reviews| Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java |
| diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java |
| index 5b6753927c2692ba857d3c5453338f3d3467ed9e..0ab4d3248e781dcb72515c821775d68c8b4e10b1 100644 |
| --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java |
| +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java |
| @@ -42,12 +42,19 @@ public class TabManager extends LinearLayout { |
| @Override |
| protected void onFinishInflate() { |
| super.onFinishInflate(); |
| + } |
| + /** |
| + * @param window The window used to generate all ContentViews. |
| + */ |
| + public void setWindow(WindowAndroid window) { |
| + assert mWindow != null; |
| + mWindow = window; |
| mContentViewHolder = (ViewGroup) findViewById(R.id.content_container); |
| mToolbar = (TestShellToolbar) findViewById(R.id.toolbar); |
| - mContentViewRenderView = new ContentViewRenderView(getContext()) { |
| + mContentViewRenderView = new ContentViewRenderView(getContext(), mWindow) { |
| @Override |
| - protected void onReadyToRender() { |
| + protected void onReadyToRender() { |
|
Ted C
2013/11/16 01:04:08
-4 indent
powei
2013/11/18 19:29:59
Done.
|
| if (mCurrentTab == null) createTab(mStartupUrl); |
| } |
| }; |
| @@ -58,13 +65,6 @@ public class TabManager extends LinearLayout { |
| } |
| /** |
| - * @param window The window used to generate all ContentViews. |
| - */ |
| - public void setWindow(WindowAndroid window) { |
| - mWindow = window; |
| - } |
| - |
| - /** |
| * @param startupUrl The URL that the first tab should navigate to. |
| */ |
| public void setStartupUrl(String startupUrl) { |