summaryrefslogtreecommitdiffstats
path: root/ash/display/display_change_observer_x11.h
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-05 02:16:35 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-05 02:16:35 +0000
commite98603298834ec12798d02f4e5b77c377eb830c7 (patch)
tree76cb402e3f4421e75954292f617638eefed36e6e /ash/display/display_change_observer_x11.h
parent9123168625a008a23f8c39d717bbf2a2ed7604d5 (diff)
downloadchromium_src-e98603298834ec12798d02f4e5b77c377eb830c7.zip
chromium_src-e98603298834ec12798d02f4e5b77c377eb830c7.tar.gz
chromium_src-e98603298834ec12798d02f4e5b77c377eb830c7.tar.bz2
chromeos: Refactor OutputConfigurator.
This moves OutputConfigurator's X11 code into a separate delegate class to make testing possible. It also removes some ugliness in the form of Displays, XRRScreenResources, and Windows getting passed between methods. No functional changes are intended. BUG=225536 Review URL: https://chromiumcodereview.appspot.com/13430025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_change_observer_x11.h')
-rw-r--r--ash/display/display_change_observer_x11.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/display/display_change_observer_x11.h b/ash/display/display_change_observer_x11.h
index 5396afd..079b12a 100644
--- a/ash/display/display_change_observer_x11.h
+++ b/ash/display/display_change_observer_x11.h
@@ -18,13 +18,14 @@ namespace internal {
// An object that observes changes in display configuration and
// update DisplayManagers.
-class DisplayChangeObserverX11 : public chromeos::OutputConfigurator::Delegate,
- public chromeos::OutputConfigurator::Observer {
+class DisplayChangeObserverX11
+ : public chromeos::OutputConfigurator::StateController,
+ public chromeos::OutputConfigurator::Observer {
public:
DisplayChangeObserverX11();
virtual ~DisplayChangeObserverX11();
- // chromeos::OutputConfigurator::Delegate overrides:
+ // chromeos::OutputConfigurator::StateController overrides:
virtual chromeos::OutputState GetStateForOutputs(
const std::vector<chromeos::OutputInfo>& outputs) const OVERRIDE;