summaryrefslogtreecommitdiffstats
path: root/ash/test/test_shell_delegate.h
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/test/test_shell_delegate.h
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/test/test_shell_delegate.h')
-rw-r--r--ash/test/test_shell_delegate.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 4c1f9e2..f7bb171 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -66,13 +66,9 @@ class TestShellDelegate : public ShellDelegate {
virtual double GetSavedScreenMagnifierScale() OVERRIDE;
virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
- virtual bool IsSearchKeyActingAsFunctionKey() const OVERRIDE;
virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
int num_exit_requests() const { return num_exit_requests_; }
- void set_is_search_key_acting_as_function_key(bool b) {
- is_search_key_acting_as_function_key_ = b;
- }
private:
friend class ash::test::AshTestBase;
@@ -101,7 +97,6 @@ class TestShellDelegate : public ShellDelegate {
MagnifierType screen_magnifier_type_;
bool user_logged_in_;
bool can_lock_screen_;
- bool is_search_key_acting_as_function_key_;
int num_exit_requests_;
scoped_ptr<content::BrowserContext> current_browser_context_;