Replace OS X and Mac OS with macOS

atom/browser/atom_browser_main_parts.cc

@@ -148,7 +148,7 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
 #endif
 
 #if !defined(OS_MACOSX)
-  // The corresponding call in OS X is in AtomApplicationDelegate.
+  // The corresponding call in macOS is in AtomApplicationDelegate.
   Browser::Get()->WillFinishLaunching();
   Browser::Get()->DidFinishLaunching();
 #endif

atom/browser/browser_mac.mm

@@ -58,7 +58,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol) {
   if (!bundleList) {
     return false;
   }
-  // On Mac OS X, we can't query the default, but the handlers list seems to put
+  // On macOS, we can't query the default, but the handlers list seems to put
   // Apple's defaults first, so we'll use the first option that isn't our bundle
   CFStringRef other = nil;
   for (CFIndex i = 0; i < CFArrayGetCount(bundleList); i++) {

atom/browser/browser_observer.h

@@ -33,7 +33,7 @@ class BrowserObserver {
   virtual void OnQuit() {}
 
   // The browser has opened a file by double clicking in Finder or dragging the
-  // file to the Dock icon. (OS X only)
+  // file to the Dock icon. (macOS only)
   virtual void OnOpenFile(bool* prevent_default,
                           const std::string& file_path) {}
 
@@ -53,7 +53,7 @@ class BrowserObserver {
                        const base::DictionaryValue& request_details) {}
 
 #if defined(OS_MACOSX)
-  // The browser wants to resume a user activity via handoff. (OS X only)
+  // The browser wants to resume a user activity via handoff. (macOS only)
   virtual void OnContinueUserActivity(
       bool* prevent_default,
       const std::string& type,

atom/browser/native_window.h

@@ -320,7 +320,7 @@ class NativeWindow : public base::SupportsUserData,
   base::CancelableClosure window_unresposive_closure_;
 
   // Used to display sheets at the appropriate horizontal and vertical offsets
-  // on OS X.
+  // on macOS.
   double sheet_offset_x_;
   double sheet_offset_y_;
 

atom/browser/native_window_mac.mm

@@ -232,7 +232,7 @@ bool ScopedDisableResize::disable_resize_ = false;
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
-  // For certain versions of OS X the fullscreen button will automatically show
+  // For certain versions of macOS the fullscreen button will automatically show
   // after exiting fullscreen mode.
   if (!shell_->has_frame()) {
     NSWindow* window = shell_->GetNativeWindow();
@@ -537,7 +537,7 @@ NativeWindowMac::NativeWindowMac(
     [window_ setToolbar:toolbar];
   }
 
-  // On OS X the initial window size doesn't include window frame.
+  // On macOS the initial window size doesn't include window frame.
   bool use_content_size = false;
   options.Get(options::kUseContentSize, &use_content_size);
   if (!has_frame() || !use_content_size)
@@ -1041,7 +1041,7 @@ void NativeWindowMac::InstallView() {
     [[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
     [[window_ standardWindowButton:NSWindowCloseButton] setHidden:YES];
 
-    // Some third-party OS X utilities check the zoom button's enabled state to
+    // Some third-party macOS utilities check the zoom button's enabled state to
     // determine whether to show custom UI on hover, so we disable it here to
     // prevent them from doing so in a frameless app window.
     [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:NO];
@@ -1111,7 +1111,7 @@ void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
   else
     [window_ setStyleMask:[window_ styleMask] & (~flag)];
   // Change style mask will make the zoom button revert to default, probably
-  // a bug of Cocoa or OS X.
+  // a bug of Cocoa or macOS.
   if (!zoom_button_enabled)
     SetMaximizable(false);
 }
@@ -1123,7 +1123,7 @@ void NativeWindowMac::SetCollectionBehavior(bool on, NSUInteger flag) {
   else
     [window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)];
   // Change collectionBehavior will make the zoom button revert to default,
-  // probably a bug of Cocoa or OS X.
+  // probably a bug of Cocoa or macOS.
   if (!zoom_button_enabled)
     SetMaximizable(false);
 }

atom/browser/ui/message_box_mac.mm

@@ -79,7 +79,7 @@ NSAlert* CreateNSAlert(NativeWindow* parent_window,
 
   for (size_t i = 0; i < buttons.size(); ++i) {
     NSString* title = base::SysUTF8ToNSString(buttons[i]);
-    // An empty title causes crash on OS X.
+    // An empty title causes crash on macOS.
     if (buttons[i].empty())
       title = @"(empty)";
     NSButton* button = [alert addButtonWithTitle:title];

atom/browser/ui/tray_icon.h

@@ -40,11 +40,11 @@ class TrayIcon {
   virtual void SetToolTip(const std::string& tool_tip) = 0;
 
   // Sets the title displayed aside of the status icon in the status bar. This
-  // only works on OS X.
+  // only works on macOS.
   virtual void SetTitle(const std::string& title);
 
   // Sets whether the status icon is highlighted when it is clicked. This only
-  // works on OS X.
+  // works on macOS.
   virtual void SetHighlightMode(bool highlight);
 
   // Displays a notification balloon with the specified contents.

atom/browser/ui/tray_icon_cocoa.mm

@@ -12,9 +12,9 @@
 
 namespace {
 
-// By default, OS X sets 4px to tray image as left and right padding margin.
+// By default, macOS sets 4px to tray image as left and right padding margin.
 const CGFloat kHorizontalMargin = 4;
-// OS X tends to make the title 2px lower.
+// macOS tends to make the title 2px lower.
 const CGFloat kVerticalTitleMargin = 2;
 
 }  //  namespace