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

Side by Side Diff: ash/shell.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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
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/common/shelf/shelf_types.h" 13 #include "ash/common/shelf/shelf_types.h"
14 #include "ash/metrics/user_metrics_recorder.h" 14 #include "ash/metrics/user_metrics_recorder.h"
15 #include "ash/wm/cursor_manager_chromeos.h" 15 #include "ash/wm/cursor_manager_chromeos.h"
16 #include "ash/wm/system_modal_container_event_filter_delegate.h" 16 #include "ash/wm/system_modal_container_event_filter_delegate.h"
17 #include "base/compiler_specific.h"
18 #include "base/gtest_prod_util.h" 17 #include "base/gtest_prod_util.h"
19 #include "base/macros.h" 18 #include "base/macros.h"
20 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
21 #include "base/observer_list.h" 20 #include "base/observer_list.h"
22 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
23 #include "ui/base/ui_base_types.h" 22 #include "ui/base/ui_base_types.h"
24 #include "ui/display/screen.h" 23 #include "ui/display/screen.h"
25 #include "ui/events/event_target.h" 24 #include "ui/events/event_target.h"
26 #include "ui/gfx/geometry/insets.h" 25 #include "ui/gfx/geometry/insets.h"
27 #include "ui/gfx/geometry/size.h" 26 #include "ui/gfx/geometry/size.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 return screenshot_controller_.get(); 359 return screenshot_controller_.get();
361 } 360 }
362 MouseCursorEventFilter* mouse_cursor_filter() { 361 MouseCursorEventFilter* mouse_cursor_filter() {
363 return mouse_cursor_filter_.get(); 362 return mouse_cursor_filter_.get();
364 } 363 }
365 EventTransformationHandler* event_transformation_handler() { 364 EventTransformationHandler* event_transformation_handler() {
366 return event_transformation_handler_.get(); 365 return event_transformation_handler_.get();
367 } 366 }
368 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } 367 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
369 368
370 ShellDelegate* delegate() { return delegate_.get(); }
371
372 UserWallpaperDelegate* user_wallpaper_delegate() { 369 UserWallpaperDelegate* user_wallpaper_delegate() {
373 return user_wallpaper_delegate_.get(); 370 return user_wallpaper_delegate_.get();
374 } 371 }
375 372
376 SessionStateDelegate* session_state_delegate() { 373 SessionStateDelegate* session_state_delegate() {
377 return session_state_delegate_.get(); 374 return session_state_delegate_.get();
378 } 375 }
379 376
380 AccessibilityDelegate* accessibility_delegate() { 377 AccessibilityDelegate* accessibility_delegate() {
381 return accessibility_delegate_.get(); 378 return accessibility_delegate_.get();
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 aura::Window* target_root_window_; 585 aura::Window* target_root_window_;
589 aura::Window* scoped_target_root_window_; 586 aura::Window* scoped_target_root_window_;
590 587
591 // The CompoundEventFilter owned by aura::Env object. 588 // The CompoundEventFilter owned by aura::Env object.
592 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 589 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
593 590
594 std::vector<WindowAndBoundsPair> to_restore_; 591 std::vector<WindowAndBoundsPair> to_restore_;
595 592
596 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 593 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
597 std::unique_ptr<AcceleratorController> accelerator_controller_; 594 std::unique_ptr<AcceleratorController> accelerator_controller_;
598 std::unique_ptr<ShellDelegate> delegate_;
599 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 595 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
600 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 596 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
601 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 597 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
602 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 598 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
603 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; 599 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
604 std::unique_ptr<ShelfDelegate> shelf_delegate_; 600 std::unique_ptr<ShelfDelegate> shelf_delegate_;
605 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 601 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
606 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 602 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
607 603
608 std::unique_ptr<ShelfModel> shelf_model_; 604 std::unique_ptr<ShelfModel> shelf_model_;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 base::SequencedWorkerPool* blocking_pool_; 708 base::SequencedWorkerPool* blocking_pool_;
713 709
714 bool in_mus_ = false; 710 bool in_mus_ = false;
715 711
716 DISALLOW_COPY_AND_ASSIGN(Shell); 712 DISALLOW_COPY_AND_ASSIGN(Shell);
717 }; 713 };
718 714
719 } // namespace ash 715 } // namespace ash
720 716
721 #endif // ASH_SHELL_H_ 717 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698