Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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.content.browser; | 5 package org.chromium.content.browser; |
| 6 | 6 |
| 7 import android.annotation.SuppressLint; | 7 import android.annotation.SuppressLint; |
| 8 import android.app.Activity; | 8 import android.app.Activity; |
| 9 import android.app.SearchManager; | 9 import android.app.SearchManager; |
| 10 import android.content.ContentResolver; | 10 import android.content.ContentResolver; |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 727 R.string.accessibility_content_view); | 727 R.string.accessibility_content_view); |
| 728 } | 728 } |
| 729 mContainerView.setContentDescription(contentDescription); | 729 mContainerView.setContentDescription(contentDescription); |
| 730 mWebContentsObserver = new WebContentsObserverAndroid(this) { | 730 mWebContentsObserver = new WebContentsObserverAndroid(this) { |
| 731 @Override | 731 @Override |
| 732 public void didStartLoading(String url) { | 732 public void didStartLoading(String url) { |
| 733 hidePopupDialog(); | 733 hidePopupDialog(); |
| 734 resetScrollInProgress(); | 734 resetScrollInProgress(); |
| 735 resetGestureDetectors(); | 735 resetGestureDetectors(); |
| 736 } | 736 } |
| 737 | |
| 738 @Override | |
| 739 public void renderProcessGone(boolean wasOomProtected) { | |
| 740 hidePopupDialog(); | |
|
jdduke (slow)
2014/04/10 14:02:04
If the ContentViewCore persists (permanently) afte
jdduke (slow)
2014/04/11 00:11:00
Yeah, turns out we'll want to call both of the men
| |
| 741 } | |
| 737 }; | 742 }; |
| 738 } | 743 } |
| 739 | 744 |
| 740 @CalledByNative | 745 @CalledByNative |
| 741 void onNativeContentViewCoreDestroyed(long nativeContentViewCore) { | 746 void onNativeContentViewCoreDestroyed(long nativeContentViewCore) { |
| 742 assert nativeContentViewCore == mNativeContentViewCore; | 747 assert nativeContentViewCore == mNativeContentViewCore; |
| 743 mNativeContentViewCore = 0; | 748 mNativeContentViewCore = 0; |
| 744 } | 749 } |
| 745 | 750 |
| 746 /** | 751 /** |
| (...skipping 2600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3347 boolean enableHiding, boolean enableShowing, boolean animate); | 3352 boolean enableHiding, boolean enableShowing, boolean animate); |
| 3348 | 3353 |
| 3349 private native void nativeShowImeIfNeeded(long nativeContentViewCoreImpl); | 3354 private native void nativeShowImeIfNeeded(long nativeContentViewCoreImpl); |
| 3350 | 3355 |
| 3351 private native void nativeSetAccessibilityEnabled( | 3356 private native void nativeSetAccessibilityEnabled( |
| 3352 long nativeContentViewCoreImpl, boolean enabled); | 3357 long nativeContentViewCoreImpl, boolean enabled); |
| 3353 | 3358 |
| 3354 private native void nativeExtractSmartClipData(long nativeContentViewCoreImp l, | 3359 private native void nativeExtractSmartClipData(long nativeContentViewCoreImp l, |
| 3355 int x, int y, int w, int h); | 3360 int x, int y, int w, int h); |
| 3356 } | 3361 } |
| OLD | NEW |