Chromium Code Reviews| 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 #ifndef ASH_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
| 6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 515 | 515 |
| 516 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. | 516 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. |
| 517 void set_root_window_for_new_windows(WmWindow* root) { | 517 void set_root_window_for_new_windows(WmWindow* root) { |
| 518 root_window_for_new_windows_ = root; | 518 root_window_for_new_windows_ = root; |
| 519 } | 519 } |
| 520 | 520 |
| 521 // Creates instance of FirstRunHelper. Caller is responsible for deleting | 521 // Creates instance of FirstRunHelper. Caller is responsible for deleting |
| 522 // returned object. | 522 // returned object. |
| 523 ash::FirstRunHelper* CreateFirstRunHelper(); | 523 ash::FirstRunHelper* CreateFirstRunHelper(); |
| 524 | 524 |
| 525 // Creates the ShelfView for each display and populates it with items. | |
| 526 // Called after the user session is active and profile is available. | |
| 527 void CreateShelfView(); | |
| 528 | |
| 529 void SetLargeCursorSizeInDip(int large_cursor_size_in_dip); | 525 void SetLargeCursorSizeInDip(int large_cursor_size_in_dip); |
| 530 | 526 |
| 531 // Toggles cursor compositing on/off. Native cursor is disabled when cursor | 527 // Toggles cursor compositing on/off. Native cursor is disabled when cursor |
| 532 // compositing is enabled, and vice versa. | 528 // compositing is enabled, and vice versa. |
| 533 void SetCursorCompositingEnabled(bool enabled); | 529 void SetCursorCompositingEnabled(bool enabled); |
| 534 | 530 |
| 535 StickyKeysController* sticky_keys_controller() { | 531 StickyKeysController* sticky_keys_controller() { |
| 536 return sticky_keys_controller_.get(); | 532 return sticky_keys_controller_.get(); |
| 537 } | 533 } |
| 538 | 534 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 647 // aura::client::ActivationChangeObserver: | 643 // aura::client::ActivationChangeObserver: |
| 648 void OnWindowActivated(ActivationReason reason, | 644 void OnWindowActivated(ActivationReason reason, |
| 649 aura::Window* gained_active, | 645 aura::Window* gained_active, |
| 650 aura::Window* lost_active) override; | 646 aura::Window* lost_active) override; |
| 651 | 647 |
| 652 // SessionObserver: | 648 // SessionObserver: |
| 653 void OnSessionStateChanged(session_manager::SessionState state) override; | 649 void OnSessionStateChanged(session_manager::SessionState state) override; |
| 654 void OnLoginStatusChanged(LoginStatus login_status) override; | 650 void OnLoginStatusChanged(LoginStatus login_status) override; |
| 655 void OnLockStateChanged(bool locked) override; | 651 void OnLockStateChanged(bool locked) override; |
| 656 | 652 |
| 653 // Finalizes the shelf state. Called after the user session is active and | |
| 654 // profile is available. | |
|
msw
2017/05/16 22:42:00
nit: 'the profile'
James Cook
2017/05/17 16:16:13
Done.
| |
| 655 void InitializeShelf(); | |
|
James Cook
2017/05/16 21:32:35
Private visibility is best visibility!
msw
2017/05/16 22:42:00
Acknowledged.
| |
| 656 | |
| 657 // Callback for prefs::ConnectToPrefService. | 657 // Callback for prefs::ConnectToPrefService. |
| 658 void OnPrefServiceInitialized(std::unique_ptr<::PrefService> pref_service); | 658 void OnPrefServiceInitialized(std::unique_ptr<::PrefService> pref_service); |
| 659 | 659 |
| 660 static Shell* instance_; | 660 static Shell* instance_; |
| 661 | 661 |
| 662 // Only valid in mash, for classic ash this is null. | 662 // Only valid in mash, for classic ash this is null. |
| 663 static aura::WindowTreeClient* window_tree_client_; | 663 static aura::WindowTreeClient* window_tree_client_; |
| 664 static aura::WindowManagerClient* window_manager_client_; | 664 static aura::WindowManagerClient* window_manager_client_; |
| 665 | 665 |
| 666 // If set before the Shell is initialized, the mouse cursor will be hidden | 666 // If set before the Shell is initialized, the mouse cursor will be hidden |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 826 base::ObserverList<ShellObserver> shell_observers_; | 826 base::ObserverList<ShellObserver> shell_observers_; |
| 827 | 827 |
| 828 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 828 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 829 | 829 |
| 830 DISALLOW_COPY_AND_ASSIGN(Shell); | 830 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 831 }; | 831 }; |
| 832 | 832 |
| 833 } // namespace ash | 833 } // namespace ash |
| 834 | 834 |
| 835 #endif // ASH_SHELL_H_ | 835 #endif // ASH_SHELL_H_ |
| OLD | NEW |