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

Side by Side Diff: services/ui/demo/mus_demo_internal.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 | « mash/simple_wm/simple_wm.cc ('k') | services/ui/demo/mus_demo_internal.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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ 5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_
6 #define SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ 6 #define SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
(...skipping 18 matching lines...) Expand all
29 // ui::demo::MusDemo: 29 // ui::demo::MusDemo:
30 void OnStartImpl() final; 30 void OnStartImpl() final;
31 std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final; 31 std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final;
32 32
33 // aura::WindowManagerDelegate: 33 // aura::WindowManagerDelegate:
34 void SetWindowManagerClient(aura::WindowManagerClient* client) final; 34 void SetWindowManagerClient(aura::WindowManagerClient* client) final;
35 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) final; 35 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) final;
36 bool OnWmSetProperty(aura::Window* window, 36 bool OnWmSetProperty(aura::Window* window,
37 const std::string& name, 37 const std::string& name,
38 std::unique_ptr<std::vector<uint8_t>>* new_data) final; 38 std::unique_ptr<std::vector<uint8_t>>* new_data) final;
39 void OnWmSetModalType(aura::Window* window, ModalType type) final;
39 void OnWmSetCanFocus(aura::Window* window, bool can_focus) final; 40 void OnWmSetCanFocus(aura::Window* window, bool can_focus) final;
40 aura::Window* OnWmCreateTopLevelWindow( 41 aura::Window* OnWmCreateTopLevelWindow(
41 ui::mojom::WindowType window_type, 42 ui::mojom::WindowType window_type,
42 std::map<std::string, std::vector<uint8_t>>* properties) final; 43 std::map<std::string, std::vector<uint8_t>>* properties) final;
43 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, 44 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows,
44 bool janky) final; 45 bool janky) final;
45 void OnWmWillCreateDisplay(const display::Display& display) final; 46 void OnWmWillCreateDisplay(const display::Display& display) final;
46 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, 47 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
47 const display::Display& display) final; 48 const display::Display& display) final;
48 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) final; 49 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) final;
(...skipping 12 matching lines...) Expand all
61 bool IsWindowActive(aura::Window* window) final; 62 bool IsWindowActive(aura::Window* window) final;
62 void OnWmDeactivateWindow(aura::Window* window) final; 63 void OnWmDeactivateWindow(aura::Window* window) final;
63 64
64 DISALLOW_COPY_AND_ASSIGN(MusDemoInternal); 65 DISALLOW_COPY_AND_ASSIGN(MusDemoInternal);
65 }; 66 };
66 67
67 } // namespace demo 68 } // namespace demo
68 } // namespace ui 69 } // namespace ui
69 70
70 #endif // SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ 71 #endif // SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_
OLDNEW
« no previous file with comments | « mash/simple_wm/simple_wm.cc ('k') | services/ui/demo/mus_demo_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698