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

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

Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movea11y
Patch Set: nit Created 4 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/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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/aura/wm_lookup_aura.h" 9 #include "ash/aura/wm_lookup_aura.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 bool IsOverviewModeSelecting() override; 54 bool IsOverviewModeSelecting() override;
55 bool IsOverviewModeRestoringMinimizedWindows() override; 55 bool IsOverviewModeRestoringMinimizedWindows() override;
56 AccessibilityDelegate* GetAccessibilityDelegate() override; 56 AccessibilityDelegate* GetAccessibilityDelegate() override;
57 SessionStateDelegate* GetSessionStateDelegate() override; 57 SessionStateDelegate* GetSessionStateDelegate() override;
58 void AddActivationObserver(WmActivationObserver* observer) override; 58 void AddActivationObserver(WmActivationObserver* observer) override;
59 void RemoveActivationObserver(WmActivationObserver* observer) override; 59 void RemoveActivationObserver(WmActivationObserver* observer) override;
60 void AddDisplayObserver(WmDisplayObserver* observer) override; 60 void AddDisplayObserver(WmDisplayObserver* observer) override;
61 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 61 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
62 void AddShellObserver(ShellObserver* observer) override; 62 void AddShellObserver(ShellObserver* observer) override;
63 void RemoveShellObserver(ShellObserver* observer) override; 63 void RemoveShellObserver(ShellObserver* observer) override;
64 #if defined(OS_CHROMEOS)
65 void ToggleIgnoreExternalKeyboard() override;
66 #endif
64 67
65 private: 68 private:
66 // aura::client::ActivationChangeObserver: 69 // aura::client::ActivationChangeObserver:
67 void OnWindowActivated(ActivationReason reason, 70 void OnWindowActivated(ActivationReason reason,
68 aura::Window* gained_active, 71 aura::Window* gained_active,
69 aura::Window* lost_active) override; 72 aura::Window* lost_active) override;
70 void OnAttemptToReactivateWindow(aura::Window* request_active, 73 void OnAttemptToReactivateWindow(aura::Window* request_active,
71 aura::Window* actual_active) override; 74 aura::Window* actual_active) override;
72 75
73 // WindowTreeHostManager::Observer: 76 // WindowTreeHostManager::Observer:
74 void OnDisplayConfigurationChanging() override; 77 void OnDisplayConfigurationChanging() override;
75 void OnDisplayConfigurationChanged() override; 78 void OnDisplayConfigurationChanged() override;
76 79
77 // Owned by Shell. 80 // Owned by Shell.
78 WmShellCommon* wm_shell_common_; 81 WmShellCommon* wm_shell_common_;
79 82
80 WmLookupAura wm_lookup_; 83 WmLookupAura wm_lookup_;
81 bool added_activation_observer_ = false; 84 bool added_activation_observer_ = false;
82 base::ObserverList<WmActivationObserver> activation_observers_; 85 base::ObserverList<WmActivationObserver> activation_observers_;
83 86
84 bool added_display_observer_ = false; 87 bool added_display_observer_ = false;
85 base::ObserverList<WmDisplayObserver> display_observers_; 88 base::ObserverList<WmDisplayObserver> display_observers_;
86 89
87 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 90 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
88 }; 91 };
89 92
90 } // namespace ash 93 } // namespace ash
91 94
92 #endif // ASH_AURA_WM_SHELL_AURA_H_ 95 #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