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

Side by Side Diff: content/browser/android/content_view_impl.cc

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
OLDNEW
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 #include "content/browser/android/content_view_impl.h" 5 #include "content/browser/android/content_view_impl.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "content/browser/android/content_view_client.h" 10 #include "content/browser/android/content_view_client.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 if (!HasField(env, clazz, "mNativeContentView", "I")) { 266 if (!HasField(env, clazz, "mNativeContentView", "I")) {
267 DLOG(ERROR) << "Unable to find ContentView.mNativeContentView!"; 267 DLOG(ERROR) << "Unable to find ContentView.mNativeContentView!";
268 return false; 268 return false;
269 } 269 }
270 g_native_content_view = GetFieldID(env, clazz, "mNativeContentView", "I"); 270 g_native_content_view = GetFieldID(env, clazz, "mNativeContentView", "I");
271 271
272 return RegisterNativesImpl(env) >= 0; 272 return RegisterNativesImpl(env) >= 0;
273 } 273 }
274 274
275 } // namespace content 275 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_impl.h ('k') | content/browser/android/download_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698