Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Unified Diff: headless/lib/browser/headless_focus_client.cc

Issue 2709433002: Add HeadlessFocusClient to fix document.hasFocus() issues. (Closed)
Patch Set: Remove unnecessary imports Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « headless/lib/browser/headless_focus_client.h ('k') | headless/lib/browser/headless_web_contents_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: headless/lib/browser/headless_focus_client.cc
diff --git a/headless/lib/browser/headless_focus_client.cc b/headless/lib/browser/headless_focus_client.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9a4e806e86c0710ffaaf43c4b6a59595edcf0d21
--- /dev/null
+++ b/headless/lib/browser/headless_focus_client.cc
@@ -0,0 +1,63 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "headless/lib/browser/headless_focus_client.h"
+
+#include "ui/aura/client/focus_change_observer.h"
+#include "ui/aura/window.h"
+
+namespace headless {
+
+HeadlessFocusClient::HeadlessFocusClient()
+ : focused_window_(NULL), observer_manager_(this) {}
+
+HeadlessFocusClient::~HeadlessFocusClient() {}
+
+void HeadlessFocusClient::AddObserver(
+ aura::client::FocusChangeObserver* observer) {
+ focus_observers_.AddObserver(observer);
+}
+
+void HeadlessFocusClient::RemoveObserver(
+ aura::client::FocusChangeObserver* observer) {
+ focus_observers_.RemoveObserver(observer);
+}
+
+void HeadlessFocusClient::FocusWindow(aura::Window* window) {
+ if (window && !window->CanFocus())
+ return;
+
+ if (focused_window_)
+ observer_manager_.Remove(focused_window_);
+ aura::Window* old_focused_window = focused_window_;
+ focused_window_ = window;
+ if (focused_window_)
+ observer_manager_.Add(focused_window_);
+
+ for (aura::client::FocusChangeObserver& observer : focus_observers_)
+ observer.OnWindowFocused(focused_window_, old_focused_window);
+ aura::client::FocusChangeObserver* observer =
+ aura::client::GetFocusChangeObserver(old_focused_window);
+ if (observer)
+ observer->OnWindowFocused(focused_window_, old_focused_window);
+ observer = aura::client::GetFocusChangeObserver(focused_window_);
+ if (observer)
+ observer->OnWindowFocused(focused_window_, old_focused_window);
+}
+
+void HeadlessFocusClient::ResetFocusWithinActiveWindow(aura::Window* window) {
+ if (!window->Contains(focused_window_))
+ FocusWindow(window);
+}
+
+aura::Window* HeadlessFocusClient::GetFocusedWindow() {
+ return focused_window_;
+}
+
+void HeadlessFocusClient::OnWindowDestroying(aura::Window* window) {
+ DCHECK_EQ(window, focused_window_);
+ FocusWindow(NULL);
+}
+
+} // namespace headless
« no previous file with comments | « headless/lib/browser/headless_focus_client.h ('k') | headless/lib/browser/headless_web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698