From bce67a27ccae9f48ce60695959d93c66c76fb756 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sat, 2 Jan 2021 17:10:36 -0300
Subject: [PATCH] viewSelector: Move 'toggle-overview' shortcut to overview

It is handled there already, there's no reason for it to continue
to be in ViewSelector.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1624>
---
 js/ui/overview.js     | 10 +++++++++-
 js/ui/viewSelector.js |  7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/js/ui/overview.js b/js/ui/overview.js
index c10318f0d..9e76a82f8 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Overview */
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
 // Time for initial animation going into Overview mode;
@@ -14,6 +14,7 @@ const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const OverviewControls = imports.ui.overviewControls;
 const Params = imports.misc.params;
+const WindowManager = imports.ui.windowManager;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 
 var DND_WINDOW_SWITCH_TIMEOUT = 750;
@@ -229,6 +230,13 @@ var Overview = class {
 
         Main.layoutManager.connect('monitors-changed', this._relayout.bind(this));
         this._relayout();
+
+        Main.wm.addKeybinding(
+            'toggle-overview',
+            new Gio.Settings({ schema_id: WindowManager.SHELL_KEYBINDINGS_SCHEMA }),
+            Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
+            Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW,
+            this.toggle.bind(this));
     }
 
     addSearchProvider(provider) {
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 95d6d7e5c..bbd412ff0 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -358,13 +358,6 @@ var ViewSelector = GObject.registerClass({
                               Shell.ActionMode.OVERVIEW,
                               this._toggleAppsPage.bind(this));
 
-        Main.wm.addKeybinding('toggle-overview',
-                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
-                              Shell.ActionMode.NORMAL |
-                              Shell.ActionMode.OVERVIEW,
-                              Main.overview.toggle.bind(Main.overview));
-
         let side;
         if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             side = St.Side.RIGHT;