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

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

Issue 2539263005: Makes WindowTreeHostMus supply properties directly to window creation (Closed)
Patch Set: types Created 4 years 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> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 12 matching lines...) Expand all
23 23
24 namespace aura { 24 namespace aura {
25 25
26 class InputMethodMus; 26 class InputMethodMus;
27 class WindowPortMus; 27 class WindowPortMus;
28 class WindowTreeClient; 28 class WindowTreeClient;
29 class WindowTreeHostMusDelegate; 29 class WindowTreeHostMusDelegate;
30 30
31 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform { 31 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
32 public: 32 public:
33 // |properties| are applied to the window created by this class (using
34 // PropertyConverter).
33 WindowTreeHostMus( 35 WindowTreeHostMus(
34 std::unique_ptr<WindowPortMus> window_port, 36 std::unique_ptr<WindowPortMus> window_port,
35 WindowTreeClient* window_tree_client, 37 WindowTreeClient* window_tree_client,
36 int64_t display_id, 38 int64_t display_id,
37 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); 39 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
40
41 // This constructor is intended for creating top level windows in
42 // non-window-manager code. |properties| are properties passed verbatim to
43 // the server, e.g. no conversion is done, and then applied to the window
msw 2016/12/02 00:31:08 Isn't it possible that some of these *are* convert
sky 2016/12/02 01:08:43 Ya, sorry, maybe my comment isn't clear. Is the ne
44 // created by this class (using PropertyConverter).
38 explicit WindowTreeHostMus( 45 explicit WindowTreeHostMus(
39 WindowTreeClient* window_tree_client, 46 WindowTreeClient* window_tree_client,
40 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); 47 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
41 48
42 ~WindowTreeHostMus() override; 49 ~WindowTreeHostMus() override;
43 50
44 // Sets the bounds in dips. 51 // Sets the bounds in dips.
45 void SetBoundsFromServer(const gfx::Rect& bounds); 52 void SetBoundsFromServer(const gfx::Rect& bounds);
46 53
47 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) { 54 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 bool in_set_bounds_from_server_ = false; 87 bool in_set_bounds_from_server_ = false;
81 88
82 std::unique_ptr<InputMethodMus> input_method_; 89 std::unique_ptr<InputMethodMus> input_method_;
83 90
84 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 91 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
85 }; 92 };
86 93
87 } // namespace aura 94 } // namespace aura
88 95
89 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ 96 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698