Unity

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

  1. fix-1308540
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3863
Proposed branch: lp:~azzar1/unity/fix-1308540
Merge into: lp:unity
Diff against target: 347 lines (+83/-33)
8 files modified
lockscreen/LockScreenAbstractShield.h (+9/-1)
lockscreen/LockScreenController.cpp (+18/-1)
lockscreen/LockScreenController.h (+5/-0)
lockscreen/LockScreenShield.cpp (+17/-22)
lockscreen/LockScreenShield.h (+6/-3)
lockscreen/LockScreenShieldFactory.cpp (+7/-2)
lockscreen/LockScreenShieldFactory.h (+12/-2)
tests/test_lockscreen_controller.cpp (+9/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1308540
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+226455@code.launchpad.net

Commit message

Share lockscreen password entry between screens.

Description of the change

== Problem ==
[lockscreen] the password entry is not shared between screens

== Fix ==
Share the UserPromptView object between the shields.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3791
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1308540/+merge/226455/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1021/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/108/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1021/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Mostly looks fine, just check these two comments...

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3839
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1308540/+merge/226455/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1023/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/110

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1023/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3840
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/fix-1308540/+merge/226455/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1024/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/111

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1024/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3841
http://jenkins.qa.ubuntu.com/job/unity-ci/1028/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/115/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1028/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

You also need http://pastebin.ubuntu.com/7833258/ not to fail the unityshell build, sad but true :/

Revision history for this message
Andrea Azzarone (azzar1) wrote :

> You also need http://pastebin.ubuntu.com/7833258/ not to fail the unityshell
> build, sad but true :/

Done!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3842
http://jenkins.qa.ubuntu.com/job/unity-ci/1035/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/122
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/122/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1035/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3842
http://jenkins.qa.ubuntu.com/job/unity-ci/1046/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/133/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/133/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1046/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3843
http://jenkins.qa.ubuntu.com/job/unity-ci/1067/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/154/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1067/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

It seems there's a compile error here: http://pastebin.ubuntu.com/8144555/

review: Needs Fixing
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

(I guess there's another prompt_view_ defined as a simple pointer inside the actual Shield header)

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Should work now!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3843
http://jenkins.qa.ubuntu.com/job/unity-ci/1075/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/162

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1075/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Yay

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h 2014-06-05 19:48:27 +0000
+++ lockscreen/LockScreenAbstractShield.h 2014-08-27 13:25:30 +0000
@@ -32,16 +32,23 @@
32namespace lockscreen32namespace lockscreen
33{33{
3434
35class UserPromptView;
36
35class AbstractShield : public MockableBaseWindow37class AbstractShield : public MockableBaseWindow
36{38{
37public:39public:
38 AbstractShield(session::Manager::Ptr const& session, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor_num, bool is_primary)40 AbstractShield(session::Manager::Ptr const& session,
41 indicator::Indicators::Ptr const& indicators,
42 Accelerators::Ptr const& accelerators,
43 nux::ObjectPtr<UserPromptView> const& prompt_view,
44 int monitor_num, bool is_primary)
39 : MockableBaseWindow("Unity Lockscreen")45 : MockableBaseWindow("Unity Lockscreen")
40 , primary(is_primary)46 , primary(is_primary)
41 , monitor(monitor_num)47 , monitor(monitor_num)
42 , session_manager_(session)48 , session_manager_(session)
43 , indicators_(indicators)49 , indicators_(indicators)
44 , accelerators_(accelerators)50 , accelerators_(accelerators)
51 , prompt_view_(prompt_view)
45 {}52 {}
4653
47 nux::Property<bool> primary;54 nux::Property<bool> primary;
@@ -58,6 +65,7 @@
58 session::Manager::Ptr session_manager_;65 session::Manager::Ptr session_manager_;
59 indicator::Indicators::Ptr indicators_;66 indicator::Indicators::Ptr indicators_;
60 Accelerators::Ptr accelerators_;67 Accelerators::Ptr accelerators_;
68 nux::ObjectPtr<UserPromptView> prompt_view_;
61};69};
6270
63} // lockscreen71} // lockscreen
6472
=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp 2014-07-30 18:33:31 +0000
+++ lockscreen/LockScreenController.cpp 2014-08-27 13:25:30 +0000
@@ -24,6 +24,7 @@
2424
25#include "LockScreenShield.h"25#include "LockScreenShield.h"
26#include "LockScreenSettings.h"26#include "LockScreenSettings.h"
27#include "UserPromptView.h"
27#include "unity-shared/AnimationUtils.h"28#include "unity-shared/AnimationUtils.h"
28#include "unity-shared/UScreen.h"29#include "unity-shared/UScreen.h"
29#include "unity-shared/WindowManager.h"30#include "unity-shared/WindowManager.h"
@@ -154,6 +155,20 @@
154 primary_shield_->ActivatePanel();155 primary_shield_->ActivatePanel();
155}156}
156157
158UserPromptView* Controller::CreatePromptView()
159{
160 auto* prompt_view = new UserPromptView(session_manager_);
161
162 auto width = 8 * Settings::GRID_SIZE;
163 auto height = 3 * Settings::GRID_SIZE;
164
165 prompt_view->SetMinimumWidth(width);
166 prompt_view->SetMaximumWidth(width);
167 prompt_view->SetMinimumHeight(height);
168
169 return prompt_view;
170}
171
157void Controller::ResetPostLockScreenSaver()172void Controller::ResetPostLockScreenSaver()
158{173{
159 screensaver_post_lock_timeout_.reset();174 screensaver_post_lock_timeout_.reset();
@@ -192,6 +207,8 @@
192207
193 shields_.resize(num_monitors);208 shields_.resize(num_monitors);
194209
210 prompt_view_ = test_mode_ ? nullptr : CreatePromptView();
211
195 for (int i = 0; i < num_monitors; ++i)212 for (int i = 0; i < num_monitors; ++i)
196 {213 {
197 auto& shield = shields_[i];214 auto& shield = shields_[i];
@@ -199,7 +216,7 @@
199216
200 if (i >= shields_size)217 if (i >= shields_size)
201 {218 {
202 shield = shield_factory_->CreateShield(session_manager_, indicators_, accelerator_controller_->GetAccelerators(), i, i == primary);219 shield = shield_factory_->CreateShield(session_manager_, indicators_, accelerator_controller_->GetAccelerators(), prompt_view_, i, i == primary);
203 is_new = true;220 is_new = true;
204 }221 }
205222
206223
=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h 2014-05-20 11:49:40 +0000
+++ lockscreen/LockScreenController.h 2014-08-27 13:25:30 +0000
@@ -27,6 +27,7 @@
27#include "LockScreenShieldFactory.h"27#include "LockScreenShieldFactory.h"
28#include "LockScreenAcceleratorController.h"28#include "LockScreenAcceleratorController.h"
29#include "ScreenSaverDBusManager.h"29#include "ScreenSaverDBusManager.h"
30#include "UserPromptView.h"
30#include "unity-shared/BackgroundEffectHelper.h"31#include "unity-shared/BackgroundEffectHelper.h"
31#include "unity-shared/UpstartWrapper.h"32#include "unity-shared/UpstartWrapper.h"
3233
@@ -35,6 +36,8 @@
35namespace lockscreen36namespace lockscreen
36{37{
3738
39class UserPromptView;
40
38class Controller : public sigc::trackable41class Controller : public sigc::trackable
39{42{
40public:43public:
@@ -51,6 +54,7 @@
51private:54private:
52 friend class TestLockScreenController;55 friend class TestLockScreenController;
5356
57 UserPromptView* CreatePromptView();
54 void EnsureShields(std::vector<nux::Geometry> const& monitors);58 void EnsureShields(std::vector<nux::Geometry> const& monitors);
55 void EnsureBlankWindow();59 void EnsureBlankWindow();
56 void LockScreen();60 void LockScreen();
@@ -79,6 +83,7 @@
79 AcceleratorController::Ptr accelerator_controller_;83 AcceleratorController::Ptr accelerator_controller_;
80 UpstartWrapper::Ptr upstart_wrapper_;84 UpstartWrapper::Ptr upstart_wrapper_;
81 ShieldFactoryInterface::Ptr shield_factory_;85 ShieldFactoryInterface::Ptr shield_factory_;
86 nux::ObjectPtr<UserPromptView> prompt_view_;
8287
83 nux::animation::AnimateValue<double> fade_animator_;88 nux::animation::AnimateValue<double> fade_animator_;
84 nux::animation::AnimateValue<double> blank_window_animator_;89 nux::animation::AnimateValue<double> blank_window_animator_;
8590
=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp 2014-07-30 20:10:23 +0000
+++ lockscreen/LockScreenShield.cpp 2014-08-27 13:25:30 +0000
@@ -42,10 +42,13 @@
42const unsigned MAX_GRAB_WAIT = 50;42const unsigned MAX_GRAB_WAIT = 50;
43}43}
4444
45Shield::Shield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor_num, bool is_primary)45Shield::Shield(session::Manager::Ptr const& session_manager,
46 : AbstractShield(session_manager, indicators, accelerators, monitor_num, is_primary)46 indicator::Indicators::Ptr const& indicators,
47 Accelerators::Ptr const& accelerators,
48 nux::ObjectPtr<UserPromptView> const& prompt_view,
49 int monitor_num, bool is_primary)
50 : AbstractShield(session_manager, indicators, accelerators, prompt_view, monitor_num, is_primary)
47 , bg_settings_(std::make_shared<BackgroundSettings>())51 , bg_settings_(std::make_shared<BackgroundSettings>())
48 , prompt_view_(nullptr)
49 , panel_view_(nullptr)52 , panel_view_(nullptr)
50{53{
51 is_primary ? ShowPrimaryView() : ShowSecondaryView();54 is_primary ? ShowPrimaryView() : ShowSecondaryView();
@@ -117,6 +120,11 @@
117 if (primary_layout_)120 if (primary_layout_)
118 {121 {
119 GrabScreen(false);122 GrabScreen(false);
123
124 if (prompt_view_ && prompt_view_->GetParentObject())
125 static_cast<nux::Layout*>(prompt_view_->GetParentObject())->RemoveChildObject(prompt_view_.GetPointer());
126 prompt_layout_->AddView(prompt_view_.GetPointer());
127
120 SetLayout(primary_layout_.GetPointer());128 SetLayout(primary_layout_.GetPointer());
121 return;129 return;
122 }130 }
@@ -128,15 +136,16 @@
128136
129 main_layout->AddView(CreatePanel());137 main_layout->AddView(CreatePanel());
130138
131 nux::HLayout* prompt_layout = new nux::HLayout();139 prompt_layout_ = new nux::HLayout();
132 prompt_layout->SetLeftAndRightPadding(2 * Settings::GRID_SIZE);140 prompt_layout_->SetLeftAndRightPadding(2 * Settings::GRID_SIZE);
133141
134 prompt_view_ = CreatePromptView();142 if (prompt_view_ && prompt_view_->GetParentObject())
135 prompt_layout->AddView(prompt_view_);143 static_cast<nux::Layout*>(prompt_view_->GetParentObject())->RemoveChildObject(prompt_view_.GetPointer());
144 prompt_layout_->AddView(prompt_view_.GetPointer());
136145
137 // 10 is just a random number to center the prompt view.146 // 10 is just a random number to center the prompt view.
138 main_layout->AddSpace(0, 10);147 main_layout->AddSpace(0, 10);
139 main_layout->AddLayout(prompt_layout);148 main_layout->AddLayout(prompt_layout_.GetPointer());
140 main_layout->AddSpace(0, 10);149 main_layout->AddSpace(0, 10);
141}150}
142151
@@ -182,20 +191,6 @@
182 return panel_view_;191 return panel_view_;
183}192}
184193
185UserPromptView* Shield::CreatePromptView()
186{
187 auto* prompt_view = new UserPromptView(session_manager_);
188
189 auto width = 8 * Settings::GRID_SIZE;
190 auto height = 3 * Settings::GRID_SIZE;
191
192 prompt_view->SetMinimumWidth(width);
193 prompt_view->SetMaximumWidth(width);
194 prompt_view->SetMinimumHeight(height);
195
196 return prompt_view;
197}
198
199nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)194nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
200{195{
201 if (primary)196 if (primary)
202197
=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h 2014-07-30 18:33:31 +0000
+++ lockscreen/LockScreenShield.h 2014-08-27 13:25:30 +0000
@@ -37,7 +37,11 @@
37class Shield : public AbstractShield37class Shield : public AbstractShield
38{38{
39public:39public:
40 Shield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary);40 Shield(session::Manager::Ptr const&,
41 indicator::Indicators::Ptr const&,
42 Accelerators::Ptr const&,
43 nux::ObjectPtr<UserPromptView> const&,
44 int monitor, bool is_primary);
4145
42 bool IsIndicatorOpen() const override;46 bool IsIndicatorOpen() const override;
43 void ActivatePanel() override;47 void ActivatePanel() override;
@@ -53,16 +57,15 @@
53 void ShowPrimaryView();57 void ShowPrimaryView();
54 void ShowSecondaryView();58 void ShowSecondaryView();
55 Panel* CreatePanel();59 Panel* CreatePanel();
56 UserPromptView* CreatePromptView();
5760
58 std::shared_ptr<BackgroundSettings> bg_settings_;61 std::shared_ptr<BackgroundSettings> bg_settings_;
59 std::unique_ptr<nux::AbstractPaintLayer> background_layer_;62 std::unique_ptr<nux::AbstractPaintLayer> background_layer_;
60 nux::ObjectPtr<nux::Layout> primary_layout_;63 nux::ObjectPtr<nux::Layout> primary_layout_;
64 nux::ObjectPtr<nux::Layout> prompt_layout_;
61 nux::ObjectPtr<nux::Layout> cof_layout_;65 nux::ObjectPtr<nux::Layout> cof_layout_;
62 connection::Wrapper panel_active_conn_;66 connection::Wrapper panel_active_conn_;
63 connection::Wrapper regrab_conn_;67 connection::Wrapper regrab_conn_;
64 glib::Source::UniquePtr regrab_timeout_;68 glib::Source::UniquePtr regrab_timeout_;
65 UserPromptView* prompt_view_;
66 Panel* panel_view_;69 Panel* panel_view_;
67};70};
6871
6972
=== modified file 'lockscreen/LockScreenShieldFactory.cpp'
--- lockscreen/LockScreenShieldFactory.cpp 2014-04-17 13:08:05 +0000
+++ lockscreen/LockScreenShieldFactory.cpp 2014-08-27 13:25:30 +0000
@@ -19,15 +19,20 @@
1919
20#include "LockScreenShieldFactory.h"20#include "LockScreenShieldFactory.h"
21#include "LockScreenShield.h"21#include "LockScreenShield.h"
22#include "UserPromptView.h"
2223
23namespace unity24namespace unity
24{25{
25namespace lockscreen26namespace lockscreen
26{27{
2728
28nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor, bool is_primary)29nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager,
30 indicator::Indicators::Ptr const& indicators,
31 Accelerators::Ptr const& accelerators,
32 nux::ObjectPtr<UserPromptView> const& prompt_view,
33 int monitor, bool is_primary)
29{34{
30 return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, accelerators, monitor, is_primary));35 return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, accelerators, prompt_view, monitor, is_primary));
31}36}
3237
33}38}
3439
=== modified file 'lockscreen/LockScreenShieldFactory.h'
--- lockscreen/LockScreenShieldFactory.h 2014-04-17 13:08:05 +0000
+++ lockscreen/LockScreenShieldFactory.h 2014-08-27 13:25:30 +0000
@@ -31,18 +31,28 @@
31namespace lockscreen31namespace lockscreen
32{32{
3333
34class UserPromptView;
35
34struct ShieldFactoryInterface36struct ShieldFactoryInterface
35{37{
36 typedef std::shared_ptr<ShieldFactoryInterface> Ptr;38 typedef std::shared_ptr<ShieldFactoryInterface> Ptr;
3739
38 virtual ~ShieldFactoryInterface() = default;40 virtual ~ShieldFactoryInterface() = default;
3941
40 virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary) = 0;42 virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&,
43 indicator::Indicators::Ptr const&,
44 Accelerators::Ptr const&,
45 nux::ObjectPtr<UserPromptView> const&,
46 int monitor, bool is_primary) = 0;
41};47};
4248
43struct ShieldFactory : ShieldFactoryInterface49struct ShieldFactory : ShieldFactoryInterface
44{50{
45 nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary) override;51 nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&,
52 indicator::Indicators::Ptr const&,
53 Accelerators::Ptr const&,
54 nux::ObjectPtr<UserPromptView> const&,
55 int monitor, bool is_primary) override;
46};56};
4757
48}58}
4959
=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp 2014-06-07 16:26:59 +0000
+++ tests/test_lockscreen_controller.cpp 2014-08-27 13:25:30 +0000
@@ -20,6 +20,7 @@
20#include <gmock/gmock.h>20#include <gmock/gmock.h>
21using namespace testing;21using namespace testing;
2222
23#include "lockscreen/UserPromptView.h"
23#include "lockscreen/LockScreenController.h"24#include "lockscreen/LockScreenController.h"
2425
25#include <Nux/NuxTimerTickSource.h>26#include <Nux/NuxTimerTickSource.h>
@@ -29,6 +30,7 @@
2930
30#include "lockscreen/LockScreenSettings.h"31#include "lockscreen/LockScreenSettings.h"
31#include "lockscreen/ScreenSaverDBusManager.h"32#include "lockscreen/ScreenSaverDBusManager.h"
33#include "unity-shared/DashStyle.h"
32#include "unity-shared/PanelStyle.h"34#include "unity-shared/PanelStyle.h"
33#include "unity-shared/UScreen.h"35#include "unity-shared/UScreen.h"
34#include "test_mock_session_manager.h"36#include "test_mock_session_manager.h"
@@ -52,7 +54,7 @@
52struct MockShield : AbstractShield54struct MockShield : AbstractShield
53{55{
54 MockShield()56 MockShield()
55 : AbstractShield(nullptr, nullptr, nullptr, 0, false)57 : AbstractShield(nullptr, nullptr, nullptr, nux::ObjectPtr<UserPromptView>(), 0, false)
56 {}58 {}
5759
58 MOCK_CONST_METHOD0(IsIndicatorOpen, bool());60 MOCK_CONST_METHOD0(IsIndicatorOpen, bool());
@@ -61,7 +63,11 @@
6163
62struct ShieldFactoryMock : ShieldFactoryInterface64struct ShieldFactoryMock : ShieldFactoryInterface
63{65{
64 nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int, bool) override66 nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&,
67 indicator::Indicators::Ptr const&,
68 Accelerators::Ptr const&,
69 nux::ObjectPtr<UserPromptView> const&,
70 int, bool) override
65 {71 {
66 return nux::ObjectPtr<AbstractShield>(new MockShield());72 return nux::ObjectPtr<AbstractShield>(new MockShield());
67 }73 }
@@ -95,6 +101,7 @@
95 nux::animation::AnimationController animation_controller;101 nux::animation::AnimationController animation_controller;
96102
97 MockUScreen uscreen;103 MockUScreen uscreen;
104 unity::dash::Style dash_style;
98 unity::panel::Style panel_style;105 unity::panel::Style panel_style;
99 unity::lockscreen::Settings lockscreen_settings;106 unity::lockscreen::Settings lockscreen_settings;
100 session::MockManager::Ptr session_manager;107 session::MockManager::Ptr session_manager;