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.LayoutInflater; | 9 import android.view.LayoutInflater; |
10 import android.view.View; | 10 import android.view.View; |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 private final EmptyTabModelObserver mTabModelObserver = new EmptyTabModelObs erver() { | 48 private final EmptyTabModelObserver mTabModelObserver = new EmptyTabModelObs erver() { |
49 @Override | 49 @Override |
50 public void didSelectTab(Tab tab, TabSelectionType type, int lastId) { | 50 public void didSelectTab(Tab tab, TabSelectionType type, int lastId) { |
51 assert tab instanceof ChromeShellTab; | 51 assert tab instanceof ChromeShellTab; |
52 setCurrentTab((ChromeShellTab) tab); | 52 setCurrentTab((ChromeShellTab) tab); |
53 hideTabSwitcher(); | 53 hideTabSwitcher(); |
54 } | 54 } |
55 | 55 |
56 @Override | 56 @Override |
57 public void willCloseTab(Tab tab, boolean animate) { | 57 public void willCloseTab(Tab tab, boolean animate) { |
58 if (tab == mCurrentTab) setCurrentTab(null); | 58 if (tab == mCurrentTab) { |
59 hideTabSwitcher(); | |
60 setCurrentTab(mCurrentTab); | |
Bernhard Bauer
2014/11/18 09:05:48
Wait, why are we doing this?
divya.bansal
2014/11/18 09:20:19
To get last tab so that its profile and url info w
Bernhard Bauer
2014/11/18 09:27:58
But this is called right before we close the tab.
divya.bansal
2014/11/19 09:51:30
Done.
| |
61 } | |
59 } | 62 } |
60 }; | 63 }; |
61 | 64 |
62 /** | 65 /** |
63 * @param context The Context the view is running in. | 66 * @param context The Context the view is running in. |
64 * @param attrs The attributes of the XML tag that is inflating the view. | 67 * @param attrs The attributes of the XML tag that is inflating the view. |
65 */ | 68 */ |
66 public TabManager(Context context, AttributeSet attrs) { | 69 public TabManager(Context context, AttributeSet attrs) { |
67 super(context, attrs); | 70 super(context, attrs); |
68 } | 71 } |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
245 LoadUrlParams loadUrlParams = new LoadUrlParams(url); | 248 LoadUrlParams loadUrlParams = new LoadUrlParams(url); |
246 loadUrlParams.setTransitionType(PageTransition.TYPED | PageTransition.FR OM_ADDRESS_BAR); | 249 loadUrlParams.setTransitionType(PageTransition.TYPED | PageTransition.FR OM_ADDRESS_BAR); |
247 Tab tab = mTabModelSelector.getCurrentTab(); | 250 Tab tab = mTabModelSelector.getCurrentTab(); |
248 if (tab != null) { | 251 if (tab != null) { |
249 tab.loadUrl(loadUrlParams); | 252 tab.loadUrl(loadUrlParams); |
250 return tab; | 253 return tab; |
251 } | 254 } |
252 return createTab(url, TabLaunchType.FROM_KEYBOARD); | 255 return createTab(url, TabLaunchType.FROM_KEYBOARD); |
253 } | 256 } |
254 } | 257 } |
OLD | NEW |