forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove TabModelSelector's dependency on ChromeFullscreenManager.
ChromeFullscreenManager will now register and listen for updates internally and avoids the prior cyclical dependency. This also fixes a bug introduced in: https://codereview.chromium.org/2414913004 In that, we were not clearing the reference to Tab when reparenting and then there were two fullscreen managers listening for updates. BUG=656939 Review-Url: https://chromiumcodereview.appspot.com/2440643002 Cr-Commit-Position: refs/heads/master@{#426935}
- Loading branch information
tedchoc
authored and
Commit bot
committed
Oct 22, 2016
1 parent
a02af5e
commit 820a95b
Showing
18 changed files
with
382 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
...droid/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabModelObserver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright 2016 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package org.chromium.chrome.browser.tabmodel; | ||
|
|
||
| import org.chromium.chrome.browser.tab.Tab; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Observer for all {@link TabModel}s owned by a {@link TabModelSelector}. | ||
| * | ||
| * <p> | ||
| * This can safely be constructed before native libraries have been initialized as this will | ||
| * register to observe the underlying TabModels as they are created lazily. | ||
| */ | ||
| public class TabModelSelectorTabModelObserver extends EmptyTabModelObserver { | ||
| private final TabModelSelector mTabModelSelector; | ||
|
|
||
| private TabModelSelectorObserver mSelectorObserver; | ||
|
|
||
| /** | ||
| * Constructs an observer that should be notified of changes for all tab models owned | ||
| * by a specified {@link TabModelSelector}. | ||
| * | ||
| * <p> | ||
| * {@link #destroy()} must be called to unregister this observer. | ||
| * | ||
| * @param selector The selector that owns the Tab Models that should notify this observer. | ||
| */ | ||
| public TabModelSelectorTabModelObserver(TabModelSelector selector) { | ||
| mTabModelSelector = selector; | ||
|
|
||
| List<TabModel> tabModels = selector.getModels(); | ||
| if (tabModels.isEmpty()) { | ||
| mSelectorObserver = new EmptyTabModelSelectorObserver() { | ||
| @Override | ||
| public void onNewTabCreated(Tab tab) { | ||
| assert false : "onChange should have happened and unregistered this listener."; | ||
| } | ||
|
|
||
| @Override | ||
| public void onChange() { | ||
| mTabModelSelector.removeObserver(this); | ||
| mSelectorObserver = null; | ||
| registerModelObservers(); | ||
| } | ||
| }; | ||
| mTabModelSelector.addObserver(mSelectorObserver); | ||
| } else { | ||
| registerModelObservers(); | ||
| } | ||
| } | ||
|
|
||
| private void registerModelObservers() { | ||
| List<TabModel> tabModels = mTabModelSelector.getModels(); | ||
| for (int i = 0; i < tabModels.size(); i++) { | ||
| TabModel tabModel = tabModels.get(i); | ||
| tabModel.addObserver(this); | ||
| } | ||
|
|
||
| onRegistrationComplete(); | ||
| } | ||
|
|
||
| /** | ||
| * Notifies that the registration of the observers has been completed. | ||
| */ | ||
| protected void onRegistrationComplete() { | ||
| } | ||
|
|
||
| /** | ||
| * Destroys the observer and removes itself as a listener for Tab updates. | ||
| */ | ||
| public void destroy() { | ||
| if (mSelectorObserver != null) { | ||
| mTabModelSelector.removeObserver(mSelectorObserver); | ||
| mSelectorObserver = null; | ||
| } | ||
|
|
||
| List<TabModel> tabModels = mTabModelSelector.getModels(); | ||
| for (int i = 0; i < tabModels.size(); i++) { | ||
| TabModel tabModel = tabModels.get(i); | ||
| tabModel.removeObserver(this); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.