Create hosted app shims on Mac.

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"
 #include "base/mac/mac_util.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/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"
@@ skipping 12 matching lines @@
 #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/fullscreen/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/web_contents.h"
+#include "extensions/common/constants.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/pref_names.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/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;
 using content::SSLStatus;
 using content::WebContents;
 
 namespace {
 
+const NSRect kAppTitleTextFieldSize = {{0, 24}, {200, 22}};

[Robert Sesek, 2014/12/05 18:30:37]

Where do these constants come from? And can you not use NSMakeRect() here
instead?

[mitchellj, 2014/12/09 01:39:52]

These are just UI constants. I've extracted the constants to separate
definitions in order to improve clarity.

+const NSRect kBookmarkAppBubbleAccessoryViewSize = {{0, 0}, {200, 46}};
+const int kIconPreviewTargetSize = 64;
+
 NSPoint GetPointForBubble(content::WebContents* web_contents,
                           int x_offset,
                           int y_offset) {
   NSView* view = web_contents->GetNativeView();
   NSRect bounds = [view bounds];
   NSPoint point;
   point.x = NSMinX(bounds) + x_offset;
   // The view's origin is at the bottom but |rect|'s origin is at the top.
   point.y = NSMaxY(bounds) - y_offset;
   point = [view convertPoint:point toView:nil];
@@ skipping 409 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) {
-  NOTIMPLEMENTED();
+  Profile* profile = browser_->profile();
+
+  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:@"\r"];

[Robert Sesek, 2014/12/05 18:30:37]

Use constants defined in chrome/browser/ui/cocoa/key_equivalent_constatns.h.

[mitchellj, 2014/12/09 01:39:52]

Done.

+  NSButton* cancel_button =
+      [alert addButtonWithTitle:l10n_util::GetNSString(IDS_CANCEL)];
+  [cancel_button setKeyEquivalent:@"\033"];
+
+  base::scoped_nsobject<NSButton> open_as_tab_checkbox(
+      [[NSButton alloc] initWithFrame:NSZeroRect]);
+  [open_as_tab_checkbox setButtonType:NSSwitchButton];
+  [open_as_tab_checkbox
+      setTitle:l10n_util::GetNSString(IDS_BOOKMARK_APP_BUBBLE_OPEN_AS_TAB)];
+  [open_as_tab_checkbox
+      setState:profile->GetPrefs()->GetInteger(

[Robert Sesek, 2014/12/05 18:30:37]

Move setState: back on the previous line and then break after the colon instead.

[mitchellj, 2014/12/09 01:39:52]

Done.

+                   extensions::pref_names::kBookmarkAppCreationLaunchType) ==
+               extensions::LAUNCH_TYPE_REGULAR];
+  [open_as_tab_checkbox sizeToFit];
+
+  NSTextField* app_title =

[Robert Sesek, 2014/12/05 18:30:37]

This is leaked.

[mitchellj, 2014/12/09 01:39:52]

Done.

+      [[NSTextField alloc] initWithFrame:kAppTitleTextFieldSize];
+  NSString* original_title = SysUTF16ToNSString(web_app_info.title);
+  [app_title.cell setWraps:NO];
+  [app_title.cell setScrollable:YES];
+  [app_title setStringValue:original_title];
+
+  NSView* view =

[Robert Sesek, 2014/12/05 18:30:37]

This is leaked.

[mitchellj, 2014/12/09 01:39:52]

Done.

+      [[NSView alloc] initWithFrame:kBookmarkAppBubbleAccessoryViewSize];
+  [view addSubview:open_as_tab_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()) {
+    WebApplicationInfo::IconInfo& info = web_app_info.icons.back();
+    NSImage* icon_image = gfx::Image::CreateFrom1xBitmap(info.data).ToNSImage();

[Robert Sesek, 2014/12/05 18:30:37]

icon_image is technically being used-after-free. gfx::Image owns the result of
ToNSImage(), and since the gfx::Image is temporary/deleted here, the image is
therefore unowned. Keep the gfx::Image as a local and then call [alert
setIcon:icon_image.ToNSImage()] instead.

Better would be to make WebApplicationInfo::IconInfo hold gfx::Image instead of
SkBitmap.

[mitchellj, 2014/12/09 01:39:52]

Done.

+    [icon_image
+        setSize:NSMakeSize(kIconPreviewTargetSize, kIconPreviewTargetSize)];
+    [alert setIcon:icon_image];
+  }
+
+  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_tab_checkbox state] == NSOnState
+            ? extensions::LAUNCH_TYPE_REGULAR
+            : extensions::LAUNCH_TYPE_WINDOW;
+    profile->GetPrefs()->SetInteger(
+        extensions::pref_names::kBookmarkAppCreationLaunchType, launch_type);
+    extensions::SetLaunchType(service, extension_id, launch_type);
+
+    // 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);
+    }
+
+    extensions::ExtensionRegistry* registry =
+        extensions::ExtensionRegistry::Get(profile);
+    const extensions::Extension* app = registry->GetExtensionById(
+        extension_id, extensions::ExtensionRegistry::ENABLED);
+
+    web_app::RevealAppShimInFinderForApp(profile, app);
+  } else {
+    service->UninstallExtension(extension_id,
+                                extensions::UNINSTALL_REASON_INSTALL_CANCELED,
+                                base::Bind(&base::DoNothing), NULL);
+  }
 }
 
 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 195 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];
 }