| 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.browser; | 5 package org.chromium.chrome.browser; |
| 6 | 6 |
| 7 import android.app.Activity; | 7 import android.app.Activity; |
| 8 import android.content.Context; | 8 import android.content.Context; |
| 9 import android.graphics.Bitmap; | 9 import android.graphics.Bitmap; |
| 10 import android.graphics.Color; | 10 import android.graphics.Color; |
| (...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1176 | 1176 |
| 1177 // When resuming the activity, force an update to the fullscreen state t
o ensure a | 1177 // When resuming the activity, force an update to the fullscreen state t
o ensure a |
| 1178 // subactivity did not change the fullscreen configuration of this Chrom
eTab's renderer in | 1178 // subactivity did not change the fullscreen configuration of this Chrom
eTab's renderer in |
| 1179 // the case where it was shared (i.e. via an EmbedContentViewActivity). | 1179 // the case where it was shared (i.e. via an EmbedContentViewActivity). |
| 1180 updateFullscreenEnabledState(); | 1180 updateFullscreenEnabledState(); |
| 1181 } | 1181 } |
| 1182 | 1182 |
| 1183 /** | 1183 /** |
| 1184 * Called on the foreground tab when the Activity is stopped. | 1184 * Called on the foreground tab when the Activity is stopped. |
| 1185 */ | 1185 */ |
| 1186 // TODO(jdduke): Remove after landing downstream dependency, crbug.com/43440
1. |
| 1186 public void onActivityStop() { | 1187 public void onActivityStop() { |
| 1187 hide(); | |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 /** | 1190 /** |
| 1191 * Prepares the tab to be shown. This method is supposed to be called before
the tab is | 1191 * Prepares the tab to be shown. This method is supposed to be called before
the tab is |
| 1192 * displayed. It restores the ContentView if it is not available after the c
old start and | 1192 * displayed. It restores the ContentView if it is not available after the c
old start and |
| 1193 * reloads the tab if its renderer has crashed. | 1193 * reloads the tab if its renderer has crashed. |
| 1194 * @param type Specifies how the tab was selected. | 1194 * @param type Specifies how the tab was selected. |
| 1195 */ | 1195 */ |
| 1196 public final void show(TabSelectionType type) { | 1196 public final void show(TabSelectionType type) { |
| 1197 try { | 1197 try { |
| (...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2658 private native void nativeAttachToTabContentManager(long nativeTabAndroid, | 2658 private native void nativeAttachToTabContentManager(long nativeTabAndroid, |
| 2659 TabContentManager tabContentManager); | 2659 TabContentManager tabContentManager); |
| 2660 private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid
, | 2660 private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid
, |
| 2661 ContentViewCore content, boolean visible); | 2661 ContentViewCore content, boolean visible); |
| 2662 private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid
, | 2662 private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid
, |
| 2663 ContentViewCore content); | 2663 ContentViewCore content); |
| 2664 private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String
url); | 2664 private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String
url); |
| 2665 | 2665 |
| 2666 private static native void nativeRecordStartupToCommitUma(); | 2666 private static native void nativeRecordStartupToCommitUma(); |
| 2667 } | 2667 } |
| OLD | NEW |