OLD | NEW |
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 #include "ash/display/json_converter.h" | 5 #include "ui/display/manager/json_converter.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "ash/display/display_pref_util.h" | |
11 #include "base/logging.h" | 10 #include "base/logging.h" |
12 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
13 #include "base/values.h" | 12 #include "base/values.h" |
14 #include "ui/display/display_layout.h" | 13 #include "ui/display/display_layout.h" |
| 14 #include "ui/display/manager/display_pref_util.h" |
15 | 15 |
16 namespace ash { | 16 namespace display { |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 // Persistent key names | 20 // Persistent key names |
21 const char kMirroredKey[] = "mirrored"; | 21 const char kMirroredKey[] = "mirrored"; |
22 const char kDefaultUnifiedKey[] = "default_unified"; | 22 const char kDefaultUnifiedKey[] = "default_unified"; |
23 const char kPrimaryIdKey[] = "primary-id"; | 23 const char kPrimaryIdKey[] = "primary-id"; |
24 const char kDisplayPlacementKey[] = "display_placement"; | 24 const char kDisplayPlacementKey[] = "display_placement"; |
25 | 25 |
26 // DisplayPlacement key names | 26 // DisplayPlacement key names |
27 const char kPositionKey[] = "position"; | 27 const char kPositionKey[] = "position"; |
28 const char kOffsetKey[] = "offset"; | 28 const char kOffsetKey[] = "offset"; |
29 const char kDisplayPlacementDisplayIdKey[] = "display_id"; | 29 const char kDisplayPlacementDisplayIdKey[] = "display_id"; |
30 const char kDisplayPlacementParentDisplayIdKey[] = "parent_display_id"; | 30 const char kDisplayPlacementParentDisplayIdKey[] = "parent_display_id"; |
31 | 31 |
32 bool AddLegacyValuesFromValue(const base::Value& value, | 32 bool AddLegacyValuesFromValue(const base::Value& value, DisplayLayout* layout) { |
33 display::DisplayLayout* layout) { | |
34 const base::DictionaryValue* dict_value = nullptr; | 33 const base::DictionaryValue* dict_value = nullptr; |
35 if (!value.GetAsDictionary(&dict_value)) | 34 if (!value.GetAsDictionary(&dict_value)) |
36 return false; | 35 return false; |
37 int offset; | 36 int offset; |
38 if (dict_value->GetInteger(kOffsetKey, &offset)) { | 37 if (dict_value->GetInteger(kOffsetKey, &offset)) { |
39 display::DisplayPlacement::Position position; | 38 DisplayPlacement::Position position; |
40 std::string position_str; | 39 std::string position_str; |
41 if (!dict_value->GetString(kPositionKey, &position_str)) | 40 if (!dict_value->GetString(kPositionKey, &position_str)) |
42 return false; | 41 return false; |
43 display::DisplayPlacement::StringToPosition(position_str, &position); | 42 DisplayPlacement::StringToPosition(position_str, &position); |
44 layout->placement_list.emplace_back(position, offset); | 43 layout->placement_list.emplace_back(position, offset); |
45 } | 44 } |
46 return true; | 45 return true; |
47 } | 46 } |
48 | 47 |
49 // Returns true if | 48 // Returns true if |
50 // The key is missing - output is left unchanged | 49 // The key is missing - output is left unchanged |
51 // The key matches the type - output is updated to the value. | 50 // The key matches the type - output is updated to the value. |
52 template <typename Getter, typename Output> | 51 template <typename Getter, typename Output> |
53 bool UpdateFromDict(const base::DictionaryValue* dict_value, | 52 bool UpdateFromDict(const base::DictionaryValue* dict_value, |
(...skipping 27 matching lines...) Expand all Loading... |
81 bool UpdateFromDict(const base::DictionaryValue* dict_value, | 80 bool UpdateFromDict(const base::DictionaryValue* dict_value, |
82 const std::string& field_name, | 81 const std::string& field_name, |
83 int* output) { | 82 int* output) { |
84 return UpdateFromDict(dict_value, field_name, &base::Value::GetAsInteger, | 83 return UpdateFromDict(dict_value, field_name, &base::Value::GetAsInteger, |
85 output); | 84 output); |
86 } | 85 } |
87 | 86 |
88 template <> | 87 template <> |
89 bool UpdateFromDict(const base::DictionaryValue* dict_value, | 88 bool UpdateFromDict(const base::DictionaryValue* dict_value, |
90 const std::string& field_name, | 89 const std::string& field_name, |
91 display::DisplayPlacement::Position* output) { | 90 DisplayPlacement::Position* output) { |
92 bool (base::Value::*getter)(std::string*) const = &base::Value::GetAsString; | 91 bool (base::Value::*getter)(std::string*) const = &base::Value::GetAsString; |
93 std::string value; | 92 std::string value; |
94 if (!UpdateFromDict(dict_value, field_name, getter, &value)) | 93 if (!UpdateFromDict(dict_value, field_name, getter, &value)) |
95 return false; | 94 return false; |
96 | 95 |
97 return value.empty() ? true : display::DisplayPlacement::StringToPosition( | 96 return value.empty() ? true |
98 value, output); | 97 : DisplayPlacement::StringToPosition(value, output); |
99 } | 98 } |
100 | 99 |
101 template <> | 100 template <> |
102 bool UpdateFromDict(const base::DictionaryValue* dict_value, | 101 bool UpdateFromDict(const base::DictionaryValue* dict_value, |
103 const std::string& field_name, | 102 const std::string& field_name, |
104 int64_t* output) { | 103 int64_t* output) { |
105 bool (base::Value::*getter)(std::string*) const = &base::Value::GetAsString; | 104 bool (base::Value::*getter)(std::string*) const = &base::Value::GetAsString; |
106 std::string value; | 105 std::string value; |
107 if (!UpdateFromDict(dict_value, field_name, getter, &value)) | 106 if (!UpdateFromDict(dict_value, field_name, getter, &value)) |
108 return false; | 107 return false; |
109 | 108 |
110 return value.empty() ? true : base::StringToInt64(value, output); | 109 return value.empty() ? true : base::StringToInt64(value, output); |
111 } | 110 } |
112 | 111 |
113 template <> | 112 template <> |
114 bool UpdateFromDict(const base::DictionaryValue* dict_value, | 113 bool UpdateFromDict(const base::DictionaryValue* dict_value, |
115 const std::string& field_name, | 114 const std::string& field_name, |
116 std::vector<display::DisplayPlacement>* output) { | 115 std::vector<DisplayPlacement>* output) { |
117 bool (base::Value::*getter)(const base::ListValue**) const = | 116 bool (base::Value::*getter)(const base::ListValue**) const = |
118 &base::Value::GetAsList; | 117 &base::Value::GetAsList; |
119 const base::ListValue* list = nullptr; | 118 const base::ListValue* list = nullptr; |
120 if (!UpdateFromDict(dict_value, field_name, getter, &list)) | 119 if (!UpdateFromDict(dict_value, field_name, getter, &list)) |
121 return false; | 120 return false; |
122 | 121 |
123 if (list == nullptr) | 122 if (list == nullptr) |
124 return true; | 123 return true; |
125 | 124 |
126 output->reserve(list->GetSize()); | 125 output->reserve(list->GetSize()); |
127 for (const auto& list_item : *list) { | 126 for (const auto& list_item : *list) { |
128 const base::DictionaryValue* item_values = nullptr; | 127 const base::DictionaryValue* item_values = nullptr; |
129 if (!list_item->GetAsDictionary(&item_values)) | 128 if (!list_item->GetAsDictionary(&item_values)) |
130 return false; | 129 return false; |
131 | 130 |
132 display::DisplayPlacement item; | 131 DisplayPlacement item; |
133 if (!UpdateFromDict(item_values, kOffsetKey, &item.offset) || | 132 if (!UpdateFromDict(item_values, kOffsetKey, &item.offset) || |
134 !UpdateFromDict(item_values, kPositionKey, &item.position) || | 133 !UpdateFromDict(item_values, kPositionKey, &item.position) || |
135 !UpdateFromDict(item_values, kDisplayPlacementDisplayIdKey, | 134 !UpdateFromDict(item_values, kDisplayPlacementDisplayIdKey, |
136 &item.display_id) || | 135 &item.display_id) || |
137 !UpdateFromDict(item_values, kDisplayPlacementParentDisplayIdKey, | 136 !UpdateFromDict(item_values, kDisplayPlacementParentDisplayIdKey, |
138 &item.parent_display_id)) { | 137 &item.parent_display_id)) { |
139 return false; | 138 return false; |
140 } | 139 } |
141 | 140 |
142 output->push_back(item); | 141 output->push_back(item); |
143 } | 142 } |
144 return true; | 143 return true; |
145 } | 144 } |
146 | 145 |
147 } // namespace | 146 } // namespace |
148 | 147 |
149 bool JsonToDisplayLayout(const base::Value& value, | 148 bool JsonToDisplayLayout(const base::Value& value, DisplayLayout* layout) { |
150 display::DisplayLayout* layout) { | |
151 layout->placement_list.clear(); | 149 layout->placement_list.clear(); |
152 const base::DictionaryValue* dict_value = nullptr; | 150 const base::DictionaryValue* dict_value = nullptr; |
153 if (!value.GetAsDictionary(&dict_value)) | 151 if (!value.GetAsDictionary(&dict_value)) |
154 return false; | 152 return false; |
155 | 153 |
156 if (!UpdateFromDict(dict_value, kMirroredKey, &layout->mirrored) || | 154 if (!UpdateFromDict(dict_value, kMirroredKey, &layout->mirrored) || |
157 !UpdateFromDict(dict_value, kDefaultUnifiedKey, | 155 !UpdateFromDict(dict_value, kDefaultUnifiedKey, |
158 &layout->default_unified) || | 156 &layout->default_unified) || |
159 !UpdateFromDict(dict_value, kPrimaryIdKey, &layout->primary_id)) { | 157 !UpdateFromDict(dict_value, kPrimaryIdKey, &layout->primary_id)) { |
160 return false; | 158 return false; |
161 } | 159 } |
162 | 160 |
163 UpdateFromDict(dict_value, kDisplayPlacementKey, &layout->placement_list); | 161 UpdateFromDict(dict_value, kDisplayPlacementKey, &layout->placement_list); |
164 | 162 |
165 if (layout->placement_list.size() != 0u) | 163 if (layout->placement_list.size() != 0u) |
166 return true; | 164 return true; |
167 | 165 |
168 // For compatibility with old format. | 166 // For compatibility with old format. |
169 return AddLegacyValuesFromValue(value, layout); | 167 return AddLegacyValuesFromValue(value, layout); |
170 } | 168 } |
171 | 169 |
172 bool DisplayLayoutToJson(const display::DisplayLayout& layout, | 170 bool DisplayLayoutToJson(const DisplayLayout& layout, base::Value* value) { |
173 base::Value* value) { | |
174 base::DictionaryValue* dict_value = nullptr; | 171 base::DictionaryValue* dict_value = nullptr; |
175 if (!value->GetAsDictionary(&dict_value)) | 172 if (!value->GetAsDictionary(&dict_value)) |
176 return false; | 173 return false; |
177 | 174 |
178 dict_value->SetBoolean(kMirroredKey, layout.mirrored); | 175 dict_value->SetBoolean(kMirroredKey, layout.mirrored); |
179 dict_value->SetBoolean(kDefaultUnifiedKey, layout.default_unified); | 176 dict_value->SetBoolean(kDefaultUnifiedKey, layout.default_unified); |
180 dict_value->SetString(kPrimaryIdKey, base::Int64ToString(layout.primary_id)); | 177 dict_value->SetString(kPrimaryIdKey, base::Int64ToString(layout.primary_id)); |
181 | 178 |
182 std::unique_ptr<base::ListValue> placement_list(new base::ListValue); | 179 std::unique_ptr<base::ListValue> placement_list(new base::ListValue); |
183 for (const auto& placement : layout.placement_list) { | 180 for (const auto& placement : layout.placement_list) { |
184 std::unique_ptr<base::DictionaryValue> placement_value( | 181 std::unique_ptr<base::DictionaryValue> placement_value( |
185 new base::DictionaryValue); | 182 new base::DictionaryValue); |
186 placement_value->SetString( | 183 placement_value->SetString( |
187 kPositionKey, | 184 kPositionKey, DisplayPlacement::PositionToString(placement.position)); |
188 display::DisplayPlacement::PositionToString(placement.position)); | |
189 placement_value->SetInteger(kOffsetKey, placement.offset); | 185 placement_value->SetInteger(kOffsetKey, placement.offset); |
190 placement_value->SetString(kDisplayPlacementDisplayIdKey, | 186 placement_value->SetString(kDisplayPlacementDisplayIdKey, |
191 base::Int64ToString(placement.display_id)); | 187 base::Int64ToString(placement.display_id)); |
192 placement_value->SetString( | 188 placement_value->SetString( |
193 kDisplayPlacementParentDisplayIdKey, | 189 kDisplayPlacementParentDisplayIdKey, |
194 base::Int64ToString(placement.parent_display_id)); | 190 base::Int64ToString(placement.parent_display_id)); |
195 placement_list->Append(std::move(placement_value)); | 191 placement_list->Append(std::move(placement_value)); |
196 } | 192 } |
197 dict_value->Set(kDisplayPlacementKey, std::move(placement_list)); | 193 dict_value->Set(kDisplayPlacementKey, std::move(placement_list)); |
198 return true; | 194 return true; |
199 } | 195 } |
200 | 196 |
201 } // namespace ash | 197 } // namespace display |
OLD | NEW |