| 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 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 std::unique_ptr<GPUSupport> gpu_support_; | 803 std::unique_ptr<GPUSupport> gpu_support_; |
| 804 | 804 |
| 805 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; | 805 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; |
| 806 | 806 |
| 807 std::unique_ptr<AppListDelegateImpl> app_list_delegate_impl_; | 807 std::unique_ptr<AppListDelegateImpl> app_list_delegate_impl_; |
| 808 | 808 |
| 809 base::ObserverList<ShellObserver> shell_observers_; | 809 base::ObserverList<ShellObserver> shell_observers_; |
| 810 | 810 |
| 811 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 811 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 812 | 812 |
| 813 session_manager::SessionState previous_state_; |
| 814 |
| 813 DISALLOW_COPY_AND_ASSIGN(Shell); | 815 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 814 }; | 816 }; |
| 815 | 817 |
| 816 } // namespace ash | 818 } // namespace ash |
| 817 | 819 |
| 818 #endif // ASH_SHELL_H_ | 820 #endif // ASH_SHELL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2852403002:
Make virtual keyboard work on supervised user creation (Closed)
