Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Side by Side Diff: ash/shell.h

Issue 2852403002: Make virtual keyboard work on supervised user creation (Closed)
Patch Set: nit. Restore DCHECK and updated comment. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | ash/test/ash_test_base.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 friend class SmsObserverTest; 614 friend class SmsObserverTest;
615 friend class test::ShellTestApi; 615 friend class test::ShellTestApi;
616 friend class shell::WindowWatcher; 616 friend class shell::WindowWatcher;
617 617
618 Shell(std::unique_ptr<ShellDelegate> shell_delegate, 618 Shell(std::unique_ptr<ShellDelegate> shell_delegate,
619 std::unique_ptr<ShellPort> shell_port); 619 std::unique_ptr<ShellPort> shell_port);
620 ~Shell() override; 620 ~Shell() override;
621 621
622 void Init(const ShellInitParams& init_params); 622 void Init(const ShellInitParams& init_params);
623 623
624 // Initializes virtual keyboard controller. 624 // Initializes virtual keyboard controller if virtual keyboard is enabled.
625 void InitKeyboard(); 625 void InitKeyboard();
626 626
627 // Initializes the root window so that it can host browser windows. 627 // Initializes the root window so that it can host browser windows.
628 void InitRootWindow(aura::Window* root_window); 628 void InitRootWindow(aura::Window* root_window);
629 629
630 void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate); 630 void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
631 void DeleteSystemTrayDelegate(); 631 void DeleteSystemTrayDelegate();
632 632
633 // Destroys all child windows including widgets across all roots. 633 // Destroys all child windows including widgets across all roots.
634 void CloseAllRootWindowChildWindows(); 634 void CloseAllRootWindowChildWindows();
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | ash/test/ash_test_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698