diff options
| author | afakhry <afakhry@chromium.org> | 2015-09-09 02:03:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-09 09:05:09 +0000 |
| commit | cd2bb98dd450f65d857700df192a34ee79d618bf (patch) | |
| tree | 947a8b130671159ac013024626b12a710303e881 /ash/test | |
| parent | 422d099ed5b8439b92d198deb84d4528c14ccc0c (diff) | |
| download | chromium_src-cd2bb98dd450f65d857700df192a34ee79d618bf.zip chromium_src-cd2bb98dd450f65d857700df192a34ee79d618bf.tar.gz chromium_src-cd2bb98dd450f65d857700df192a34ee79d618bf.tar.bz2 | |
Deprecating high-conflict accelerators
This CL designs a framework for deprecated accelerators.
In this CL we deprecate the following accelerators:
- Lock Screen: Ctrl+Shift+L --> Search+L
- Task Manager: Shift+Esc --> Search+Esc
The old accelerators are still enabled, but the user is shown a
notification message telling him about the new accelerator.
UMA stats are recorded for both old and new accelerators.
Keyboard overlay has been updated.
BUG=492454,486198,498565,405317,503351
TEST=manually, ash_unittests --gtest_filter=DeprecatedAcceleratorTester.*,
ash_unittests --gtest_filter=AcceleratorTableTest.CheckDeprecatedAccelerators
Committed: https://crrev.com/c2b81c9fca4abc10cafdc75d2e7b4f15314e2e5b
Cr-Commit-Position: refs/heads/master@{#335410}
Review URL: https://codereview.chromium.org/1177773002
Cr-Commit-Position: refs/heads/master@{#347865}
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 5 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index ee6fd44..dbc04f8 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -26,6 +26,7 @@ #include "ui/app_list/app_list_view_delegate.h" #include "ui/app_list/test/app_list_test_view_delegate.h" #include "ui/aura/window.h" +#include "ui/gfx/image/image.h" #if defined(OS_CHROMEOS) #include "ash/system/tray/system_tray_notifier.h" @@ -199,6 +200,10 @@ base::string16 TestShellDelegate::GetProductName() const { return base::string16(); } +gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const { + return gfx::Image(); +} + void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { #if defined(OS_CHROMEOS) Shell* shell = Shell::GetInstance(); diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 06ac471..91d000e 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -60,6 +60,7 @@ class TestShellDelegate : public ShellDelegate { ash::ShelfItem* item) override; GPUSupport* CreateGPUSupport() override; base::string16 GetProductName() const override; + gfx::Image GetDeprecatedAcceleratorImage() const override; int num_exit_requests() const { return num_exit_requests_; } |