Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: ash/shell.cc

Issue 11035050: Enable CursorManager::LockCursor to lock cursor visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 560e5e82b4b7ffb78343d97704546b270394bbd4..7f7a45c3efc330d4e77bfdfecbdbf9f250172545 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -211,8 +211,6 @@ Shell::~Shell() {
if (active_root_window_)
active_root_window_->GetFocusManager()->SetFocusedWindow(NULL, NULL);
- cursor_manager_.set_delegate(NULL);
-
// Please keep in same order as in Init() because it's easy to miss one.
RemoveEnvEventFilter(user_activity_detector_.get());
RemoveEnvEventFilter(event_rewriter_filter_.get());
@@ -363,8 +361,6 @@ void Shell::Init() {
env_filter_.reset(new aura::shared::CompoundEventFilter);
AddEnvEventFilter(env_filter_.get());
- cursor_manager_.set_delegate(this);
-
focus_manager_.reset(new aura::FocusManager);
activation_controller_.reset(
new internal::ActivationController(focus_manager_.get()));
@@ -762,18 +758,4 @@ void Shell::InitLayoutManagersForPrimaryDisplay(
panel_container->SetLayoutManager(panel_layout_manager_);
}
-void Shell::SetCursor(gfx::NativeCursor cursor) {
- RootWindowList root_windows = GetAllRootWindows();
- for (RootWindowList::iterator iter = root_windows.begin();
- iter != root_windows.end(); ++iter)
- (*iter)->SetCursor(cursor);
-}
-
-void Shell::ShowCursor(bool visible) {
- RootWindowList root_windows = GetAllRootWindows();
- for (RootWindowList::iterator iter = root_windows.begin();
- iter != root_windows.end(); ++iter)
- (*iter)->ShowCursor(visible);
-}
-
} // namespace ash
« no previous file with comments | « ash/shell.h ('k') | ash/wm/cursor_delegate.h » ('j') | ash/wm/cursor_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698