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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

Issue 2878543003: Hook up Reader Mode InfoBar (Closed)
Patch Set: fix tests Created 3 years, 6 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.compositor.layouts; 5 package org.chromium.chrome.browser.compositor.layouts;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.view.ViewGroup; 8 import android.view.ViewGroup;
9 9
10 import org.chromium.base.ObserverList; 10 import org.chromium.base.ObserverList;
11 import org.chromium.base.VisibleForTesting; 11 import org.chromium.base.VisibleForTesting;
12 import org.chromium.chrome.browser.compositor.TitleCache; 12 import org.chromium.chrome.browser.compositor.TitleCache;
13 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; 13 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
14 import org.chromium.chrome.browser.compositor.layouts.components.VirtualView; 14 import org.chromium.chrome.browser.compositor.layouts.components.VirtualView;
15 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; 15 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
16 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandl er; 16 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandl er;
17 import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirectio n; 17 import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirectio n;
18 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout; 18 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout;
19 import org.chromium.chrome.browser.compositor.overlays.SceneOverlay; 19 import org.chromium.chrome.browser.compositor.overlays.SceneOverlay;
20 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperMa nager; 20 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperMa nager;
21 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDe legate; 21 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDe legate;
22 import org.chromium.chrome.browser.device.DeviceClassManager; 22 import org.chromium.chrome.browser.device.DeviceClassManager;
23 import org.chromium.chrome.browser.dom_distiller.ReaderModeManagerDelegate;
24 import org.chromium.chrome.browser.fullscreen.FullscreenManager; 23 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
25 import org.chromium.chrome.browser.tab.Tab; 24 import org.chromium.chrome.browser.tab.Tab;
26 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver; 25 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
27 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver; 26 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
28 import org.chromium.chrome.browser.tabmodel.TabCreatorManager; 27 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
29 import org.chromium.chrome.browser.tabmodel.TabModel; 28 import org.chromium.chrome.browser.tabmodel.TabModel;
30 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; 29 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
31 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType; 30 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
32 import org.chromium.chrome.browser.tabmodel.TabModelObserver; 31 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
33 import org.chromium.chrome.browser.tabmodel.TabModelSelector; 32 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 */ 188 */
190 @Override 189 @Override
191 public EdgeSwipeHandler getTopSwipeHandler() { 190 public EdgeSwipeHandler getTopSwipeHandler() {
192 return mToolbarSwipeHandler; 191 return mToolbarSwipeHandler;
193 } 192 }
194 193
195 @Override 194 @Override
196 public void init(TabModelSelector selector, TabCreatorManager creator, 195 public void init(TabModelSelector selector, TabCreatorManager creator,
197 TabContentManager content, ViewGroup androidContentContainer, 196 TabContentManager content, ViewGroup androidContentContainer,
198 ContextualSearchManagementDelegate contextualSearchDelegate, 197 ContextualSearchManagementDelegate contextualSearchDelegate,
199 ReaderModeManagerDelegate readerModeDelegate,
200 DynamicResourceLoader dynamicResourceLoader) { 198 DynamicResourceLoader dynamicResourceLoader) {
201 // TODO: TitleCache should be a part of the ResourceManager. 199 // TODO: TitleCache should be a part of the ResourceManager.
202 mTitleCache = mHost.getTitleCache(); 200 mTitleCache = mHost.getTitleCache();
203 201
204 // Initialize Layouts 202 // Initialize Layouts
205 mToolbarSwipeLayout.setTabModelSelector(selector, content); 203 mToolbarSwipeLayout.setTabModelSelector(selector, content);
206 mOverviewListLayout.setTabModelSelector(selector, content); 204 mOverviewListLayout.setTabModelSelector(selector, content);
207 if (mOverviewLayout != null) mOverviewLayout.setTabModelSelector(selecto r, content); 205 if (mOverviewLayout != null) mOverviewLayout.setTabModelSelector(selecto r, content);
208 206
209 super.init(selector, creator, content, androidContentContainer, contextu alSearchDelegate, 207 super.init(selector, creator, content, androidContentContainer, contextu alSearchDelegate,
210 readerModeDelegate, dynamicResourceLoader); 208 dynamicResourceLoader);
211 209
212 mTabModelSelectorObserver = new EmptyTabModelSelectorObserver() { 210 mTabModelSelectorObserver = new EmptyTabModelSelectorObserver() {
213 @Override 211 @Override
214 public void onTabModelSelected(TabModel newModel, TabModel oldModel) { 212 public void onTabModelSelected(TabModel newModel, TabModel oldModel) {
215 tabModelSwitched(newModel.isIncognito()); 213 tabModelSwitched(newModel.isIncognito());
216 } 214 }
217 }; 215 };
218 selector.addObserver(mTabModelSelectorObserver); 216 selector.addObserver(mTabModelSelectorObserver);
219 selector.setCloseAllTabsDelegate(this); 217 selector.setCloseAllTabsDelegate(this);
220 218
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 657
660 /** 658 /**
661 * @param id The id of the {@link Tab} to search for. 659 * @param id The id of the {@link Tab} to search for.
662 * @return A {@link Tab} instance or {@code null} if it could be found. 660 * @return A {@link Tab} instance or {@code null} if it could be found.
663 */ 661 */
664 protected Tab getTabById(int id) { 662 protected Tab getTabById(int id) {
665 TabModelSelector selector = getTabModelSelector(); 663 TabModelSelector selector = getTabModelSelector();
666 return selector == null ? null : selector.getTabById(id); 664 return selector == null ? null : selector.getTabById(id);
667 } 665 }
668 } 666 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698