Support Java resources within content and chrome

content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java

Index: content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
index 2e90c36f6cbc4599c5940c3e67d15ae253e00be8..cf78f041deed221e9f854b05b8810d14a739af36 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
@@ -26,6 +26,7 @@ import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
 
 import org.chromium.content.app.AppResource;
+import org.chromium.content.R;
 
 /**
  * PopupZoomer is used to show the on-demand link zooming popup. It handles manipulation of the
@@ -120,8 +121,7 @@ class PopupZoomer extends View {
      */
     private static Drawable getOverlayDrawable(Context context) {
         if (sOverlayDrawable == null) {
-            sOverlayDrawable = context.getResources().getDrawable(
-                    AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY);

[benm (inactive), 2012/11/09 16:20:00]

Should there be a diff in AppResource.java to remove this?

[newt (away), 2012/11/09 21:37:44]

My plan is to change AppResource.java in another CL.  For now, I just want to
reference org.chromium.content.R.drawable.ondemand_overlay to prove that it
works.

+            sOverlayDrawable = context.getResources().getDrawable(R.drawable.ondemand_overlay);

[benm (inactive), 2012/11/09 11:05:11]

I don't think that this will work for WebView. We do not have a concept of a
final built APK (only developers using WebView do), and need to map the
resources that content/ needs to resource IDs in the Android framework. The
extra level of indirection that AppResource gave us suited perfectly - I did not
realise this was just a hack?

[newt (away), 2012/11/09 21:37:44]

As discussed offline, WebView will used a hand crafted version of
org.chromium.content.R, which will provide the sort of indirection that
AppResource currently does.

             sOverlayPadding = new Rect();
             sOverlayDrawable.getPadding(sOverlayPadding);
         }