| Index: services/ui/display/screen_manager.h
|
| diff --git a/services/ui/display/platform_screen.h b/services/ui/display/screen_manager.h
|
| similarity index 60%
|
| rename from services/ui/display/platform_screen.h
|
| rename to services/ui/display/screen_manager.h
|
| index c266a57ee95adfc706c3baadb29653225479ad9a..3a0679cb085f2d68b0815ef6c2fac2c31287fe11 100644
|
| --- a/services/ui/display/platform_screen.h
|
| +++ b/services/ui/display/screen_manager.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SERVICES_UI_DISPLAY_PLATFORM_SCREEN_H_
|
| -#define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_H_
|
| +#ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_H_
|
| +#define SERVICES_UI_DISPLAY_SCREEN_MANAGER_H_
|
|
|
| #include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "services/ui/display/platform_screen_delegate.h"
|
| +#include "services/ui/display/screen_manager_delegate.h"
|
|
|
| namespace service_manager {
|
| class InterfaceRegistry;
|
| @@ -16,16 +16,16 @@ class InterfaceRegistry;
|
|
|
| namespace display {
|
|
|
| -// PlatformScreen provides the necessary functionality to configure all
|
| +// ScreenManager provides the necessary functionality to configure all
|
| // attached physical displays.
|
| -class PlatformScreen {
|
| +class ScreenManager {
|
| public:
|
| - PlatformScreen();
|
| - virtual ~PlatformScreen();
|
| + ScreenManager();
|
| + virtual ~ScreenManager();
|
|
|
| - // Creates a singleton PlatformScreen instance.
|
| - static std::unique_ptr<PlatformScreen> Create();
|
| - static PlatformScreen* GetInstance();
|
| + // Creates a singleton ScreenManager instance.
|
| + static std::unique_ptr<ScreenManager> Create();
|
| + static ScreenManager* GetInstance();
|
|
|
| // Registers Mojo interfaces provided.
|
| virtual void AddInterfaces(service_manager::InterfaceRegistry* registry) = 0;
|
| @@ -35,7 +35,7 @@ class PlatformScreen {
|
| // more fake displays and pretend to configure them. A non-null |delegate|
|
| // must be provided that will receive notifications when displays are added,
|
| // removed or modified.
|
| - virtual void Init(PlatformScreenDelegate* delegate) = 0;
|
| + virtual void Init(ScreenManagerDelegate* delegate) = 0;
|
|
|
| // Handle requests from the platform to close a display.
|
| virtual void RequestCloseDisplay(int64_t display_id) = 0;
|
| @@ -43,11 +43,11 @@ class PlatformScreen {
|
| virtual int64_t GetPrimaryDisplayId() const = 0;
|
|
|
| private:
|
| - static PlatformScreen* instance_; // Instance is not owned.
|
| + static ScreenManager* instance_; // Instance is not owned.
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(PlatformScreen);
|
| + DISALLOW_COPY_AND_ASSIGN(ScreenManager);
|
| };
|
|
|
| } // namespace display
|
|
|
| -#endif // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_H_
|
| +#endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_H_
|
|
|