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

Side by Side Diff: ash/shell.h

Issue 2304443002: ash: Move ShelfWidget ownership to WmShelf and refactor access to it (Closed)
Patch Set: review comments Created 4 years, 3 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/screen_util.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 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 ~Shell() override; 452 ~Shell() override;
453 453
454 void Init(const ShellInitParams& init_params); 454 void Init(const ShellInitParams& init_params);
455 455
456 // Initializes virtual keyboard controller. 456 // Initializes virtual keyboard controller.
457 void InitKeyboard(); 457 void InitKeyboard();
458 458
459 // Initializes the root window so that it can host browser windows. 459 // Initializes the root window so that it can host browser windows.
460 void InitRootWindow(aura::Window* root_window); 460 void InitRootWindow(aura::Window* root_window);
461 461
462 // Prepares the shelf to be deleted.
463 void ShutdownShelf();
464
465 // SystemModalContainerEventFilterDelegate: 462 // SystemModalContainerEventFilterDelegate:
466 bool CanWindowReceiveEvents(aura::Window* window) override; 463 bool CanWindowReceiveEvents(aura::Window* window) override;
467 464
468 // Overridden from ui::EventTarget: 465 // Overridden from ui::EventTarget:
469 bool CanAcceptEvent(const ui::Event& event) override; 466 bool CanAcceptEvent(const ui::Event& event) override;
470 EventTarget* GetParentTarget() override; 467 EventTarget* GetParentTarget() override;
471 std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override; 468 std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
472 ui::EventTargeter* GetEventTargeter() override; 469 ui::EventTargeter* GetEventTargeter() override;
473 470
474 static Shell* instance_; 471 static Shell* instance_;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 base::SequencedWorkerPool* blocking_pool_; 590 base::SequencedWorkerPool* blocking_pool_;
594 591
595 bool in_mus_ = false; 592 bool in_mus_ = false;
596 593
597 DISALLOW_COPY_AND_ASSIGN(Shell); 594 DISALLOW_COPY_AND_ASSIGN(Shell);
598 }; 595 };
599 596
600 } // namespace ash 597 } // namespace ash
601 598
602 #endif // ASH_SHELL_H_ 599 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/screen_util.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698