Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTabModelSelector.java

Issue 682223003: Added code to support launch new tab with context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed mutator and modified constructor to pass tabManager Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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,
41 TabManager tabManager) {
40 mWindow = window; 42 mWindow = window;
41 mContentVideoViewClient = videoViewClient; 43 mContentVideoViewClient = videoViewClient;
42 mParent = parent; 44 mParent = parent;
43 mOrderController = new TabModelOrderController(this); 45 mOrderController = new TabModelOrderController(this);
46 mTabManager = tabManager;
44 47
45 TabModelDelegate tabModelDelegate = new TabModelDelegate() { 48 TabModelDelegate tabModelDelegate = new TabModelDelegate() {
46 @Override 49 @Override
47 public void didCreateNewTab(Tab tab) {} 50 public void didCreateNewTab(Tab tab) {}
48 51
49 @Override 52 @Override
50 public void didChange() {} 53 public void didChange() {}
51 54
52 @Override 55 @Override
53 public void selectModel(boolean incognito) { 56 public void selectModel(boolean incognito) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, Tab p arent, 89 public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, Tab p arent,
87 boolean incognito) { 90 boolean incognito) {
88 assert !incognito; 91 assert !incognito;
89 ContentViewClient client = new ContentViewClient() { 92 ContentViewClient client = new ContentViewClient() {
90 @Override 93 @Override
91 public ContentVideoViewClient getContentVideoViewClient() { 94 public ContentVideoViewClient getContentVideoViewClient() {
92 return mContentVideoViewClient; 95 return mContentVideoViewClient;
93 } 96 }
94 }; 97 };
95 ChromeShellTab tab = new ChromeShellTab( 98 ChromeShellTab tab = new ChromeShellTab(
96 mParent.getContext(), loadUrlParams.getUrl(), mWindow, client); 99 mParent.getContext(), loadUrlParams.getUrl(), mWindow, client, m TabManager);
97 int index = mOrderController.determineInsertionIndex(type, tab); 100 int index = mOrderController.determineInsertionIndex(type, tab);
98 TabModel tabModel = getCurrentModel(); 101 TabModel tabModel = getCurrentModel();
99 tabModel.addTab(tab, index, type); 102 tabModel.addTab(tab, index, type);
100 tabModel.setIndex(index, TabSelectionType.FROM_NEW); 103 tabModel.setIndex(index, TabSelectionType.FROM_NEW);
101 return tab; 104 return tab;
102 } 105 }
103 106
104 /** 107 /**
105 * Toggles the tab switcher visibility. 108 * Toggles the tab switcher visibility.
106 */ 109 */
(...skipping 26 matching lines...) Expand all
133 } 136 }
134 137
135 if (mTabModelWrapper.getParent() == null) { 138 if (mTabModelWrapper.getParent() == null) {
136 mParent.addView(mTabModelWrapper); 139 mParent.addView(mTabModelWrapper);
137 } 140 }
138 } 141 }
139 142
140 private boolean isTabSwitcherVisible() { 143 private boolean isTabSwitcherVisible() {
141 return mTabModelWrapper != null && mTabModelWrapper.getParent() == mPare nt; 144 return mTabModelWrapper != null && mTabModelWrapper.getParent() == mPare nt;
142 } 145 }
146
143 } 147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698