chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java - Issue 1385663002: [Contextual Search] Add Mojo-enabled API component.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

Issue 1385663002: [Contextual Search] Add Mojo-enabled API component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed the CS API controller to not be a notification observer. Created 5 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayContentDelegate.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java » ('j') | chrome/browser/android/contextualsearch/contextual_search_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

index 9c9cbc55762a8e7191073c1cf8d2ded0d5830495..b0aff8c6ce99b6c141d12d9a307eb794c50a358e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

@@ -232,7 +232,7 @@ public class OverlayPanelContent {

public void destroyContentView() {

pedro (no code reviews) 2015/10/23 05:43:54 FYI: This method is now private, I think you need

Donn Denman 2015/10/23 18:58:07 Done.

if (mContentViewCore != null) {

- nativeDestroyWebContents(mNativeOverlayPanelContentPtr);

+ int processId = nativeDestroyWebContents(mNativeOverlayPanelContentPtr);

mContentViewCore.getWebContents().destroy();

mContentViewCore.destroy();

mContentViewCore = null;

@@ -241,7 +241,7 @@ public class OverlayPanelContent {

mWebContentsObserver = null;

}

- mOverlayObserver.onContentViewDestroyed();

+ mOverlayObserver.onContentViewDestroyed(processId);

}

// This should be called last here. The setSearchContentViewVisibility method

@@ -411,7 +411,7 @@ public class OverlayPanelContent {

long nativeOverlayPanelContent, String historyUrl, long urlTimeMs);

private native void nativeSetWebContents(long nativeOverlayPanelContent,

ContentViewCore contentViewCore, WebContentsDelegateAndroid delegate);

- private native void nativeDestroyWebContents(long nativeOverlayPanelContent);

+ private native int nativeDestroyWebContents(long nativeOverlayPanelContent);

private native void nativeSetInterceptNavigationDelegate(long nativeOverlayPanelContent,

InterceptNavigationDelegate delegate, WebContents webContents);

}