| 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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 for (auto& observer : shell_observers_) | 516 for (auto& observer : shell_observers_) |
| 517 observer.OnFullscreenStateChanged(is_fullscreen, root_window); | 517 observer.OnFullscreenStateChanged(is_fullscreen, root_window); |
| 518 } | 518 } |
| 519 | 519 |
| 520 void Shell::NotifyPinnedStateChanged(WmWindow* pinned_window) { | 520 void Shell::NotifyPinnedStateChanged(WmWindow* pinned_window) { |
| 521 for (auto& observer : shell_observers_) | 521 for (auto& observer : shell_observers_) |
| 522 observer.OnPinnedStateChanged(pinned_window); | 522 observer.OnPinnedStateChanged(pinned_window); |
| 523 } | 523 } |
| 524 | 524 |
| 525 void Shell::NotifyVirtualKeyboardActivated(bool activated, | 525 void Shell::NotifyVirtualKeyboardActivated(bool activated, |
| 526 WmWindow* root_window) { | 526 aura::Window* root_window) { |
| 527 for (auto& observer : shell_observers_) | 527 for (auto& observer : shell_observers_) |
| 528 observer.OnVirtualKeyboardStateChanged(activated, root_window); | 528 observer.OnVirtualKeyboardStateChanged(activated, root_window); |
| 529 } | 529 } |
| 530 | 530 |
| 531 void Shell::NotifyShelfCreatedForRootWindow(WmWindow* root_window) { | 531 void Shell::NotifyShelfCreatedForRootWindow(WmWindow* root_window) { |
| 532 for (auto& observer : shell_observers_) | 532 for (auto& observer : shell_observers_) |
| 533 observer.OnShelfCreatedForRootWindow(root_window); | 533 observer.OnShelfCreatedForRootWindow(root_window); |
| 534 } | 534 } |
| 535 | 535 |
| 536 void Shell::NotifyShelfAlignmentChanged(WmWindow* root_window) { | 536 void Shell::NotifyShelfAlignmentChanged(WmWindow* root_window) { |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1253 void Shell::OnPrefServiceInitialized( | 1253 void Shell::OnPrefServiceInitialized( |
| 1254 std::unique_ptr<::PrefService> pref_service) { | 1254 std::unique_ptr<::PrefService> pref_service) { |
| 1255 if (!instance_) | 1255 if (!instance_) |
| 1256 return; | 1256 return; |
| 1257 // |pref_service_| is null if can't connect to Chrome (as happens when | 1257 // |pref_service_| is null if can't connect to Chrome (as happens when |
| 1258 // running mash outside of chrome --mash and chrome isn't built). | 1258 // running mash outside of chrome --mash and chrome isn't built). |
| 1259 pref_service_ = std::move(pref_service); | 1259 pref_service_ = std::move(pref_service); |
| 1260 } | 1260 } |
| 1261 | 1261 |
| 1262 } // namespace ash | 1262 } // namespace ash |
| OLD | NEW |