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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
344 if (keyboard::KeyboardController::GetInstance()) { | 344 if (keyboard::KeyboardController::GetInstance()) { |
345 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 345 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
346 for (RootWindowControllerList::iterator iter = controllers.begin(); | 346 for (RootWindowControllerList::iterator iter = controllers.begin(); |
347 iter != controllers.end(); ++iter) { | 347 iter != controllers.end(); ++iter) { |
348 (*iter)->DeactivateKeyboard(keyboard::KeyboardController::GetInstance()); | 348 (*iter)->DeactivateKeyboard(keyboard::KeyboardController::GetInstance()); |
349 } | 349 } |
350 } | 350 } |
351 keyboard::KeyboardController::ResetInstance(nullptr); | 351 keyboard::KeyboardController::ResetInstance(nullptr); |
352 } | 352 } |
353 | 353 |
354 void Shell::ShowShelf() { | |
355 RootWindowControllerList controllers = GetAllRootWindowControllers(); | |
356 for (RootWindowControllerList::iterator iter = controllers.begin(); | |
357 iter != controllers.end(); ++iter) | |
358 (*iter)->ShowShelf(); | |
359 } | |
360 | |
361 #if defined(OS_CHROMEOS) | 354 #if defined(OS_CHROMEOS) |
362 bool Shell::ShouldSaveDisplaySettings() { | 355 bool Shell::ShouldSaveDisplaySettings() { |
363 return !( | 356 return !( |
364 screen_orientation_controller_->ignore_display_configuration_updates() || | 357 screen_orientation_controller_->ignore_display_configuration_updates() || |
365 resolution_notification_controller_->DoesNotificationTimeout()); | 358 resolution_notification_controller_->DoesNotificationTimeout()); |
366 } | 359 } |
367 #endif | 360 #endif |
368 | 361 |
369 void Shell::UpdateShelfVisibility() { | 362 void Shell::UpdateShelfVisibility() { |
370 for (WmWindow* root : wm_shell_->GetAllRootWindows()) | 363 for (WmWindow* root : wm_shell_->GetAllRootWindows()) |
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
923 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 916 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
924 return std::unique_ptr<ui::EventTargetIterator>(); | 917 return std::unique_ptr<ui::EventTargetIterator>(); |
925 } | 918 } |
926 | 919 |
927 ui::EventTargeter* Shell::GetEventTargeter() { | 920 ui::EventTargeter* Shell::GetEventTargeter() { |
928 NOTREACHED(); | 921 NOTREACHED(); |
929 return nullptr; | 922 return nullptr; |
930 } | 923 } |
931 | 924 |
932 } // namespace ash | 925 } // namespace ash |
OLD | NEW |