diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 21:53:54 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 21:53:54 +0000 |
| commit | b752e7a73f1019fab2b3813981a72a75450e036f (patch) | |
| tree | 3e9fbd28e98c95ff7f7d34d7dc1d352baea9b406 /ash/test | |
| parent | 046c048dd4f59f43dc430ac60a3a0344d58a99fe (diff) | |
| download | chromium_src-b752e7a73f1019fab2b3813981a72a75450e036f.zip chromium_src-b752e7a73f1019fab2b3813981a72a75450e036f.tar.gz chromium_src-b752e7a73f1019fab2b3813981a72a75450e036f.tar.bz2 | |
Adds an accelerator to handle Ctrl-Shift-L during weird cases
BUG=106873
Review URL: https://chromiumcodereview.appspot.com/9132004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 5 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index ef080e9..198f925 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -27,6 +27,11 @@ views::Widget* TestShellDelegate::CreateStatusArea() { return NULL; } +#if defined(OS_CHROMEOS) +void TestShellDelegate::LockScreen() { +} +#endif + void TestShellDelegate::Exit() { } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 9eedc96..b8e443e 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -20,6 +20,9 @@ class TestShellDelegate : public ShellDelegate { // Overridden from ShellDelegate: virtual void CreateNewWindow() OVERRIDE; virtual views::Widget* CreateStatusArea() OVERRIDE; +#if defined(OS_CHROMEOS) + virtual void LockScreen() OVERRIDE; +#endif virtual void Exit() OVERRIDE; virtual void BuildAppListModel(AppListModel* model) OVERRIDE; virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; |