Consolidate chrome/browser/android/banners into chrome/brower/banners.

This CL removes the chrome/browser/android/banners directory and moves all files to chrome/browser/banners. This means that there is one fewer directory for C++ app banner code to live in. The obsolete AppBannerMetricsIds.template is also removed in this CL. BUG=None [email protected] Change-Id: I376b42a51d7cc94d829c9acaac1707268a7976ec Reviewed-on: https://chromium-review.googlesource.com/756370 Reviewed-by: Ted Choc <[email protected]> Reviewed-by: Ben Wells <[email protected]> Reviewed-by: Peter Kotwicz <[email protected]> Commit-Queue: Dominick Ng <[email protected]> Cr-Commit-Position: refs/heads/master@{#514729}
TLeaves · Nov 8, 2017 · 4568f11 · 4568f11
1 parent 99967e8
commit 4568f11
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 37 deletions.
diff --git a/WATCHLISTS b/WATCHLISTS
@@ -29,7 +29,6 @@
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/webapps/|'\
                   'chrome/android/javatests/src/org/chromium/chrome/browser/webapps/|'\
                   'chrome/android/junit/src/org/chromium/chrome/browser/webapps/|'\
-                  'chrome/android/javatests/src/org/chromium/chrome/browser/banners/|'\
                   'chrome/browser/android/shortcut_.*|'\
                   'chrome/browser/android/webapps/',
     },
@@ -166,7 +165,6 @@
     'banners': {
       'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/banners/|'\
                   'chrome/android/javatests/src/org/chromium/chrome/browser/banners/|'\
-                  'chrome/browser/android/banners/|'\
                   'chrome/browser/banners/|'\
                   'chrome/browser/ui/android/infobars/app_banner_.*|'\
                   'third_party/WebKit/public/platform/modules/app_banner/|'\

diff --git a/chrome/android/java/AppBannerMetricsIds.template b/chrome/android/java/AppBannerMetricsIds.template
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1791,10 +1791,6 @@ split_static_library("browser") {
       "android/background_sync_launcher_android.h",
       "android/background_tab_manager.cc",
       "android/background_tab_manager.h",
-      "android/banners/app_banner_infobar_delegate_android.cc",
-      "android/banners/app_banner_infobar_delegate_android.h",
-      "android/banners/app_banner_manager_android.cc",
-      "android/banners/app_banner_manager_android.h",
       "android/bookmarks/bookmark_bridge.cc",
       "android/bookmarks/bookmark_bridge.h",
       "android/bookmarks/partner_bookmarks_reader.cc",
@@ -2133,6 +2129,10 @@ split_static_library("browser") {
       "autofill/android/personal_data_manager_android.cc",
       "autofill/android/personal_data_manager_android.h",
       "autofill/android/phone_number_util_android.cc",
+      "banners/app_banner_infobar_delegate_android.cc",
+      "banners/app_banner_infobar_delegate_android.h",
+      "banners/app_banner_manager_android.cc",
+      "banners/app_banner_manager_android.h",
       "chrome_browser_field_trials_mobile.cc",
       "chrome_browser_field_trials_mobile.h",
       "dom_distiller/dom_distiller_service_factory_android.cc",

diff --git a/chrome/browser/android/banners/OWNERS b/chrome/browser/android/banners/OWNERS
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -11,10 +11,10 @@
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
-#include "chrome/browser/android/banners/app_banner_manager_android.h"
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/android/feature_utilities.h"
 #include "chrome/browser/android/hung_renderer_infobar_delegate.h"
+#include "chrome/browser/banners/app_banner_manager_android.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/infobars/infobar_service.h"

diff --git a/chrome/browser/android/webapps/add_to_homescreen_manager.cc b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
@@ -11,11 +11,11 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/android/banners/app_banner_manager_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/android/webapk/webapk_metrics.h"
+#include "chrome/browser/banners/app_banner_manager_android.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/installable/installable_manager.h"
 #include "content/public/browser/browser_thread.h"

diff --git a/...rs/app_banner_infobar_delegate_android.cc → ...rs/app_banner_infobar_delegate_android.cc b/...rs/app_banner_infobar_delegate_android.cc → ...rs/app_banner_infobar_delegate_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
+#include "chrome/browser/banners/app_banner_infobar_delegate_android.h"
 
 #include <utility>
 
@@ -75,7 +75,7 @@ bool AppBannerInfoBarDelegateAndroid::Create(
       app_title, native_app_data, icon, native_app_package_name, referrer));
   return InfoBarService::FromWebContents(web_contents)
       ->AddInfoBar(base::MakeUnique<AppBannerInfoBarAndroid>(
-           std::move(infobar_delegate), native_app_data));
+          std::move(infobar_delegate), native_app_data));
 }
 
 AppBannerInfoBarDelegateAndroid::~AppBannerInfoBarDelegateAndroid() {
@@ -216,10 +216,8 @@ bool AppBannerInfoBarDelegateAndroid::AcceptNativeApp(
   ScopedJavaLocalRef<jstring> jreferrer(
       ConvertUTF8ToJavaString(env, referrer_));
 
-  bool was_opened =
-      Java_AppBannerInfoBarDelegateAndroid_installOrOpenNativeApp(
-          env, java_delegate_, tab->GetJavaObject(),
-          native_app_data_, jreferrer);
+  bool was_opened = Java_AppBannerInfoBarDelegateAndroid_installOrOpenNativeApp(
+      env, java_delegate_, tab->GetJavaObject(), native_app_data_, jreferrer);
 
   if (was_opened)
     TrackDismissEvent(DISMISS_EVENT_APP_OPEN);

diff --git a/...ers/app_banner_infobar_delegate_android.h → ...ers/app_banner_infobar_delegate_android.h b/...ers/app_banner_infobar_delegate_android.h → ...ers/app_banner_infobar_delegate_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
-#define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
+#ifndef CHROME_BROWSER_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
+#define CHROME_BROWSER_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
 
 #include <memory>
 #include <string>
@@ -135,4 +135,4 @@ class AppBannerInfoBarDelegateAndroid : public ConfirmInfoBarDelegate {
 
 }  // namespace banners
 
-#endif  // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
+#endif  // CHROME_BROWSER_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
diff --git a/...oid/banners/app_banner_manager_android.cc → ...ser/banners/app_banner_manager_android.cc b/...oid/banners/app_banner_manager_android.cc → ...ser/banners/app_banner_manager_android.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/banners/app_banner_manager_android.h"
+#include "chrome/browser/banners/app_banner_manager_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"
+#include "chrome/browser/banners/app_banner_infobar_delegate_android.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "content/public/browser/manifest_icon_downloader.h"

diff --git a/...roid/banners/app_banner_manager_android.h → ...wser/banners/app_banner_manager_android.h b/...roid/banners/app_banner_manager_android.h → ...wser/banners/app_banner_manager_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_MANAGER_ANDROID_H_
-#define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_MANAGER_ANDROID_H_
+#ifndef CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_ANDROID_H_
+#define CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_ANDROID_H_
 
 #include <string>
 
@@ -129,4 +129,4 @@ class AppBannerManagerAndroid
 
 }  // namespace banners
 
-#endif  // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_MANAGER_ANDROID_H_
+#endif  // CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_ANDROID_H_
diff --git a/chrome/browser/ui/android/infobars/app_banner_infobar_android.cc b/chrome/browser/ui/android/infobars/app_banner_infobar_android.cc
@@ -9,7 +9,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
-#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
+#include "chrome/browser/banners/app_banner_infobar_delegate_android.h"
 #include "jni/AppBannerInfoBarAndroid_jni.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/gfx/android/java_bitmap.h"

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
@@ -90,13 +90,13 @@
 #include "printing/features/features.h"
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/android/banners/app_banner_manager_android.h"
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/android/data_usage/data_use_tab_helper.h"
 #include "chrome/browser/android/oom_intervention/oom_intervention_tab_helper.h"
 #include "chrome/browser/android/search_permissions/search_geolocation_disclosure_tab_helper.h"
 #include "chrome/browser/android/voice_search_tab_helper.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
+#include "chrome/browser/banners/app_banner_manager_android.h"
 #include "chrome/browser/ui/android/context_menu_helper.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #else