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

Side by Side Diff: ash/shell.h

Issue 1614233002: Shutdown the status tray before the system tray delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 11 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
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 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 ~Shell() override; 598 ~Shell() override;
599 599
600 void Init(const ShellInitParams& init_params); 600 void Init(const ShellInitParams& init_params);
601 601
602 // Initializes virtual keyboard controller. 602 // Initializes virtual keyboard controller.
603 void InitKeyboard(); 603 void InitKeyboard();
604 604
605 // Initializes the root window so that it can host browser windows. 605 // Initializes the root window so that it can host browser windows.
606 void InitRootWindow(aura::Window* root_window); 606 void InitRootWindow(aura::Window* root_window);
607 607
608 // Hides the shelf view if any are visible.
609 void HideShelf();
610
608 // ash::SystemModalContainerEventFilterDelegate overrides: 611 // ash::SystemModalContainerEventFilterDelegate overrides:
609 bool CanWindowReceiveEvents(aura::Window* window) override; 612 bool CanWindowReceiveEvents(aura::Window* window) override;
610 613
611 // Overridden from ui::EventTarget: 614 // Overridden from ui::EventTarget:
612 bool CanAcceptEvent(const ui::Event& event) override; 615 bool CanAcceptEvent(const ui::Event& event) override;
613 EventTarget* GetParentTarget() override; 616 EventTarget* GetParentTarget() override;
614 scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; 617 scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
615 ui::EventTargeter* GetEventTargeter() override; 618 ui::EventTargeter* GetEventTargeter() override;
616 619
617 // Overridden from aura::client::ActivationChangeObserver: 620 // Overridden from aura::client::ActivationChangeObserver:
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 scoped_ptr<GPUSupport> gpu_support_; 768 scoped_ptr<GPUSupport> gpu_support_;
766 769
767 base::SequencedWorkerPool* blocking_pool_; 770 base::SequencedWorkerPool* blocking_pool_;
768 771
769 DISALLOW_COPY_AND_ASSIGN(Shell); 772 DISALLOW_COPY_AND_ASSIGN(Shell);
770 }; 773 };
771 774
772 } // namespace ash 775 } // namespace ash
773 776
774 #endif // ASH_SHELL_H_ 777 #endif // ASH_SHELL_H_
OLDNEW
« ash/root_window_controller.cc ('K') | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698