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

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

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test 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/BUILD.gn ('k') | ash/aura/shell_port_classic.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_SHELL_PORT_CLASSIC_H_ 5 #ifndef ASH_AURA_SHELL_PORT_CLASSIC_H_
6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_ 6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector>
9 10
10 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
11 #include "ash/display/window_tree_host_manager.h" 12 #include "ash/display/window_tree_host_manager.h"
12 #include "ash/shell_port.h" 13 #include "ash/shell_port.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/observer_list.h" 15 #include "base/observer_list.h"
15 16
16 namespace ash { 17 namespace ash {
17 18
18 class AcceleratorControllerDelegateAura; 19 class AcceleratorControllerDelegateAura;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler() 66 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
66 override; 67 override;
67 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( 68 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
68 aura::Window* workspace_window) override; 69 aura::Window* workspace_window) override;
69 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 70 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
70 CreateScopedDisableInternalMouseAndKeyboard() override; 71 CreateScopedDisableInternalMouseAndKeyboard() override;
71 std::unique_ptr<ImmersiveFullscreenController> 72 std::unique_ptr<ImmersiveFullscreenController>
72 CreateImmersiveFullscreenController() override; 73 CreateImmersiveFullscreenController() override;
73 std::unique_ptr<KeyboardUI> CreateKeyboardUI() override; 74 std::unique_ptr<KeyboardUI> CreateKeyboardUI() override;
74 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; 75 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
75 SessionStateDelegate* GetSessionStateDelegate() override;
76 void AddDisplayObserver(WmDisplayObserver* observer) override; 76 void AddDisplayObserver(WmDisplayObserver* observer) override;
77 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 77 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
78 void AddPointerWatcher(views::PointerWatcher* watcher, 78 void AddPointerWatcher(views::PointerWatcher* watcher,
79 views::PointerWatcherEventTypes events) override; 79 views::PointerWatcherEventTypes events) override;
80 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 80 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
81 bool IsTouchDown() override; 81 bool IsTouchDown() override;
82 void ToggleIgnoreExternalKeyboard() override; 82 void ToggleIgnoreExternalKeyboard() override;
83 void SetLaserPointerEnabled(bool enabled) override; 83 void SetLaserPointerEnabled(bool enabled) override;
84 void SetPartialMagnifierEnabled(bool enabled) override; 84 void SetPartialMagnifierEnabled(bool enabled) override;
85 void CreatePointerWatcherAdapter() override; 85 void CreatePointerWatcherAdapter() override;
(...skipping 19 matching lines...) Expand all
105 105
106 std::unique_ptr<AcceleratorControllerDelegateAura> 106 std::unique_ptr<AcceleratorControllerDelegateAura>
107 accelerator_controller_delegate_; 107 accelerator_controller_delegate_;
108 108
109 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic); 109 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic);
110 }; 110 };
111 111
112 } // namespace ash 112 } // namespace ash
113 113
114 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_ 114 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/aura/shell_port_classic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698