Index: chromeos/display/output_configurator.h |
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h |
index faef729ae69f26b1cc06c96895a15d4dbe193ad9..3821ace017256d6b8270f0ec0bca595ac53a29a5 100644 |
--- a/chromeos/display/output_configurator.h |
+++ b/chromeos/display/output_configurator.h |
@@ -6,6 +6,7 @@ |
#define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_ |
#include <map> |
+#include <string> |
#include <vector> |
#include "base/basictypes.h" |
@@ -70,6 +71,9 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher { |
// XInput device ID or 0 if this output isn't a touchscreen. |
int touch_device_id; |
+ |
+ // Display id for this output. |
+ int64 display_id; |
}; |
struct CoordinateTransformation { |
@@ -113,8 +117,8 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher { |
virtual ~StateController() {} |
// Called when displays are detected. |
- virtual OutputState GetStateForOutputs( |
- const std::vector<OutputInfo>& outputs) const = 0; |
+ virtual OutputState GetStateForDisplayIds( |
+ const std::vector<int64>& display_ids) const = 0; |
}; |
// Interface for classes that perform actions on behalf of OutputController. |
@@ -221,9 +225,6 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher { |
// See crbug.com/130188 for initial discussion. |
static const int kVerticalGap = 60; |
- // Returns true if an output named |name| is an internal display. |
- static bool IsInternalOutputName(const std::string& name); |
- |
OutputConfigurator(); |
virtual ~OutputConfigurator(); |