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

Side by Side Diff: ash/shell.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 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/shelf/shelf_view.h ('k') | ash/system/chromeos/network/vpn_delegate.h » ('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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 AshNativeCursorManager* native_cursor_manager_; 750 AshNativeCursorManager* native_cursor_manager_;
751 751
752 // Cursor may be hidden on certain key events in ChromeOS, whereas we never hide 752 // Cursor may be hidden on certain key events in ChromeOS, whereas we never hide
753 // the cursor on Windows. 753 // the cursor on Windows.
754 #if defined(OS_CHROMEOS) 754 #if defined(OS_CHROMEOS)
755 CursorManager cursor_manager_; 755 CursorManager cursor_manager_;
756 #else // !defined(OS_CHROMEOS) 756 #else // !defined(OS_CHROMEOS)
757 ::wm::CursorManager cursor_manager_; 757 ::wm::CursorManager cursor_manager_;
758 #endif // defined(OS_CHROMEOS) 758 #endif // defined(OS_CHROMEOS)
759 759
760 ObserverList<ShellObserver> observers_; 760 base::ObserverList<ShellObserver> observers_;
761 761
762 // For testing only: simulate that a modal window is open 762 // For testing only: simulate that a modal window is open
763 bool simulate_modal_window_open_for_testing_; 763 bool simulate_modal_window_open_for_testing_;
764 764
765 bool is_touch_hud_projection_enabled_; 765 bool is_touch_hud_projection_enabled_;
766 766
767 // Injected content::GPUDataManager support. 767 // Injected content::GPUDataManager support.
768 scoped_ptr<GPUSupport> gpu_support_; 768 scoped_ptr<GPUSupport> gpu_support_;
769 769
770 DISALLOW_COPY_AND_ASSIGN(Shell); 770 DISALLOW_COPY_AND_ASSIGN(Shell);
771 }; 771 };
772 772
773 } // namespace ash 773 } // namespace ash
774 774
775 #endif // ASH_SHELL_H_ 775 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view.h ('k') | ash/system/chromeos/network/vpn_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698