Index: ui/display/manager/json_converter.cc |
diff --git a/ash/display/json_converter.cc b/ui/display/manager/json_converter.cc |
similarity index 96% |
rename from ash/display/json_converter.cc |
rename to ui/display/manager/json_converter.cc |
index 943eeb44a358e90ceb5b79b34c863aa592d4ea2b..beb9d56011afd0b14561c736dab831933eb549da 100644 |
--- a/ash/display/json_converter.cc |
+++ b/ui/display/manager/json_converter.cc |
@@ -2,18 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ash/display/json_converter.h" |
+#include "ui/display/manager/json_converter.h" |
#include <memory> |
#include <string> |
-#include "ash/display/display_pref_util.h" |
#include "base/logging.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/values.h" |
#include "ui/display/display_layout.h" |
+#include "ui/display/manager/display_pref_util.h" |
-namespace ash { |
+namespace display { |
namespace { |
@@ -94,8 +94,9 @@ bool UpdateFromDict(const base::DictionaryValue* dict_value, |
if (!UpdateFromDict(dict_value, field_name, getter, &value)) |
return false; |
- return value.empty() ? true : display::DisplayPlacement::StringToPosition( |
- value, output); |
+ return value.empty() |
+ ? true |
+ : display::DisplayPlacement::StringToPosition(value, output); |
} |
template <> |
@@ -198,4 +199,4 @@ bool DisplayLayoutToJson(const display::DisplayLayout& layout, |
return true; |
} |
-} // namespace ash |
+} // namespace display |