Desktop PWAs: Rename BookmarkAppConfirmationView

BookmarkAppConfirmationView becomes WebAppConfirmationView.

ShowBookmarkAppDialog becomes ShowWebAppDialog.

SetAutoAcceptBookmarkAppDialogForTesting becomes
SetAutoAcceptWebAppDialogForTesting.

Not addressed in this CL: moving web app and
pwa files from
chrome/browser/ui/views/extensions/ to
chrome/browser/ui/views/web_apps/


Bug: 953540
Change-Id: Ia06769c6af7d38d2bb32f35fe1743ea6165c1201
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2081724Reviewed-by: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746207}

chrome/browser/ui/BUILD.gn

@@ -2875,8 +2875,6 @@ jumbo_static_library("ui") {
       "views/exclusive_access_bubble_views.cc",
       "views/exclusive_access_bubble_views.h",
       "views/exclusive_access_bubble_views_context.h",
-      "views/extensions/bookmark_app_confirmation_view.cc",
-      "views/extensions/bookmark_app_confirmation_view.h",
       "views/extensions/chooser_dialog_view.cc",
       "views/extensions/chooser_dialog_view.h",
       "views/extensions/expandable_container_view.cc",
@@ -2904,6 +2902,8 @@ jumbo_static_library("ui") {
       "views/extensions/extensions_toolbar_container.h",
       "views/extensions/pwa_confirmation_bubble_view.cc",
       "views/extensions/pwa_confirmation_bubble_view.h",
+      "views/extensions/web_app_confirmation_view.cc",
+      "views/extensions/web_app_confirmation_view.h",
       "views/extensions/web_app_info_image_source.cc",
       "views/extensions/web_app_info_image_source.h",
       "views/feature_promos/feature_promo_bubble_timeout.cc",

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -2149,11 +2149,11 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest,
       GURL(embedded_test_server()->GetURL("/banners/manifest_test_page.html")),
       ui::PAGE_TRANSITION_LINK);
   // Install shortcut app.
-  chrome::SetAutoAcceptBookmarkAppDialogForTesting(true, true);
+  chrome::SetAutoAcceptWebAppDialogForTesting(true, true);
   web_app::WebAppInstallObserver observer(profile());
   chrome::ExecuteCommand(browser(), IDC_CREATE_SHORTCUT);
   web_app::AppId app_id = observer.AwaitNextInstall();
-  chrome::SetAutoAcceptBookmarkAppDialogForTesting(false, false);
+  chrome::SetAutoAcceptWebAppDialogForTesting(false, false);
 
   ash::ShelfID shelf_id(app_id);
   EXPECT_FALSE(ChromeLauncherController::instance()->IsPinned(shelf_id));

chrome/browser/ui/browser_dialogs.h

@@ -99,20 +99,20 @@ void ShowCreateChromeAppShortcutsDialog(
 using AppInstallationAcceptanceCallback =
     base::OnceCallback<void(bool, std::unique_ptr<WebApplicationInfo>)>;
 
-// Shows the Bookmark App bubble.
-// See Extension::InitFromValueFlags::FROM_BOOKMARK for a description of
-// bookmark apps.
+// Shows the Web App bubble.
 //
 // |web_app_info| is the WebApplicationInfo being converted into an app.
-void ShowBookmarkAppDialog(content::WebContents* web_contents,
-                           std::unique_ptr<WebApplicationInfo> web_app_info,
-                           AppInstallationAcceptanceCallback callback);
+// |web_app_info.app_url| should contain a start url from a web app manifest
+// (for a Desktop PWA), or the current url (when creating a shortcut app).
+void ShowWebAppDialog(content::WebContents* web_contents,
+                      std::unique_ptr<WebApplicationInfo> web_app_info,
+                      AppInstallationAcceptanceCallback callback);
 
-// Sets whether |ShowBookmarkAppDialog| should accept immediately without any
+// Sets whether |ShowWebAppDialog| should accept immediately without any
 // user interaction. |auto_open_in_window| sets whether the open in window
 // checkbox is checked.
-void SetAutoAcceptBookmarkAppDialogForTesting(bool auto_accept,
-                                              bool auto_open_in_window);
+void SetAutoAcceptWebAppDialogForTesting(bool auto_accept,
+                                         bool auto_open_in_window);
 
 // Shows the PWA installation confirmation bubble anchored off the PWA install
 // icon in the omnibox.

chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc → chrome/browser/ui/views/extensions/web_app_confirmation_view.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/ui/views/extensions/bookmark_app_confirmation_view.h"
+#include "chrome/browser/ui/views/extensions/web_app_confirmation_view.h"
 
 #include <memory>
 #include <utility>
@@ -32,14 +32,14 @@
 
 namespace {
 
-bool g_auto_accept_bookmark_app_for_testing = false;
+bool g_auto_accept_web_app_for_testing = false;
 bool g_auto_check_open_in_window_for_testing = false;
 
 }  // namespace
 
-BookmarkAppConfirmationView::~BookmarkAppConfirmationView() {}
+WebAppConfirmationView::~WebAppConfirmationView() {}
 
-BookmarkAppConfirmationView::BookmarkAppConfirmationView(
+WebAppConfirmationView::WebAppConfirmationView(
     std::unique_ptr<WebApplicationInfo> web_app_info,
     chrome::AppInstallationAcceptanceCallback callback)
     : web_app_info_(std::move(web_app_info)), callback_(std::move(callback)) {
@@ -105,30 +105,30 @@ BookmarkAppConfirmationView::BookmarkAppConfirmationView(
       chrome::DialogIdentifier::BOOKMARK_APP_CONFIRMATION);
 }
 
-views::View* BookmarkAppConfirmationView::GetInitiallyFocusedView() {
+views::View* WebAppConfirmationView::GetInitiallyFocusedView() {
   return title_tf_;
 }
 
-ui::ModalType BookmarkAppConfirmationView::GetModalType() const {
+ui::ModalType WebAppConfirmationView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-base::string16 BookmarkAppConfirmationView::GetWindowTitle() const {
+base::string16 WebAppConfirmationView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_ADD_TO_OS_LAUNCH_SURFACE_BUBBLE_TITLE);
 }
 
-bool BookmarkAppConfirmationView::ShouldShowCloseButton() const {
+bool WebAppConfirmationView::ShouldShowCloseButton() const {
   return false;
 }
 
-void BookmarkAppConfirmationView::WindowClosing() {
+void WebAppConfirmationView::WindowClosing() {
   if (callback_) {
     DCHECK(web_app_info_);
     std::move(callback_).Run(false, std::move(web_app_info_));
   }
 }
 
-bool BookmarkAppConfirmationView::Accept() {
+bool WebAppConfirmationView::Accept() {
   DCHECK(web_app_info_);
   web_app_info_->title = GetTrimmedTitle();
   web_app_info_->open_as_window =
@@ -137,19 +137,19 @@ bool BookmarkAppConfirmationView::Accept() {
   return true;
 }
 
-bool BookmarkAppConfirmationView::IsDialogButtonEnabled(
+bool WebAppConfirmationView::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ? !GetTrimmedTitle().empty() : true;
 }
 
-void BookmarkAppConfirmationView::ContentsChanged(
+void WebAppConfirmationView::ContentsChanged(
     views::Textfield* sender,
     const base::string16& new_contents) {
   DCHECK_EQ(title_tf_, sender);
   DialogModelChanged();
 }
 
-base::string16 BookmarkAppConfirmationView::GetTrimmedTitle() const {
+base::string16 WebAppConfirmationView::GetTrimmedTitle() const {
   base::string16 title(title_tf_->GetText());
   base::TrimWhitespace(title, base::TRIM_ALL, &title);
   return title;
@@ -157,21 +157,21 @@ base::string16 BookmarkAppConfirmationView::GetTrimmedTitle() const {
 
 namespace chrome {
 
-void ShowBookmarkAppDialog(content::WebContents* web_contents,
-                           std::unique_ptr<WebApplicationInfo> web_app_info,
-                           AppInstallationAcceptanceCallback callback) {
-  auto* dialog = new BookmarkAppConfirmationView(std::move(web_app_info),
-                                                 std::move(callback));
+void ShowWebAppDialog(content::WebContents* web_contents,
+                      std::unique_ptr<WebApplicationInfo> web_app_info,
+                      AppInstallationAcceptanceCallback callback) {
+  auto* dialog =
+      new WebAppConfirmationView(std::move(web_app_info), std::move(callback));
   constrained_window::ShowWebModalDialogViews(dialog, web_contents);
 
-  if (g_auto_accept_bookmark_app_for_testing) {
+  if (g_auto_accept_web_app_for_testing) {
     dialog->AcceptDialog();
   }
 }
 
-void SetAutoAcceptBookmarkAppDialogForTesting(bool auto_accept,
-                                              bool auto_open_in_window) {
-  g_auto_accept_bookmark_app_for_testing = auto_accept;
+void SetAutoAcceptWebAppDialogForTesting(bool auto_accept,
+                                         bool auto_open_in_window) {
+  g_auto_accept_web_app_for_testing = auto_accept;
   g_auto_check_open_in_window_for_testing = auto_open_in_window;
 }
 

chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.h → chrome/browser/ui/views/extensions/web_app_confirmation_view.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_UI_VIEWS_EXTENSIONS_BOOKMARK_APP_CONFIRMATION_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BOOKMARK_APP_CONFIRMATION_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_WEB_APP_CONFIRMATION_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_WEB_APP_CONFIRMATION_VIEW_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -15,17 +15,16 @@
 namespace views {
 class Checkbox;
 class Textfield;
-}
+}  // namespace views
 
-// BookmarkAppConfirmationView provides views for editing the details to
-// create a bookmark app with. (More tools > Add to desktop)
-class BookmarkAppConfirmationView : public views::DialogDelegateView,
-                                    public views::TextfieldController {
+// WebAppConfirmationView provides views for editing the details to
+// create a web app with. (More tools > Add to desktop)
+class WebAppConfirmationView : public views::DialogDelegateView,
+                               public views::TextfieldController {
  public:
-  BookmarkAppConfirmationView(
-      std::unique_ptr<WebApplicationInfo> web_app_info,
-      chrome::AppInstallationAcceptanceCallback callback);
-  ~BookmarkAppConfirmationView() override;
+  WebAppConfirmationView(std::unique_ptr<WebApplicationInfo> web_app_info,
+                         chrome::AppInstallationAcceptanceCallback callback);
+  ~WebAppConfirmationView() override;
 
  private:
   // Overridden from views::WidgetDelegate:
@@ -59,7 +58,7 @@ class BookmarkAppConfirmationView : public views::DialogDelegateView,
   // Textfield showing the title of the app.
   views::Textfield* title_tf_ = nullptr;
 
-  DISALLOW_COPY_AND_ASSIGN(BookmarkAppConfirmationView);
+  DISALLOW_COPY_AND_ASSIGN(WebAppConfirmationView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BOOKMARK_APP_CONFIRMATION_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_WEB_APP_CONFIRMATION_VIEW_H_

chrome/browser/ui/web_applications/create_shortcut_browsertest.cc

@@ -26,11 +26,11 @@ namespace web_app {
 class CreateShortcutBrowserTest : public WebAppControllerBrowserTest {
  public:
   AppId InstallShortcutAppForCurrentUrl() {
-    chrome::SetAutoAcceptBookmarkAppDialogForTesting(true, false);
+    chrome::SetAutoAcceptWebAppDialogForTesting(true, false);
     WebAppInstallObserver observer(profile());
     CHECK(chrome::ExecuteCommand(browser(), IDC_CREATE_SHORTCUT));
     AppId app_id = observer.AwaitNextInstall();
-    chrome::SetAutoAcceptBookmarkAppDialogForTesting(false, false);
+    chrome::SetAutoAcceptWebAppDialogForTesting(false, false);
     return app_id;
   }
 
@@ -56,7 +56,7 @@ IN_PROC_BROWSER_TEST_P(CreateShortcutBrowserTest,
 
   AppId app_id = InstallShortcutAppForCurrentUrl();
   EXPECT_EQ(registrar().GetAppShortName(app_id), GetInstallableAppName());
-  // Bookmark apps to PWAs should launch in a tab.
+  // Shortcut apps to PWAs should launch in a tab.
   EXPECT_EQ(registrar().GetAppUserDisplayMode(app_id), DisplayMode::kBrowser);
 
   EXPECT_EQ(0, user_action_tester.GetActionCount("InstallWebAppFromMenu"));

chrome/browser/ui/web_applications/web_app_dialog_utils.cc

@@ -45,9 +45,8 @@ void WebAppInstallDialogCallback(
                                  std::move(web_app_info),
                                  std::move(web_app_acceptance_callback));
   } else {
-    chrome::ShowBookmarkAppDialog(initiator_web_contents,
-                                  std::move(web_app_info),
-                                  std::move(web_app_acceptance_callback));
+    chrome::ShowWebAppDialog(initiator_web_contents, std::move(web_app_info),
+                             std::move(web_app_acceptance_callback));
   }
 }
 

chrome/browser/web_applications/web_app_migration_manager_browsertest.cc

@@ -118,7 +118,7 @@ class WebAppMigrationManagerBrowserTest : public InProcessBrowserTest {
 
   AppId InstallWebAppAsUserViaOmnibox() {
     chrome::SetAutoAcceptPWAInstallConfirmationForTesting(true);
-    chrome::SetAutoAcceptBookmarkAppDialogForTesting(
+    chrome::SetAutoAcceptWebAppDialogForTesting(
         /*auto_accept=*/true,
         /*auto_open_in_window=*/true);