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

Side by Side Diff: ash/shell.h

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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_window_watcher_unittest.cc ('k') | ash/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 (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>
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 #endif 324 #endif
325 325
326 AcceleratorController* accelerator_controller() { 326 AcceleratorController* accelerator_controller() {
327 return accelerator_controller_.get(); 327 return accelerator_controller_.get();
328 } 328 }
329 329
330 DisplayManager* display_manager() { return display_manager_.get(); } 330 DisplayManager* display_manager() { return display_manager_.get(); }
331 DisplayConfigurationController* display_configuration_controller() { 331 DisplayConfigurationController* display_configuration_controller() {
332 return display_configuration_controller_.get(); 332 return display_configuration_controller_.get();
333 } 333 }
334 ::wm::CompoundEventFilter* env_filter() { 334 ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
335 return env_filter_.get();
336 }
337 views::corewm::TooltipController* tooltip_controller() { 335 views::corewm::TooltipController* tooltip_controller() {
338 return tooltip_controller_.get(); 336 return tooltip_controller_.get();
339 } 337 }
340 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 338 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
341 DesktopBackgroundController* desktop_background_controller() { 339 DesktopBackgroundController* desktop_background_controller() {
342 return desktop_background_controller_.get(); 340 return desktop_background_controller_.get();
343 } 341 }
344 LinkHandlerModelFactory* link_handler_model_factory() { 342 LinkHandlerModelFactory* link_handler_model_factory() {
345 return link_handler_model_factory_; 343 return link_handler_model_factory_;
346 } 344 }
347 void set_link_handler_model_factory( 345 void set_link_handler_model_factory(
348 LinkHandlerModelFactory* link_handler_model_factory) { 346 LinkHandlerModelFactory* link_handler_model_factory) {
349 link_handler_model_factory_ = link_handler_model_factory; 347 link_handler_model_factory_ = link_handler_model_factory;
350 } 348 }
351 PowerButtonController* power_button_controller() { 349 PowerButtonController* power_button_controller() {
352 return power_button_controller_.get(); 350 return power_button_controller_.get();
353 } 351 }
354 LockStateController* lock_state_controller() { 352 LockStateController* lock_state_controller() {
355 return lock_state_controller_.get(); 353 return lock_state_controller_.get();
356 } 354 }
357 MruWindowTracker* mru_window_tracker() { 355 MruWindowTracker* mru_window_tracker() {
358 return wm_shell_common_->mru_window_tracker(); 356 return wm_shell_common_->mru_window_tracker();
359 } 357 }
360 VideoDetector* video_detector() { 358 VideoDetector* video_detector() { return video_detector_.get(); }
361 return video_detector_.get();
362 }
363 WindowCycleController* window_cycle_controller() { 359 WindowCycleController* window_cycle_controller() {
364 return window_cycle_controller_.get(); 360 return window_cycle_controller_.get();
365 } 361 }
366 WindowTreeHostManager* window_tree_host_manager() { 362 WindowTreeHostManager* window_tree_host_manager() {
367 return window_tree_host_manager_.get(); 363 return window_tree_host_manager_.get();
368 } 364 }
369 #if defined(OS_CHROMEOS) 365 #if defined(OS_CHROMEOS)
370 PowerEventObserver* power_event_observer() { 366 PowerEventObserver* power_event_observer() {
371 return power_event_observer_.get(); 367 return power_event_observer_.get();
372 } 368 }
(...skipping 23 matching lines...) Expand all
396 } 392 }
397 393
398 AccessibilityDelegate* accessibility_delegate() { 394 AccessibilityDelegate* accessibility_delegate() {
399 return accessibility_delegate_.get(); 395 return accessibility_delegate_.get();
400 } 396 }
401 397
402 NewWindowDelegate* new_window_delegate() { 398 NewWindowDelegate* new_window_delegate() {
403 return new_window_delegate_.get(); 399 return new_window_delegate_.get();
404 } 400 }
405 401
406 MediaDelegate* media_delegate() { 402 MediaDelegate* media_delegate() { return media_delegate_.get(); }
407 return media_delegate_.get();
408 }
409 403
410 HighContrastController* high_contrast_controller() { 404 HighContrastController* high_contrast_controller() {
411 return high_contrast_controller_.get(); 405 return high_contrast_controller_.get();
412 } 406 }
413 407
414 MagnificationController* magnification_controller() { 408 MagnificationController* magnification_controller() {
415 return magnification_controller_.get(); 409 return magnification_controller_.get();
416 } 410 }
417 411
418 PartialMagnificationController* partial_magnification_controller() { 412 PartialMagnificationController* partial_magnification_controller() {
419 return partial_magnification_controller_.get(); 413 return partial_magnification_controller_.get();
420 } 414 }
421 415
422 AutoclickController* autoclick_controller() { 416 AutoclickController* autoclick_controller() {
423 return autoclick_controller_.get(); 417 return autoclick_controller_.get();
424 } 418 }
425 419
426 aura::client::ActivationClient* activation_client() { 420 aura::client::ActivationClient* activation_client() {
427 return activation_client_; 421 return activation_client_;
428 } 422 }
429 423
430 ShelfItemDelegateManager* shelf_item_delegate_manager() { 424 ShelfItemDelegateManager* shelf_item_delegate_manager() {
431 return shelf_item_delegate_manager_.get(); 425 return shelf_item_delegate_manager_.get();
432 } 426 }
433 427
434 base::SequencedWorkerPool* blocking_pool() { 428 base::SequencedWorkerPool* blocking_pool() { return blocking_pool_; }
435 return blocking_pool_;
436 }
437 429
438 // Force the shelf to query for it's current visibility state. 430 // Force the shelf to query for it's current visibility state.
439 // TODO(jamescook): Move to Shelf. 431 // TODO(jamescook): Move to Shelf.
440 void UpdateShelfVisibility(); 432 void UpdateShelfVisibility();
441 433
442 // Called when the alignment for a shelf changes. 434 // Called when the alignment for a shelf changes.
443 // TODO(jamescook): Move to Shelf. 435 // TODO(jamescook): Move to Shelf.
444 void OnShelfAlignmentChanged(WmWindow* root_window); 436 void OnShelfAlignmentChanged(WmWindow* root_window);
445 437
446 // Called when the auto-hide behavior for a shelf changes. 438 // Called when the auto-hide behavior for a shelf changes.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 505
514 VirtualKeyboardController* virtual_keyboard_controller() { 506 VirtualKeyboardController* virtual_keyboard_controller() {
515 return virtual_keyboard_controller_.get(); 507 return virtual_keyboard_controller_.get();
516 } 508 }
517 509
518 chromeos::AudioA11yController* audio_a11y_controller() { 510 chromeos::AudioA11yController* audio_a11y_controller() {
519 return audio_a11y_controller_.get(); 511 return audio_a11y_controller_.get();
520 } 512 }
521 #endif // defined(OS_CHROMEOS) 513 #endif // defined(OS_CHROMEOS)
522 514
523 ShelfModel* shelf_model() { 515 ShelfModel* shelf_model() { return shelf_model_.get(); }
524 return shelf_model_.get();
525 }
526 516
527 WindowPositioner* window_positioner() { 517 WindowPositioner* window_positioner() { return window_positioner_.get(); }
528 return window_positioner_.get();
529 }
530 518
531 // Returns the launcher delegate, creating if necesary. 519 // Returns the launcher delegate, creating if necesary.
532 ShelfDelegate* GetShelfDelegate(); 520 ShelfDelegate* GetShelfDelegate();
533 521
534 UserMetricsRecorder* metrics() { 522 UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); }
535 return user_metrics_recorder_.get();
536 }
537 523
538 void SetTouchHudProjectionEnabled(bool enabled); 524 void SetTouchHudProjectionEnabled(bool enabled);
539 525
540 bool is_touch_hud_projection_enabled() const { 526 bool is_touch_hud_projection_enabled() const {
541 return is_touch_hud_projection_enabled_; 527 return is_touch_hud_projection_enabled_;
542 } 528 }
543 529
544 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } 530 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
545 531
546 // TODO(sky): remove this. This was needed by sysui, but as sysui is going 532 // TODO(sky): remove this. This was needed by sysui, but as sysui is going
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 bool in_mus_ = false; 746 bool in_mus_ = false;
761 747
762 std::unique_ptr<KeyboardUI> keyboard_ui_; 748 std::unique_ptr<KeyboardUI> keyboard_ui_;
763 749
764 DISALLOW_COPY_AND_ASSIGN(Shell); 750 DISALLOW_COPY_AND_ASSIGN(Shell);
765 }; 751 };
766 752
767 } // namespace ash 753 } // namespace ash
768 754
769 #endif // ASH_SHELL_H_ 755 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698