| 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.view.LayoutInflater; | 7 import android.view.LayoutInflater; |
| 8 import android.view.ViewGroup; | 8 import android.view.ViewGroup; |
| 9 import android.view.ViewParent; | 9 import android.view.ViewParent; |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * no incognito one. | 27 * no incognito one. |
| 28 */ | 28 */ |
| 29 class ChromeShellTabModelSelector extends TabModelSelectorBase { | 29 class ChromeShellTabModelSelector extends TabModelSelectorBase { |
| 30 | 30 |
| 31 private final WindowAndroid mWindow; | 31 private final WindowAndroid mWindow; |
| 32 private final ContentVideoViewClient mContentVideoViewClient; | 32 private final ContentVideoViewClient mContentVideoViewClient; |
| 33 private final ViewGroup mParent; | 33 private final ViewGroup mParent; |
| 34 private final TabModelOrderController mOrderController; | 34 private final TabModelOrderController mOrderController; |
| 35 | 35 |
| 36 private AccessibilityTabModelWrapper mTabModelWrapper; | 36 private AccessibilityTabModelWrapper mTabModelWrapper; |
| 37 private TabManager mTabManager; |
| 37 | 38 |
| 38 public ChromeShellTabModelSelector( | 39 public ChromeShellTabModelSelector( |
| 39 WindowAndroid window, ContentVideoViewClient videoViewClient, ViewGr
oup parent) { | 40 WindowAndroid window, ContentVideoViewClient videoViewClient, ViewGr
oup parent) { |
| 40 mWindow = window; | 41 mWindow = window; |
| 41 mContentVideoViewClient = videoViewClient; | 42 mContentVideoViewClient = videoViewClient; |
| 42 mParent = parent; | 43 mParent = parent; |
| 43 mOrderController = new TabModelOrderController(this); | 44 mOrderController = new TabModelOrderController(this); |
| 44 | 45 |
| 45 TabModelDelegate tabModelDelegate = new TabModelDelegate() { | 46 TabModelDelegate tabModelDelegate = new TabModelDelegate() { |
| 46 @Override | 47 @Override |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, Tab p
arent, | 87 public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, Tab p
arent, |
| 87 boolean incognito) { | 88 boolean incognito) { |
| 88 assert !incognito; | 89 assert !incognito; |
| 89 ContentViewClient client = new ContentViewClient() { | 90 ContentViewClient client = new ContentViewClient() { |
| 90 @Override | 91 @Override |
| 91 public ContentVideoViewClient getContentVideoViewClient() { | 92 public ContentVideoViewClient getContentVideoViewClient() { |
| 92 return mContentVideoViewClient; | 93 return mContentVideoViewClient; |
| 93 } | 94 } |
| 94 }; | 95 }; |
| 95 ChromeShellTab tab = new ChromeShellTab( | 96 ChromeShellTab tab = new ChromeShellTab( |
| 96 mParent.getContext(), loadUrlParams.getUrl(), mWindow, client); | 97 mParent.getContext(), loadUrlParams.getUrl(), mWindow, client, m
TabManager); |
| 97 int index = mOrderController.determineInsertionIndex(type, tab); | 98 int index = mOrderController.determineInsertionIndex(type, tab); |
| 98 TabModel tabModel = getCurrentModel(); | 99 TabModel tabModel = getCurrentModel(); |
| 99 tabModel.addTab(tab, index, type); | 100 tabModel.addTab(tab, index, type); |
| 100 tabModel.setIndex(index, TabSelectionType.FROM_NEW); | 101 tabModel.setIndex(index, TabSelectionType.FROM_NEW); |
| 101 return tab; | 102 return tab; |
| 102 } | 103 } |
| 103 | 104 |
| 104 /** | 105 /** |
| 105 * Toggles the tab switcher visibility. | 106 * Toggles the tab switcher visibility. |
| 106 */ | 107 */ |
| (...skipping 26 matching lines...) Expand all Loading... |
| 133 } | 134 } |
| 134 | 135 |
| 135 if (mTabModelWrapper.getParent() == null) { | 136 if (mTabModelWrapper.getParent() == null) { |
| 136 mParent.addView(mTabModelWrapper); | 137 mParent.addView(mTabModelWrapper); |
| 137 } | 138 } |
| 138 } | 139 } |
| 139 | 140 |
| 140 private boolean isTabSwitcherVisible() { | 141 private boolean isTabSwitcherVisible() { |
| 141 return mTabModelWrapper != null && mTabModelWrapper.getParent() == mPare
nt; | 142 return mTabModelWrapper != null && mTabModelWrapper.getParent() == mPare
nt; |
| 142 } | 143 } |
| 144 |
| 145 public void setTabManager(TabManager tabManager) { |
| 146 mTabManager = tabManager; |
| 147 } |
| 148 |
| 143 } | 149 } |
| OLD | NEW |