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

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2330403002: Do not activate system tray bubble by default (Closed)
Patch Set: Do not activate system tray bubble by default Created 4 years, 3 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/aura/wm_shell_aura.h ('k') | ash/common/key_event_watcher.h » ('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 #include "ash/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/key_event_watcher_aura.h"
9 #include "ash/aura/pointer_watcher_adapter.h" 10 #include "ash/aura/pointer_watcher_adapter.h"
10 #include "ash/aura/wm_window_aura.h" 11 #include "ash/aura/wm_window_aura.h"
11 #include "ash/common/session/session_state_delegate.h" 12 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/shell_delegate.h" 13 #include "ash/common/shell_delegate.h"
13 #include "ash/common/shell_observer.h" 14 #include "ash/common/shell_observer.h"
14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 15 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
15 #include "ash/common/wm/mru_window_tracker.h" 16 #include "ash/common/wm/mru_window_tracker.h"
16 #include "ash/common/wm/overview/window_selector_controller.h" 17 #include "ash/common/wm/overview/window_selector_controller.h"
17 #include "ash/common/wm_activation_observer.h" 18 #include "ash/common/wm_activation_observer.h"
18 #include "ash/common/wm_display_observer.h" 19 #include "ash/common/wm_display_observer.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone); 223 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone);
223 #endif 224 #endif
224 return nullptr; 225 return nullptr;
225 } 226 }
226 227
227 std::unique_ptr<ImmersiveFullscreenController> 228 std::unique_ptr<ImmersiveFullscreenController>
228 WmShellAura::CreateImmersiveFullscreenController() { 229 WmShellAura::CreateImmersiveFullscreenController() {
229 return base::MakeUnique<ImmersiveFullscreenController>(); 230 return base::MakeUnique<ImmersiveFullscreenController>();
230 } 231 }
231 232
233 std::unique_ptr<KeyEventWatcher> WmShellAura::CreateKeyEventWatcher() {
234 return base::MakeUnique<KeyEventWatcherAura>();
235 }
236
232 void WmShellAura::OnOverviewModeStarting() { 237 void WmShellAura::OnOverviewModeStarting() {
233 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), 238 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
234 OnOverviewModeStarting()); 239 OnOverviewModeStarting());
235 } 240 }
236 241
237 void WmShellAura::OnOverviewModeEnded() { 242 void WmShellAura::OnOverviewModeEnded() {
238 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); 243 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
239 } 244 }
240 245
241 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { 246 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 320 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
316 OnDisplayConfigurationChanging()); 321 OnDisplayConfigurationChanging());
317 } 322 }
318 323
319 void WmShellAura::OnDisplayConfigurationChanged() { 324 void WmShellAura::OnDisplayConfigurationChanged() {
320 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, 325 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
321 OnDisplayConfigurationChanged()); 326 OnDisplayConfigurationChanged());
322 } 327 }
323 328
324 } // namespace ash 329 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/key_event_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698