diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc
index df00e4c599a9..f282acf4c9e5 100644
--- a/atom/browser/common_web_contents_delegate.cc
+++ b/atom/browser/common_web_contents_delegate.cc
@@ -242,7 +242,7 @@ void CommonWebContentsDelegate::RunFileChooser(
     content::RenderFrameHost* render_frame_host,
     const content::FileChooserParams& params) {
   if (!web_dialog_helper_)
-    web_dialog_helper_.reset(new WebDialogHelper(owner_window(), 
+    web_dialog_helper_.reset(new WebDialogHelper(owner_window(),
       owner_window()->IsOffScreenDummy()));
   web_dialog_helper_->RunFileChooser(render_frame_host, params);
 }
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 5caa8380b002..b5a438bf76df 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -1360,14 +1360,14 @@ void NativeWindowViews::ShowAutofillPopup(
     content::RenderFrameHost* frame_host,
     const gfx::RectF& bounds,
     const std::vector<base::string16>& values,
-    const std::vector<base::string16>& labels) {  
+    const std::vector<base::string16>& labels) {
   WebContentsPreferences* web_preferences =
     WebContentsPreferences::FromWebContents(web_contents());
-  
+
   bool isOffsceen = web_preferences->IsOffScreen(web_contents());
-  bool isEmbedderOffscreen = web_preferences->IsGuest(web_contents()) && 
+  bool isEmbedderOffscreen = web_preferences->IsGuest(web_contents()) &&
     web_preferences->IsOffScreen(web_preferences->Embedder(web_contents()));
-    
+
   autofill_popup_->CreateView(
     frame_host,
     isOffsceen || isEmbedderOffscreen,
@@ -1396,7 +1396,7 @@ void NativeWindowViews::Layout() {
         gfx::Rect(0, menu_bar_bounds.height(), size.width(),
                   size.height() - menu_bar_bounds.height()));
   }
-  
+
   if (autofill_popup_.get())
     autofill_popup_->UpdatePopupBounds(menu_bar_visible_ ? 0 : kMenuBarHeight);
 }
diff --git a/atom/browser/ui/autofill_popup.cc b/atom/browser/ui/autofill_popup.cc
index 74c9d9d56997..7c43f56a036d 100644
--- a/atom/browser/ui/autofill_popup.cc
+++ b/atom/browser/ui/autofill_popup.cc
@@ -170,7 +170,7 @@ void AutofillPopup::UpdatePopupBounds(int height_compensation) {
   int desired_height = GetDesiredPopupHeight();
   bool is_rtl = false;
 
-  gfx::Point origin(element_bounds_.origin().x(), 
+  gfx::Point origin(element_bounds_.origin().x(),
     element_bounds_.origin().y() - height_compensation);
   gfx::Rect bounds(origin, element_bounds_.size());
 
diff --git a/atom/browser/ui/autofill_popup.h b/atom/browser/ui/autofill_popup.h
index 7064c3fd786e..0a194045a4f0 100644
--- a/atom/browser/ui/autofill_popup.h
+++ b/atom/browser/ui/autofill_popup.h
@@ -11,8 +11,8 @@
 #include "content/public/browser/render_frame_host.h"
 #include "ui/gfx/font_list.h"
 #include "ui/native_theme/native_theme.h"
-#include "ui/views/widget/widget.h"
 #include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
 
 namespace atom {
 
diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 2c9e1f51cea1..83bd787b85ef 100644
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -281,7 +281,7 @@ content::WebContents* WebContentsPreferences::Embedder(
       }
     }
   }
-  
+
   return nullptr;
 }