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

Side by Side Diff: ui/aura/mus/window_tree_host_mus.h

Issue 2495423005: Enables passing initial properties to top level window creation (Closed)
Patch Set: cleanup Created 4 years, 1 month 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 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 UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ 5 #ifndef UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_
6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ 6 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_
7 7
8 #include <stdint.h>
9
10 #include <map>
8 #include <memory> 11 #include <memory>
12 #include <string>
13 #include <vector>
9 14
10 #include "base/macros.h" 15 #include "base/macros.h"
11 #include "services/service_manager/public/cpp/connector.h" 16 #include "services/service_manager/public/cpp/connector.h"
12 #include "ui/aura/aura_export.h" 17 #include "ui/aura/aura_export.h"
13 #include "ui/aura/window_tree_host_platform.h" 18 #include "ui/aura/window_tree_host_platform.h"
14 19
15 namespace display { 20 namespace display {
16 class Display; 21 class Display;
17 } 22 }
18 23
19 namespace aura { 24 namespace aura {
20 25
21 class InputMethodMus; 26 class InputMethodMus;
22 class WindowPortMus; 27 class WindowPortMus;
23 class WindowTreeClient; 28 class WindowTreeClient;
24 class WindowTreeHostMusDelegate; 29 class WindowTreeHostMusDelegate;
25 30
26 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { 31 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
27 public: 32 public:
28 WindowTreeHostMus(std::unique_ptr<WindowPortMus> window_port, 33 WindowTreeHostMus(
29 WindowTreeHostMusDelegate* delegate, 34 std::unique_ptr<WindowPortMus> window_port,
30 int64_t display_id); 35 WindowTreeHostMusDelegate* delegate,
31 explicit WindowTreeHostMus(WindowTreeClient* window_tree_client); 36 int64_t display_id,
37 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
38 WindowTreeHostMus(
39 WindowTreeClient* window_tree_client,
40 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
41
32 ~WindowTreeHostMus() override; 42 ~WindowTreeHostMus() override;
33 43
34 // Sets the bounds in dips. 44 // Sets the bounds in dips.
35 void SetBoundsFromServer(const gfx::Rect& bounds); 45 void SetBoundsFromServer(const gfx::Rect& bounds);
36 46
37 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) { 47 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) {
38 return aura::WindowTreeHostPlatform::SendEventToProcessor(event); 48 return aura::WindowTreeHostPlatform::SendEventToProcessor(event);
39 } 49 }
40 50
41 InputMethodMus* input_method() { return input_method_.get(); } 51 InputMethodMus* input_method() { return input_method_.get(); }
(...skipping 21 matching lines...) Expand all
63 bool in_set_bounds_from_server_ = false; 73 bool in_set_bounds_from_server_ = false;
64 74
65 std::unique_ptr<InputMethodMus> input_method_; 75 std::unique_ptr<InputMethodMus> input_method_;
66 76
67 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 77 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
68 }; 78 };
69 79
70 } // namespace aura 80 } // namespace aura
71 81
72 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ 82 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698