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

Side by Side Diff: ash/shell.h

Issue 2000393003: ash: Reorder shutdown of ShelfLayoutManager and StatusAreaWidget (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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_widget.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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 ~Shell() override; 636 ~Shell() override;
637 637
638 void Init(const ShellInitParams& init_params); 638 void Init(const ShellInitParams& init_params);
639 639
640 // Initializes virtual keyboard controller. 640 // Initializes virtual keyboard controller.
641 void InitKeyboard(); 641 void InitKeyboard();
642 642
643 // Initializes the root window so that it can host browser windows. 643 // Initializes the root window so that it can host browser windows.
644 void InitRootWindow(aura::Window* root_window); 644 void InitRootWindow(aura::Window* root_window);
645 645
646 // Hides the shelf view if any are visible. 646 // Prepares the shelf to be deleted.
647 void HideShelf(); 647 void ShutdownShelf();
648 648
649 // ash::SystemModalContainerEventFilterDelegate overrides: 649 // ash::SystemModalContainerEventFilterDelegate overrides:
650 bool CanWindowReceiveEvents(aura::Window* window) override; 650 bool CanWindowReceiveEvents(aura::Window* window) override;
651 651
652 // Overridden from ui::EventTarget: 652 // Overridden from ui::EventTarget:
653 bool CanAcceptEvent(const ui::Event& event) override; 653 bool CanAcceptEvent(const ui::Event& event) override;
654 EventTarget* GetParentTarget() override; 654 EventTarget* GetParentTarget() override;
655 std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override; 655 std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
656 ui::EventTargeter* GetEventTargeter() override; 656 ui::EventTargeter* GetEventTargeter() override;
657 657
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 bool in_mus_ = false; 814 bool in_mus_ = false;
815 815
816 std::unique_ptr<KeyboardUI> keyboard_ui_; 816 std::unique_ptr<KeyboardUI> keyboard_ui_;
817 817
818 DISALLOW_COPY_AND_ASSIGN(Shell); 818 DISALLOW_COPY_AND_ASSIGN(Shell);
819 }; 819 };
820 820
821 } // namespace ash 821 } // namespace ash
822 822
823 #endif // ASH_SHELL_H_ 823 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698