Mac File Dialogs: Remove SaveAccessoryView.xib

ui/shell_dialogs/select_file_dialog_mac.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 "ui/shell_dialogs/select_file_dialog_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/files/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
+#import "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #import "ui/base/cocoa/nib_loading.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/strings/grit/ui_strings.h"
 
 namespace {
 
+const int kAccessoryViewHorizontalMargin = 20;
+const int kAccessoryViewVerticalMargin = 20;
 const int kFileTypePopupTag = 1234;
 
 CFStringRef CreateUTIFromExtension(const base::FilePath::StringType& ext) {
   base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
   return UTTypeCreatePreferredIdentifierForTag(
       kUTTagClassFilenameExtension, ext_cf.get(), NULL);
 }
 
 NSString* GetDescriptionFromExtension(const base::FilePath::StringType& ext) {
   base::ScopedCFTypeRef<CFStringRef> uti(CreateUTIFromExtension(ext));
@@ skipping 221 matching lines @@
   // through it.
   std::vector<NSSavePanel*> panels;
   for (const auto& value : dialog_data_map_)
     panels.push_back(value.first);
 
   for (const auto& panel : panels)
     [panel cancel:panel];
 }
 
 // static
+NSView* SelectFileDialogImpl::CreateAccessoryView() {
+  base::scoped_nsobject<NSTextField> textfield([[NSTextField alloc] init]);
+  [textfield
+      setStringValue:l10n_util::GetNSString(IDS_SAVE_PAGE_FILE_FORMAT_PROMPT)];
+  [textfield setDrawsBackground:NO];
+  [textfield setEditable:NO];
+  [textfield setSelectable:NO];
+  [textfield setBezeled:NO];
+  [textfield setFont:[NSFont systemFontOfSize:0]];
+  [textfield setTranslatesAutoresizingMaskIntoConstraints:NO];
+
+  base::scoped_nsobject<NSPopUpButton> popup([[NSPopUpButton alloc] init]);
+  [popup setTag:kFileTypePopupTag];
+  [popup setAlignment:NSNaturalTextAlignment];
+  [popup setTranslatesAutoresizingMaskIntoConstraints:NO];
+
+  NSStackView* accessory_view =
+      [NSStackView stackViewWithViews:@[ textfield, popup ]];
+  [accessory_view
+      setEdgeInsets:NSEdgeInsetsMake(kAccessoryViewVerticalMargin,
+                                     kAccessoryViewHorizontalMargin,
+                                     kAccessoryViewVerticalMargin,
+                                     kAccessoryViewHorizontalMargin)];
+  return accessory_view;
+}
+
+// static
 base::scoped_nsobject<ExtensionDropdownHandler>
 SelectFileDialogImpl::SetAccessoryView(
     NSSavePanel* dialog,
     const FileTypeInfo* file_types,
     int file_type_index,
     const base::FilePath::StringType& default_extension) {
   DCHECK(file_types);
-  NSView* accessory_view = ui::GetViewFromNib(@"SaveAccessoryView");
-  if (!accessory_view)
-    return base::scoped_nsobject<ExtensionDropdownHandler>();
-  [dialog setAccessoryView:accessory_view];
 
+  NSView* accessory_view = CreateAccessoryView();
   NSPopUpButton* popup = [accessory_view viewWithTag:kFileTypePopupTag];
   DCHECK(popup);
 
   // Create an array with each item corresponding to an array of different
   // extensions in an extension group.
   NSMutableArray* file_type_lists = [NSMutableArray array];
   int default_extension_index = -1;
   for (size_t i = 0; i < file_types->extensions.size(); ++i) {
     const std::vector<base::FilePath::StringType>& ext_list =
         file_types->extensions[i];
@@ skipping 58 matching lines @@
   } else if (!default_extension.empty() && default_extension_index != -1) {
     [popup selectItemAtIndex:default_extension_index];
     [dialog
         setAllowedFileTypes:@[ base::SysUTF8ToNSString(default_extension) ]];
   } else {
     // Select the first item.
     [popup selectItemAtIndex:0];
     [handler popupAction:popup];
   }
 
+  // This should not have been needed but is required for correct layout on OSX
+  // 10.9.
+  [accessory_view layoutSubtreeIfNeeded];
+  [dialog setAccessoryView:accessory_view];
   return handler;
 }
 
 bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
   return hasMultipleFileTypeChoices_;
 }
 
 SelectFileDialog* CreateSelectFileDialog(SelectFileDialog::Listener* listener,
                                          SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
@@ skipping 74 matching lines @@
     // For save dialogs, this causes the first item in the allowedFileTypes
     // array to be used as the extension for the save panel.
     [dialog_ setAllowedFileTypes:[fileTypeLists_ objectAtIndex:index]];
   } else {
     // The user selected "All files" option.
     [dialog_ setAllowedFileTypes:nil];
   }
 }
 
 @end