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

Side by Side Diff: ash/mus/window_manager.h

Issue 2759643003: Add system modals to the proper container in mus+ash. (Closed)
Patch Set: addressed feedback. Created 3 years, 9 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 | « no previous file | ash/mus/window_manager.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MUS_WINDOW_MANAGER_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_
6 #define ASH_MUS_WINDOW_MANAGER_H_ 6 #define ASH_MUS_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 aura::Window* target) override; 137 aura::Window* target) override;
138 aura::PropertyConverter* GetPropertyConverter() override; 138 aura::PropertyConverter* GetPropertyConverter() override;
139 139
140 // WindowManagerDelegate: 140 // WindowManagerDelegate:
141 void SetWindowManagerClient(aura::WindowManagerClient* client) override; 141 void SetWindowManagerClient(aura::WindowManagerClient* client) override;
142 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; 142 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override;
143 bool OnWmSetProperty( 143 bool OnWmSetProperty(
144 aura::Window* window, 144 aura::Window* window,
145 const std::string& name, 145 const std::string& name,
146 std::unique_ptr<std::vector<uint8_t>>* new_data) override; 146 std::unique_ptr<std::vector<uint8_t>>* new_data) override;
147 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override;
147 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; 148 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override;
148 aura::Window* OnWmCreateTopLevelWindow( 149 aura::Window* OnWmCreateTopLevelWindow(
149 ui::mojom::WindowType window_type, 150 ui::mojom::WindowType window_type,
150 std::map<std::string, std::vector<uint8_t>>* properties) override; 151 std::map<std::string, std::vector<uint8_t>>* properties) override;
151 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, 152 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows,
152 bool not_responding) override; 153 bool not_responding) override;
153 void OnWmWillCreateDisplay(const display::Display& display) override; 154 void OnWmWillCreateDisplay(const display::Display& display) override;
154 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, 155 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
155 const display::Display& display) override; 156 const display::Display& display) override;
156 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; 157 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // See WmShellMus's constructor for details. Tests may set to false. 200 // See WmShellMus's constructor for details. Tests may set to false.
200 bool create_session_state_delegate_stub_for_test_ = true; 201 bool create_session_state_delegate_stub_for_test_ = true;
201 202
202 DISALLOW_COPY_AND_ASSIGN(WindowManager); 203 DISALLOW_COPY_AND_ASSIGN(WindowManager);
203 }; 204 };
204 205
205 } // namespace mus 206 } // namespace mus
206 } // namespace ash 207 } // namespace ash
207 208
208 #endif // ASH_MUS_WINDOW_MANAGER_H_ 209 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698