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

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: comment 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
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/mus/window_tree_host_mus.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 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).
35 // TODO: this should take an unordered_map, see http://crbug.com/670515.
33 WindowTreeHostMus( 36 WindowTreeHostMus(
34 std::unique_ptr<WindowPortMus> window_port, 37 std::unique_ptr<WindowPortMus> window_port,
35 WindowTreeClient* window_tree_client, 38 WindowTreeClient* window_tree_client,
36 int64_t display_id, 39 int64_t display_id,
37 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); 40 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
41
42 // This constructor is intended for creating top level windows in
43 // non-window-manager code. |properties| are properties passed verbatim to
44 // the server, that is, no conversion is done before sending |properties| to
45 // the server. Additionally |properties| are passed to PropertyConverter and
46 // any known properties are set on the Window created by this class.
47 // TODO: this should take an unordered_map, see http://crbug.com/670515.
38 explicit WindowTreeHostMus( 48 explicit WindowTreeHostMus(
39 WindowTreeClient* window_tree_client, 49 WindowTreeClient* window_tree_client,
40 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr); 50 const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
41 51
42 ~WindowTreeHostMus() override; 52 ~WindowTreeHostMus() override;
43 53
44 // Sets the bounds in dips. 54 // Sets the bounds in dips.
45 void SetBoundsFromServer(const gfx::Rect& bounds); 55 void SetBoundsFromServer(const gfx::Rect& bounds);
46 56
47 ui::EventDispatchDetails SendEventToProcessor(ui::Event* event) { 57 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; 90 bool in_set_bounds_from_server_ = false;
81 91
82 std::unique_ptr<InputMethodMus> input_method_; 92 std::unique_ptr<InputMethodMus> input_method_;
83 93
84 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 94 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
85 }; 95 };
86 96
87 } // namespace aura 97 } // namespace aura
88 98
89 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_ 99 #endif // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | ui/aura/mus/window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698