Upstream oodles of Chrome for Android code into Chromium.

chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappControlContainer.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappControlContainer.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappControlContainer.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappControlContainer.java
new file mode 100644
index 0000000000000000000000000000000000000000..de385f2ab57b50d2ecdc90a3ee388a52f73e84fd
--- /dev/null
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappControlContainer.java
@@ -0,0 +1,39 @@
+// Copyright 2015 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.chrome.browser.webapps;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
+import org.chromium.chrome.browser.widget.ControlContainer;
+import org.chromium.chrome.browser.widget.ViewResourceFrameLayout;
+import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
+
+/**
+ * The control container used by WebApps.
+ */
+public class WebappControlContainer extends ViewResourceFrameLayout
+        implements ControlContainer {
+
+    /** Constructor for inflating from XML. */
+    public WebappControlContainer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public ViewResourceAdapter getToolbarResourceAdapter() {
+        return getResourceAdapter();
+    }
+
+    @Override
+    public ViewResourceAdapter getProgressResourceAdapter() {
+        return null;
+    }
+
+    @Override
+    public void setSwipeHandler(EdgeSwipeHandler handler) {
+    }
+}