| OLD | NEW |
| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 internal::ShelfLayoutManager* shelf_; | 358 internal::ShelfLayoutManager* shelf_; |
| 359 | 359 |
| 360 // Manages layout of panels. Owned by PanelContainer. | 360 // Manages layout of panels. Owned by PanelContainer. |
| 361 internal::PanelLayoutManager* panel_layout_manager_; | 361 internal::PanelLayoutManager* panel_layout_manager_; |
| 362 | 362 |
| 363 ObserverList<ShellObserver> observers_; | 363 ObserverList<ShellObserver> observers_; |
| 364 | 364 |
| 365 // Owned by aura::RootWindow, cached here for type safety. | 365 // Owned by aura::RootWindow, cached here for type safety. |
| 366 internal::RootWindowLayoutManager* root_window_layout_; | 366 internal::RootWindowLayoutManager* root_window_layout_; |
| 367 | 367 |
| 368 // Status area with clock, Wi-Fi signal, etc. | 368 // System tray with clock, Wi-Fi signal, etc. |
| 369 views::Widget* status_widget_; | |
| 370 | |
| 371 // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for | |
| 372 // |status_widget_|). | |
| 373 scoped_ptr<SystemTray> tray_; | 369 scoped_ptr<SystemTray> tray_; |
| 374 | 370 |
| 375 // Used by ash/shell. | 371 // Used by ash/shell. |
| 376 content::BrowserContext* browser_context_; | 372 content::BrowserContext* browser_context_; |
| 377 | 373 |
| 378 DISALLOW_COPY_AND_ASSIGN(Shell); | 374 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 379 }; | 375 }; |
| 380 | 376 |
| 381 } // namespace ash | 377 } // namespace ash |
| 382 | 378 |
| 383 #endif // ASH_SHELL_H_ | 379 #endif // ASH_SHELL_H_ |
| OLD | NEW |