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

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 build 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') | 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 class Widget; 56 class Widget;
57 namespace corewm { 57 namespace corewm {
58 class CompoundEventFilter; 58 class CompoundEventFilter;
59 class InputMethodEventFilter; 59 class InputMethodEventFilter;
60 class ShadowController; 60 class ShadowController;
61 class VisibilityController; 61 class VisibilityController;
62 class WindowModalityController; 62 class WindowModalityController;
63 } 63 }
64 } 64 }
65 65
66 namespace message_center {
67 class MessageCenter;
68 }
69
66 namespace ash { 70 namespace ash {
67 71
68 class AcceleratorController; 72 class AcceleratorController;
69 class CapsLockDelegate; 73 class CapsLockDelegate;
70 class DesktopBackgroundController; 74 class DesktopBackgroundController;
71 class DisplayController; 75 class DisplayController;
72 class HighContrastController; 76 class HighContrastController;
73 class Launcher; 77 class Launcher;
74 class LauncherDelegate; 78 class LauncherDelegate;
75 class LauncherModel; 79 class LauncherModel;
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 428
425 #if defined(OS_CHROMEOS) 429 #if defined(OS_CHROMEOS)
426 chromeos::OutputConfigurator* output_configurator() { 430 chromeos::OutputConfigurator* output_configurator() {
427 return output_configurator_.get(); 431 return output_configurator_.get();
428 } 432 }
429 internal::OutputConfiguratorAnimation* output_configurator_animation() { 433 internal::OutputConfiguratorAnimation* output_configurator_animation() {
430 return output_configurator_animation_.get(); 434 return output_configurator_animation_.get();
431 } 435 }
432 #endif // defined(OS_CHROMEOS) 436 #endif // defined(OS_CHROMEOS)
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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 #if defined(OS_CHROMEOS) 576 #if defined(OS_CHROMEOS)
570 // Controls video output device state. 577 // Controls video output device state.
571 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 578 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
572 scoped_ptr<internal::OutputConfiguratorAnimation> 579 scoped_ptr<internal::OutputConfiguratorAnimation>
573 output_configurator_animation_; 580 output_configurator_animation_;
574 581
575 // Receives output change events and udpates the display manager. 582 // Receives output change events and udpates the display manager.
576 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; 583 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
577 #endif // defined(OS_CHROMEOS) 584 #endif // defined(OS_CHROMEOS)
578 585
586 scoped_ptr<message_center::MessageCenter> message_center_;
587
579 CursorManager cursor_manager_; 588 CursorManager cursor_manager_;
580 589
581 ObserverList<ShellObserver> observers_; 590 ObserverList<ShellObserver> observers_;
582 591
583 // Used by ash/shell. 592 // Used by ash/shell.
584 content::BrowserContext* browser_context_; 593 content::BrowserContext* browser_context_;
585 594
586 // For testing only: simulate that a modal window is open 595 // For testing only: simulate that a modal window is open
587 bool simulate_modal_window_open_for_testing_; 596 bool simulate_modal_window_open_for_testing_;
588 597
589 DISALLOW_COPY_AND_ASSIGN(Shell); 598 DISALLOW_COPY_AND_ASSIGN(Shell);
590 }; 599 };
591 600
592 } // namespace ash 601 } // namespace ash
593 602
594 #endif // ASH_SHELL_H_ 603 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698