| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 | 407 |
| 408 void Shell::ShutdownShelf() { | 408 void Shell::ShutdownShelf() { |
| 409 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 409 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
| 410 for (RootWindowControllerList::iterator iter = controllers.begin(); | 410 for (RootWindowControllerList::iterator iter = controllers.begin(); |
| 411 iter != controllers.end(); ++iter) { | 411 iter != controllers.end(); ++iter) { |
| 412 if ((*iter)->shelf_widget()) | 412 if ((*iter)->shelf_widget()) |
| 413 (*iter)->shelf_widget()->Shutdown(); | 413 (*iter)->shelf_widget()->Shutdown(); |
| 414 } | 414 } |
| 415 } | 415 } |
| 416 | 416 |
| 417 void Shell::AddPointerWatcher(views::PointerWatcher* watcher) { | 417 void Shell::AddPointerWatcher(views::PointerWatcher* watcher, |
| 418 pointer_watcher_delegate_->AddPointerWatcher(watcher); | 418 bool wants_moves) { |
| 419 pointer_watcher_delegate_->AddPointerWatcher(watcher, wants_moves); |
| 419 } | 420 } |
| 420 | 421 |
| 421 void Shell::RemovePointerWatcher(views::PointerWatcher* watcher) { | 422 void Shell::RemovePointerWatcher(views::PointerWatcher* watcher) { |
| 422 pointer_watcher_delegate_->RemovePointerWatcher(watcher); | 423 pointer_watcher_delegate_->RemovePointerWatcher(watcher); |
| 423 } | 424 } |
| 424 | 425 |
| 425 #if defined(OS_CHROMEOS) | 426 #if defined(OS_CHROMEOS) |
| 426 bool Shell::ShouldSaveDisplaySettings() { | 427 bool Shell::ShouldSaveDisplaySettings() { |
| 427 return !( | 428 return !( |
| 428 screen_orientation_controller_->ignore_display_configuration_updates() || | 429 screen_orientation_controller_->ignore_display_configuration_updates() || |
| (...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1038 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 1039 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 1039 return std::unique_ptr<ui::EventTargetIterator>(); | 1040 return std::unique_ptr<ui::EventTargetIterator>(); |
| 1040 } | 1041 } |
| 1041 | 1042 |
| 1042 ui::EventTargeter* Shell::GetEventTargeter() { | 1043 ui::EventTargeter* Shell::GetEventTargeter() { |
| 1043 NOTREACHED(); | 1044 NOTREACHED(); |
| 1044 return nullptr; | 1045 return nullptr; |
| 1045 } | 1046 } |
| 1046 | 1047 |
| 1047 } // namespace ash | 1048 } // namespace ash |
| OLD | NEW |