Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: ui/gfx/monitor.h

Issue 10260033: Build fixes to get use_aura && !use_ash to build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | ui/gfx/monitor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_MONITOR_H_ 5 #ifndef UI_GFX_MONITOR_H_
6 #define UI_GFX_MONITOR_H_ 6 #define UI_GFX_MONITOR_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 const gfx::Rect& bounds_in_pixel); 62 const gfx::Rect& bounds_in_pixel);
63 63
64 // Sets the monitor's size. This updates the work area using the same insets 64 // Sets the monitor's size. This updates the work area using the same insets
65 // between old bounds and work area. 65 // between old bounds and work area.
66 void SetSize(const gfx::Size& size_in_pixel); 66 void SetSize(const gfx::Size& size_in_pixel);
67 67
68 // Computes and updates the monitor's work are using 68 // Computes and updates the monitor's work are using
69 // |work_area_insets| and the bounds. 69 // |work_area_insets| and the bounds.
70 void UpdateWorkAreaFromInsets(const gfx::Insets& work_area_insets); 70 void UpdateWorkAreaFromInsets(const gfx::Insets& work_area_insets);
71 71
72 #if defined(USE_ASH) 72 #if defined(USE_AURA)
73 // TODO(oshima): |bounds()| on ash is not screen's coordinate and 73 // TODO(oshima): |bounds()| on ash is not screen's coordinate and
74 // this is an workaround for this. This will be removed when ash 74 // this is an workaround for this. This will be removed when ash
75 // has true multi monitor support. crbug.com/119268. 75 // has true multi monitor support. crbug.com/119268.
76 // Returns the monitor's bounds in pixel coordinates. 76 // Returns the monitor's bounds in pixel coordinates.
77 const Rect& bounds_in_pixel() const { return bounds_in_pixel_; } 77 const Rect& bounds_in_pixel() const { return bounds_in_pixel_; }
78 #endif 78 #endif
79 79
80 // Returns a string representation of the monitor; 80 // Returns a string representation of the monitor;
81 std::string ToString() const; 81 std::string ToString() const;
82 82
83 private: 83 private:
84 int id_; 84 int id_;
85 Rect bounds_; 85 Rect bounds_;
86 Rect work_area_; 86 Rect work_area_;
87 #if defined(USE_ASH) 87 #if defined(USE_AURA)
88 Rect bounds_in_pixel_; 88 Rect bounds_in_pixel_;
89 #endif 89 #endif
90 float device_scale_factor_; 90 float device_scale_factor_;
91 }; 91 };
92 92
93 } // namespace gfx 93 } // namespace gfx
94 94
95 #endif // UI_GFX_MONITOR_H_ 95 #endif // UI_GFX_MONITOR_H_
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | ui/gfx/monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698