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

Side by Side Diff: ash/shell.h

Issue 2041423002: Moves MruWindowTracker to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mru_window_tracker
Patch Set: merge Created 4 years, 6 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/aura/wm_shell_aura.h"
13 #include "ash/common/shelf/shelf_types.h" 14 #include "ash/common/shelf/shelf_types.h"
14 #include "ash/metrics/user_metrics_recorder.h" 15 #include "ash/metrics/user_metrics_recorder.h"
15 #include "ash/system/user/login_status.h" 16 #include "ash/system/user/login_status.h"
16 #include "ash/wm/cursor_manager_chromeos.h" 17 #include "ash/wm/cursor_manager_chromeos.h"
17 #include "ash/wm/system_modal_container_event_filter_delegate.h" 18 #include "ash/wm/system_modal_container_event_filter_delegate.h"
18 #include "base/compiler_specific.h" 19 #include "base/compiler_specific.h"
19 #include "base/gtest_prod_util.h" 20 #include "base/gtest_prod_util.h"
20 #include "base/macros.h" 21 #include "base/macros.h"
21 #include "base/memory/weak_ptr.h" 22 #include "base/memory/weak_ptr.h"
22 #include "base/observer_list.h" 23 #include "base/observer_list.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 LinkHandlerModelFactory* link_handler_model_factory) { 380 LinkHandlerModelFactory* link_handler_model_factory) {
380 link_handler_model_factory_ = link_handler_model_factory; 381 link_handler_model_factory_ = link_handler_model_factory;
381 } 382 }
382 PowerButtonController* power_button_controller() { 383 PowerButtonController* power_button_controller() {
383 return power_button_controller_.get(); 384 return power_button_controller_.get();
384 } 385 }
385 LockStateController* lock_state_controller() { 386 LockStateController* lock_state_controller() {
386 return lock_state_controller_.get(); 387 return lock_state_controller_.get();
387 } 388 }
388 MruWindowTracker* mru_window_tracker() { 389 MruWindowTracker* mru_window_tracker() {
389 return mru_window_tracker_.get(); 390 return wm_shell_->mru_window_tracker();
390 } 391 }
391 VideoDetector* video_detector() { 392 VideoDetector* video_detector() {
392 return video_detector_.get(); 393 return video_detector_.get();
393 } 394 }
394 WindowCycleController* window_cycle_controller() { 395 WindowCycleController* window_cycle_controller() {
395 return window_cycle_controller_.get(); 396 return window_cycle_controller_.get();
396 } 397 }
397 WindowSelectorController* window_selector_controller() { 398 WindowSelectorController* window_selector_controller() {
398 return window_selector_controller_.get(); 399 return window_selector_controller_.get();
399 } 400 }
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 std::unique_ptr<DragDropController> drag_drop_controller_; 695 std::unique_ptr<DragDropController> drag_drop_controller_;
695 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 696 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
696 std::unique_ptr<::wm::ShadowController> shadow_controller_; 697 std::unique_ptr<::wm::ShadowController> shadow_controller_;
697 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 698 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
698 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 699 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
699 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 700 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
700 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 701 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
701 LinkHandlerModelFactory* link_handler_model_factory_; 702 LinkHandlerModelFactory* link_handler_model_factory_;
702 std::unique_ptr<PowerButtonController> power_button_controller_; 703 std::unique_ptr<PowerButtonController> power_button_controller_;
703 std::unique_ptr<LockStateController> lock_state_controller_; 704 std::unique_ptr<LockStateController> lock_state_controller_;
704 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
705 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 705 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
706 std::unique_ptr<VideoDetector> video_detector_; 706 std::unique_ptr<VideoDetector> video_detector_;
707 std::unique_ptr<WindowCycleController> window_cycle_controller_; 707 std::unique_ptr<WindowCycleController> window_cycle_controller_;
708 std::unique_ptr<WindowSelectorController> window_selector_controller_; 708 std::unique_ptr<WindowSelectorController> window_selector_controller_;
709 std::unique_ptr<FocusCycler> focus_cycler_; 709 std::unique_ptr<FocusCycler> focus_cycler_;
710 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 710 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
711 std::unique_ptr<HighContrastController> high_contrast_controller_; 711 std::unique_ptr<HighContrastController> high_contrast_controller_;
712 std::unique_ptr<MagnificationController> magnification_controller_; 712 std::unique_ptr<MagnificationController> magnification_controller_;
713 std::unique_ptr<PartialMagnificationController> 713 std::unique_ptr<PartialMagnificationController>
714 partial_magnification_controller_; 714 partial_magnification_controller_;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 bool in_mus_ = false; 805 bool in_mus_ = false;
806 806
807 std::unique_ptr<KeyboardUI> keyboard_ui_; 807 std::unique_ptr<KeyboardUI> keyboard_ui_;
808 808
809 DISALLOW_COPY_AND_ASSIGN(Shell); 809 DISALLOW_COPY_AND_ASSIGN(Shell);
810 }; 810 };
811 811
812 } // namespace ash 812 } // namespace ash
813 813
814 #endif // ASH_SHELL_H_ 814 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698