OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.chrome.shell; | 5 package org.chromium.chrome.shell; |
6 | 6 |
7 import android.content.Context; | 7 import android.content.Context; |
8 import android.util.AttributeSet; | 8 import android.util.AttributeSet; |
9 import android.view.View; | 9 import android.view.View; |
10 import android.view.ViewGroup; | 10 import android.view.ViewGroup; |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 * @param window The window used to generate all ContentViews. | 68 * @param window The window used to generate all ContentViews. |
69 * @param videoViewClient The client to handle interactions from ContentVide
oViews. | 69 * @param videoViewClient The client to handle interactions from ContentVide
oViews. |
70 */ | 70 */ |
71 public void initialize(WindowAndroid window, ContentVideoViewClient videoVie
wClient) { | 71 public void initialize(WindowAndroid window, ContentVideoViewClient videoVie
wClient) { |
72 assert window != null; | 72 assert window != null; |
73 assert videoViewClient != null; | 73 assert videoViewClient != null; |
74 | 74 |
75 mContentViewHolder = (ViewGroup) findViewById(R.id.content_container); | 75 mContentViewHolder = (ViewGroup) findViewById(R.id.content_container); |
76 | 76 |
77 mTabModelSelector = new ChromeShellTabModelSelector( | 77 mTabModelSelector = new ChromeShellTabModelSelector( |
78 window, videoViewClient, mContentViewHolder); | 78 window, videoViewClient, mContentViewHolder, this); |
79 mTabModelSelector.getModel(false).addObserver(mTabModelObserver); | 79 mTabModelSelector.getModel(false).addObserver(mTabModelObserver); |
80 | 80 |
81 mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar); | 81 mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar); |
82 mToolbar.setTabManager(this); | 82 mToolbar.setTabManager(this); |
83 mContentViewRenderView = new ContentViewRenderView(getContext()) { | 83 mContentViewRenderView = new ContentViewRenderView(getContext()) { |
84 @Override | 84 @Override |
85 protected void onReadyToRender() { | 85 protected void onReadyToRender() { |
86 if (mCurrentTab == null) createTab(mStartupUrl, TabLaunchType.FR
OM_RESTORE); | 86 if (mCurrentTab == null) createTab(mStartupUrl, TabLaunchType.FR
OM_RESTORE); |
87 } | 87 } |
88 }; | 88 }; |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 LoadUrlParams loadUrlParams = new LoadUrlParams(url); | 199 LoadUrlParams loadUrlParams = new LoadUrlParams(url); |
200 loadUrlParams.setTransitionType(PageTransition.TYPED | PageTransition.FR
OM_ADDRESS_BAR); | 200 loadUrlParams.setTransitionType(PageTransition.TYPED | PageTransition.FR
OM_ADDRESS_BAR); |
201 Tab tab = mTabModelSelector.getCurrentTab(); | 201 Tab tab = mTabModelSelector.getCurrentTab(); |
202 if (tab != null) { | 202 if (tab != null) { |
203 tab.loadUrl(loadUrlParams); | 203 tab.loadUrl(loadUrlParams); |
204 return tab; | 204 return tab; |
205 } | 205 } |
206 return createTab(url, TabLaunchType.FROM_KEYBOARD); | 206 return createTab(url, TabLaunchType.FROM_KEYBOARD); |
207 } | 207 } |
208 } | 208 } |
OLD | NEW |