content/browser/android/content_view_impl.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/browser/android/content_view_impl.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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/android/content_view_impl.cc » ('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_CONTENT_VIEW_IMPL_H_	5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_

6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_	6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/android/jni_helper.h"	9 #include "base/android/jni_helper.h"

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

(...skipping 110 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
121 bool tab_crashed_;	121 bool tab_crashed_;

122	122

123 DISALLOW_COPY_AND_ASSIGN(ContentViewImpl);	123 DISALLOW_COPY_AND_ASSIGN(ContentViewImpl);

124 };	124 };

125	125

126 bool RegisterContentView(JNIEnv* env);	126 bool RegisterContentView(JNIEnv* env);

127	127

128 }; // namespace content	128 }; // namespace content

129	129

130 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_	130 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_IMPL_H_

OLD	NEW