| 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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 | 412 |
| 413 void Shell::ShutdownShelf() { | 413 void Shell::ShutdownShelf() { |
| 414 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 414 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
| 415 for (RootWindowControllerList::iterator iter = controllers.begin(); | 415 for (RootWindowControllerList::iterator iter = controllers.begin(); |
| 416 iter != controllers.end(); ++iter) { | 416 iter != controllers.end(); ++iter) { |
| 417 if ((*iter)->shelf_widget()) | 417 if ((*iter)->shelf_widget()) |
| 418 (*iter)->shelf_widget()->Shutdown(); | 418 (*iter)->shelf_widget()->Shutdown(); |
| 419 } | 419 } |
| 420 } | 420 } |
| 421 | 421 |
| 422 void Shell::AddPointerWatcher(views::PointerWatcher* watcher) { | 422 void Shell::AddPointerWatcher(views::PointerWatcher* watcher, |
| 423 pointer_watcher_delegate_->AddPointerWatcher(watcher); | 423 bool wants_moves) { |
| 424 pointer_watcher_delegate_->AddPointerWatcher(watcher, wants_moves); |
| 424 } | 425 } |
| 425 | 426 |
| 426 void Shell::RemovePointerWatcher(views::PointerWatcher* watcher) { | 427 void Shell::RemovePointerWatcher(views::PointerWatcher* watcher) { |
| 427 pointer_watcher_delegate_->RemovePointerWatcher(watcher); | 428 pointer_watcher_delegate_->RemovePointerWatcher(watcher); |
| 428 } | 429 } |
| 429 | 430 |
| 430 #if defined(OS_CHROMEOS) | 431 #if defined(OS_CHROMEOS) |
| 431 bool Shell::ShouldSaveDisplaySettings() { | 432 bool Shell::ShouldSaveDisplaySettings() { |
| 432 return !( | 433 return !( |
| 433 screen_orientation_controller_->ignore_display_configuration_updates() || | 434 screen_orientation_controller_->ignore_display_configuration_updates() || |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1053 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 1054 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 1054 return std::unique_ptr<ui::EventTargetIterator>(); | 1055 return std::unique_ptr<ui::EventTargetIterator>(); |
| 1055 } | 1056 } |
| 1056 | 1057 |
| 1057 ui::EventTargeter* Shell::GetEventTargeter() { | 1058 ui::EventTargeter* Shell::GetEventTargeter() { |
| 1058 NOTREACHED(); | 1059 NOTREACHED(); |
| 1059 return nullptr; | 1060 return nullptr; |
| 1060 } | 1061 } |
| 1061 | 1062 |
| 1062 } // namespace ash | 1063 } // namespace ash |
| OLD | NEW |