From 9000bd66794025ab4c3d6bf2365484fd6c3ff295 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 6 Mar 2018 16:05:31 +0900
Subject: [PATCH] views: Explicitly set initially focused view

---
 atom/browser/native_window_views.cc | 5 +++--
 atom/browser/native_window_views.h  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 4d945235fc..46f4a5c1b7 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -140,7 +140,8 @@ NativeWindowViews::NativeWindowViews(
     NativeWindow* parent)
     : NativeWindow(web_contents, options, parent),
       window_(new views::Widget),
-      web_view_(inspectable_web_contents()->GetView()->GetView()),
+      web_view_(web_contents->GetView()->GetView()),
+      focused_view_(web_contents->GetView()->GetWebView()),
       menu_bar_autohide_(false),
       menu_bar_visible_(false),
       menu_bar_alt_pressed_(false),
@@ -1235,7 +1236,7 @@ void NativeWindowViews::DeleteDelegate() {
 }
 
 views::View* NativeWindowViews::GetInitiallyFocusedView() {
-  return inspectable_web_contents()->GetView()->GetWebView();
+  return focused_view_;
 }
 
 bool NativeWindowViews::CanResize() const {
diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index eed18a03a6..da2a712d42 100644
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -214,6 +214,7 @@ class NativeWindowViews : public NativeWindow,
 
   std::unique_ptr<views::Widget> window_;
   views::View* web_view_;  // Managed by inspectable_web_contents_.
+  views::View* focused_view_;  // The view should be focused by default.
 
   std::unique_ptr<AutofillPopup> autofill_popup_;