summaryrefslogtreecommitdiffstats
path: root/chromeos/display/output_configurator.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 02:49:36 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 02:49:36 +0000
commit947f36a7de0b78169ff8e1bb851f528068bb1ecd (patch)
tree0c260765f896705691acd46672a0b3585c71ec8f /chromeos/display/output_configurator.h
parent6779453b2d9539938811c58049b4da84944d8a31 (diff)
downloadchromium_src-947f36a7de0b78169ff8e1bb851f528068bb1ecd.zip
chromium_src-947f36a7de0b78169ff8e1bb851f528068bb1ecd.tar.gz
chromium_src-947f36a7de0b78169ff8e1bb851f528068bb1ecd.tar.bz2
Don't handle display change event/requests to avoid being killed by session manager
BUG=177014 TEST=none Review URL: https://chromiumcodereview.appspot.com/12367007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/display/output_configurator.h')
-rw-r--r--chromeos/display/output_configurator.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h
index ea96a3b..cd3420a 100644
--- a/chromeos/display/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -74,6 +74,9 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher {
// color.
void Init(bool is_panel_fitting_enabled, uint32 background_color_argb);
+ // Stop handling display configuration events/requests.
+ void Stop();
+
// Called when the user hits ctrl-F4 to request a display mode change.
// This method should only return false if it was called in a single-head or
// headless mode.
@@ -178,7 +181,7 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher {
// Xrandr X11 extension is supported.
// If this flag is set to false, any attempts to change the output
// configuration to immediately fail without changing the state.
- bool is_running_on_chrome_os_;
+ bool configure_display_;
// This is set externally in Init,
// and is used to enable modes which rely on panel fitting.