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

Unified Diff: ash/content/keyboard_overlay/keyboard_overlay_delegate.cc

Issue 2804523002: Fix mistmached |GetDisplayNearest{Window,View}| param type (Closed)
Patch Set: window Created 3 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/common/wm/window_cycle_list.cc ('k') | ash/display/screen_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/content/keyboard_overlay/keyboard_overlay_delegate.cc
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc
index bc79aca672bb53bfe9e08d4bc3b1f2cf0fe8ee8c..3cab0f186026c53a96c8a0d726fc455fad90e00c 100644
--- a/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc
+++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate.cc
@@ -78,9 +78,10 @@ views::Widget* KeyboardOverlayDelegate::Show(views::WebDialogView* view) {
// Show the widget at the bottom of the work area.
gfx::Size size;
GetDialogSize(&size);
- const gfx::Rect rect = display::Screen::GetScreen()
- ->GetDisplayNearestWindow(widget_->GetNativeView())
- .work_area();
+ const gfx::Rect rect =
+ display::Screen::GetScreen()
+ ->GetDisplayNearestWindow(widget_->GetNativeWindow())
+ .work_area();
gfx::Rect bounds(rect.x() + (rect.width() - size.width()) / 2,
rect.y() + (rect.height() - size.height()) / 2, size.width(),
size.height());
@@ -111,7 +112,7 @@ void KeyboardOverlayDelegate::GetDialogSize(gfx::Size* size) const {
using std::min;
DCHECK(widget_);
gfx::Rect rect = display::Screen::GetScreen()
- ->GetDisplayNearestWindow(widget_->GetNativeView())
+ ->GetDisplayNearestWindow(widget_->GetNativeWindow())
.work_area();
const int width = min(kBaseWidth, rect.width() - kHorizontalMargin);
const int height = width * kBaseHeight / kBaseWidth;
« no previous file with comments | « ash/common/wm/window_cycle_list.cc ('k') | ash/display/screen_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698