Revert 185178: Broke CrOS build:

chromeos-chrome-27.0.1425.0_alpha-r1: ui/base/x/events_x.cc: In function 'gfx::Point {anonymous}::CalibrateTouchCoordinates(const XIDeviceEvent*)':
chromeos-chrome-27.0.1425.0_alpha-r1: ui/base/x/events_x.cc:722:59: error: 'class gfx::Display' has no member named 'bounds_in_pixel'
http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28daisy%29/builds/7530/steps/BuildTarget/logs/stdio

> Refactor DisplayInfo/Display
> 
> This is a first step to fix overscan issue and implement
> screen rotation.
> 
> * remove bounds_in_pixel from gfx::Display
> * promote DisplayInfo to separate class/file
> * All display information is now generated in display_change_observer_x11.cc.
>   almost no X11 depenency in display_manager.cc
>  (I'll move FindInternalDisplayID out from display_manager.cc once https://codereview.chromium.org/12217120/ is landed)
> 
>   This makes testing more consistent with real environment.
> 
> * Add DisplayManager::ClearCustomOverscanInsets so that
>   you can reset the insets to default value.
> * Removed obsolete AshTestBase::ChangeDisplayConfig
> 
> BUG=174721,119268
> TEST=covered by test
> 
> Review URL: https://chromiumcodereview.appspot.com/12218045

TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/12386017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185188 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 0 deletions

diff --git a/ui/gfx/display.h b/ui/gfx/display.h
index 81963f2..4df69b7 100644
--- a/ui/gfx/display.h
+++ b/ui/gfx/display.h
@@ -88,6 +88,13 @@ class UI_EXPORT Display {
   // Returns the display's size in pixel coordinates.
   gfx::Size GetSizeInPixel() const;
 
+#if defined(USE_AURA)
+  // TODO(oshima|skuhne): Eliminate the use of bounds_in_pixel in events_x.cc
+  // and remove bounds_in_pixel from gfx::Display.
+  // Returns the display's bounds in pixel coordinates.
+  const Rect& bounds_in_pixel() const { return bounds_in_pixel_; }
+#endif
+
   // Returns a string representation of the display;
   std::string ToString() const;
 
@@ -107,6 +114,9 @@ class UI_EXPORT Display {
   int64 id_;
   Rect bounds_;
   Rect work_area_;
+#if defined(USE_AURA)
+  Rect bounds_in_pixel_;
+#endif
   float device_scale_factor_;
 };