Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/widget/ControlContainer.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/widget/ControlContainer.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/ControlContainer.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/ControlContainer.java
deleted file mode 100644
index bb81556b4fedb602c5a5b0b3e4c0975cdb009fbf..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/ControlContainer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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.widget;
-
-import android.view.View;
-
-import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
-import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
-
-/**
- * Interface that defines the responsibilities of the layout container for the top controls.
- * <p>
- * Concrete implementations of this class must extend ViewGroup.
- */
-public interface ControlContainer {
-    /**
-     * @return The {@link ViewResourceAdapter} that exposes this {@link View} as a CC resource.
-     */
-    ViewResourceAdapter getToolbarResourceAdapter();
-
-    /**
-     * @return The {@link ViewResourceAdapter} that exposes the progress widget as a CC resource
-     *         (if applicable).
-     */
-    ViewResourceAdapter getProgressResourceAdapter();
-
-    /**
-     * @param handler The swipe handler to be notified of swipe events on this container.
-     */
-    void setSwipeHandler(EdgeSwipeHandler handler);
-}