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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.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.graphics.PointF; 7 import android.graphics.PointF;
8 import android.graphics.Rect; 8 import android.graphics.Rect;
9 import android.graphics.RectF; 9 import android.graphics.RectF;
10 import android.os.Handler; 10 import android.os.Handler;
11 import android.os.SystemClock; 11 import android.os.SystemClock;
12 import android.view.MotionEvent; 12 import android.view.MotionEvent;
13 import android.view.View; 13 import android.view.View;
14 import android.view.ViewGroup; 14 import android.view.ViewGroup;
15 15
16 import org.chromium.base.ObserverList; 16 import org.chromium.base.ObserverList;
17 import org.chromium.base.TraceEvent; 17 import org.chromium.base.TraceEvent;
18 import org.chromium.base.VisibleForTesting; 18 import org.chromium.base.VisibleForTesting;
19 import org.chromium.base.annotations.SuppressFBWarnings; 19 import org.chromium.base.annotations.SuppressFBWarnings;
20 import org.chromium.chrome.browser.compositor.LayerTitleCache; 20 import org.chromium.chrome.browser.compositor.LayerTitleCache;
21 import org.chromium.chrome.browser.compositor.layouts.Layout.Orientation; 21 import org.chromium.chrome.browser.compositor.layouts.Layout.Orientation;
22 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; 22 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
23 import org.chromium.chrome.browser.compositor.layouts.components.VirtualView; 23 import org.chromium.chrome.browser.compositor.layouts.components.VirtualView;
24 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; 24 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
25 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandl er; 25 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandl er;
26 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter; 26 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
27 import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer; 27 import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
28 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDe legate; 28 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDe legate;
29 import org.chromium.chrome.browser.dom_distiller.ReaderModeManagerDelegate;
30 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager; 29 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
31 import org.chromium.chrome.browser.fullscreen.FullscreenManager; 30 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
32 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver; 31 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
33 import org.chromium.chrome.browser.tabmodel.TabCreatorManager; 32 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
34 import org.chromium.chrome.browser.tabmodel.TabModelSelector; 33 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
35 import org.chromium.ui.base.SPenSupport; 34 import org.chromium.ui.base.SPenSupport;
36 import org.chromium.ui.resources.ResourceManager; 35 import org.chromium.ui.resources.ResourceManager;
37 import org.chromium.ui.resources.dynamics.DynamicResourceLoader; 36 import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
38 37
39 import java.util.List; 38 import java.util.List;
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 return mUpdateRequested; 205 return mUpdateRequested;
207 } 206 }
208 207
209 /** 208 /**
210 * Initializes the {@link LayoutManager}. Must be called before using this object. 209 * Initializes the {@link LayoutManager}. Must be called before using this object.
211 * @param selector A {@link TabModelSelector} instance. 210 * @param selector A {@link TabModelSelector} instance.
212 * @param creator A {@link TabCreatorManager} instance. 211 * @param creator A {@link TabCreatorManager} instance.
213 * @param content A {@link TabContentManager} instance. 212 * @param content A {@link TabContentManager} instance.
214 * @param androidContentContainer A {@link ViewGroup} for Android views to be bound to. 213 * @param androidContentContainer A {@link ViewGroup} for Android views to be bound to.
215 * @param contextualSearchDelegate A {@link ContextualSearchDelegate} instan ce. 214 * @param contextualSearchDelegate A {@link ContextualSearchDelegate} instan ce.
216 * @param readerModeDelegate A {@link ReaderModeManagerDelegate} insta nce.
217 * @param dynamicResourceLoader A {@link DynamicResourceLoader} instance. 215 * @param dynamicResourceLoader A {@link DynamicResourceLoader} instance.
218 */ 216 */
219 public void init(TabModelSelector selector, TabCreatorManager creator, 217 public void init(TabModelSelector selector, TabCreatorManager creator,
220 TabContentManager content, ViewGroup androidContentContainer, 218 TabContentManager content, ViewGroup androidContentContainer,
221 ContextualSearchManagementDelegate contextualSearchDelegate, 219 ContextualSearchManagementDelegate contextualSearchDelegate,
222 ReaderModeManagerDelegate readerModeDelegate,
223 DynamicResourceLoader dynamicResourceLoader) { 220 DynamicResourceLoader dynamicResourceLoader) {
224 mTabModelSelector = selector; 221 mTabModelSelector = selector;
225 mContentContainer = androidContentContainer; 222 mContentContainer = androidContentContainer;
226 223
227 if (mNextActiveLayout != null) startShowing(mNextActiveLayout, true); 224 if (mNextActiveLayout != null) startShowing(mNextActiveLayout, true);
228 225
229 updateLayoutForTabModelSelector(); 226 updateLayoutForTabModelSelector();
230 } 227 }
231 228
232 /** 229 /**
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 @Override 488 @Override
492 public void run() { 489 public void run() {
493 mTabModelSelector.removeObserver(observer); 490 mTabModelSelector.removeObserver(observer);
494 } 491 }
495 }); 492 });
496 } 493 }
497 }); 494 });
498 } 495 }
499 } 496 }
500 } 497 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698