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

Side by Side Diff: ash/common/wm_shell.h

Issue 2408273002: mash: Port TrayUpdateTest to AshTest (Closed)
Patch Set: WmShellTestApi Created 4 years, 2 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 | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 450
451 void DeleteToastManager(); 451 void DeleteToastManager();
452 452
453 void SetAcceleratorController( 453 void SetAcceleratorController(
454 std::unique_ptr<AcceleratorController> accelerator_controller); 454 std::unique_ptr<AcceleratorController> accelerator_controller);
455 455
456 private: 456 private:
457 friend class AcceleratorControllerTest; 457 friend class AcceleratorControllerTest;
458 friend class ScopedRootWindowForNewWindows; 458 friend class ScopedRootWindowForNewWindows;
459 friend class Shell; 459 friend class Shell;
460 friend class WmShellTestApi;
460 461
461 static WmShell* instance_; 462 static WmShell* instance_;
462 463
463 base::ObserverList<ShellObserver> shell_observers_; 464 base::ObserverList<ShellObserver> shell_observers_;
464 std::unique_ptr<ShellDelegate> delegate_; 465 std::unique_ptr<ShellDelegate> delegate_;
465 466
466 std::unique_ptr<AcceleratorController> accelerator_controller_; 467 std::unique_ptr<AcceleratorController> accelerator_controller_;
467 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 468 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
468 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 469 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
469 std::unique_ptr<FocusCycler> focus_cycler_; 470 std::unique_ptr<FocusCycler> focus_cycler_;
(...skipping 29 matching lines...) Expand all
499 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 500 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
500 501
501 #if defined(OS_CHROMEOS) 502 #if defined(OS_CHROMEOS)
502 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 503 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
503 #endif 504 #endif
504 }; 505 };
505 506
506 } // namespace ash 507 } // namespace ash
507 508
508 #endif // ASH_COMMON_WM_SHELL_H_ 509 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698