Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1549)

Unified Diff: services/ui/display/screen_manager_ozone.h

Issue 2685003002: Rename ScreeManagerOzone to ScreenManagerOzoneInternal (Closed)
Patch Set: patch for landing Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/display/BUILD.gn ('k') | services/ui/display/screen_manager_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/screen_manager_ozone.h
diff --git a/services/ui/display/screen_manager_ozone.h b/services/ui/display/screen_manager_ozone.h
deleted file mode 100644
index 013607672e0309f895e502bc975a355a2a7d43f2..0000000000000000000000000000000000000000
--- a/services/ui/display/screen_manager_ozone.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
-#define SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
-
-#include <stdint.h>
-
-#include <memory>
-
-#include "base/macros.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/service_manager/public/cpp/connection.h"
-#include "services/service_manager/public/cpp/interface_factory.h"
-#include "services/ui/display/screen_manager.h"
-#include "services/ui/display/viewport_metrics.h"
-#include "services/ui/public/interfaces/display/display_controller.mojom.h"
-#include "services/ui/public/interfaces/display/test_display_controller.mojom.h"
-#include "ui/display/display.h"
-#include "ui/display/display_observer.h"
-#include "ui/display/manager/chromeos/display_configurator.h"
-#include "ui/display/manager/display_manager.h"
-#include "ui/display/types/display_constants.h"
-
-namespace display {
-
-class DisplayChangeObserver;
-class FakeDisplayController;
-class ScreenBase;
-class TouchTransformController;
-
-// ScreenManagerOzone provides the necessary functionality to configure all
-// attached physical displays on the ozone platform.
-class ScreenManagerOzone
- : public ScreenManager,
- public mojom::TestDisplayController,
- public mojom::DisplayController,
- public DisplayObserver,
- public DisplayManager::Delegate,
- public service_manager::InterfaceFactory<mojom::DisplayController>,
- public service_manager::InterfaceFactory<mojom::TestDisplayController> {
- public:
- ScreenManagerOzone();
- ~ScreenManagerOzone() override;
-
- void SetPrimaryDisplayId(int64_t display_id);
-
- // ScreenManager:
- void AddInterfaces(service_manager::InterfaceRegistry* registry) override;
- void Init(ScreenManagerDelegate* delegate) override;
- void RequestCloseDisplay(int64_t display_id) override;
- int64_t GetPrimaryDisplayId() const override;
-
- // mojom::TestDisplayController:
- void ToggleAddRemoveDisplay() override;
- void ToggleDisplayResolution() override;
-
- // mojom::DisplayController:
- void IncreaseInternalDisplayZoom() override;
- void DecreaseInternalDisplayZoom() override;
- void ResetInternalDisplayZoom() override;
- void RotateCurrentDisplayCW() override;
- void SwapPrimaryDisplay() override;
- void ToggleMirrorMode() override;
- void SetDisplayWorkArea(int64_t display_id,
- const gfx::Size& size,
- const gfx::Insets& insets) override;
- void TakeDisplayControl(const TakeDisplayControlCallback& callback) override;
- void RelinquishDisplayControl(
- const RelinquishDisplayControlCallback& callback) override;
-
- private:
- friend class ScreenManagerOzoneTest;
-
- ViewportMetrics GetViewportMetricsForDisplay(const Display& display);
-
- // DisplayObserver:
- void OnDisplayAdded(const Display& new_display) override;
- void OnDisplayRemoved(const Display& old_display) override;
- void OnDisplayMetricsChanged(const Display& display,
- uint32_t changed_metrics) override;
-
- // DisplayManager::Delegate:
- void CreateOrUpdateMirroringDisplay(
- const DisplayInfoList& display_info_list) override;
- void CloseMirroringDisplayIfNotNecessary() override;
- void PreDisplayConfigurationChange(bool clear_focus) override;
- void PostDisplayConfigurationChange(bool must_clear_window) override;
- DisplayConfigurator* display_configurator() override;
-
- // mojo::InterfaceFactory<mojom::DisplayController>:
- void Create(const service_manager::Identity& remote_identity,
- mojom::DisplayControllerRequest request) override;
-
- // mojo::InterfaceFactory<mojom::TestDisplayController>:
- void Create(const service_manager::Identity& remote_identity,
- mojom::TestDisplayControllerRequest request) override;
-
- DisplayConfigurator display_configurator_;
- std::unique_ptr<DisplayManager> display_manager_;
- std::unique_ptr<DisplayChangeObserver> display_change_observer_;
- std::unique_ptr<TouchTransformController> touch_transform_controller_;
-
- ScreenBase* screen_ = nullptr;
- ScreenManagerDelegate* delegate_ = nullptr;
-
- std::unique_ptr<NativeDisplayDelegate> native_display_delegate_;
-
- // If not null it provides a way to modify the display state when running off
- // device (eg. running mustash on Linux).
- FakeDisplayController* fake_display_controller_ = nullptr;
-
- int64_t primary_display_id_ = kInvalidDisplayId;
-
- mojo::BindingSet<mojom::DisplayController> controller_bindings_;
- mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzone);
-};
-
-} // namespace display
-
-#endif // SERVICES_UI_DISPLAY_SCREEN_MANAGER_OZONE_H_
« no previous file with comments | « services/ui/display/BUILD.gn ('k') | services/ui/display/screen_manager_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698