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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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.document; 5 package org.chromium.chrome.browser.document;
6 6
7 import org.chromium.components.web_contents_delegate_android.WebContentsDelegate Android; 7 import org.chromium.components.web_contents_delegate_android.WebContentsDelegate Android;
8 import org.chromium.content_public.browser.WebContents; 8 import org.chromium.content_public.browser.WebContents;
9 9
10 /** 10 /**
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } 42 }
43 43
44 private DocumentWebContentsDelegate() { 44 private DocumentWebContentsDelegate() {
45 mNativePtr = nativeInitialize(); 45 mNativePtr = nativeInitialize();
46 } 46 }
47 47
48 private native long nativeInitialize(); 48 private native long nativeInitialize();
49 private native void nativeAttachContents( 49 private native void nativeAttachContents(
50 long nativeDocumentWebContentsDelegate, WebContents webContents); 50 long nativeDocumentWebContentsDelegate, WebContents webContents);
51 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698