Index: ui/views/widget/desktop_aura/x11_desktop_handler.h |
diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.h b/ui/views/widget/desktop_aura/x11_desktop_handler.h |
index b9c9060fd561bace44f9ebb82c7ba1537d862888..63ddf5af726a6587568c437731ba36d089c81ae4 100644 |
--- a/ui/views/widget/desktop_aura/x11_desktop_handler.h |
+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.h |
@@ -44,28 +44,6 @@ class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher, |
// Gets the current workspace ID. |
std::string GetWorkspace(); |
- // Gets/sets the X11 server time of the most recent mouse click, touch or |
- // key press on a Chrome window. |
- int wm_user_time_ms() const { return wm_user_time_ms_; } |
- void set_wm_user_time_ms(Time time_ms); |
- |
- // Sends a request to the window manager to activate |window|. |
- // This method should only be called if the window is already mapped. |
- void ActivateWindow(::Window window); |
- |
- // Attempts to get the window manager to deactivate |window| by moving it to |
- // the bottom of the stack. Regardless of whether |window| was actually |
- // deactivated, sets the window as inactive in our internal state. |
- void DeactivateWindow(::Window window); |
- |
- // Checks if the current active window is |window|. |
- bool IsActiveWindow(::Window window) const; |
- |
- // Processes activation/focus related events. Some of these events are |
- // dispatched to the X11 window dispatcher, and not to the X11 root-window |
- // dispatcher. The window dispatcher sends these events to here. |
- void ProcessXEvent(XEvent* event); |
- |
// ui::PlatformEventDispatcher |
bool CanDispatchEvent(const ui::PlatformEvent& event) override; |
uint32_t DispatchEvent(const ui::PlatformEvent& event) override; |
@@ -75,17 +53,9 @@ class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher, |
void OnWillDestroyEnv() override; |
private: |
- enum ActiveState { |
- ACTIVE, |
- NOT_ACTIVE |
- }; |
- |
X11DesktopHandler(); |
~X11DesktopHandler() override; |
- // Handles changes in activation. |
- void OnActiveWindowChanged(::Window window, ActiveState active_state); |
- |
// Called when |window| has been created or destroyed. |window| may not be |
// managed by Chrome. |
void OnWindowCreatedOrDestroyed(int event_type, XID window); |
@@ -99,24 +69,8 @@ class VIEWS_EXPORT X11DesktopHandler : public ui::PlatformEventDispatcher, |
// The native root window. |
::Window x_root_window_; |
- // The last known active X window |
- ::Window x_active_window_; |
- |
- // The X11 server time of the most recent mouse click, touch, or key press |
- // on a Chrome window. |
- Time wm_user_time_ms_; |
- |
- // The active window according to X11 server. |
- ::Window current_window_; |
- |
- // Whether we should treat |current_window_| as active. In particular, we |
- // pretend that a window is deactivated after a call to DeactivateWindow(). |
- ActiveState current_window_active_state_; |
- |
ui::X11AtomCache atom_cache_; |
- bool wm_supports_active_window_; |
- |
base::ObserverList<X11DesktopHandlerObserver> observers_; |
std::string workspace_; |