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

Side by Side Diff: ash/shell.cc

Issue 181563004: Remove --ash-disable-overview-mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore chromeactions.txt Created 6 years, 9 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
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/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "ash/wm/resize_shadow_controller.h" 67 #include "ash/wm/resize_shadow_controller.h"
68 #include "ash/wm/root_window_layout_manager.h" 68 #include "ash/wm/root_window_layout_manager.h"
69 #include "ash/wm/screen_dimmer.h" 69 #include "ash/wm/screen_dimmer.h"
70 #include "ash/wm/system_gesture_event_filter.h" 70 #include "ash/wm/system_gesture_event_filter.h"
71 #include "ash/wm/system_modal_container_event_filter.h" 71 #include "ash/wm/system_modal_container_event_filter.h"
72 #include "ash/wm/system_modal_container_layout_manager.h" 72 #include "ash/wm/system_modal_container_layout_manager.h"
73 #include "ash/wm/toplevel_window_event_handler.h" 73 #include "ash/wm/toplevel_window_event_handler.h"
74 #include "ash/wm/user_activity_detector.h" 74 #include "ash/wm/user_activity_detector.h"
75 #include "ash/wm/video_detector.h" 75 #include "ash/wm/video_detector.h"
76 #include "ash/wm/window_animations.h" 76 #include "ash/wm/window_animations.h"
77 #include "ash/wm/window_cycle_controller.h"
78 #include "ash/wm/window_positioner.h" 77 #include "ash/wm/window_positioner.h"
79 #include "ash/wm/window_properties.h" 78 #include "ash/wm/window_properties.h"
80 #include "ash/wm/window_util.h" 79 #include "ash/wm/window_util.h"
81 #include "ash/wm/workspace_controller.h" 80 #include "ash/wm/workspace_controller.h"
82 #include "base/bind.h" 81 #include "base/bind.h"
83 #include "base/command_line.h" 82 #include "base/command_line.h"
84 #include "base/debug/trace_event.h" 83 #include "base/debug/trace_event.h"
85 #include "ui/aura/client/aura_constants.h" 84 #include "ui/aura/client/aura_constants.h"
86 #include "ui/aura/client/user_action_client.h" 85 #include "ui/aura/client/user_action_client.h"
87 #include "ui/aura/env.h" 86 #include "ui/aura/env.h"
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 // deleted because it's observing video activity through 671 // deleted because it's observing video activity through
673 // VideoDetectorObserver interface. 672 // VideoDetectorObserver interface.
674 video_activity_notifier_.reset(); 673 video_activity_notifier_.reset();
675 #endif // defined(OS_CHROMEOS) 674 #endif // defined(OS_CHROMEOS)
676 video_detector_.reset(); 675 video_detector_.reset();
677 676
678 shadow_controller_.reset(); 677 shadow_controller_.reset();
679 resize_shadow_controller_.reset(); 678 resize_shadow_controller_.reset();
680 679
681 window_selector_controller_.reset(); 680 window_selector_controller_.reset();
682 window_cycle_controller_.reset();
683 mru_window_tracker_.reset(); 681 mru_window_tracker_.reset();
684 682
685 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| 683 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_|
686 // and has window observers. 684 // and has window observers.
687 shelf_window_watcher_.reset(); 685 shelf_window_watcher_.reset();
688 686
689 // Destroy all child windows including widgets. 687 // Destroy all child windows including widgets.
690 display_controller_->CloseChildWindows(); 688 display_controller_->CloseChildWindows();
691 display_controller_->CloseNonDesktopDisplay(); 689 display_controller_->CloseNonDesktopDisplay();
692 690
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 MagnificationController::CreateInstance()); 901 MagnificationController::CreateInstance());
904 mru_window_tracker_.reset(new MruWindowTracker(activation_client_)); 902 mru_window_tracker_.reset(new MruWindowTracker(activation_client_));
905 903
906 partial_magnification_controller_.reset( 904 partial_magnification_controller_.reset(
907 new PartialMagnificationController()); 905 new PartialMagnificationController());
908 906
909 autoclick_controller_.reset(AutoclickController::CreateInstance()); 907 autoclick_controller_.reset(AutoclickController::CreateInstance());
910 908
911 high_contrast_controller_.reset(new HighContrastController); 909 high_contrast_controller_.reset(new HighContrastController);
912 video_detector_.reset(new VideoDetector); 910 video_detector_.reset(new VideoDetector);
913 window_cycle_controller_.reset(new WindowCycleController());
914 window_selector_controller_.reset(new WindowSelectorController()); 911 window_selector_controller_.reset(new WindowSelectorController());
915 912
916 tooltip_controller_.reset( 913 tooltip_controller_.reset(
917 new views::corewm::TooltipController( 914 new views::corewm::TooltipController(
918 scoped_ptr<views::corewm::Tooltip>( 915 scoped_ptr<views::corewm::Tooltip>(
919 new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE)))); 916 new views::corewm::TooltipAura(gfx::SCREEN_TYPE_ALTERNATE))));
920 AddPreTargetHandler(tooltip_controller_.get()); 917 AddPreTargetHandler(tooltip_controller_.get());
921 918
922 event_client_.reset(new internal::EventClientImpl); 919 event_client_.reset(new internal::EventClientImpl);
923 920
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 delegate_->CreateKeyboardControllerProxy(); 1006 delegate_->CreateKeyboardControllerProxy();
1010 keyboard_controller_.reset( 1007 keyboard_controller_.reset(
1011 new keyboard::KeyboardController(proxy)); 1008 new keyboard::KeyboardController(proxy));
1012 } 1009 }
1013 } 1010 }
1014 1011
1015 void Shell::InitRootWindow(aura::Window* root_window) { 1012 void Shell::InitRootWindow(aura::Window* root_window) {
1016 DCHECK(activation_client_); 1013 DCHECK(activation_client_);
1017 DCHECK(visibility_controller_.get()); 1014 DCHECK(visibility_controller_.get());
1018 DCHECK(drag_drop_controller_.get()); 1015 DCHECK(drag_drop_controller_.get());
1019 DCHECK(window_cycle_controller_.get());
1020 1016
1021 aura::client::SetFocusClient(root_window, focus_client_.get()); 1017 aura::client::SetFocusClient(root_window, focus_client_.get());
1022 input_method_filter_->SetInputMethodPropertyInRootWindow(root_window); 1018 input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
1023 aura::client::SetActivationClient(root_window, activation_client_); 1019 aura::client::SetActivationClient(root_window, activation_client_);
1024 views::corewm::FocusController* focus_controller = 1020 views::corewm::FocusController* focus_controller =
1025 static_cast<views::corewm::FocusController*>(activation_client_); 1021 static_cast<views::corewm::FocusController*>(activation_client_);
1026 root_window->AddPreTargetHandler(focus_controller); 1022 root_window->AddPreTargetHandler(focus_controller);
1027 aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); 1023 aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
1028 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); 1024 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
1029 aura::client::SetScreenPositionClient(root_window, 1025 aura::client::SetScreenPositionClient(root_window,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 //////////////////////////////////////////////////////////////////////////////// 1079 ////////////////////////////////////////////////////////////////////////////////
1084 // Shell, aura::client::ActivationChangeObserver implementation: 1080 // Shell, aura::client::ActivationChangeObserver implementation:
1085 1081
1086 void Shell::OnWindowActivated(aura::Window* gained_active, 1082 void Shell::OnWindowActivated(aura::Window* gained_active,
1087 aura::Window* lost_active) { 1083 aura::Window* lost_active) {
1088 if (gained_active) 1084 if (gained_active)
1089 target_root_window_ = gained_active->GetRootWindow(); 1085 target_root_window_ = gained_active->GetRootWindow();
1090 } 1086 }
1091 1087
1092 } // namespace ash 1088 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698