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

Side by Side Diff: ash/aura/wm_shell_aura.h

Issue 2222653002: Moves CustomFrameViewAsh to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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/ash.gyp ('k') | ash/aura/wm_shell_aura.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_AURA_WM_SHELL_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_
6 #define ASH_AURA_WM_SHELL_AURA_H_ 6 #define ASH_AURA_WM_SHELL_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ui::MenuSourceType source_type) override; 51 ui::MenuSourceType source_type) override;
52 std::unique_ptr<WindowResizer> CreateDragWindowResizer( 52 std::unique_ptr<WindowResizer> CreateDragWindowResizer(
53 std::unique_ptr<WindowResizer> next_window_resizer, 53 std::unique_ptr<WindowResizer> next_window_resizer,
54 wm::WindowState* window_state) override; 54 wm::WindowState* window_state) override;
55 std::unique_ptr<WindowCycleEventFilter> CreateWindowCycleEventFilter() 55 std::unique_ptr<WindowCycleEventFilter> CreateWindowCycleEventFilter()
56 override; 56 override;
57 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler() 57 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
58 override; 58 override;
59 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 59 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
60 CreateScopedDisableInternalMouseAndKeyboard() override; 60 CreateScopedDisableInternalMouseAndKeyboard() override;
61 std::unique_ptr<WmImmersiveFullscreenController>
62 CreateImmersiveFullscreenController() override;
61 void OnOverviewModeStarting() override; 63 void OnOverviewModeStarting() override;
62 void OnOverviewModeEnded() override; 64 void OnOverviewModeEnded() override;
63 SessionStateDelegate* GetSessionStateDelegate() override; 65 SessionStateDelegate* GetSessionStateDelegate() override;
64 void AddActivationObserver(WmActivationObserver* observer) override; 66 void AddActivationObserver(WmActivationObserver* observer) override;
65 void RemoveActivationObserver(WmActivationObserver* observer) override; 67 void RemoveActivationObserver(WmActivationObserver* observer) override;
66 void AddDisplayObserver(WmDisplayObserver* observer) override; 68 void AddDisplayObserver(WmDisplayObserver* observer) override;
67 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 69 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
68 void AddPointerWatcher(views::PointerWatcher* watcher) override; 70 void AddPointerWatcher(views::PointerWatcher* watcher) override;
69 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 71 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
70 bool IsTouchDown() override; 72 bool IsTouchDown() override;
(...skipping 19 matching lines...) Expand all
90 92
91 bool added_display_observer_ = false; 93 bool added_display_observer_ = false;
92 base::ObserverList<WmDisplayObserver> display_observers_; 94 base::ObserverList<WmDisplayObserver> display_observers_;
93 95
94 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 96 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
95 }; 97 };
96 98
97 } // namespace ash 99 } // namespace ash
98 100
99 #endif // ASH_AURA_WM_SHELL_AURA_H_ 101 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698