| Index: ash/display/display_manager.h
|
| diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
|
| index 4b15ddc588731d15662f0bb220ae950279357d82..c8ee67f2fe05c84bb823970d2e78c9c8abbcef10 100644
|
| --- a/ash/display/display_manager.h
|
| +++ b/ash/display/display_manager.h
|
| @@ -60,7 +60,7 @@ class ASH_EXPORT DisplayManager
|
| #if defined(OS_CHROMEOS)
|
| : public ui::DisplayConfigurator::SoftwareMirroringController
|
| #endif
|
| - {
|
| +{
|
| public:
|
| class ASH_EXPORT Delegate {
|
| public:
|
| @@ -101,9 +101,7 @@ class ASH_EXPORT DisplayManager
|
| virtual ~DisplayManager();
|
| #endif
|
|
|
| - DisplayLayoutStore* layout_store() {
|
| - return layout_store_.get();
|
| - }
|
| + DisplayLayoutStore* layout_store() { return layout_store_.get(); }
|
|
|
| void set_delegate(Delegate* delegate) { delegate_ = delegate; }
|
|
|
| @@ -286,7 +284,7 @@ class ASH_EXPORT DisplayManager
|
| void AddRemoveDisplay();
|
| void ToggleDisplayScaleFactor();
|
|
|
| - // SoftwareMirroringController override:
|
| +// SoftwareMirroringController override:
|
| #if defined(OS_CHROMEOS)
|
| void SetSoftwareMirroring(bool enabled) override;
|
| bool SoftwareMirroringEnabled() const override;
|
| @@ -327,7 +325,7 @@ class ASH_EXPORT DisplayManager
|
| // for this test scenario.
|
| void UpdateInternalDisplayModeListForTest();
|
|
|
| -private:
|
| + private:
|
| FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
|
| FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
|
| FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest,
|
|
|