blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java - Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp.

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/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix nit issues, and prepare to commit. Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java ('k') | blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java

diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java

index 3a9b9d6264be86051d0648443a932abd9d13aa0b..60e117319737d120bb741bb5343167c2c0517e0c 100644

--- a/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java

+++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java

@@ -4,9 +4,12 @@

package org.chromium.blimp.core;

+import android.preference.PreferenceFragment;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

import org.chromium.blimp_public.BlimpClientContext;

+import org.chromium.blimp_public.BlimpSettingsCallbacks;

import org.chromium.blimp_public.contents.BlimpContents;

/**

@@ -43,4 +46,14 @@ public class DummyBlimpClientContext implements BlimpClientContext {

assert mNativeDummyBlimpClientContextAndroid != 0;

return mNativeDummyBlimpClientContextAndroid;

}

+ @Override

+ public boolean isBlimpSupported() {

+ return false;

+ }

+ @Override

+ public void attachBlimpPreferences(PreferenceFragment fragment,

+ BlimpSettingsCallbacks callbacks) {

+ }

}