content/browser/android/web_contents_observer_android.h - Issue 247263009: Rename jni_helper.h to jni_weak_ref.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/android/web_contents_observer_android.h

Issue 247263009: Rename jni_helper.h to jni_weak_ref.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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 | Annotate | Revision Log

« no previous file with comments | « content/browser/android/tracing_controller_android.h ('k') | content/browser/geolocation/location_api_adapter_android.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_	5 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_

6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_	6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9	9

10 #include "base/android/jni_helper.h"	10 #include "base/android/jni_weak_ref.h"

11 #include "base/basictypes.h"	11 #include "base/basictypes.h"

12 #include "base/process/kill.h"	12 #include "base/process/kill.h"

13 #include "content/browser/web_contents/web_contents_impl.h"	13 #include "content/browser/web_contents/web_contents_impl.h"

14 #include "content/public/browser/web_contents_observer.h"	14 #include "content/public/browser/web_contents_observer.h"

15 #include "content/public/common/frame_navigate_params.h"	15 #include "content/public/common/frame_navigate_params.h"

16 #include "url/gurl.h"	16 #include "url/gurl.h"

17	17

18 namespace content {	18 namespace content {

19	19

20 class RenderViewHost;	20 class RenderViewHost;

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89	89

90 JavaObjectWeakGlobalRef weak_java_observer_;	90 JavaObjectWeakGlobalRef weak_java_observer_;

91	91

92 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid);	92 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid);

93 };	93 };

94	94

95 bool RegisterWebContentsObserverAndroid(JNIEnv* env);	95 bool RegisterWebContentsObserverAndroid(JNIEnv* env);

96 } // namespace content	96 } // namespace content

97	97

98 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_	98 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_

OLD	NEW