Add a flag to enable open in window for hosted apps 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"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.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/fullscreen.h"
 #include "chrome/browser/profiles/profile.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_mac.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 547 matching lines @@
   [[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)]);
-  [view addSubview:open_as_window_checkbox];
+  if (extensions::util::CanHostedAppsOpenInWindows())

[tapted, 2015/08/19 06:48:13]

nit: comment here like "Omit the Open As Window checkbox when that isn't
supported to avoid confusing the user."

[dominickn, 2015/08/19 07:10:41]

Done.

+    [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;
+    if (extensions::util::CanHostedAppsOpenInWindows()) {

[tapted, 2015/08/19 06:48:13]

Is this to address something specific? (I think we can remove it..)

[dominickn, 2015/08/19 07:10:41]

Digging deeper, it looks like it doesn't doesn't have an effect. I've undone the
change.

+      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);
 }
 
 void BrowserWindowCocoa::ShowTranslateBubble(
@@ skipping 225 matching lines @@
 void BrowserWindowCocoa::UnhideDownloadShelf() {
   GetDownloadShelf()->Unhide();
 }
 
 void BrowserWindowCocoa::HideDownloadShelf() {
   GetDownloadShelf()->Hide();
   StatusBubble* statusBubble = GetStatusBubble();
   if (statusBubble)
     statusBubble->Hide();
 }