summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 23:03:35 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 23:03:35 +0000
commit25645efa60be6f6392f321c66ced61c53c3f0865 (patch)
tree47ea46a585a609628f9b32b2841ea73cb0c0df33 /content
parent049dd99c2271b818e2e3e2ae23187c60cb4e6f38 (diff)
downloadchromium_src-25645efa60be6f6392f321c66ced61c53c3f0865.zip
chromium_src-25645efa60be6f6392f321c66ced61c53c3f0865.tar.gz
chromium_src-25645efa60be6f6392f321c66ced61c53c3f0865.tar.bz2
Hooking up setBackgroundColor from AwContents to renderer
Final call into WebKit API ommitted as it depends on blink change https://codereview.chromium.org/19883002/ BUG=263263 Review URL: https://chromiumcodereview.appspot.com/19693016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/android/content_view_core_impl.cc9
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java8
2 files changed, 0 insertions, 17 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 9ee3838..4d19514 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -325,15 +325,6 @@ jint ContentViewCoreImpl::GetBackgroundColor(JNIEnv* env, jobject obj) {
return rwhva->GetCachedBackgroundColor();
}
-void ContentViewCoreImpl::SetBackgroundColor(JNIEnv* env,
- jobject obj,
- jint color) {
- RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
- if (!rwhva)
- return;
- rwhva->OnDidChangeBodyBackgroundColor(color);
-}
-
void ContentViewCoreImpl::OnHide(JNIEnv* env, jobject obj) {
Hide();
}
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index bc7e3f9..e86056e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -883,12 +883,6 @@ import java.util.Map;
return Color.WHITE;
}
- public void setBackgroundColor(int color) {
- if (mNativeContentViewCore != 0 && getBackgroundColor() != color) {
- nativeSetBackgroundColor(mNativeContentViewCore, color);
- }
- }
-
@CalledByNative
private void onBackgroundColorChanged(int color) {
getContentViewClient().onBackgroundColorChanged(color);
@@ -3101,8 +3095,6 @@ import java.util.Map;
private native int nativeGetBackgroundColor(int nativeContentViewCoreImpl);
- private native void nativeSetBackgroundColor(int nativeContentViewCoreImpl, int color);
-
private native void nativeOnShow(int nativeContentViewCoreImpl);
private native void nativeOnHide(int nativeContentViewCoreImpl);