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.cc

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 | « ash/shell.h ('k') | ash/system/web_notification/web_notification_tray.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 (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 #include "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "ui/aura/layout_manager.h" 76 #include "ui/aura/layout_manager.h"
77 #include "ui/aura/root_window.h" 77 #include "ui/aura/root_window.h"
78 #include "ui/aura/window.h" 78 #include "ui/aura/window.h"
79 #include "ui/base/ui_base_switches.h" 79 #include "ui/base/ui_base_switches.h"
80 #include "ui/compositor/layer.h" 80 #include "ui/compositor/layer.h"
81 #include "ui/compositor/layer_animator.h" 81 #include "ui/compositor/layer_animator.h"
82 #include "ui/gfx/display.h" 82 #include "ui/gfx/display.h"
83 #include "ui/gfx/image/image_skia.h" 83 #include "ui/gfx/image/image_skia.h"
84 #include "ui/gfx/screen.h" 84 #include "ui/gfx/screen.h"
85 #include "ui/gfx/size.h" 85 #include "ui/gfx/size.h"
86 #include "ui/message_center/message_center.h"
86 #include "ui/views/corewm/compound_event_filter.h" 87 #include "ui/views/corewm/compound_event_filter.h"
87 #include "ui/views/corewm/corewm_switches.h" 88 #include "ui/views/corewm/corewm_switches.h"
88 #include "ui/views/corewm/focus_controller.h" 89 #include "ui/views/corewm/focus_controller.h"
89 #include "ui/views/corewm/input_method_event_filter.h" 90 #include "ui/views/corewm/input_method_event_filter.h"
90 #include "ui/views/corewm/shadow_controller.h" 91 #include "ui/views/corewm/shadow_controller.h"
91 #include "ui/views/corewm/visibility_controller.h" 92 #include "ui/views/corewm/visibility_controller.h"
92 #include "ui/views/corewm/window_modality_controller.h" 93 #include "ui/views/corewm/window_modality_controller.h"
93 #include "ui/views/focus/focus_manager_factory.h" 94 #include "ui/views/focus/focus_manager_factory.h"
94 #include "ui/views/widget/native_widget_aura.h" 95 #include "ui/views/widget/native_widget_aura.h"
95 #include "ui/views/widget/widget.h" 96 #include "ui/views/widget/widget.h"
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 root->ShowRootWindow(); 824 root->ShowRootWindow();
824 // Activate new root for testing. 825 // Activate new root for testing.
825 active_root_window_ = root; 826 active_root_window_ = root;
826 } 827 }
827 828
828 void Shell::DoInitialWorkspaceAnimation() { 829 void Shell::DoInitialWorkspaceAnimation() {
829 return GetPrimaryRootWindowController()->workspace_controller()-> 830 return GetPrimaryRootWindowController()->workspace_controller()->
830 DoInitialAnimation(); 831 DoInitialAnimation();
831 } 832 }
832 833
834 message_center::MessageCenter* Shell::message_center() {
835 if (!message_center_.get())
836 message_center_.reset(new message_center::MessageCenter());
837 return message_center_.get();
838 }
839
833 void Shell::InitRootWindowController( 840 void Shell::InitRootWindowController(
834 internal::RootWindowController* controller) { 841 internal::RootWindowController* controller) {
835 aura::RootWindow* root_window = controller->root_window(); 842 aura::RootWindow* root_window = controller->root_window();
836 DCHECK(activation_client_); 843 DCHECK(activation_client_);
837 DCHECK(visibility_controller_.get()); 844 DCHECK(visibility_controller_.get());
838 DCHECK(drag_drop_controller_.get()); 845 DCHECK(drag_drop_controller_.get());
839 DCHECK(capture_controller_.get()); 846 DCHECK(capture_controller_.get());
840 DCHECK(window_cycle_controller_.get()); 847 DCHECK(window_cycle_controller_.get());
841 848
842 aura::client::SetFocusClient(root_window, focus_client_.get()); 849 aura::client::SetFocusClient(root_window, focus_client_.get());
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 //////////////////////////////////////////////////////////////////////////////// 921 ////////////////////////////////////////////////////////////////////////////////
915 // Shell, aura::client::ActivationChangeObserver implementation: 922 // Shell, aura::client::ActivationChangeObserver implementation:
916 923
917 void Shell::OnWindowActivated(aura::Window* gained_active, 924 void Shell::OnWindowActivated(aura::Window* gained_active,
918 aura::Window* lost_active) { 925 aura::Window* lost_active) {
919 if (gained_active) 926 if (gained_active)
920 active_root_window_ = gained_active->GetRootWindow(); 927 active_root_window_ = gained_active->GetRootWindow();
921 } 928 }
922 929
923 } // namespace ash 930 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698