Merge lp:~azzar1/unity/fix-985883 into lp:unity

[Andrea Azzarone]

Raise shortcut overlay on show.

== Problem ==
Dash - When the Dash is already open, holding the SUPER key should display the 'keyboard shortcuts overlay' on top of the Dash

== Fix ==
Use PushToFront to raise the BaseWindow.

== Test ==
Unit test added. I know that BaseWindowRaiser is not the best solution. Maybe we should pass nux::BaseWindow to shortcut::Controller through DI, but we don't have nux::AbstractBaseWindow (or something like that).

[Brandon Schaefer (brandontschaefer)]

Code looks good, manual test pass and unity test pass. :)

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-07 12:40:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-11 10:45:23 +0000
@@ -25,6 +25,7 @@
 #include <Nux/BaseWindow.h>
 #include <Nux/WindowCompositor.h>
 
+#include "BaseWindowRaiserImp.h"
 #include "IconRenderer.h"
 #include "Launcher.h"
 #include "LauncherIcon.h"
@@ -2960,7 +2961,8 @@
 
   // Setup Shortcut Hint
   InitHints();
-  shortcut_controller_ = std::make_shared<shortcut::Controller>(hints_);
+  auto base_window_raiser_ = std::make_shared<shortcut::BaseWindowRaiserImp>();
+  shortcut_controller_ = std::make_shared<shortcut::Controller>(hints_, base_window_raiser_);
   AddChild(shortcut_controller_.get());
 
   AddChild(dash_controller_.get());

=== modified file 'shortcuts/AbstractShortcutHint.h'
--- shortcuts/AbstractShortcutHint.h	2012-05-07 22:28:17 +0000
+++ shortcuts/AbstractShortcutHint.h	2012-09-11 10:45:23 +0000
@@ -14,12 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Andrea Azzarone <[e-mail]>
+ * Authored by: Andrea Azzarone <[e-mail]>
  */
 
 #ifndef UNITYSHELL_ABSTRACT_SHORTCUT_ICON_H
 #define UNITYSHELL_ABSTRACT_SHORTCUT_ICON_H
 
+#include <memory>
 #include <string>
 
 #include <Nux/Nux.h>
@@ -44,7 +45,7 @@
 {
 public:
   typedef std::shared_ptr<AbstractHint> Ptr;
-  // Ctor
+
   AbstractHint(std::string const& category,
                std::string const& prefix,
                std::string const& postfix,
@@ -61,10 +62,8 @@
     , arg1(arg1)
     , arg2(arg2)
     , arg3(arg3)
-  {
-  }
+  {}
 
-  // Copy ctor
   AbstractHint(unity::shortcut::AbstractHint const& obj)
     : category(obj.category())
     , prefix(obj.prefix())
@@ -76,13 +75,10 @@
     , arg3(obj.arg3())
     , value(obj.value())
     , shortkey(obj.shortkey())
-  {
-  }
+  {}
 
-  // Dtor
   virtual ~AbstractHint(){};
 
-  // Public Methods
   virtual bool Fill() = 0;
 
   // Properties
@@ -98,7 +94,7 @@
   nux::Property<std::string> shortkey;
 };
 
-} // namespace shortcut
-} // namespace unity
+}
+}
 
-#endif // UNITYSHELL_ABSTRACT_SHORTCUT_ICON_H
+#endif

=== added file 'shortcuts/BaseWindowRaiser.h'
--- shortcuts/BaseWindowRaiser.h	1970-01-01 00:00:00 +0000
+++ shortcuts/BaseWindowRaiser.h	2012-09-11 10:45:23 +0000
@@ -0,0 +1,47 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITYSHELL_BASE_WINDOW_RAISER_H
+#define UNITYSHELL_BASE_WINDOW_RAISER_H
+
+#include <boost/noncopyable.hpp>
+#include <memory>
+
+#include <Nux/Nux.h>
+#include <Nux/BaseWindow.h>
+
+namespace unity
+{
+namespace shortcut
+{
+
+class BaseWindowRaiser : boost::noncopyable
+{
+public:
+  typedef std::shared_ptr<BaseWindowRaiser> Ptr;
+
+  virtual ~BaseWindowRaiser() {};
+
+  virtual void Raise(nux::ObjectPtr<nux::BaseWindow> window) = 0;
+};
+
+}
+}
+
+#endif

=== added file 'shortcuts/BaseWindowRaiserImp.cpp'
--- shortcuts/BaseWindowRaiserImp.cpp	1970-01-01 00:00:00 +0000
+++ shortcuts/BaseWindowRaiserImp.cpp	2012-09-11 10:45:23 +0000
@@ -0,0 +1,33 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include "BaseWindowRaiserImp.h"
+
+namespace unity
+{
+namespace shortcut
+{
+
+void BaseWindowRaiserImp::Raise(nux::ObjectPtr<nux::BaseWindow> window)
+{
+  window->PushToFront();
+}
+
+}
+}

=== added file 'shortcuts/BaseWindowRaiserImp.h'
--- shortcuts/BaseWindowRaiserImp.h	1970-01-01 00:00:00 +0000
+++ shortcuts/BaseWindowRaiserImp.h	2012-09-11 10:45:23 +0000
@@ -0,0 +1,39 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITYSHELL_BASE_WINDOW_RAISER_IMP_H
+#define UNITYSHELL_BASE_WINDOW_RAISER_IMP_H
+
+#include "BaseWindowRaiser.h"
+
+namespace unity
+{
+namespace shortcut
+{
+
+class BaseWindowRaiserImp : public BaseWindowRaiser
+{
+public:
+  virtual void Raise(nux::ObjectPtr<nux::BaseWindow> window);
+};
+
+}
+}
+
+#endif

=== modified file 'shortcuts/CMakeLists.txt'
--- shortcuts/CMakeLists.txt	2012-07-06 10:20:29 +0000
+++ shortcuts/CMakeLists.txt	2012-09-11 10:45:23 +0000
@@ -30,6 +30,7 @@
 #
 set (SHORTCUTS_SOURCES
      AbstractShortcutHint.h
+     BaseWindowRaiserImp.cpp
      MockShortcutHint.h
      ShortcutController.cpp
      ShortcutController.h

=== modified file 'shortcuts/MockShortcutHint.h'
--- shortcuts/MockShortcutHint.h	2012-05-07 22:28:17 +0000
+++ shortcuts/MockShortcutHint.h	2012-09-11 10:45:23 +0000
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Andrea Azzarone <[e-mail]>
+ * Authored by: Andrea Azzarone <[e-mail]>
  */
 
 #ifndef UNITYSHELL_MOCK_SHORTCUT_HINT_H
@@ -30,7 +30,8 @@
 class MockHint : public AbstractHint
 {
 public:
-   // Ctor and dtor
+  typedef std::shared_ptr<MockHint> Ptr;
+
   MockHint(std::string const& category,
            std::string const& prefix,
            std::string const& postfix,
@@ -40,10 +41,7 @@
            std::string const& arg2 = "",
            std::string const& arg3 = "")
     : AbstractHint(category, prefix, postfix, description, type, arg1, arg2, arg3)
-  {
-  }
-  
-  ~MockHint() {};
+  {}
   
   // Methods...
   bool Fill()
@@ -67,7 +65,7 @@
   }
 };
   
-} // shortcut hint
-} // namespace unity
+}
+}
 
-#endif // UNITYSHELL_MOCK_SHORTCUT_HINT_H
+#endif

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2012-08-14 09:42:03 +0000
+++ shortcuts/ShortcutController.cpp	2012-09-11 10:45:23 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Andrea Azzarone <[e-mail]>
+ * Authored by: Andrea Azzarone <[e-mail]>
  */
 
 #include "ShortcutController.h"
@@ -29,37 +29,37 @@
 {
 const unsigned int SUPER_TAP_DURATION = 650;
 const unsigned int FADE_DURATION = 100;
-} // anonymouse namespace;
+}
 
-Controller::Controller(std::list<AbstractHint::Ptr>& hints)
-  : visible_(false)
+Controller::Controller(std::list<AbstractHint::Ptr> const& hints,
+                       BaseWindowRaiser::Ptr const& base_window_raiser)
+  : model_(std::make_shared<Model>(hints))
+  , base_window_raiser_(base_window_raiser)
+  , visible_(false)
   , enabled_(true)
+  , bg_color_(0.0, 0.0, 0.0, 0.5)
   , fade_in_animator_(FADE_DURATION)
   , fade_out_animator_(FADE_DURATION)
 {
-  bg_color_ = nux::Color(0.0, 0.0, 0.0, 0.5);
+  model_->Fill();
 
   ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED,
                                  sigc::mem_fun(this, &Controller::OnBackgroundUpdate));
 
-  ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, [&] (GVariant*) {
+  ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, [this] (GVariant*) {
                                    enabled_ = false;
                                  });
 
-  ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER, [&] (GVariant*) {
+  ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER, [this] (GVariant*) {
                                    enabled_ = true;
                                  });
 
-  ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, [&] (GVariant*) {
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, [this] (GVariant*) {
                                    Hide();
                                  });
 
   ubus_manager_.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
 
-  model_.reset(new Model(hints));
-
-  model_->Fill();
-
   fade_in_animator_.animation_updated.connect(sigc::mem_fun(this, &Controller::OnFadeInUpdated));
   fade_in_animator_.animation_ended.connect(sigc::mem_fun(this, &Controller::OnFadeInEnded));
   fade_out_animator_.animation_updated.connect(sigc::mem_fun(this, &Controller::OnFadeOutUpdated));
@@ -87,7 +87,6 @@
   view_window_->SetOpacity(0.0);
 }
 
-
 void Controller::OnBackgroundUpdate(GVariant* data)
 {
   gdouble red, green, blue, alpha;
@@ -118,6 +117,7 @@
     return false;
 
   EnsureView();
+  base_window_raiser_->Raise(view_window_);
 
   nux::Geometry geo;
   if (!view_->GetBaseGeometry(geo))
@@ -190,12 +190,12 @@
   }
 }
 
-bool Controller::Visible()
+bool Controller::Visible() const
 {
   return visible_;
 }
 
-bool Controller::IsEnabled()
+bool Controller::IsEnabled() const
 {
   return enabled_;
 }

=== modified file 'shortcuts/ShortcutController.h'
--- shortcuts/ShortcutController.h	2012-06-18 02:57:23 +0000
+++ shortcuts/ShortcutController.h	2012-09-11 10:45:23 +0000
@@ -13,13 +13,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Andrea Azzarone <[e-mail]>
+ * Authored by: Andrea Azzarone <[e-mail]>
  */
 
-#ifndef UNITYSHELL_SHORTCUTCONTROLLER_H
-#define UNITYSHELL_SHORTCUTCONTROLLER_H
+#ifndef UNITYSHELL_SHORTCUT_CONTROLLER_H
+#define UNITYSHELL_SHORTCUT_CONTROLLER_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
@@ -28,10 +28,11 @@
 #include <UnityCore/Variant.h>
 #include <UnityCore/GLibSource.h>
 
+#include "BaseWindowRaiser.h"
+#include "ShortcutModel.h"
+#include "ShortcutView.h"
 #include "unity-shared/Animator.h"
 #include "unity-shared/Introspectable.h"
-#include "ShortcutModel.h"
-#include "ShortcutView.h"
 #include "unity-shared/UBusWrapper.h"
 
 namespace unity
@@ -44,25 +45,24 @@
 public:
   typedef std::shared_ptr<Controller> Ptr;
 
-  // Ctor
-  Controller(std::list<AbstractHint::Ptr>& hints);
+  Controller(std::list<AbstractHint::Ptr> const& hints,
+             BaseWindowRaiser::Ptr const& raiser);
 
-  // Public Methods
   bool Show();
   void Hide();
 
-  bool Visible();
-  bool IsEnabled();
+  bool Visible() const;
+  bool IsEnabled() const;
 
   void SetAdjustment(int x, int y);
   void SetEnabled(bool enabled);
 
 protected:
+  // Introspectable
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
 private:
-  // Private Methods
   void ConstructView();
   void EnsureView();
   void OnBackgroundUpdate(GVariant* data);
@@ -72,9 +72,9 @@
   void OnFadeOutEnded();
   bool OnShowTimer();
 
-  // Private Members
   View::Ptr view_;
   Model::Ptr model_;
+  BaseWindowRaiser::Ptr base_window_raiser_;
 
   nux::Geometry workarea_;
   nux::ObjectPtr<nux::BaseWindow> view_window_;
@@ -91,8 +91,7 @@
   UBusManager ubus_manager_;
 };
 
-} // namespace shortcut
-} // namespace unity
-
-#endif //UNITYSHELL_SHORTCUTHINTCONTROLLER_H
-
+}
+}
+
+#endif

=== modified file 'shortcuts/ShortcutModel.cpp'
--- shortcuts/ShortcutModel.cpp	2012-05-07 22:28:17 +0000
+++ shortcuts/ShortcutModel.cpp	2012-09-11 10:45:23 +0000
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Andrea Azzarone <[e-mail]>
+ * Authored by: Andrea Azzarone <[e-mail]>
  */
 
 #include "ShortcutModel.h"
@@ -24,20 +24,13 @@
 namespace shortcut
 {
 
-// Ctor
-Model::Model(std::list<AbstractHint::Ptr>& hints)
+Model::Model(std::list<AbstractHint::Ptr> const& hints)
 {
   for (auto hint : hints)
     AddHint(hint);
 }
 
-// Dtor
-Model::~Model()
-{
-}
-
-
-void Model::AddHint(AbstractHint::Ptr hint)
+void Model::AddHint(AbstractHint::Ptr const& hint)
 {
   if (!hint)
     return;
@@ -56,5 +49,5 @@
       item->Fill();
 }
 
-} // namespace shortcut
-} // namespace unity
+}
+}

=== modified file 'shortcuts/ShortcutModel.h'
--- shortcuts/ShortcutModel.h	2012-05-07 22:28:17 +0000
+++ shortcuts/ShortcutModel.h	2012-09-11 10:45:23 +0000
@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Andrea Azzarone <[e-mail]>
+ * Authored by: Andrea Azzarone <[e-mail]>
  */
 
-#ifndef UNITYSHELL_SHORTCUSMODEL_H
-#define UNITYSHELL_SHORTCUSMODEL_H
+#ifndef UNITYSHELL_SHORTCUS_MODEL_H
+#define UNITYSHELL_SHORTCUS_MODEL_H
 
 #include <boost/noncopyable.hpp>
 #include <map>
@@ -39,26 +39,21 @@
 public:
   typedef std::shared_ptr<Model> Ptr;
 
-  // Ctor and dtor
-  Model(std::list<AbstractHint::Ptr>& hints);
-  ~Model();
+  Model(std::list<AbstractHint::Ptr> const& hints);
 
-  // Accessors
   std::vector<std::string>& categories() { return categories_; }
   std::map<std::string, std::list<AbstractHint::Ptr>>& hints() { return hints_; }
 
   void Fill();
 
 private:
-  // Private functions
-  void AddHint(AbstractHint::Ptr hint);
+  void AddHint(AbstractHint::Ptr const& hint);
 
-  // Private members
   std::vector<std::string> categories_;
   std::map<std::string, std::list<AbstractHint::Ptr>> hints_;
 };
 
-} // shortcut
-} // unity
+}
+}
 
-#endif // UNITYSHELL_SHORTCUTS_H
+#endif

=== modified file 'shortcuts/StandaloneShortcuts.cpp'
--- shortcuts/StandaloneShortcuts.cpp	2012-08-28 07:07:13 +0000
+++ shortcuts/StandaloneShortcuts.cpp	2012-09-11 10:45:23 +0000
@@ -23,6 +23,7 @@
 #include <Nux/WindowThread.h>
 
 #include "unity-shared/BackgroundEffectHelper.h"
+#include "BaseWindowRaiserImp.h"
 #include "MockShortcutHint.h"
 #include "ShortcutController.h"
 
@@ -228,7 +229,8 @@
                                                                                  "resize",
                                                                                  "initiate_key")));
 
-  controller.reset(new shortcut::Controller(hints));
+  auto base_window_raiser_ = std::make_shared<shortcut::BaseWindowRaiserImp>();
+  controller.reset(new shortcut::Controller(hints, base_window_raiser_));
   controller->Show();
 }
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-08-31 21:32:38 +0000
+++ tests/CMakeLists.txt	2012-09-11 10:45:23 +0000
@@ -223,6 +223,7 @@
                  test_quicklist_menu_item.cpp
                  test_quicklist_view.cpp
                  test_resultviewgrid.cpp
+                 test_shortcut_controller.cpp
                  test_single_monitor_launcher_icon.cpp
                  test_switcher_controller.cpp
                  test_switcher_model.cpp
@@ -305,6 +306,11 @@
                  ${CMAKE_SOURCE_DIR}/launcher/VolumeImp.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/VolumeLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/VolumeMonitorWrapper.cpp
+                 ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutController.cpp
+                 ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutModel.cpp
+                 #${CMAKE_SOURCE_DIR}/shortcuts/ShortcutHintPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutView.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/AbstractSeparator.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/Animator.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/BackgroundEffectHelper.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/CoverArt.cpp
@@ -317,6 +323,7 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/IMTextEntry.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/IntrospectableWrappers.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/LineSeparator.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/JSONParser.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/KeyboardUtil.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/OverlayRenderer.cpp

=== added file 'tests/test_shortcut_controller.cpp'
--- tests/test_shortcut_controller.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_shortcut_controller.cpp	2012-09-11 10:45:23 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+using namespace testing;
+
+#include "shortcuts/BaseWindowRaiser.h"
+#include "shortcuts/ShortcutController.h"
+using namespace unity;
+
+#include "test_utils.h"
+
+namespace
+{
+
+class MockBaseWindowRaiser : public shortcut::BaseWindowRaiser
+{
+public:
+  typedef std::shared_ptr<MockBaseWindowRaiser> Ptr;
+
+  MOCK_METHOD1 (Raise, void(nux::ObjectPtr<nux::BaseWindow> window));
+};
+
+class TestShortcutController : public Test
+{
+public:
+  TestShortcutController()
+    : base_window_raiser_(std::make_shared<MockBaseWindowRaiser>())
+    , controller_(hints_, base_window_raiser_)
+  {}
+
+  std::list<shortcut::AbstractHint::Ptr> hints_;
+  MockBaseWindowRaiser::Ptr base_window_raiser_;
+  shortcut::Controller controller_;
+};
+
+TEST_F (TestShortcutController, WindowIsRaisedOnShow)
+{
+  EXPECT_CALL(*base_window_raiser_, Raise(_))
+    .Times(1);
+
+  controller_.Show();
+  Utils::WaitForTimeout(1);
+}
+
+}