summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authortdanderson@chromium.org <tdanderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 02:40:36 +0000
committertdanderson@chromium.org <tdanderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-14 02:40:36 +0000
commit6b010c2e6f192583f075fec215b83dbfbf6dac6b (patch)
tree45d29c904f36de32ad09875ac63d394c6d717810 /ash/shell.cc
parent1c140f494de2fc410c053c0794cb5aa1cd86c5f6 (diff)
downloadchromium_src-6b010c2e6f192583f075fec215b83dbfbf6dac6b.zip
chromium_src-6b010c2e6f192583f075fec215b83dbfbf6dac6b.tar.gz
chromium_src-6b010c2e6f192583f075fec215b83dbfbf6dac6b.tar.bz2
Remove restrictions for cursor visibility from CompoundEventFilter
Remove the variable |cursor_hidden_by_filter_| from CompoundEventFilter and instead always show the cursor on a (non-synthetic) mousemove and always hide the cursor on touch in the function CompoundEventFilter::SetCursorVisibilityOnEvent(). There shouldn't be a reason for this function to track whether or not it was responsible for showing/hiding the cursor in the first place. If the user moves the cursor, they expect it to become visible, and if they touch the screen then they expect the cursor to hide regardless of where the cursor state had previously been mutated. Of course, the exception to the above would be if the cursor has a lock set. CursorManager::ShowCursor()/HideCursor() already checks if there is a lock on the cursor and, if so, will not change the cursor visibility state. Setting a cursor lock should be the only mechanism for freezing the cursor state. I suspect that landing this patch will resolve the problems related to invisible cursors (issue 267789 and its duplicates). BUG=267789 Review URL: https://codereview.chromium.org/58973005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index e25182f..4eff38c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -892,12 +892,6 @@ void Shell::Init() {
cursor_manager_.HideCursor();
cursor_manager_.SetCursor(ui::kCursorPointer);
- if (!cursor_manager_.IsCursorVisible()) {
- // Cursor might have been hidden by something other than chrome.
- // Let the first mouse event show the cursor.
- env_filter_->set_cursor_hidden_by_filter(true);
- }
-
#if defined(OS_CHROMEOS)
// Set accelerator controller delegates.
accelerator_controller_->SetBrightnessControlDelegate(