| 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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| 532 void Shell::NotifyShelfCreatedForRootWindow(WmWindow* root_window) { | 532 void Shell::NotifyShelfCreatedForRootWindow(aura::Window* root_window) { |
| 533 for (auto& observer : shell_observers_) | 533 for (auto& observer : shell_observers_) |
| 534 observer.OnShelfCreatedForRootWindow(root_window); | 534 observer.OnShelfCreatedForRootWindow(root_window); |
| 535 } | 535 } |
| 536 | 536 |
| 537 void Shell::NotifyShelfAlignmentChanged(WmWindow* root_window) { | 537 void Shell::NotifyShelfAlignmentChanged(aura::Window* root_window) { |
| 538 for (auto& observer : shell_observers_) | 538 for (auto& observer : shell_observers_) |
| 539 observer.OnShelfAlignmentChanged(root_window); | 539 observer.OnShelfAlignmentChanged(root_window); |
| 540 } | 540 } |
| 541 | 541 |
| 542 void Shell::NotifyShelfAutoHideBehaviorChanged(WmWindow* root_window) { | 542 void Shell::NotifyShelfAutoHideBehaviorChanged(aura::Window* root_window) { |
| 543 for (auto& observer : shell_observers_) | 543 for (auto& observer : shell_observers_) |
| 544 observer.OnShelfAutoHideBehaviorChanged(root_window); | 544 observer.OnShelfAutoHideBehaviorChanged(root_window); |
| 545 } | 545 } |
| 546 | 546 |
| 547 // static | 547 // static |
| 548 void Shell::SetIsBrowserProcessWithMash() { | 548 void Shell::SetIsBrowserProcessWithMash() { |
| 549 g_is_browser_process_with_mash = true; | 549 g_is_browser_process_with_mash = true; |
| 550 } | 550 } |
| 551 | 551 |
| 552 //////////////////////////////////////////////////////////////////////////////// | 552 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1268 void Shell::OnPrefServiceInitialized( | 1268 void Shell::OnPrefServiceInitialized( |
| 1269 std::unique_ptr<::PrefService> pref_service) { | 1269 std::unique_ptr<::PrefService> pref_service) { |
| 1270 if (!instance_) | 1270 if (!instance_) |
| 1271 return; | 1271 return; |
| 1272 // |pref_service_| is null if can't connect to Chrome (as happens when | 1272 // |pref_service_| is null if can't connect to Chrome (as happens when |
| 1273 // running mash outside of chrome --mash and chrome isn't built). | 1273 // running mash outside of chrome --mash and chrome isn't built). |
| 1274 pref_service_ = std::move(pref_service); | 1274 pref_service_ = std::move(pref_service); |
| 1275 } | 1275 } |
| 1276 | 1276 |
| 1277 } // namespace ash | 1277 } // namespace ash |
| OLD | NEW |