Move UiWidgetFactory to org.chromium.ui.widget

UiWidgetFactory is not popup, so it should be moved
from org.chromium.ui.widget.popups to org.chromium.ui.widget

Bug: 813917
Change-Id: I8056b456bfa71e5de51bbd0fe244e5b347f57b0d
Reviewed-on: https://chromium-review.googlesource.com/1005793Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Amirhossein Simjour <asimjour@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549968}

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

@@ -60,7 +60,7 @@ import org.chromium.content_public.browser.ScreenOrientationDelegate;
 import org.chromium.content_public.browser.ScreenOrientationDelegateManager;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.display.DisplayAndroidManager;
-import org.chromium.ui.widget.popups.UiWidgetFactory;
+import org.chromium.ui.widget.UiWidgetFactory;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrUiWidgetFactory.java

@@ -8,7 +8,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.widget.PopupWindow;
 
-import org.chromium.ui.widget.popups.UiWidgetFactory;
+import org.chromium.ui.widget.UiWidgetFactory;
 
 /**
  * The factory that creates VR compatible UI widgets.

ui/android/BUILD.gn

@@ -251,8 +251,8 @@ android_library("ui_full_java") {
     "java/src/org/chromium/ui/widget/TextViewWithClickableSpans.java",
     "java/src/org/chromium/ui/widget/TextViewWithLeading.java",
     "java/src/org/chromium/ui/widget/Toast.java",
+    "java/src/org/chromium/ui/widget/UiWidgetFactory.java",
     "java/src/org/chromium/ui/widget/ViewRectProvider.java",
-    "java/src/org/chromium/ui/widget/popups/UiWidgetFactory.java",
   ]
   deps = [
     ":ui_java_resources",

ui/android/java/src/org/chromium/ui/widget/AnchoredPopupWindow.java

@@ -22,7 +22,6 @@ import android.widget.PopupWindow.OnDismissListener;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
-import org.chromium.ui.widget.popups.UiWidgetFactory;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

ui/android/java/src/org/chromium/ui/widget/Toast.java

@@ -17,7 +17,6 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import org.chromium.base.SysUtils;
-import org.chromium.ui.widget.popups.UiWidgetFactory;
 
 /**
  * Toast wrapper, makes sure toasts are not HW accelerated on low-end devices and presented

ui/android/java/src/org/chromium/ui/widget/popups/UiWidgetFactory.java → ui/android/java/src/org/chromium/ui/widget/UiWidgetFactory.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui.widget.popups;
+package org.chromium.ui.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;