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

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: Fix test failures 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
« no previous file with comments | « no previous file | 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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 ~Shell() override; 600 ~Shell() override;
601 601
602 void Init(const ShellInitParams& init_params); 602 void Init(const ShellInitParams& init_params);
603 603
604 // Initializes virtual keyboard controller. 604 // Initializes virtual keyboard controller.
605 void InitKeyboard(); 605 void InitKeyboard();
606 606
607 // Initializes the root window so that it can host browser windows. 607 // Initializes the root window so that it can host browser windows.
608 void InitRootWindow(aura::Window* root_window); 608 void InitRootWindow(aura::Window* root_window);
609 609
610 // Hides the shelf view if any are visible.
611 void HideShelf();
612
610 // ash::SystemModalContainerEventFilterDelegate overrides: 613 // ash::SystemModalContainerEventFilterDelegate overrides:
611 bool CanWindowReceiveEvents(aura::Window* window) override; 614 bool CanWindowReceiveEvents(aura::Window* window) override;
612 615
613 // Overridden from ui::EventTarget: 616 // Overridden from ui::EventTarget:
614 bool CanAcceptEvent(const ui::Event& event) override; 617 bool CanAcceptEvent(const ui::Event& event) override;
615 EventTarget* GetParentTarget() override; 618 EventTarget* GetParentTarget() override;
616 scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; 619 scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
617 ui::EventTargeter* GetEventTargeter() override; 620 ui::EventTargeter* GetEventTargeter() override;
618 621
619 // Overridden from aura::client::ActivationChangeObserver: 622 // Overridden from aura::client::ActivationChangeObserver:
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 scoped_ptr<GPUSupport> gpu_support_; 770 scoped_ptr<GPUSupport> gpu_support_;
768 771
769 base::SequencedWorkerPool* blocking_pool_; 772 base::SequencedWorkerPool* blocking_pool_;
770 773
771 DISALLOW_COPY_AND_ASSIGN(Shell); 774 DISALLOW_COPY_AND_ASSIGN(Shell);
772 }; 775 };
773 776
774 } // namespace ash 777 } // namespace ash
775 778
776 #endif // ASH_SHELL_H_ 779 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698