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

Side by Side Diff: ash/shell.h

Issue 2801333002: mash: Run pre-unlock animation via SessionController (Closed)
Patch Set: rebase Created 3 years, 8 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/session/session_state_observer.h ('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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 views::NonClientFrameView* CreateDefaultNonClientFrameView( 265 views::NonClientFrameView* CreateDefaultNonClientFrameView(
266 views::Widget* widget); 266 views::Widget* widget);
267 267
268 // Sets work area insets of the display containing |window|, pings observers. 268 // Sets work area insets of the display containing |window|, pings observers.
269 void SetDisplayWorkAreaInsets(aura::Window* window, 269 void SetDisplayWorkAreaInsets(aura::Window* window,
270 const gfx::Insets& insets); 270 const gfx::Insets& insets);
271 271
272 // Called when the application is exiting. 272 // Called when the application is exiting.
273 void OnAppTerminating(); 273 void OnAppTerminating();
274 274
275 // Called when the screen is locked (after the lock window is visible) or
276 // unlocked.
277 void OnLockStateChanged(bool locked);
278
279 // Called when a casting session is started or stopped. 275 // Called when a casting session is started or stopped.
280 void OnCastingSessionStartedOrStopped(bool started); 276 void OnCastingSessionStartedOrStopped(bool started);
281 277
282 // Called when a root window is created. 278 // Called when a root window is created.
283 void OnRootWindowAdded(WmWindow* root_window); 279 void OnRootWindowAdded(WmWindow* root_window);
284 280
285 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 281 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
286 // exists. 282 // exists.
287 void CreateKeyboard(); 283 void CreateKeyboard();
288 284
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 ui::EventTargeter* GetEventTargeter() override; 627 ui::EventTargeter* GetEventTargeter() override;
632 628
633 // aura::client::ActivationChangeObserver: 629 // aura::client::ActivationChangeObserver:
634 void OnWindowActivated(ActivationReason reason, 630 void OnWindowActivated(ActivationReason reason,
635 aura::Window* gained_active, 631 aura::Window* gained_active,
636 aura::Window* lost_active) override; 632 aura::Window* lost_active) override;
637 633
638 // SessionStateObserver: 634 // SessionStateObserver:
639 void SessionStateChanged(session_manager::SessionState state) override; 635 void SessionStateChanged(session_manager::SessionState state) override;
640 void LoginStatusChanged(LoginStatus login_status) override; 636 void LoginStatusChanged(LoginStatus login_status) override;
637 void LockStateChanged(bool locked) override;
641 638
642 // Callback for prefs::ConnectToPrefService. 639 // Callback for prefs::ConnectToPrefService.
643 void OnPrefServiceInitialized(std::unique_ptr<::PrefService> pref_service); 640 void OnPrefServiceInitialized(std::unique_ptr<::PrefService> pref_service);
644 641
645 static Shell* instance_; 642 static Shell* instance_;
646 643
647 // Only valid in mash, for classic ash this is null. 644 // Only valid in mash, for classic ash this is null.
648 static aura::WindowTreeClient* window_tree_client_; 645 static aura::WindowTreeClient* window_tree_client_;
649 static aura::WindowManagerClient* window_manager_client_; 646 static aura::WindowManagerClient* window_manager_client_;
650 647
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 base::ObserverList<ShellObserver> shell_observers_; 807 base::ObserverList<ShellObserver> shell_observers_;
811 808
812 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 809 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
813 810
814 DISALLOW_COPY_AND_ASSIGN(Shell); 811 DISALLOW_COPY_AND_ASSIGN(Shell);
815 }; 812 };
816 813
817 } // namespace ash 814 } // namespace ash
818 815
819 #endif // ASH_SHELL_H_ 816 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/session/session_state_observer.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698