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

Unified Diff: chrome/browser/chromeos/input_method/candidate_window.cc

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/chromeos/login/helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/candidate_window.cc
diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index bfff28e52f247ea7e1f263fb4241a64fcecf90f3..b6ae0cb2ce297ddc53e91f5331d6395193a1fb73 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -1205,8 +1205,8 @@ void CandidateWindowView::ResizeAndMoveParentFrame() {
const int horizontal_offset = GetHorizontalOffset();
gfx::Rect old_bounds = parent_frame_->GetClientAreaScreenBounds();
- gfx::Rect screen_bounds = gfx::Screen::GetMonitorWorkAreaNearestWindow(
- parent_frame_->GetNativeView());
+ gfx::Rect screen_bounds = gfx::Screen::GetMonitorNearestWindow(
+ parent_frame_->GetNativeView()).work_area();
// The size.
gfx::Rect frame_bounds = old_bounds;
frame_bounds.set_size(GetPreferredSize());
@@ -1478,8 +1478,8 @@ void InfolistWindowView::UpdateCandidates(
void InfolistWindowView::ResizeAndMoveParentFrame() {
int x, y;
gfx::Rect old_bounds = parent_frame_->GetClientAreaScreenBounds();
- gfx::Rect screen_bounds = gfx::Screen::GetMonitorWorkAreaNearestWindow(
- parent_frame_->GetNativeView());
+ gfx::Rect screen_bounds = gfx::Screen::GetMonitorNearestWindow(
+ parent_frame_->GetNativeView()).work_area();
// The size.
gfx::Rect frame_bounds = old_bounds;
frame_bounds.set_size(GetPreferredSize());
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/chromeos/login/helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698