Create bookmark apps at the end of the process.

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/prefs/pref_service.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/bookmark_app_helper.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
-#include "chrome/browser/ui/app_list/app_list_util.h"
-#include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands_mac.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_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"
 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
-#include "chrome/browser/web_applications/web_app_mac.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/pref_names.h"
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/geometry/rect.h"
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h"
 #endif
 
 using content::NativeWebKeyboardEvent;
@@ skipping 418 matching lines @@
 }
 
 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 std::string& extension_id) {
-  Profile* profile = browser_->profile();
-
+    const ShowBookmarkAppBubbleCallback& callback) {
   base::scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]);
   [alert setMessageText:l10n_util::GetNSString(IDS_BOOKMARK_APP_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:
-      profile->GetPrefs()->GetInteger(
-          extensions::pref_names::kBookmarkAppCreationLaunchType) ==
-      extensions::LAUNCH_TYPE_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];
@@ skipping 11 matching lines @@
     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;
       }
     }
   }
 
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile)->extension_service();
   if ([alert runModal] == NSAlertFirstButtonReturn) {
-    // Save launch type preferences for later when creating another hosted app.
-    extensions::LaunchType launch_type =
-        [open_as_window_checkbox state] == NSOnState
-            ? extensions::LAUNCH_TYPE_WINDOW
-            : extensions::LAUNCH_TYPE_REGULAR;
-    profile->GetPrefs()->SetInteger(
-        extensions::pref_names::kBookmarkAppCreationLaunchType, launch_type);
-    extensions::SetLaunchType(profile, extension_id, launch_type);
+    WebApplicationInfo updated_info = web_app_info;
+    updated_info.open_as_window = [open_as_window_checkbox state] == NSOnState;
 
-    // Update name of app.
     NSString* new_title = [app_title stringValue];
-    if (![original_title isEqualToString:new_title]) {
-      WebApplicationInfo new_web_app_info(web_app_info);
-      new_web_app_info.title = base::SysNSStringToUTF16(new_title);
-      extensions::CreateOrUpdateBookmarkApp(service, &new_web_app_info);
-    }
+    updated_info.title = base::SysNSStringToUTF16(new_title);
 
-    // If we're not creating app shims, no need to reveal it in Finder.
-    // Otherwise reveal the app in the app launcher. If not installed,
-    // then open the chrome://apps page.
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableHostedAppShimCreation)) {
-      extensions::ExtensionRegistry* registry =
-          extensions::ExtensionRegistry::Get(profile);
-      const extensions::Extension* app = registry->GetExtensionById(
-          extension_id, extensions::ExtensionRegistry::ENABLED);
+    callback.Run(true, updated_info);
+    return;
+  }
 
-      web_app::RevealAppShimInFinderForApp(profile, app);
-    } else {
-      if (IsAppLauncherEnabled()) {
-        AppListService::Get(chrome::GetHostDesktopTypeForNativeWindow(
-                                browser_->window()->GetNativeWindow()))
-            ->ShowForAppInstall(profile, extension_id, false);
-      } else {
-        chrome::NavigateParams params(profile, GURL(chrome::kChromeUIAppsURL),
-                                      ui::PAGE_TRANSITION_LINK);
-        params.disposition = SINGLETON_TAB;
-        chrome::Navigate(&params);
-
-        content::NotificationService::current()->Notify(
-            chrome::NOTIFICATION_APP_INSTALLED_TO_NTP,
-            content::Source<content::WebContents>(params.target_contents),
-            content::Details<const std::string>(&extension_id));
-      }
-    }
-  } else {
-    service->UninstallExtension(extension_id,
-                                extensions::UNINSTALL_REASON_INSTALL_CANCELED,
-                                base::Bind(&base::DoNothing), NULL);
-  }
+  callback.Run(false, web_app_info);
 }
 
 void BrowserWindowCocoa::ShowTranslateBubble(
     content::WebContents* contents,
     translate::TranslateStep step,
     translate::TranslateErrors::Type error_type,
     bool is_user_gesture) {
   ChromeTranslateClient* chrome_translate_client =
       ChromeTranslateClient::FromWebContents(contents);
   translate::LanguageState& language_state =
@@ skipping 197 matching lines @@
   if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED)
     return 0;
   return 40;
 }
 
 void BrowserWindowCocoa::ExecuteExtensionCommand(
     const extensions::Extension* extension,
     const extensions::Command& command) {
   [cocoa_controller() executeExtensionCommand:extension->id() command:command];
 }