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

Side by Side Diff: ash/shell.h

Issue 2934673002: Revert of Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Created 3 years, 6 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_layout_manager.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>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/metrics/user_metrics_recorder.h" 13 #include "ash/metrics/user_metrics_recorder.h"
14 #include "ash/public/cpp/shelf_types.h" 14 #include "ash/public/cpp/shelf_types.h"
15 #include "ash/session/session_observer.h" 15 #include "ash/session/session_observer.h"
16 #include "ash/wm/system_modal_container_event_filter_delegate.h" 16 #include "ash/wm/system_modal_container_event_filter_delegate.h"
17 #include "base/gtest_prod_util.h" 17 #include "base/gtest_prod_util.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/observer_list.h" 20 #include "base/observer_list.h"
21 #include "ui/app_list/presenter/app_list_delegate.h"
22 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
23 #include "ui/display/screen.h" 22 #include "ui/display/screen.h"
24 #include "ui/events/event_target.h" 23 #include "ui/events/event_target.h"
25 #include "ui/wm/core/cursor_manager.h" 24 #include "ui/wm/core/cursor_manager.h"
26 #include "ui/wm/public/activation_change_observer.h" 25 #include "ui/wm/public/activation_change_observer.h"
27 26
28 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
29 #include "ash/wm/cursor_manager_chromeos.h" 28 #include "ash/wm/cursor_manager_chromeos.h"
30 #endif // defined(OS_CHROMEOS) 29 #endif // defined(OS_CHROMEOS)
31 30
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 // TODO(jamescook): Move to Shelf. 602 // TODO(jamescook): Move to Shelf.
604 void NotifyShelfAlignmentChanged(aura::Window* root_window); 603 void NotifyShelfAlignmentChanged(aura::Window* root_window);
605 604
606 // Notifies observers that |root_window|'s shelf changed auto-hide behavior. 605 // Notifies observers that |root_window|'s shelf changed auto-hide behavior.
607 // TODO(jamescook): Move to Shelf. 606 // TODO(jamescook): Move to Shelf.
608 void NotifyShelfAutoHideBehaviorChanged(aura::Window* root_window); 607 void NotifyShelfAutoHideBehaviorChanged(aura::Window* root_window);
609 608
610 // Used to provide better error messages for Shell::Get() under mash. 609 // Used to provide better error messages for Shell::Get() under mash.
611 static void SetIsBrowserProcessWithMash(); 610 static void SetIsBrowserProcessWithMash();
612 611
613 void OnAppListVisibilityChanged(bool visible, aura::Window* root_window);
614
615 private: 612 private:
616 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 613 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
617 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 614 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
618 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 615 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
619 friend class AcceleratorControllerTest; 616 friend class AcceleratorControllerTest;
620 friend class RootWindowController; 617 friend class RootWindowController;
621 friend class ScopedRootWindowForNewWindows; 618 friend class ScopedRootWindowForNewWindows;
622 friend class SmsObserverTest; 619 friend class SmsObserverTest;
623 friend class test::ShellTestApi; 620 friend class test::ShellTestApi;
624 friend class shell::WindowWatcher; 621 friend class shell::WindowWatcher;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 base::ObserverList<ShellObserver> shell_observers_; 832 base::ObserverList<ShellObserver> shell_observers_;
836 833
837 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 834 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
838 835
839 DISALLOW_COPY_AND_ASSIGN(Shell); 836 DISALLOW_COPY_AND_ASSIGN(Shell);
840 }; 837 };
841 838
842 } // namespace ash 839 } // namespace ash
843 840
844 #endif // ASH_SHELL_H_ 841 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698