diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index ae907b0669d..85fbcb872bc 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -249,8 +249,8 @@ bool Window::IsFullscreen() { return window_->IsFullscreen(); } -void Window::MaintainAspectRatioOfInteriorContent(double aspectRatio, double extraWidth, double extraHeight) { - window_->MaintainAspectRatioOfInteriorContent(aspectRatio, gfx::Size(extraWidth, extraHeight)); +void Window::MaintainContentAspectRatio(double aspectRatio, double width, double height) { + window_->MaintainContentAspectRatio(aspectRatio, gfx::Size(width, height)); } void Window::SetBounds(const gfx::Rect& bounds) { @@ -502,7 +502,7 @@ void Window::BuildPrototype(v8::Isolate* isolate, .SetMethod("isMinimized", &Window::IsMinimized) .SetMethod("setFullScreen", &Window::SetFullScreen) .SetMethod("isFullScreen", &Window::IsFullscreen) - .SetMethod("maintainAspectRatioOfInteriorContent", &Window::MaintainAspectRatioOfInteriorContent) + .SetMethod("maintainContentAspectRatio", &Window::MaintainContentAspectRatio) .SetMethod("getBounds", &Window::GetBounds) .SetMethod("setBounds", &Window::SetBounds) .SetMethod("getSize", &Window::GetSize) diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index 8c27f5b36a6..21f61b5d5e0 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -95,7 +95,7 @@ class Window : public mate::TrackableObject, bool IsMinimized(); void SetFullScreen(bool fullscreen); bool IsFullscreen(); - void MaintainAspectRatioOfInteriorContent(double aspectRatio, double extraWidth, double extraHeight); + void MaintainContentAspectRatio(double aspectRatio, double width, double height); void SetBounds(const gfx::Rect& bounds); gfx::Rect GetBounds(); void SetSize(int width, int height); diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 8e21876fdfa..5014c041cf7 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -203,7 +203,7 @@ gfx::Size NativeWindow::GetInteriorContentExtraSize() { return interiorContentExtraSize; } -void NativeWindow::MaintainAspectRatioOfInteriorContent(double aspectRatio, const gfx::Size& extraSize) { +void NativeWindow::MaintainContentAspectRatio(double aspectRatio, const gfx::Size& extraSize) { interiorContentAspectRatio = aspectRatio; interiorContentExtraSize = extraSize; } diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index 248a8a5338d..b73ff47dbdf 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -109,7 +109,7 @@ class NativeWindow : public content::WebContentsObserver, virtual bool IsFullscreen() const = 0; double GetInteriorContentAspectRatio(); virtual gfx::Size GetInteriorContentExtraSize(); - virtual void MaintainAspectRatioOfInteriorContent(double aspectRatio, const gfx::Size& extraSize); + virtual void MaintainContentAspectRatio(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);