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

Side by Side Diff: ash/shell.h

Issue 2860553002: Clean up most of the ChromeOS headers in non-ChromeOS build (Closed)
Patch Set: rebase Created 3 years, 7 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 | « no previous file | chrome/browser/certificate_manager_model.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/metrics/user_metrics_recorder.h" 13 #include "ash/metrics/user_metrics_recorder.h"
14 #include "ash/public/cpp/shelf_types.h" 14 #include "ash/public/cpp/shelf_types.h"
15 #include "ash/session/session_observer.h" 15 #include "ash/session/session_observer.h"
16 #include "ash/wm/cursor_manager_chromeos.h"
17 #include "ash/wm/system_modal_container_event_filter_delegate.h" 16 #include "ash/wm/system_modal_container_event_filter_delegate.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/display/screen.h" 22 #include "ui/display/screen.h"
24 #include "ui/events/event_target.h" 23 #include "ui/events/event_target.h"
25 #include "ui/wm/core/cursor_manager.h" 24 #include "ui/wm/core/cursor_manager.h"
26 #include "ui/wm/public/activation_change_observer.h" 25 #include "ui/wm/public/activation_change_observer.h"
27 26
27 #if defined(OS_CHROMEOS)
28 #include "ash/wm/cursor_manager_chromeos.h"
29 #endif // defined(OS_CHROMEOS)
30
28 class PrefRegistrySimple; 31 class PrefRegistrySimple;
29 class PrefService; 32 class PrefService;
30 33
31 namespace aura { 34 namespace aura {
32 class RootWindow; 35 class RootWindow;
33 class UserActivityForwarder; 36 class UserActivityForwarder;
34 class Window; 37 class Window;
35 class WindowManagerClient; 38 class WindowManagerClient;
36 class WindowTreeClient; 39 class WindowTreeClient;
37 namespace client { 40 namespace client {
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 base::ObserverList<ShellObserver> shell_observers_; 826 base::ObserverList<ShellObserver> shell_observers_;
824 827
825 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 828 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
826 829
827 DISALLOW_COPY_AND_ASSIGN(Shell); 830 DISALLOW_COPY_AND_ASSIGN(Shell);
828 }; 831 };
829 832
830 } // namespace ash 833 } // namespace ash
831 834
832 #endif // ASH_SHELL_H_ 835 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/certificate_manager_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698