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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
264 return window_cycle_controller_.get(); | 264 return window_cycle_controller_.get(); |
265 } | 265 } |
266 internal::FocusCycler* focus_cycler() { | 266 internal::FocusCycler* focus_cycler() { |
267 return focus_cycler_.get(); | 267 return focus_cycler_.get(); |
268 } | 268 } |
269 internal::MonitorController* monitor_controller() { | 269 internal::MonitorController* monitor_controller() { |
270 return monitor_controller_.get(); | 270 return monitor_controller_.get(); |
271 } | 271 } |
272 | 272 |
273 ShellDelegate* delegate() { return delegate_.get(); } | 273 ShellDelegate* delegate() { return delegate_.get(); } |
274 SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); } | 274 |
275 UserWallpaperDelegate* user_wallpaper_delegate() { | 275 UserWallpaperDelegate* user_wallpaper_delegate() { |
276 return user_wallpaper_delegate_.get(); | 276 return user_wallpaper_delegate_.get(); |
277 } | 277 } |
278 | 278 |
279 HighContrastController* high_contrast_controller() { | 279 HighContrastController* high_contrast_controller() { |
280 return high_contrast_controller_.get(); | 280 return high_contrast_controller_.get(); |
281 } | 281 } |
282 | 282 |
283 internal::MagnificationController* magnification_controller() { | 283 internal::MagnificationController* magnification_controller() { |
284 return magnification_controller_.get(); | 284 return magnification_controller_.get(); |
(...skipping 17 matching lines...) Expand all Loading... | |
302 void SetShelfAlignment(ShelfAlignment alignment); | 302 void SetShelfAlignment(ShelfAlignment alignment); |
303 ShelfAlignment GetShelfAlignment(); | 303 ShelfAlignment GetShelfAlignment(); |
304 | 304 |
305 // TODO(sky): don't expose this! | 305 // TODO(sky): don't expose this! |
306 internal::ShelfLayoutManager* shelf() const { return shelf_; } | 306 internal::ShelfLayoutManager* shelf() const { return shelf_; } |
307 | 307 |
308 internal::StatusAreaWidget* status_area_widget() const { | 308 internal::StatusAreaWidget* status_area_widget() const { |
309 return status_area_widget_; | 309 return status_area_widget_; |
310 } | 310 } |
311 | 311 |
312 SystemTray* system_tray() const { return system_tray_.get(); } | 312 // Convenience accessor for members of StatusAreaWidget. |
313 // TODO(stevenjb): remove these and move code to StatusAreaWidget instead. | |
314 SystemTrayDelegate* tray_delegate(); | |
315 SystemTray* system_tray(); | |
sadrul
2012/06/12 15:13:39
I feel like it's reasonable to make these accessib
stevenjb
2012/06/12 16:46:50
TODO removed (for now anyway). I'd kind of prefer
| |
313 | 316 |
314 // Returns the size of the grid. | 317 // Returns the size of the grid. |
315 int GetGridSize() const; | 318 int GetGridSize() const; |
316 | 319 |
317 // Returns true if in maximized or fullscreen mode. | 320 // Returns true if in maximized or fullscreen mode. |
318 bool IsInMaximizedMode() const; | 321 bool IsInMaximizedMode() const; |
319 | 322 |
320 static void set_initially_hide_cursor(bool hide) { | 323 static void set_initially_hide_cursor(bool hide) { |
321 initially_hide_cursor_ = hide; | 324 initially_hide_cursor_ = hide; |
322 } | 325 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 | 385 |
383 std::vector<WindowAndBoundsPair> to_restore_; | 386 std::vector<WindowAndBoundsPair> to_restore_; |
384 | 387 |
385 #if !defined(OS_MACOSX) | 388 #if !defined(OS_MACOSX) |
386 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; | 389 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; |
387 | 390 |
388 scoped_ptr<AcceleratorController> accelerator_controller_; | 391 scoped_ptr<AcceleratorController> accelerator_controller_; |
389 #endif // !defined(OS_MACOSX) | 392 #endif // !defined(OS_MACOSX) |
390 | 393 |
391 scoped_ptr<ShellDelegate> delegate_; | 394 scoped_ptr<ShellDelegate> delegate_; |
392 scoped_ptr<SystemTrayDelegate> tray_delegate_; | |
393 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; | 395 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; |
394 | 396 |
395 scoped_ptr<Launcher> launcher_; | 397 scoped_ptr<Launcher> launcher_; |
396 | 398 |
397 scoped_ptr<internal::AppListController> app_list_controller_; | 399 scoped_ptr<internal::AppListController> app_list_controller_; |
398 | 400 |
399 scoped_ptr<internal::ShellContextMenu> shell_context_menu_; | 401 scoped_ptr<internal::ShellContextMenu> shell_context_menu_; |
400 scoped_ptr<internal::StackingController> stacking_controller_; | 402 scoped_ptr<internal::StackingController> stacking_controller_; |
401 scoped_ptr<internal::ActivationController> activation_controller_; | 403 scoped_ptr<internal::ActivationController> activation_controller_; |
402 scoped_ptr<internal::CaptureController> capture_controller_; | 404 scoped_ptr<internal::CaptureController> capture_controller_; |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
461 internal::PanelLayoutManager* panel_layout_manager_; | 463 internal::PanelLayoutManager* panel_layout_manager_; |
462 | 464 |
463 ObserverList<ShellObserver> observers_; | 465 ObserverList<ShellObserver> observers_; |
464 | 466 |
465 // Owned by aura::RootWindow, cached here for type safety. | 467 // Owned by aura::RootWindow, cached here for type safety. |
466 internal::RootWindowLayoutManager* root_window_layout_; | 468 internal::RootWindowLayoutManager* root_window_layout_; |
467 | 469 |
468 // Widget containing system tray. | 470 // Widget containing system tray. |
469 internal::StatusAreaWidget* status_area_widget_; | 471 internal::StatusAreaWidget* status_area_widget_; |
470 | 472 |
471 // System tray with clock, Wi-Fi signal, etc. | |
472 scoped_ptr<SystemTray> system_tray_; | |
473 | |
474 // Used by ash/shell. | 473 // Used by ash/shell. |
475 content::BrowserContext* browser_context_; | 474 content::BrowserContext* browser_context_; |
476 | 475 |
477 DISALLOW_COPY_AND_ASSIGN(Shell); | 476 DISALLOW_COPY_AND_ASSIGN(Shell); |
478 }; | 477 }; |
479 | 478 |
480 } // namespace ash | 479 } // namespace ash |
481 | 480 |
482 #endif // ASH_SHELL_H_ | 481 #endif // ASH_SHELL_H_ |
OLD | NEW |