:lipstick: Pick duplicate code together.

diff --git a/browser/ui/file_dialog_mac.mm b/browser/ui/file_dialog_mac.mm
index 0770d0e4035af43f098d149c388c2df6bffb76e3..e4902e4b5f5bb875c5535a570690d1d769700083 100644 (file)
--- a/browser/ui/file_dialog_mac.mm
+++ b/browser/ui/file_dialog_mac.mm
@@ -38,6 +38,7 @@ void SetupDialog(NSSavePanel* dialog,
   if (default_filename)
     [dialog setNameFieldStringValue:default_filename];
 
+  [dialog setCanSelectHiddenExtension:YES];
   [dialog setAllowsOtherFileTypes:YES];
 }
 
@@ -51,6 +52,25 @@ void SetupDialogForProperties(NSOpenPanel* dialog, int properties) {
     [dialog setAllowsMultipleSelection:YES];
 }
 
+// Run modal dialog with parent window and return user's choice.
+int RunModalDialog(NSSavePanel* dialog, atom::NativeWindow* parent_window) {
+  __block int chosen = NSFileHandlingPanelCancelButton;
+  if (parent_window == NULL) {
+    chosen = [dialog runModal];
+  } else {
+    NSWindow* window = parent_window->GetNativeWindow();
+
+    [dialog beginSheetModalForWindow:window
+                   completionHandler:^(NSInteger c) {
+      chosen = c;
+      [NSApp stopModal];
+    }];
+    [NSApp runModalForWindow:window];
+  }
+
+  return chosen;
+}
+
 void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) {
   NSArray* urls = [dialog URLs];
   for (NSURL* url in urls)
@@ -71,21 +91,7 @@ bool ShowOpenDialog(atom::NativeWindow* parent_window,
   SetupDialog(dialog, title, default_path);
   SetupDialogForProperties(dialog, properties);
 
-  __block int chosen = -1;
-
-  if (parent_window == NULL) {
-    chosen = [dialog runModal];
-  } else {
-    NSWindow* window = parent_window->GetNativeWindow();
-
-    [dialog beginSheetModalForWindow:window
-                   completionHandler:^(NSInteger c) {
-      chosen = c;
-      [NSApp stopModal];
-    }];
-    [NSApp runModalForWindow:window];
-  }
-
+  int chosen = RunModalDialog(dialog, parent_window);
   if (chosen == NSFileHandlingPanelCancelButton)
     return false;
 
@@ -129,23 +135,7 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
 
   SetupDialog(dialog, title, default_path);
 
-  [dialog setCanSelectHiddenExtension:YES];
-
-  __block int chosen = -1;
-
-  if (parent_window == NULL) {
-    chosen = [dialog runModal];
-  } else {
-    NSWindow* window = parent_window->GetNativeWindow();
-
-    [dialog beginSheetModalForWindow:window
-                   completionHandler:^(NSInteger c) {
-      chosen = c;
-      [NSApp stopModal];
-    }];
-    [NSApp runModalForWindow:window];
-  }
-
+  int chosen = RunModalDialog(dialog, parent_window);
   if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
     return false;