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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java

Issue 1871433002: Alternative fix for FindToolbar crash when reparenting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile and rebase Created 4 years, 8 months 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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.browser.tabmodel; 5 package org.chromium.chrome.browser.tabmodel;
6 6
7 import org.chromium.base.ApplicationStatus; 7 import org.chromium.base.ApplicationStatus;
8 import org.chromium.base.ObserverList; 8 import org.chromium.base.ObserverList;
9 import org.chromium.base.TraceEvent; 9 import org.chromium.base.TraceEvent;
10 import org.chromium.chrome.browser.ChromeTabbedActivity; 10 import org.chromium.chrome.browser.ChromeTabbedActivity;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 mOrderController = orderController; 78 mOrderController = orderController;
79 mTabContentManager = tabContentManager; 79 mTabContentManager = tabContentManager;
80 mTabSaver = tabSaver; 80 mTabSaver = tabSaver;
81 mModelDelegate = modelDelegate; 81 mModelDelegate = modelDelegate;
82 mIsUndoSupported = supportUndo; 82 mIsUndoSupported = supportUndo;
83 mObservers = new ObserverList<TabModelObserver>(); 83 mObservers = new ObserverList<TabModelObserver>();
84 } 84 }
85 85
86 @Override 86 @Override
87 public void removeTab(Tab tab) { 87 public void removeTab(Tab tab) {
88 removeTabAndSelectNext(tab, TabSelectionType.FROM_USER, true, true);
89
88 for (TabModelObserver obs : mObservers) obs.tabRemoved(tab); 90 for (TabModelObserver obs : mObservers) obs.tabRemoved(tab);
89
90 removeTabAndSelectNext(tab, TabSelectionType.FROM_USER, true, true);
91 } 91 }
92 92
93 @Override 93 @Override
94 public void destroy() { 94 public void destroy() {
95 for (Tab tab : mTabs) { 95 for (Tab tab : mTabs) {
96 if (tab.isInitialized()) tab.destroy(); 96 if (tab.isInitialized()) tab.destroy();
97 } 97 }
98 98
99 mRewoundList.destroy(); 99 mRewoundList.destroy();
100 mTabs.clear(); 100 mTabs.clear();
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 @Override 730 @Override
731 public int index() { 731 public int index() {
732 return mIndex; 732 return mIndex;
733 } 733 }
734 734
735 @Override 735 @Override
736 protected boolean isSessionRestoreInProgress() { 736 protected boolean isSessionRestoreInProgress() {
737 return mModelDelegate.isSessionRestoreInProgress(); 737 return mModelDelegate.isSessionRestoreInProgress();
738 } 738 }
739 } 739 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698