| Index: ash/display/display_change_observer_chromeos.h
|
| diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
|
| deleted file mode 100644
|
| index b7f51f1ae3d05e16347723bd358875dc97419830..0000000000000000000000000000000000000000
|
| --- a/ash/display/display_change_observer_chromeos.h
|
| +++ /dev/null
|
| @@ -1,77 +0,0 @@
|
| -// Copyright 2013 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 ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
|
| -#define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
|
| -
|
| -#include <stdint.h>
|
| -
|
| -#include <memory>
|
| -#include <vector>
|
| -
|
| -#include "ash/ash_export.h"
|
| -#include "base/macros.h"
|
| -#include "ui/display/manager/chromeos/display_configurator.h"
|
| -#include "ui/display/manager/managed_display_info.h"
|
| -#include "ui/events/devices/input_device_event_observer.h"
|
| -
|
| -namespace display {
|
| -class DisplayManager;
|
| -}
|
| -
|
| -namespace ash {
|
| -
|
| -class DisplaySnapshot;
|
| -
|
| -// An object that observes changes in display configuration and updates
|
| -// DisplayManager.
|
| -class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
|
| - public ui::DisplayConfigurator::Observer,
|
| - public ui::InputDeviceEventObserver {
|
| - public:
|
| - // Returns the mode list for internal display.
|
| - ASH_EXPORT static display::ManagedDisplayInfo::ManagedDisplayModeList
|
| - GetInternalManagedDisplayModeList(
|
| - const display::ManagedDisplayInfo& display_info,
|
| - const ui::DisplaySnapshot& output);
|
| -
|
| - // Returns the resolution list.
|
| - ASH_EXPORT static display::ManagedDisplayInfo::ManagedDisplayModeList
|
| - GetExternalManagedDisplayModeList(const ui::DisplaySnapshot& output);
|
| -
|
| - DisplayChangeObserver(ui::DisplayConfigurator* display_configurator,
|
| - display::DisplayManager* display_manager);
|
| - ~DisplayChangeObserver() override;
|
| -
|
| - // ui::DisplayConfigurator::StateController overrides:
|
| - ui::MultipleDisplayState GetStateForDisplayIds(
|
| - const ui::DisplayConfigurator::DisplayStateList& outputs) const override;
|
| - bool GetResolutionForDisplayId(int64_t display_id,
|
| - gfx::Size* size) const override;
|
| -
|
| - // Overriden from ui::DisplayConfigurator::Observer:
|
| - void OnDisplayModeChanged(
|
| - const ui::DisplayConfigurator::DisplayStateList& outputs) override;
|
| - void OnDisplayModeChangeFailed(
|
| - const ui::DisplayConfigurator::DisplayStateList& displays,
|
| - ui::MultipleDisplayState failed_new_state) override;
|
| -
|
| - // Overriden from ui::InputDeviceEventObserver:
|
| - void OnTouchscreenDeviceConfigurationChanged() override;
|
| -
|
| - // Exposed for testing.
|
| - ASH_EXPORT static float FindDeviceScaleFactor(float dpi);
|
| -
|
| - private:
|
| - // Both |display_configurator_| and |display_manager_| are not owned and must
|
| - // outlive DisplayChangeObserver.
|
| - ui::DisplayConfigurator* display_configurator_;
|
| - display::DisplayManager* display_manager_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver);
|
| -};
|
| -
|
| -} // namespace ash
|
| -
|
| -#endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
|
|
|