← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/include/mir_test_doubles/mock_input_targeter.h

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/mir_test_doubles/mock_input_targeter.h
33
33
struct MockInputTargeter : public shell::InputTargeter
34
34
{
35
35
    virtual ~MockInputTargeter() noexcept(true) {}
36
 
    MOCK_METHOD1(focus_changed, void(std::shared_ptr<input::InputChannel const> const&));
37
 
    MOCK_METHOD0(focus_cleared, void());
 
36
    MOCK_METHOD1(set_focus, void(std::shared_ptr<input::Surface> const&));
 
37
    MOCK_METHOD0(clear_focus, void());
38
38
};
39
39
 
40
40
}