| Index: ui/display/display_layout_builder.h
 | 
| diff --git a/ui/display/manager/display_layout_builder.h b/ui/display/display_layout_builder.h
 | 
| similarity index 84%
 | 
| rename from ui/display/manager/display_layout_builder.h
 | 
| rename to ui/display/display_layout_builder.h
 | 
| index b93683e39a5763625b1ddc73768d5c5132d84d97..ecd685a2732a7268d09041bf95d2d424bad45af3 100644
 | 
| --- a/ui/display/manager/display_layout_builder.h
 | 
| +++ b/ui/display/display_layout_builder.h
 | 
| @@ -2,14 +2,14 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#ifndef UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_BUILDER_H_
 | 
| -#define UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_BUILDER_H_
 | 
| +#ifndef UI_DISPLAY_DISPLAY_LAYOUT_BUILDER_H_
 | 
| +#define UI_DISPLAY_DISPLAY_LAYOUT_BUILDER_H_
 | 
|  
 | 
|  #include <memory>
 | 
|  
 | 
|  #include "base/macros.h"
 | 
|  #include "ui/display/display_export.h"
 | 
| -#include "ui/display/manager/display_layout.h"
 | 
| +#include "ui/display/display_layout.h"
 | 
|  
 | 
|  namespace display {
 | 
|  
 | 
| @@ -39,8 +39,7 @@ class DISPLAY_EXPORT DisplayLayoutBuilder final {
 | 
|                                              int offset);
 | 
|  
 | 
|    // Adds a display placement.
 | 
| -  DisplayLayoutBuilder& AddDisplayPlacement(
 | 
| -      const DisplayPlacement& placement);
 | 
| +  DisplayLayoutBuilder& AddDisplayPlacement(const DisplayPlacement& placement);
 | 
|  
 | 
|    // Sets the display placement for the secondary display.
 | 
|    DisplayLayoutBuilder& SetSecondaryPlacement(
 | 
| @@ -59,4 +58,4 @@ class DISPLAY_EXPORT DisplayLayoutBuilder final {
 | 
|  
 | 
|  }  // namespace display
 | 
|  
 | 
| -#endif  // UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_BUILDER_H_
 | 
| +#endif  // UI_DISPLAY_DISPLAY_LAYOUT_BUILDER_H_
 | 
| 
 |