| OLD | NEW |
| 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.tab; | 5 package org.chromium.chrome.browser.tab; |
| 6 | 6 |
| 7 import android.os.SystemClock; | 7 import android.os.SystemClock; |
| 8 import android.support.annotation.IntDef; | 8 import android.support.annotation.IntDef; |
| 9 import android.view.View; | 9 import android.view.View; |
| 10 | 10 |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 auditor.notifyAuditEvent(mTab.getApplicationContext(), AuditEvent.OPEN_U
RL_FAILURE, | 178 auditor.notifyAuditEvent(mTab.getApplicationContext(), AuditEvent.OPEN_U
RL_FAILURE, |
| 179 failingUrl, description); | 179 failingUrl, description); |
| 180 if (errorCode == BLOCKED_BY_ADMINISTRATOR) { | 180 if (errorCode == BLOCKED_BY_ADMINISTRATOR) { |
| 181 auditor.notifyAuditEvent( | 181 auditor.notifyAuditEvent( |
| 182 mTab.getApplicationContext(), AuditEvent.OPEN_URL_BLOCKED, f
ailingUrl, ""); | 182 mTab.getApplicationContext(), AuditEvent.OPEN_URL_BLOCKED, f
ailingUrl, ""); |
| 183 } | 183 } |
| 184 } | 184 } |
| 185 | 185 |
| 186 @Override | 186 @Override |
| 187 public void didStartProvisionalLoadForFrame(long frameId, long parentFrameId
, | 187 public void didStartProvisionalLoadForFrame(long frameId, long parentFrameId
, |
| 188 boolean isMainFrame, String validatedUrl, boolean isErrorPage, | 188 boolean isMainFrame, String validatedUrl, boolean isErrorPage) { |
| 189 boolean isIframeSrcdoc) { | |
| 190 if (isMainFrame) mTab.didStartPageLoad(validatedUrl, isErrorPage); | 189 if (isMainFrame) mTab.didStartPageLoad(validatedUrl, isErrorPage); |
| 191 | 190 |
| 192 mTab.handleDidStartProvisionalLoadForFrame(isMainFrame, validatedUrl); | 191 mTab.handleDidStartProvisionalLoadForFrame(isMainFrame, validatedUrl); |
| 193 } | 192 } |
| 194 | 193 |
| 195 @Override | 194 @Override |
| 196 public void didCommitProvisionalLoadForFrame(long frameId, boolean isMainFra
me, String url, | 195 public void didCommitProvisionalLoadForFrame(long frameId, boolean isMainFra
me, String url, |
| 197 int transitionType) { | 196 int transitionType) { |
| 198 if (isMainFrame && UmaUtils.isRunningApplicationStart()) { | 197 if (isMainFrame && UmaUtils.isRunningApplicationStart()) { |
| 199 // Currently it takes about 2000ms to commit a navigation if the mea
surement | 198 // Currently it takes about 2000ms to commit a navigation if the mea
surement |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 } | 307 } |
| 309 } | 308 } |
| 310 | 309 |
| 311 @Override | 310 @Override |
| 312 public void destroy() { | 311 public void destroy() { |
| 313 MediaCaptureNotificationService.updateMediaNotificationForTab( | 312 MediaCaptureNotificationService.updateMediaNotificationForTab( |
| 314 mTab.getApplicationContext(), mTab.getId(), 0, mTab.getUrl()); | 313 mTab.getApplicationContext(), mTab.getId(), 0, mTab.getUrl()); |
| 315 super.destroy(); | 314 super.destroy(); |
| 316 } | 315 } |
| 317 } | 316 } |
| OLD | NEW |