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

Side by Side Diff: ash/shell.h

Issue 11958025: Start delegating notifications to MessageCenter on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another compile fix Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | chrome/browser/browser_process_impl.h » ('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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 class Widget; 57 class Widget;
58 namespace corewm { 58 namespace corewm {
59 class CompoundEventFilter; 59 class CompoundEventFilter;
60 class InputMethodEventFilter; 60 class InputMethodEventFilter;
61 class ShadowController; 61 class ShadowController;
62 class VisibilityController; 62 class VisibilityController;
63 class WindowModalityController; 63 class WindowModalityController;
64 } 64 }
65 } 65 }
66 66
67 namespace message_center {
68 class MessageCenter;
69 }
70
67 namespace ash { 71 namespace ash {
68 72
69 class AcceleratorController; 73 class AcceleratorController;
70 class CapsLockDelegate; 74 class CapsLockDelegate;
71 class DesktopBackgroundController; 75 class DesktopBackgroundController;
72 class DisplayController; 76 class DisplayController;
73 class HighContrastController; 77 class HighContrastController;
74 class Launcher; 78 class Launcher;
75 class LauncherDelegate; 79 class LauncherDelegate;
76 class LauncherModel; 80 class LauncherModel;
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 426
423 #if defined(OS_CHROMEOS) 427 #if defined(OS_CHROMEOS)
424 chromeos::OutputConfigurator* output_configurator() { 428 chromeos::OutputConfigurator* output_configurator() {
425 return output_configurator_.get(); 429 return output_configurator_.get();
426 } 430 }
427 internal::OutputConfiguratorAnimation* output_configurator_animation() { 431 internal::OutputConfiguratorAnimation* output_configurator_animation() {
428 return output_configurator_animation_.get(); 432 return output_configurator_animation_.get();
429 } 433 }
430 #endif // defined(OS_CHROMEOS) 434 #endif // defined(OS_CHROMEOS)
431 435
432 aura::client::StackingClient* stacking_client(); 436 aura::client::StackingClient* stacking_client();
433 437
434 RootWindowHostFactory* root_window_host_factory() { 438 RootWindowHostFactory* root_window_host_factory() {
435 return root_window_host_factory_.get(); 439 return root_window_host_factory_.get();
436 } 440 }
441
442 // MessageCenter is a global list of currently displayed notifications.
443 message_center::MessageCenter* message_center();
437 444
438 private: 445 private:
439 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 446 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
440 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 447 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
441 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 448 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
442 friend class internal::RootWindowController; 449 friend class internal::RootWindowController;
443 friend class test::ShellTestApi; 450 friend class test::ShellTestApi;
444 friend class shell::WindowWatcher; 451 friend class shell::WindowWatcher;
445 452
446 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 453 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 #if defined(OS_CHROMEOS) 577 #if defined(OS_CHROMEOS)
571 // Controls video output device state. 578 // Controls video output device state.
572 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 579 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
573 scoped_ptr<internal::OutputConfiguratorAnimation> 580 scoped_ptr<internal::OutputConfiguratorAnimation>
574 output_configurator_animation_; 581 output_configurator_animation_;
575 582
576 // Receives output change events and udpates the display manager. 583 // Receives output change events and udpates the display manager.
577 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; 584 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
578 #endif // defined(OS_CHROMEOS) 585 #endif // defined(OS_CHROMEOS)
579 586
587 scoped_ptr<message_center::MessageCenter> message_center_;
588
580 CursorManager cursor_manager_; 589 CursorManager cursor_manager_;
581 590
582 ObserverList<ShellObserver> observers_; 591 ObserverList<ShellObserver> observers_;
583 592
584 // Used by ash/shell. 593 // Used by ash/shell.
585 content::BrowserContext* browser_context_; 594 content::BrowserContext* browser_context_;
586 595
587 // For testing only: simulate that a modal window is open 596 // For testing only: simulate that a modal window is open
588 bool simulate_modal_window_open_for_testing_; 597 bool simulate_modal_window_open_for_testing_;
589 598
590 DISALLOW_COPY_AND_ASSIGN(Shell); 599 DISALLOW_COPY_AND_ASSIGN(Shell);
591 }; 600 };
592 601
593 } // namespace ash 602 } // namespace ash
594 603
595 #endif // ASH_SHELL_H_ 604 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | chrome/browser/browser_process_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698