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

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

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 years, 5 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
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 #include "ash/common/wm_shell.h" 5 #include "ash/common/wm_shell.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accessibility_delegate.h" 9 #include "ash/common/accessibility_delegate.h"
10 #include "ash/common/focus_cycler.h" 10 #include "ash/common/focus_cycler.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 76
77 void WmShell::AddShellObserver(ShellObserver* observer) { 77 void WmShell::AddShellObserver(ShellObserver* observer) {
78 shell_observers_.AddObserver(observer); 78 shell_observers_.AddObserver(observer);
79 } 79 }
80 80
81 void WmShell::RemoveShellObserver(ShellObserver* observer) { 81 void WmShell::RemoveShellObserver(ShellObserver* observer) {
82 shell_observers_.RemoveObserver(observer); 82 shell_observers_.RemoveObserver(observer);
83 } 83 }
84 84
85 void WmShell::OnLockStateEvent(LockStateObserver::EventType event) {
86 FOR_EACH_OBSERVER(LockStateObserver, lock_state_observers_,
87 OnLockStateEvent(event));
88 }
89
90 void WmShell::AddLockStateObserver(LockStateObserver* observer) {
91 lock_state_observers_.AddObserver(observer);
92 }
93
94 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) {
95 lock_state_observers_.RemoveObserver(observer);
96 }
97
85 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) 98 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
86 : delegate_(std::move(shell_delegate)), 99 : delegate_(std::move(shell_delegate)),
87 focus_cycler_(new FocusCycler), 100 focus_cycler_(new FocusCycler),
88 system_tray_notifier_(new SystemTrayNotifier), 101 system_tray_notifier_(new SystemTrayNotifier),
89 window_selector_controller_(new WindowSelectorController) { 102 window_selector_controller_(new WindowSelectorController) {
90 #if defined(OS_CHROMEOS) 103 #if defined(OS_CHROMEOS)
91 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos); 104 brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);
92 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController); 105 keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController);
93 #endif 106 #endif
94 window_cycle_controller_.reset(new WindowCycleController()); 107 window_cycle_controller_.reset(new WindowCycleController());
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 173
161 void WmShell::CreateMruWindowTracker() { 174 void WmShell::CreateMruWindowTracker() {
162 mru_window_tracker_.reset(new MruWindowTracker); 175 mru_window_tracker_.reset(new MruWindowTracker);
163 } 176 }
164 177
165 void WmShell::DeleteMruWindowTracker() { 178 void WmShell::DeleteMruWindowTracker() {
166 mru_window_tracker_.reset(); 179 mru_window_tracker_.reset();
167 } 180 }
168 181
169 } // namespace ash 182 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698