content/public/browser/android/content_view.h - Issue 10693134: Revert 146000 - Split out ContentViewCore from ContentView for embedders.

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/public/browser/android/content_view.h

Issue 10693134: Revert 146000 - Split out ContentViewCore from ContentView for embedders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 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/public/android/java/src/org/chromium/content/browser/ZoomManager.java ('k') | content/public/browser/android/content_view_core.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Property Changes:

Added: svn:mergeinfo

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_PUBLIC_BROWSER_CONTENT_VIEW_H_	5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_

6 #define CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_	6 #define CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_

7 #pragma once	7 #pragma once

8	8

9 #include <jni.h>	9 #include <jni.h>

10	10

(...skipping 23 matching lines...) Expand all Loading...
34 WebContents* web_contents);	34 WebContents* web_contents);

35 static ContentView* GetNativeContentView(JNIEnv* env, jobject obj);	35 static ContentView* GetNativeContentView(JNIEnv* env, jobject obj);

36	36

37 protected:	37 protected:

38 virtual ~ContentView() {};	38 virtual ~ContentView() {};

39 };	39 };

40	40

41 }; // namespace content	41 }; // namespace content

42	42

43 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_	43 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_H_

OLD	NEW