diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc
index d262f5684fd7..d6d2cf759e14 100644
--- a/atom/browser/api/frame_subscriber.cc
+++ b/atom/browser/api/frame_subscriber.cc
@@ -9,11 +9,6 @@
 #include "atom/common/node_includes.h"
 #include "content/public/browser/render_widget_host.h"
 
-#include "content/browser/compositor/image_transport_factory.h"
-#include "cc/surfaces/surface_manager.h"
-#include "cc/surfaces/surface.h"
-#include "cc/output/copy_output_request.h"
-
 namespace atom {
 
 namespace api {
@@ -35,7 +30,6 @@ bool FrameSubscriber::ShouldCaptureFrame(
     scoped_refptr<media::VideoFrame>* storage,
     DeliverFrameCallback* callback) {
   const auto host = view_ ? view_->GetRenderWidgetHost() : nullptr;
-
   if (!view_ || !host)
     return false;
 
diff --git a/atom/browser/api/frame_subscriber.h b/atom/browser/api/frame_subscriber.h
index 09ac712987c3..0da554ac4795 100644
--- a/atom/browser/api/frame_subscriber.h
+++ b/atom/browser/api/frame_subscriber.h
@@ -14,10 +14,6 @@
 #include "ui/gfx/geometry/size.h"
 #include "v8/include/v8.h"
 
-#include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "cc/surfaces/surface_id.h"
-#include "cc/output/copy_output_result.h"
-
 namespace atom {
 
 namespace api {
@@ -38,9 +34,6 @@ class FrameSubscriber : public content::RenderWidgetHostViewFrameSubscriber {
                           DeliverFrameCallback* callback) override;
 
  private:
-  void ReadbackResultAsBitmap(
-    std::unique_ptr<cc::CopyOutputResult> result);
-
   void OnFrameDelivered(const FrameCaptureCallback& callback,
                         const gfx::Rect& damage_rect,
                         const SkBitmap& bitmap,
diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index d22a6801820e..f2f0ee8aec53 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-#include <iostream>
-
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/atom_javascript_dialog_manager.h"
 #include "atom/browser/atom_security_state_model_client.h"
@@ -33,10 +31,6 @@
 #include "content/public/browser/security_style_explanations.h"
 #include "storage/browser/fileapi/isolated_context.h"
 
-// #include "content/browser/web_contents/web_contents_impl.h"
-// #include "atom/browser/osr_web_contents_view.h"
-#include "atom/browser/native_window_views.h"
-
 using content::BrowserThread;
 using security_state::SecurityStateModel;
 
@@ -200,7 +194,6 @@ void CommonWebContentsDelegate::SetOwnerWindow(NativeWindow* owner_window) {
 void CommonWebContentsDelegate::SetOwnerWindow(
     content::WebContents* web_contents, NativeWindow* owner_window) {
   owner_window_ = owner_window->GetWeakPtr();
-
   NativeWindowRelay* relay = new NativeWindowRelay(owner_window_);
   web_contents->SetUserData(relay->key, relay);
 }
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index afd3c1a17ffa..b4dcf291714c 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -57,13 +57,6 @@
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
 
-#include "content/public/browser/render_widget_host.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/context_factory.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/thread.h"
-#include "ui/gfx/native_widget_types.h"
-
 namespace atom {
 
 namespace {
@@ -1237,13 +1230,13 @@ void NativeWindowViews::HandleKeyboardEvent(
   }
 }
 
-/*gfx::Size NativeWindowViews::GetMinimumSize() {
+gfx::Size NativeWindowViews::GetMinimumSize() {
   return NativeWindow::GetMinimumSize();
 }
 
 gfx::Size NativeWindowViews::GetMaximumSize() {
   return NativeWindow::GetMaximumSize();
-}*/
+}
 
 bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
   return accelerator_util::TriggerAcceleratorTableCommand(
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index daca3ae2e717..0030e814da91 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -170,9 +170,9 @@ class NativeWindowViews : public NativeWindow,
       content::WebContents*,
       const content::NativeWebKeyboardEvent& event) override;
 
-  // // views::View:
-  // gfx::Size GetMinimumSize() const override;
-  // gfx::Size GetMaximumSize() const override;
+  // views::View:
+  gfx::Size GetMinimumSize() const override;
+  gfx::Size GetMaximumSize() const override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 
   // Register accelerators supported by the menu model.