summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 00:52:58 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 00:52:58 +0000
commit750508d57a355c3f65ae61af4ae527bb9fcf4046 (patch)
tree4fb724af36898a7ea3077cadea3c06b5822a8488 /ash/shell
parent91305c8cc059552839b57ddeb77f075b97629a7a (diff)
downloadchromium_src-750508d57a355c3f65ae61af4ae527bb9fcf4046.zip
chromium_src-750508d57a355c3f65ae61af4ae527bb9fcf4046.tar.gz
chromium_src-750508d57a355c3f65ae61af4ae527bb9fcf4046.tar.bz2
Enable Search-key modifiers for extended key shortcuts.
We use the Search-key as a modifier to disable existing shortcuts that do not use the Search key. So Alt+Backspace still generates a Delete, but Search+Alt+Backspace generates Alt+Backspace. And, Search+Backspace will also generate Delete. Search acts as a modifier for accessing all of the extended keys: Home, End, Delete, Page up, Page down, Insert. This removes the command line flag entirely, making everything work in a way that does not need a flag or a preference option. Tests: unit_tests:EventRewriterTest.TestRewriteExtendedKeys unit_tests:EventRewriterTest.TestRewriteFunctionKeys unit_tests:EventRewriterTest.TestRewriteExtendedKeysWithSearchRemapped BUG=162268 NOTRY=true Review URL: https://codereview.chromium.org/11578044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/shell_delegate_impl.cc4
-rw-r--r--ash/shell/shell_delegate_impl.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 879ccdd..fde2bd1 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -210,10 +210,6 @@ aura::client::StackingClient* ShellDelegateImpl::CreateStackingClient() {
return new StackingController;
}
-bool ShellDelegateImpl::IsSearchKeyActingAsFunctionKey() const {
- return false;
-}
-
RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() {
return RootWindowHostFactory::Create();
}
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 27ad26c..3a987e2 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -68,7 +68,6 @@ class ShellDelegateImpl : public ash::ShellDelegate {
virtual ui::MenuModel* CreateContextMenu(
aura::RootWindow* root_window) OVERRIDE;
virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
- virtual bool IsSearchKeyActingAsFunctionKey() const OVERRIDE;
virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
private: