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

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

Issue 2629523006: chromeos: changes DisconnectedAppHandler to be associated with a single window (Closed)
Patch Set: comment Created 3 years, 11 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
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_MUS_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/mus/disconnected_app_handler.h"
11 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
12 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 11 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
13 #include "ui/display/display.h" 12 #include "ui/display/display.h"
14 13
15 namespace aura { 14 namespace aura {
16 class WindowTreeHostMus; 15 class WindowTreeHostMus;
17 } 16 }
18 17
19 namespace gfx { 18 namespace gfx {
20 class Insets; 19 class Insets;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 gfx::Rect GetMaximizedWindowBounds() const; 86 gfx::Rect GetMaximizedWindowBounds() const;
88 87
89 WindowManager* window_manager_; 88 WindowManager* window_manager_;
90 std::unique_ptr<ash::RootWindowController> ash_root_window_controller_; 89 std::unique_ptr<ash::RootWindowController> ash_root_window_controller_;
91 // Owned by |ash_root_window_controller_|. 90 // Owned by |ash_root_window_controller_|.
92 aura::WindowTreeHostMus* window_tree_host_; 91 aura::WindowTreeHostMus* window_tree_host_;
93 int window_count_ = 0; 92 int window_count_ = 0;
94 93
95 display::Display display_; 94 display::Display display_;
96 95
97 std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;
98
99 DISALLOW_COPY_AND_ASSIGN(RootWindowController); 96 DISALLOW_COPY_AND_ASSIGN(RootWindowController);
100 }; 97 };
101 98
102 } // namespace mus 99 } // namespace mus
103 } // namespace ash 100 } // namespace ash
104 101
105 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_ 102 #endif // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698