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

Side by Side Diff: ash/common/wm_shell.h

Issue 2372843002: Add ash devtools client (Closed)
Patch Set: Use MakeUnique Created 4 years, 1 month 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/common/devtools/devtools_dom_agent.cc ('k') | ash/common/wm_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
14 #include "ash/common/media_delegate.h" 14 #include "ash/common/media_delegate.h"
15 #include "ash/common/metrics/gesture_action_type.h" 15 #include "ash/common/metrics/gesture_action_type.h"
16 #include "ash/common/metrics/user_metrics_action.h" 16 #include "ash/common/metrics/user_metrics_action.h"
17 #include "ash/common/wm/lock_state_observer.h" 17 #include "ash/common/wm/lock_state_observer.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "components/ui_devtools/devtools_server.h"
19 #include "ui/base/ui_base_types.h" 20 #include "ui/base/ui_base_types.h"
20 #include "ui/compositor/layer_type.h" 21 #include "ui/compositor/layer_type.h"
21 #include "ui/wm/public/window_types.h" 22 #include "ui/wm/public/window_types.h"
22 23
23 namespace base { 24 namespace base {
24 class SequencedWorkerPool; 25 class SequencedWorkerPool;
25 } 26 }
26 27
27 namespace display { 28 namespace display {
28 class Display; 29 class Display;
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 std::unique_ptr<ShelfDelegate> shelf_delegate_; 486 std::unique_ptr<ShelfDelegate> shelf_delegate_;
486 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 487 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
487 std::unique_ptr<SystemTrayController> system_tray_controller_; 488 std::unique_ptr<SystemTrayController> system_tray_controller_;
488 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 489 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
489 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 490 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
490 std::unique_ptr<ToastManager> toast_manager_; 491 std::unique_ptr<ToastManager> toast_manager_;
491 std::unique_ptr<WallpaperController> wallpaper_controller_; 492 std::unique_ptr<WallpaperController> wallpaper_controller_;
492 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; 493 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
493 std::unique_ptr<WindowCycleController> window_cycle_controller_; 494 std::unique_ptr<WindowCycleController> window_cycle_controller_;
494 std::unique_ptr<WindowSelectorController> window_selector_controller_; 495 std::unique_ptr<WindowSelectorController> window_selector_controller_;
496 std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
495 497
496 base::ObserverList<LockStateObserver> lock_state_observers_; 498 base::ObserverList<LockStateObserver> lock_state_observers_;
497 499
498 // See comment for GetRootWindowForNewWindows(). 500 // See comment for GetRootWindowForNewWindows().
499 WmWindow* root_window_for_new_windows_ = nullptr; 501 WmWindow* root_window_for_new_windows_ = nullptr;
500 WmWindow* scoped_root_window_for_new_windows_ = nullptr; 502 WmWindow* scoped_root_window_for_new_windows_ = nullptr;
501 503
502 bool simulate_modal_window_open_for_testing_ = false; 504 bool simulate_modal_window_open_for_testing_ = false;
503 505
504 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 506 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
505 507
506 #if defined(OS_CHROMEOS) 508 #if defined(OS_CHROMEOS)
507 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 509 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
508 #endif 510 #endif
509 }; 511 };
510 512
511 } // namespace ash 513 } // namespace ash
512 514
513 #endif // ASH_COMMON_WM_SHELL_H_ 515 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/devtools/devtools_dom_agent.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698