Use BookmarkAppConfirmationView on Mac. Delete the NSAlert Mac uses currently.

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/metrics/browser_window_histogram_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/chrome_signin_helper.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 15 matching lines @@
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 #import "chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #include "chrome/browser/ui/cocoa/restart_browser.h"
 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/profile_chooser_constants.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/rect.h"
 
 #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h"
 #endif
 
 using content::NativeWebKeyboardEvent;
 using content::WebContents;
 
-namespace {
-
-// These UI constants are used in BrowserWindowCocoa::ShowBookmarkAppBubble.
-// Used for defining the layout of the NSAlert and NSTextField within the
-// accessory view.
-const int kAppTextFieldVerticalSpacing = 2;
-const int kAppTextFieldWidth = 200;
-const int kAppTextFieldHeight = 22;
-const int kBookmarkAppBubbleViewWidth = 200;
-const int kBookmarkAppBubbleViewHeight = 46;
-
-const int kIconPreviewTargetSize = 128;
-
-base::string16 TrimText(NSString* controlText) {
-  base::string16 text = base::SysNSStringToUTF16(controlText);
-  base::TrimWhitespace(text, base::TRIM_ALL, &text);
-  return text;
-}
-
-}  // namespace
-
-@interface TextRequiringDelegate : NSObject<NSTextFieldDelegate> {
- @private
-  // Disable |control_| when text changes to just whitespace or empty string.
-  NSControl* control_;
-}
-- (id)initWithControl:(NSControl*)control text:(NSString*)text;
-- (void)controlTextDidChange:(NSNotification*)notification;
-@end
-
-@interface TextRequiringDelegate ()
-- (void)validateText:(NSString*)text;
-@end
-
-@implementation TextRequiringDelegate
-- (id)initWithControl:(NSControl*)control text:(NSString*)text {
-  if ((self = [super init])) {
-    control_ = control;
-    [self validateText:text];
-  }
-  return self;
-}
-
-- (void)controlTextDidChange:(NSNotification*)notification {
-  [self validateText:[[notification object] stringValue]];
-}
-
-- (void)validateText:(NSString*)text {
-  [control_ setEnabled:TrimText(text).empty() ? NO : YES];
-}
-@end
-
 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
                                        BrowserWindowController* controller)
   : browser_(browser),
     controller_(controller),
     initial_show_state_(ui::SHOW_STATE_DEFAULT),
     attention_request_id_(0) {
 
   gfx::Rect bounds;
   chrome::GetSavedWindowBoundsAndShowState(browser_,
                                            &bounds,
@@ skipping 403 matching lines @@
     restart_browser::RequestRestart(window());
   }
 }
 
 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url,
                                             bool already_bookmarked) {
   [controller_ showBookmarkBubbleForURL:url
                       alreadyBookmarked:(already_bookmarked ? YES : NO)];
 }
 
-void BrowserWindowCocoa::ShowBookmarkAppBubble(
-    const WebApplicationInfo& web_app_info,
-    const ShowBookmarkAppBubbleCallback& callback) {
-  base::scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]);
-  [alert setMessageText:l10n_util::GetNSString(
-      IDS_ADD_TO_APPLICATIONS_BUBBLE_TITLE)];
-  [alert setAlertStyle:NSInformationalAlertStyle];
-
-  NSButton* continue_button =
-      [alert addButtonWithTitle:l10n_util::GetNSString(IDS_OK)];
-  [continue_button setKeyEquivalent:kKeyEquivalentReturn];
-  NSButton* cancel_button =
-      [alert addButtonWithTitle:l10n_util::GetNSString(IDS_CANCEL)];
-  [cancel_button setKeyEquivalent:kKeyEquivalentEscape];
-
-  base::scoped_nsobject<NSButton> open_as_window_checkbox(
-      [[NSButton alloc] initWithFrame:NSZeroRect]);
-  [open_as_window_checkbox setButtonType:NSSwitchButton];
-  [open_as_window_checkbox
-      setTitle:l10n_util::GetNSString(IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_WINDOW)];
-  [open_as_window_checkbox setState:web_app_info.open_as_window];
-  [open_as_window_checkbox sizeToFit];
-
-  base::scoped_nsobject<NSTextField> app_title([[NSTextField alloc]
-      initWithFrame:NSMakeRect(0, kAppTextFieldHeight +
-                                      kAppTextFieldVerticalSpacing,
-                               kAppTextFieldWidth, kAppTextFieldHeight)]);
-  NSString* original_title = SysUTF16ToNSString(web_app_info.title);
-  [[app_title cell] setWraps:NO];
-  [[app_title cell] setScrollable:YES];
-  [app_title setStringValue:original_title];
-  base::scoped_nsobject<TextRequiringDelegate> delegate(
-      [[TextRequiringDelegate alloc] initWithControl:continue_button
-                                                text:[app_title stringValue]]);
-  [app_title setDelegate:delegate];
-
-  base::scoped_nsobject<NSView> view([[NSView alloc]
-      initWithFrame:NSMakeRect(0, 0, kBookmarkAppBubbleViewWidth,
-                               kBookmarkAppBubbleViewHeight)]);
-
-  // When CanHostedAppsOpenInWindows() returns false, do not show the open as
-  // window checkbox to avoid confusing users.
-  if (extensions::util::CanHostedAppsOpenInWindows())
-    [view addSubview:open_as_window_checkbox];
-  [view addSubview:app_title];
-  [alert setAccessoryView:view];
-
-  // Find the image with target size.
-  // Assumes that the icons are sorted in ascending order of size.
-  if (!web_app_info.icons.empty()) {
-    for (const WebApplicationInfo::IconInfo& info : web_app_info.icons) {
-      if (info.width == kIconPreviewTargetSize &&
-          info.height == kIconPreviewTargetSize) {
-        gfx::Image icon_image = gfx::Image::CreateFrom1xBitmap(info.data);
-        [alert setIcon:icon_image.ToNSImage()];
-        break;
-      }
-    }
-  }
-
-  NSInteger response = [alert runModal];
-
-  // Prevent |app_title| from accessing |delegate| after it's destroyed.
-  [app_title setDelegate:nil];
-
-  if (response == NSAlertFirstButtonReturn) {
-    WebApplicationInfo updated_info = web_app_info;
-    updated_info.open_as_window = [open_as_window_checkbox state] == NSOnState;
-    updated_info.title = TrimText([app_title stringValue]);
-
-    callback.Run(true, updated_info);
-    return;
-  }
-
-  callback.Run(false, web_app_info);
-}
-
 autofill::SaveCardBubbleView* BrowserWindowCocoa::ShowSaveCreditCardBubble(
     content::WebContents* web_contents,
     autofill::SaveCardBubbleController* controller,
     bool user_gesture) {
   return new autofill::SaveCardBubbleViewBridge(controller, controller_);
 }
 
 ShowTranslateBubbleResult BrowserWindowCocoa::ShowTranslateBubble(
     content::WebContents* contents,
     translate::TranslateStep step,
@@ skipping 209 matching lines @@
 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() {
   return [controller_ exclusiveAccessController];
 }
 
 void BrowserWindowCocoa::ShowImeWarningBubble(
     const extensions::Extension* extension,
     const base::Callback<void(ImeWarningBubblePermissionStatus status)>&
         callback) {
   NOTREACHED() << "The IME warning bubble is unsupported on this platform.";
 }