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

Side by Side Diff: mash/wm/bridge/wm_globals_mus.h

Issue 1984293002: Random fixes for mash bridge classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 7 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 | « mash/wm/bridge/mus_layout_manager_adapter.cc ('k') | mash/wm/bridge/wm_globals_mus.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 MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_ 5 #ifndef MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_
6 #define MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_ 6 #define MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void RemoveDisplayObserver(ash::wm::WmDisplayObserver* observer) override; 67 void RemoveDisplayObserver(ash::wm::WmDisplayObserver* observer) override;
68 void AddOverviewModeObserver( 68 void AddOverviewModeObserver(
69 ash::wm::WmOverviewModeObserver* observer) override; 69 ash::wm::WmOverviewModeObserver* observer) override;
70 void RemoveOverviewModeObserver( 70 void RemoveOverviewModeObserver(
71 ash::wm::WmOverviewModeObserver* observer) override; 71 ash::wm::WmOverviewModeObserver* observer) override;
72 72
73 private: 73 private:
74 // Returns true if |window| is a window that can have active children. 74 // Returns true if |window| is a window that can have active children.
75 static bool IsActivationParent(mus::Window* window); 75 static bool IsActivationParent(mus::Window* window);
76 76
77 void RemoveConnectionObserver();
78
77 // mus::WindowTreeConnectionObserver: 79 // mus::WindowTreeConnectionObserver:
78 void OnWindowTreeFocusChanged(mus::Window* gained_focus, 80 void OnWindowTreeFocusChanged(mus::Window* gained_focus,
79 mus::Window* lost_focus) override; 81 mus::Window* lost_focus) override;
82 void OnWillDestroyConnection(mus::WindowTreeConnection* connection) override;
80 83
81 mus::WindowTreeConnection* connection_; 84 mus::WindowTreeConnection* connection_;
82 85
83 std::vector<WmRootWindowControllerMus*> root_window_controllers_; 86 std::vector<WmRootWindowControllerMus*> root_window_controllers_;
84 87
85 base::ObserverList<ash::wm::WmActivationObserver> activation_observers_; 88 base::ObserverList<ash::wm::WmActivationObserver> activation_observers_;
86 89
87 DISALLOW_COPY_AND_ASSIGN(WmGlobalsMus); 90 DISALLOW_COPY_AND_ASSIGN(WmGlobalsMus);
88 }; 91 };
89 92
90 } // namespace wm 93 } // namespace wm
91 } // namespace mash 94 } // namespace mash
92 95
93 #endif // MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_ 96 #endif // MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_
OLDNEW
« no previous file with comments | « mash/wm/bridge/mus_layout_manager_adapter.cc ('k') | mash/wm/bridge/wm_globals_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698