| 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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 for (auto& observer : shell_observers_) | 511 for (auto& observer : shell_observers_) |
| 512 observer.OnOverviewModeEnded(); | 512 observer.OnOverviewModeEnded(); |
| 513 } | 513 } |
| 514 | 514 |
| 515 void Shell::NotifyFullscreenStateChanged(bool is_fullscreen, | 515 void Shell::NotifyFullscreenStateChanged(bool is_fullscreen, |
| 516 WmWindow* root_window) { | 516 WmWindow* root_window) { |
| 517 for (auto& observer : shell_observers_) | 517 for (auto& observer : shell_observers_) |
| 518 observer.OnFullscreenStateChanged(is_fullscreen, root_window); | 518 observer.OnFullscreenStateChanged(is_fullscreen, root_window); |
| 519 } | 519 } |
| 520 | 520 |
| 521 void Shell::NotifyPinnedStateChanged(WmWindow* pinned_window) { | 521 void Shell::NotifyPinnedStateChanged(aura::Window* pinned_window) { |
| 522 for (auto& observer : shell_observers_) | 522 for (auto& observer : shell_observers_) |
| 523 observer.OnPinnedStateChanged(pinned_window); | 523 observer.OnPinnedStateChanged(pinned_window); |
| 524 } | 524 } |
| 525 | 525 |
| 526 void Shell::NotifyVirtualKeyboardActivated(bool activated, | 526 void Shell::NotifyVirtualKeyboardActivated(bool activated, |
| 527 aura::Window* root_window) { | 527 aura::Window* root_window) { |
| 528 for (auto& observer : shell_observers_) | 528 for (auto& observer : shell_observers_) |
| 529 observer.OnVirtualKeyboardStateChanged(activated, root_window); | 529 observer.OnVirtualKeyboardStateChanged(activated, root_window); |
| 530 } | 530 } |
| 531 | 531 |
| (...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1269 void Shell::OnPrefServiceInitialized( | 1269 void Shell::OnPrefServiceInitialized( |
| 1270 std::unique_ptr<::PrefService> pref_service) { | 1270 std::unique_ptr<::PrefService> pref_service) { |
| 1271 if (!instance_) | 1271 if (!instance_) |
| 1272 return; | 1272 return; |
| 1273 // |pref_service_| is null if can't connect to Chrome (as happens when | 1273 // |pref_service_| is null if can't connect to Chrome (as happens when |
| 1274 // running mash outside of chrome --mash and chrome isn't built). | 1274 // running mash outside of chrome --mash and chrome isn't built). |
| 1275 pref_service_ = std::move(pref_service); | 1275 pref_service_ = std::move(pref_service); |
| 1276 } | 1276 } |
| 1277 | 1277 |
| 1278 } // namespace ash | 1278 } // namespace ash |
| OLD | NEW |