blimp/client/public/contents/blimp_contents.h - Issue 2233023002: Adding BlimpNavigationController to Tab

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

Unified Diff: blimp/client/public/contents/blimp_contents.h

Issue 2233023002: Adding BlimpNavigationController to Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nav_handler_remove

Patch Set: Fixing unit tests Created 4 years, 4 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

« no previous file with comments | « blimp/client/public/android/java/src/org/chromium/blimp_public/contents/BlimpNavigationController.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/public/contents/blimp_contents.h

diff --git a/blimp/client/public/contents/blimp_contents.h b/blimp/client/public/contents/blimp_contents.h

index ea11aa7305a00239917de041d3f01b50c2fd34d8..c481696156b926ebaf8cf2d5c446e34f79a3450f 100644

--- a/blimp/client/public/contents/blimp_contents.h

+++ b/blimp/client/public/contents/blimp_contents.h

@@ -9,6 +9,10 @@

#include "base/supports_user_data.h"

#include "url/gurl.h"

+#if defined(OS_ANDROID)

+#include "base/android/scoped_java_ref.h"

+#endif

namespace blimp {

namespace client {

@@ -31,6 +35,12 @@ class BlimpContents : public base::SupportsUserData {

virtual void AddObserver(BlimpContentsObserver* observer) = 0;

virtual void RemoveObserver(BlimpContentsObserver* observer) = 0;

+#if defined(OS_ANDROID)

+ // Returns a Java object of the type BlimpContents for the given

+ // BlimpContents.

+ virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;

+#endif

protected:

BlimpContents() {}