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

Side by Side Diff: ash/shell.h

Issue 11312139: Add SystemTrayObservers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment. Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/ash.gyp ('k') | ash/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 (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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 class HighContrastController; 67 class HighContrastController;
68 class Launcher; 68 class Launcher;
69 class NestedDispatcherController; 69 class NestedDispatcherController;
70 class PowerButtonController; 70 class PowerButtonController;
71 class ScreenAsh; 71 class ScreenAsh;
72 class SessionStateController; 72 class SessionStateController;
73 class ShellDelegate; 73 class ShellDelegate;
74 class ShellObserver; 74 class ShellObserver;
75 class SystemTray; 75 class SystemTray;
76 class SystemTrayDelegate; 76 class SystemTrayDelegate;
77 class SystemTrayNotifier;
77 class UserActivityDetector; 78 class UserActivityDetector;
78 class UserWallpaperDelegate; 79 class UserWallpaperDelegate;
79 class VideoDetector; 80 class VideoDetector;
80 class WebNotificationTray; 81 class WebNotificationTray;
81 class WindowCycleController; 82 class WindowCycleController;
82 83
83 namespace internal { 84 namespace internal {
84 class AcceleratorFilter; 85 class AcceleratorFilter;
85 class ActivationController; 86 class ActivationController;
86 class AppListController; 87 class AppListController;
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // status_area_widget() has been destroyed; check status_area_widget() 366 // status_area_widget() has been destroyed; check status_area_widget()
366 // before calling these in destructors. 367 // before calling these in destructors.
367 internal::StatusAreaWidget* status_area_widget(); 368 internal::StatusAreaWidget* status_area_widget();
368 SystemTray* system_tray(); 369 SystemTray* system_tray();
369 370
370 // TODO(stevenjb): Rename to system_tray_delegate(). 371 // TODO(stevenjb): Rename to system_tray_delegate().
371 SystemTrayDelegate* tray_delegate() { 372 SystemTrayDelegate* tray_delegate() {
372 return system_tray_delegate_.get(); 373 return system_tray_delegate_.get();
373 } 374 }
374 375
376 SystemTrayNotifier* system_tray_notifier() {
377 return system_tray_notifier_.get();
378 }
379
375 static void set_initially_hide_cursor(bool hide) { 380 static void set_initially_hide_cursor(bool hide) {
376 initially_hide_cursor_ = hide; 381 initially_hide_cursor_ = hide;
377 } 382 }
378 383
379 internal::ResizeShadowController* resize_shadow_controller() { 384 internal::ResizeShadowController* resize_shadow_controller() {
380 return resize_shadow_controller_.get(); 385 return resize_shadow_controller_.get();
381 } 386 }
382 387
383 // Made available for tests. 388 // Made available for tests.
384 internal::ShadowController* shadow_controller() { 389 internal::ShadowController* shadow_controller() {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 std::vector<WindowAndBoundsPair> to_restore_; 456 std::vector<WindowAndBoundsPair> to_restore_;
452 457
453 #if !defined(OS_MACOSX) 458 #if !defined(OS_MACOSX)
454 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 459 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
455 460
456 scoped_ptr<AcceleratorController> accelerator_controller_; 461 scoped_ptr<AcceleratorController> accelerator_controller_;
457 #endif // !defined(OS_MACOSX) 462 #endif // !defined(OS_MACOSX)
458 463
459 scoped_ptr<ShellDelegate> delegate_; 464 scoped_ptr<ShellDelegate> delegate_;
460 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 465 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
466 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
461 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 467 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
462 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 468 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
463 469
464 scoped_ptr<internal::AppListController> app_list_controller_; 470 scoped_ptr<internal::AppListController> app_list_controller_;
465 471
466 scoped_ptr<internal::StackingController> stacking_controller_; 472 scoped_ptr<internal::StackingController> stacking_controller_;
467 scoped_ptr<internal::ActivationController> activation_controller_; 473 scoped_ptr<internal::ActivationController> activation_controller_;
468 scoped_ptr<internal::CaptureController> capture_controller_; 474 scoped_ptr<internal::CaptureController> capture_controller_;
469 scoped_ptr<internal::WindowModalityController> window_modality_controller_; 475 scoped_ptr<internal::WindowModalityController> window_modality_controller_;
470 scoped_ptr<internal::DragDropController> drag_drop_controller_; 476 scoped_ptr<internal::DragDropController> drag_drop_controller_;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 533
528 // For testing only: simulate that a modal window is open 534 // For testing only: simulate that a modal window is open
529 bool simulate_modal_window_open_for_testing_; 535 bool simulate_modal_window_open_for_testing_;
530 536
531 DISALLOW_COPY_AND_ASSIGN(Shell); 537 DISALLOW_COPY_AND_ASSIGN(Shell);
532 }; 538 };
533 539
534 } // namespace ash 540 } // namespace ash
535 541
536 #endif // ASH_SHELL_H_ 542 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698