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

Unified Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 2741043004: Revert of Add Java wrapper for RenderFrameHost (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 0141d86ed5eef72a7350072af730b5da55bd9eea..74ee70b1b2541002d192b8df3fbf34ed5a768c1a 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -20,7 +20,6 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
-#include "base/supports_user_data.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "content/browser/accessibility/browser_accessibility_manager.h"
@@ -112,7 +111,6 @@
class CONTENT_EXPORT RenderFrameHostImpl
: public RenderFrameHost,
- public base::SupportsUserData,
NON_EXPORTED_BASE(public mojom::FrameHost),
public BrowserAccessibilityDelegate,
public SiteInstanceImpl::Observer,
@@ -616,10 +614,6 @@
bool has_focused_editable_element() const {
return has_focused_editable_element_;
}
-
-#if defined(OS_ANDROID)
- base::android::ScopedJavaLocalRef<jobject> GetJavaRenderFrameHost();
-#endif
protected:
friend class RenderFrameHostFactory;
« no previous file with comments | « content/browser/frame_host/render_frame_host_delegate.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698