| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 95b6f9d1fc074465b9c90c76805d54667cd16d1d..a48d23202487a4265056ad2c6719fc6d1726b9b0 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());
|
| @@ -370,8 +368,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()));
|
| @@ -802,20 +798,6 @@ 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);
|
| -}
|
| -
|
| bool Shell::CanWindowReceiveEvents(aura::Window* window) {
|
| RootWindowControllerList controllers = GetAllRootWindowControllers();
|
| for (RootWindowControllerList::iterator iter = controllers.begin();
|
|
|