Add Java resources to content and chrome.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ skipping 10 matching lines @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 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
  * canvas and touch events to display the on-demand zoom magnifier.
  */
 class PopupZoomer extends View {
     private static String LOGTAG = "PopupZoomer";
 
     // The padding between the edges of the view and the popup. Note that there is a mirror
     // constant in content/renderer/render_view_impl.cc which should be kept in sync if
@@ skipping 61 matching lines @@
     // Since we sometimes overflow the bounds of the mViewClipRect, we need to allow scrolling.
     // Current scroll position.
     private float mPopupScrollX, mPopupScrollY;
     // Scroll bounds.
     private float mMinScrollX, mMaxScrollX;
     private float mMinScrollY, mMaxScrollY;
 
     private GestureDetector mGestureDetector;
 
     private static float getOverlayCornerRadius(Context context) {
-        // TODO(leandrogracia): restore an assertion for the resource id != 0
-        // here after fixing crbug.com/136704
-        // assert AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS != 0;
-        if (sOverlayCornerRadius == 0 && AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS != 0)
+        if (sOverlayCornerRadius == 0)
             sOverlayCornerRadius = context.getResources().getDimension(
-                    AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS);
+                    R.dimen.link_preview_overlay_radius);
         return sOverlayCornerRadius;
     }
 
     /**
      * Gets the drawable that should be used to frame the zooming popup, loading
      * it from the resource bundle if not already cached.
      */
     private static Drawable getOverlayDrawable(Context context) {
         if (sOverlayDrawable == null) {
             try {
                 sOverlayDrawable = context.getResources().getDrawable(
-                        AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY);
+                        R.drawable.ondemand_overlay);
             } catch (Resources.NotFoundException e) {
                 Log.w(LOGTAG, "No drawable resource for PopupZoomer overlay found.");
                 sOverlayDrawable = new ColorDrawable();
             }
             sOverlayPadding = new Rect();
             sOverlayDrawable.getPadding(sOverlayPadding);
         }
         return sOverlayDrawable;
     }
 
@@ skipping 360 matching lines @@
         }
 
         @Override
         public float getInterpolation(float input) {
             input = 1.0f - input;
             if (mInterpolator == null) return input;
             return mInterpolator.getInterpolation(input);
         }
     }
 }