Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java
deleted file mode 100644
index 527097c1b1bae7acc7f3976d0a6b66ca437ec2f1..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java
+++ /dev/null
@@ -1,38 +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.bookmarkswidget;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-/**
- * Proxy that responds to tapping on the Bookmarks widget.
- */
-public class BookmarkWidgetProxy extends BroadcastReceiver {
-    private static final String TAG = "BookmarkWidgetProxy";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (BookmarkThumbnailWidgetService.getChangeFolderAction(context)
-                .equals(intent.getAction())) {
-            BookmarkThumbnailWidgetService.changeFolder(context, intent);
-        } else {
-            Intent view = new Intent(intent);
-            view.setComponent(null);
-            startActivity(context, view);
-        }
-    }
-
-    void startActivity(Context context, Intent intent) {
-        try {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(intent);
-        } catch (Exception e) {
-            Log.w(TAG, "Failed to start intent activity", e);
-        }
-    }
-}