Style fixes

* Use under_score for variable names in C++
* Use const& when possible
* Line length <= 80

atom/browser/api/atom_api_window.cc

@@ -249,8 +249,8 @@ bool Window::IsFullscreen() {
   return window_->IsFullscreen();
 }
 
-void Window::SetAspectRatio(double aspectRatio, gfx::Size extraSize) {
+void Window::SetAspectRatio(double aspect_ratio, const gfx::Size& extraSize) {
-  window_->SetAspectRatio(aspectRatio, extraSize);
+  window_->SetAspectRatio(aspect_ratio, extraSize);
 }
 
 void Window::SetBounds(const gfx::Rect& bounds) {

atom/browser/api/atom_api_window.h

@@ -95,7 +95,7 @@ class Window : public mate::TrackableObject<Window>,
   bool IsMinimized();
   void SetFullScreen(bool fullscreen);
   bool IsFullscreen();
-  void SetAspectRatio(double aspectRatio, gfx::Size extraSize);
+  void SetAspectRatio(double aspect_ratio, const gfx::Size& extraSize);
   void SetBounds(const gfx::Rect& bounds);
   gfx::Rect GetBounds();
   void SetSize(int width, int height);

atom/browser/native_window.cc

@@ -85,6 +85,7 @@ NativeWindow::NativeWindow(
       node_integration_(true),
       has_dialog_attached_(false),
       zoom_factor_(1.0),
+      aspect_ratio_(0.0),
       inspectable_web_contents_(inspectable_web_contents),
       weak_factory_(this) {
   inspectable_web_contents->GetView()->SetDelegate(this);
@@ -195,20 +196,6 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
     Show();
 }
 
-double NativeWindow::GetAspectRatio() {
-  return aspectRatio_;
-}
-
-gfx::Size NativeWindow::GetAspectRatioExtraSize() {
-  return aspectRatioExtraSize_;
-}
-
-void NativeWindow::SetAspectRatio(double aspectRatio,
-                                  const gfx::Size& extraSize) {
-  aspectRatio_ = aspectRatio;
-  aspectRatioExtraSize_ = extraSize;
-}
-
 void NativeWindow::SetSize(const gfx::Size& size) {
   SetBounds(gfx::Rect(GetPosition(), size));
 }
@@ -260,6 +247,20 @@ bool NativeWindow::IsMenuBarVisible() {
   return true;
 }
 
+double NativeWindow::GetAspectRatio() {
+  return aspect_ratio_;
+}
+
+gfx::Size NativeWindow::GetAspectRatioExtraSize() {
+  return aspect_ratio_extraSize_;
+}
+
+void NativeWindow::SetAspectRatio(double aspect_ratio,
+                                  const gfx::Size& extra_size) {
+  aspect_ratio_ = aspect_ratio;
+  aspect_ratio_extraSize_ = extra_size;
+}
+
 bool NativeWindow::HasModalDialog() {
   return has_dialog_attached_;
 }

atom/browser/native_window.h

@@ -107,9 +107,6 @@ class NativeWindow : public content::WebContentsObserver,
   virtual bool IsMinimized() = 0;
   virtual void SetFullScreen(bool fullscreen) = 0;
   virtual bool IsFullscreen() const = 0;
-  double GetAspectRatio();
-  virtual gfx::Size GetAspectRatioExtraSize();
-  virtual void SetAspectRatio(double aspectRatio, const gfx::Size& extraSize);
   virtual void SetBounds(const gfx::Rect& bounds) = 0;
   virtual gfx::Rect GetBounds() = 0;
   virtual void SetSize(const gfx::Size& size);
@@ -166,6 +163,11 @@ class NativeWindow : public content::WebContentsObserver,
   virtual void SetMenuBarVisibility(bool visible);
   virtual bool IsMenuBarVisible();
 
+  // Set the aspect ratio when resizing window.
+  double GetAspectRatio();
+  gfx::Size GetAspectRatioExtraSize();
+  void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
+
   base::WeakPtr<NativeWindow> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
@@ -290,8 +292,8 @@ class NativeWindow : public content::WebContentsObserver,
 
   // Used to maintain the aspect ratio of a view which is inside of the
   // content view.
-  double aspectRatio_ = 0.0;
+  double aspect_ratio_;
-  gfx::Size aspectRatioExtraSize_;
+  gfx::Size aspect_ratio_extraSize_;
 
   // The page this window is viewing.
   brightray::InspectableWebContents* inspectable_web_contents_;

atom/browser/native_window_mac.mm

@@ -95,27 +95,38 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
   shell_->NotifyWindowBlur();
 }
 
-- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize {
+- (NSSize)windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize {
   NSSize newSize = frameSize;
   double aspectRatio = shell_->GetAspectRatio();
 
   if (aspectRatio > 0.0) {
-    gfx::Size windowFrameSize = shell_->GetSize();
+    gfx::Size windowSize = shell_->GetSize();
-    gfx::Size contentViewSize = shell_->GetContentSize();
+    gfx::Size contentSize = shell_->GetContentSize();
-    gfx::Size aspectRatioExtraSize = shell_->GetAspectRatioExtraSize();
+    gfx::Size extraSize = shell_->GetAspectRatioExtraSize();
-    double extraWidthPlusFrame = windowFrameSize.width() - contentViewSize.width() + aspectRatioExtraSize.width();
-    double extraHeightPlusFrame = windowFrameSize.height() - contentViewSize.height() + aspectRatioExtraSize.height();
 
-    newSize.width = roundf(((frameSize.height - extraHeightPlusFrame) * aspectRatio) + extraWidthPlusFrame);
+    double extraWidthPlusFrame =
+        windowSize.width() - contentSize.width() + extraSize.width();
+    double extraHeightPlusFrame =
+        windowSize.height() - contentSize.height() + extraSize.height();
 
-    // If the new width is less than the frame size use it as the primary constraint. This ensures that the value returned
+    newSize.width =
-    // by this method will never be larger than the users requested window size.
+        roundf((frameSize.height - extraHeightPlusFrame) * aspectRatio +
+               extraWidthPlusFrame);
+
+    // If the new width is less than the frame size use it as the primary
+    // constraint. This ensures that the value returned by this method will
+    // never be larger than the users requested window size.
     if (newSize.width <= frameSize.width) {
-        newSize.height = roundf(((newSize.width - extraWidthPlusFrame) / aspectRatio) + extraHeightPlusFrame);
+      newSize.height =
-    }
+          roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
-    else {
+                 extraHeightPlusFrame);
-        newSize.height = roundf(((frameSize.width - extraWidthPlusFrame) / aspectRatio) + extraHeightPlusFrame);
+    } else {
-        newSize.width = roundf(((newSize.height - extraHeightPlusFrame) * aspectRatio) + extraWidthPlusFrame);
+      newSize.height =
+          roundf((frameSize.width - extraWidthPlusFrame) / aspectRatio +
+                 extraHeightPlusFrame);
+      newSize.width =
+          roundf((newSize.height - extraHeightPlusFrame) * aspectRatio +
+                 extraWidthPlusFrame);
     }
   }