Provide a common interface for all Android app resources.

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10626017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143909 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 77 insertions, 20 deletions

diff --git a/content/public/android/java/org/chromium/content/app/AppResource.java b/content/public/android/java/org/chromium/content/app/AppResource.java
new file mode 100644
index 0000000..4178702
--- /dev/null
+++ b/content/public/android/java/org/chromium/content/app/AppResource.java
@@ -0,0 +1,40 @@
+// 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.app;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+/**
+ * Interface to list and expose any required Android app resources.
+ * All resources must be registered before instantiating ContentView objects.
+ */
+public class AppResource {
+    /** Array resource containing the official command line arguments. */
+    public static int ARRAY_OFFICIAL_COMMAND_LINE;
+
+    /** Dimension of the radius used in the link preview overlay. */
+    public static int DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS;
+
+    /** Drawable resource for the link preview popup overlay. */
+    public static int DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY;
+
+    /**
+     * Iterates through all the resources ids and verifies they have values other than zero.
+     * @return true if all the resources have been registered.
+     */
+    public static boolean verifyResourceRegistration() {
+        Field[] fields = AppResource.class.getDeclaredFields();
+        for (Field field : fields) {
+            try {
+              if (field.getType().equals(int.class) && Modifier.isStatic(field.getModifiers())) {
+                  if (field.getInt(null) == 0) return false;
+              }
+            } catch (IllegalAccessException e) {
+            }
+        }
+        return true;
+    }
+}
diff --git a/content/public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java b/content/public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java
index f848e17..b3ddb81 100644
--- a/content/public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java
+++ b/content/public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java
@@ -9,9 +9,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.util.Log;
 
+import org.chromium.content.app.AppResource;
 import org.chromium.content.app.ContentMain;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.common.CommandLine;
 
 // NOTE: This file hasn't been fully upstreamed, please don't merge to downstream.
 public class AndroidBrowserProcess {
@@ -89,6 +91,23 @@ public class AndroidBrowserProcess {
 
         Context appContext = context.getApplicationContext();
 
+        // This block is inside genericChromiumProcessInit() instead
+        // of initChromiumBrowserProcess() to make sure we do it once.
+        // In here it is protected with the sInitialized.
+        if (hostIsChrome) {
+            if (nativeIsOfficialBuild() ||
+                    CommandLine.getInstance().hasSwitch(CommandLine.ADD_OFFICIAL_COMMAND_LINE)) {
+                Resources res = context.getResources();
+                try {
+                    String[] switches = res.getStringArray(AppResource.ARRAY_OFFICIAL_COMMAND_LINE);
+                    CommandLine.getInstance().appendSwitchesAndArguments(switches);
+                } catch (Resources.NotFoundException e) {
+                    // Do nothing.  It is fine to have no command line
+                    // additions for an official build.
+                }
+            }
+        }
+
         int maxRenderers = normalizeMaxRendererProcesses(appContext, maxRendererProcesses);
         Log.i(TAG, "Initializing chromium process, renderers=" + maxRenderers +
                 " hostIsChrome=" + hostIsChrome);
diff --git a/content/public/android/java/org/chromium/content/browser/ContentView.java b/content/public/android/java/org/chromium/content/browser/ContentView.java
index 8db0a9a..10b636a 100644
--- a/content/public/android/java/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/org/chromium/content/browser/ContentView.java
@@ -12,6 +12,7 @@ import android.webkit.DownloadListener;
 import android.widget.FrameLayout;
 
 import org.chromium.base.WeakContext;
+import org.chromium.content.app.AppResource;
 import org.chromium.content.common.TraceEvent;
 
 public class ContentView extends FrameLayout {
@@ -95,24 +96,6 @@ public class ContentView extends FrameLayout {
         AndroidBrowserProcess.initContentViewProcess(context, maxRendererProcesses);
     }
 
-    /**
-     * Registers the drawable to be used for overlaying the popup zoomer contents.  The drawable
-     * should be transparent in the middle to allow the zoomed content to show.
-     *
-     * @param id The id of the drawable to be used to overlay the popup zoomer contents.
-     */
-    public static void registerPopupOverlayResourceId(int id) {
-        // TODO(tedchoc): Implement.
-    }
-
-    /**
-     * Sets how much to round the corners of the popup contents.
-     * @param r The radius of the rounded corners of the popup overlay drawable.
-     */
-    public static void registerPopupOverlayCornerRadius(float r) {
-        // TODO(tedchoc): Implement.
-    }
-
     public ContentView(Context context, int nativeWebContents, int personality) {
         this(context, nativeWebContents, null, android.R.attr.webViewStyle, personality);
     }
diff --git a/content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java
index 4f6c8f7..9271e5e 100644
--- a/content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java
+++ b/content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java
@@ -11,6 +11,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 
+import org.chromium.content.app.AppResource;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.common.CommandLine;
@@ -98,7 +99,7 @@ public class ContentShellActivity extends Activity {
     }
 
     private void initializeContentViewResources() {
-        ContentView.registerPopupOverlayCornerRadius(0);
-        ContentView.registerPopupOverlayResourceId(R.drawable.popup_zoomer_overlay);
+        AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius;
+        AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay;
     }
 }
diff --git a/content/shell/android/res/values/dimens.xml b/content/shell/android/res/values/dimens.xml
new file mode 100644
index 0000000..0a0ff61
--- /dev/null
+++ b/content/shell/android/res/values/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 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.
+ -->
+
+<resources>
+
+    <!-- Link Preview dimensions -->
+    <dimen name="link_preview_overlay_radius">0dp</dimen>
+
+</resources>