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

Side by Side Diff: ash/shell.h

Issue 2127263002: Keep the SystemModalContainerEventHandler added (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ignore touch/pointer events on Arc windows if modal open Created 4 years, 5 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') | ash/shell.cc » ('J')
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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 546
547 // Initializes virtual keyboard controller. 547 // Initializes virtual keyboard controller.
548 void InitKeyboard(); 548 void InitKeyboard();
549 549
550 // Initializes the root window so that it can host browser windows. 550 // Initializes the root window so that it can host browser windows.
551 void InitRootWindow(aura::Window* root_window); 551 void InitRootWindow(aura::Window* root_window);
552 552
553 // Prepares the shelf to be deleted. 553 // Prepares the shelf to be deleted.
554 void ShutdownShelf(); 554 void ShutdownShelf();
555 555
556 // ash::SystemModalContainerEventFilterDelegate overrides: 556 // SystemModalContainerEventFilterDelegate:
557 bool CanWindowReceiveEvents(aura::Window* window) override; 557 bool CanWindowReceiveEvents(aura::Window* window) override;
558 558
559 // Overridden from ui::EventTarget: 559 // Overridden from ui::EventTarget:
560 bool CanAcceptEvent(const ui::Event& event) override; 560 bool CanAcceptEvent(const ui::Event& event) override;
561 EventTarget* GetParentTarget() override; 561 EventTarget* GetParentTarget() override;
562 std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override; 562 std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
563 ui::EventTargeter* GetEventTargeter() override; 563 ui::EventTargeter* GetEventTargeter() override;
564 564
565 // Overridden from aura::client::ActivationChangeObserver: 565 // Overridden from aura::client::ActivationChangeObserver:
566 void OnWindowActivated( 566 void OnWindowActivated(
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 base::SequencedWorkerPool* blocking_pool_; 708 base::SequencedWorkerPool* blocking_pool_;
709 709
710 bool in_mus_ = false; 710 bool in_mus_ = false;
711 711
712 DISALLOW_COPY_AND_ASSIGN(Shell); 712 DISALLOW_COPY_AND_ASSIGN(Shell);
713 }; 713 };
714 714
715 } // namespace ash 715 } // namespace ash
716 716
717 #endif // ASH_SHELL_H_ 717 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698