summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc2
-rw-r--r--chrome/browser/ui/panels/display_settings_provider.cc6
-rw-r--r--chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc2
-rw-r--r--chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc2
-rw-r--r--chrome/browser/ui/pdf/pdf_browsertest.cc2
-rw-r--r--chrome/browser/ui/views/ash/window_positioner.cc4
-rw-r--r--chrome/browser/ui/views/ash/window_positioner_unittest.cc10
-rw-r--r--chrome/browser/ui/views/chrome_views_delegate.cc2
-rw-r--r--chrome/browser/ui/views/extensions/extension_dialog.cc2
-rw-r--r--chrome/browser/ui/views/fullscreen_exit_bubble_views.cc2
-rw-r--r--chrome/browser/ui/views/keyboard_overlay_delegate.cc4
-rw-r--r--chrome/browser/ui/views/status_bubble_views.cc2
-rw-r--r--chrome/browser/ui/views/tabs/dock_info_win.cc2
-rw-r--r--chrome/browser/ui/views/tabs/tab_drag_controller.cc2
-rw-r--r--chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc2
-rw-r--r--chrome/browser/ui/window_sizer.cc14
-rw-r--r--chrome/browser/ui/window_sizer.h4
-rw-r--r--chrome/browser/ui/window_sizer_ash.cc2
-rw-r--r--chrome/browser/ui/window_sizer_common_unittest.h8
-rw-r--r--chrome/browser/ui/window_sizer_gtk.cc2
20 files changed, 38 insertions, 38 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 6ea2b9c..f5493d3 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -2130,7 +2130,7 @@ void BrowserWindowGtk::SaveWindowPosition() {
window_preferences->SetBoolean("maximized", IsMaximized());
gfx::Rect work_area(
- gfx::Screen::GetMonitorMatching(restored_bounds_).work_area());
+ gfx::Screen::GetDisplayMatching(restored_bounds_).work_area());
window_preferences->SetInteger("work_area_left", work_area.x());
window_preferences->SetInteger("work_area_top", work_area.y());
window_preferences->SetInteger("work_area_right", work_area.right());
diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc
index 32b3955..d27ed9d 100644
--- a/chrome/browser/ui/panels/display_settings_provider.cc
+++ b/chrome/browser/ui/panels/display_settings_provider.cc
@@ -69,7 +69,7 @@ gfx::Rect DisplaySettingsProvider::GetDisplayArea() {
}
gfx::Rect DisplaySettingsProvider::GetPrimaryScreenArea() const {
- return gfx::Screen::GetPrimaryMonitor().bounds();
+ return gfx::Screen::GetPrimaryDisplay().bounds();
}
gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
@@ -78,7 +78,7 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
// screen (and overlap Dock). And we also want to exclude the system menu
// area. Note that the rect returned from gfx::Screen util functions is in
// platform-independent screen coordinates with (0, 0) as the top-left corner.
- gfx::Display display = gfx::Screen::GetPrimaryMonitor();
+ gfx::Display display = gfx::Screen::GetPrimaryDisplay();
gfx::Rect display_area = display.bounds();
gfx::Rect work_area = display.work_area();
int system_menu_height = work_area.y() - display_area.y();
@@ -88,7 +88,7 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
}
return display_area;
#else
- gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+ gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
#endif
return work_area;
}
diff --git a/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc b/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc
index 0bb710a..155121d 100644
--- a/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc
@@ -84,7 +84,7 @@ class OldPanelAndDesktopNotificationTest : public OldBasePanelBrowserTest {
// The position returned by the notification balloon is based on Mac's
// vertically inverted orientation. We need to flip it so that it can
// be compared against the position returned by the panel.
- gfx::Size screen_size = gfx::Screen::GetPrimaryMonitor().size();
+ gfx::Size screen_size = gfx::Screen::GetPrimaryDisplay().size();
return screen_size.height() - balloon->GetPosition().y();
#else
return balloon->GetPosition().y() + balloon->GetViewSize().height();
diff --git a/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc b/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc
index 1e9f54a..ae2f83e 100644
--- a/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_and_desktop_notification_browsertest.cc
@@ -88,7 +88,7 @@ class PanelAndDesktopNotificationTest : public BasePanelBrowserTest {
// The position returned by the notification balloon is based on Mac's
// vertically inverted orientation. We need to flip it so that it can
// be compared against the position returned by the panel.
- gfx::Size screen_size = gfx::Screen::GetPrimaryMonitor().size();
+ gfx::Size screen_size = gfx::Screen::GetPrimaryDisplay().size();
return screen_size.height() - balloon->GetPosition().y();
#else
return balloon->GetPosition().y() + balloon->GetViewSize().height();
diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc
index bcc5c95..5a4b3d9 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest.cc
+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc
@@ -69,7 +69,7 @@ class PDFBrowserTest : public InProcessBrowserTest,
// to a smaller window and then expanding leads to slight anti-aliasing
// differences of the text and the pixel comparison fails.
gfx::Rect bounds(gfx::Rect(0, 0, kBrowserWidth, kBrowserHeight));
- gfx::Rect screen_bounds = gfx::Screen::GetPrimaryMonitor().bounds();
+ gfx::Rect screen_bounds = gfx::Screen::GetPrimaryDisplay().bounds();
ASSERT_GT(screen_bounds.width(), kBrowserWidth);
ASSERT_GT(screen_bounds.height(), kBrowserHeight);
browser()->window()->SetBounds(bounds);
diff --git a/chrome/browser/ui/views/ash/window_positioner.cc b/chrome/browser/ui/views/ash/window_positioner.cc
index f84dfe3..3e73c6d 100644
--- a/chrome/browser/ui/views/ash/window_positioner.cc
+++ b/chrome/browser/ui/views/ash/window_positioner.cc
@@ -48,8 +48,8 @@ gfx::Rect WindowPositioner::GetPopupPosition(const gfx::Rect& old_pos) {
// work area.
aura::Window* window = ash::wm::GetActiveWindow();
const gfx::Rect work_area = window && window->IsVisible() ?
- gfx::Screen::GetMonitorNearestWindow(window).work_area() :
- gfx::Screen::GetPrimaryMonitor().work_area();
+ gfx::Screen::GetDisplayNearestWindow(window).work_area() :
+ gfx::Screen::GetPrimaryDisplay().work_area();
// Only try to reposition the popup when it is not spanning the entire
// screen.
if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=
diff --git a/chrome/browser/ui/views/ash/window_positioner_unittest.cc b/chrome/browser/ui/views/ash/window_positioner_unittest.cc
index 65ad94e..737c3db 100644
--- a/chrome/browser/ui/views/ash/window_positioner_unittest.cc
+++ b/chrome/browser/ui/views/ash/window_positioner_unittest.cc
@@ -12,8 +12,8 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/test_browser_window.h"
+#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/render_view_test.h"
#include "content/public/test/test_browser_thread.h"
@@ -194,7 +194,7 @@ void WindowPositionerTest::TearDown() {
} // namespace
TEST_F(WindowPositionerTest, cascading) {
- const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+ const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
// First see that the window will cascade down when there is no space.
window()->SetBounds(work_area);
@@ -254,7 +254,7 @@ TEST_F(WindowPositionerTest, cascading) {
}
TEST_F(WindowPositionerTest, filling) {
- const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+ const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
int grid = ash::Shell::GetInstance()->GetGridSize();
gfx::Rect popup_position(0, 0, 256, 128);
// Leave space on the left and the right and see if we fill top to bottom.
@@ -309,7 +309,7 @@ TEST_F(WindowPositionerTest, filling) {
}
TEST_F(WindowPositionerTest, blockedByPanel) {
- const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+ const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
gfx::Rect pop_position(0, 0, 200, 200);
// Let the panel cover everything.
@@ -324,7 +324,7 @@ TEST_F(WindowPositionerTest, blockedByPanel) {
}
TEST_F(WindowPositionerTest, biggerThenBorder) {
- const gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor().work_area();
+ const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
gfx::Rect pop_position(0, 0, work_area.width(), work_area.height());
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 001c203..ba23179 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -75,7 +75,7 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
window_preferences->SetBoolean("maximized",
show_state == ui::SHOW_STATE_MAXIMIZED);
gfx::Rect work_area(
- gfx::Screen::GetMonitorMatching(bounds).work_area());
+ gfx::Screen::GetDisplayMatching(bounds).work_area());
window_preferences->SetInteger("work_area_left", work_area.x());
window_preferences->SetInteger("work_area_top", work_area.y());
window_preferences->SetInteger("work_area_right", work_area.right());
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc
index d9a531d..e9f9f03 100644
--- a/chrome/browser/ui/views/extensions/extension_dialog.cc
+++ b/chrome/browser/ui/views/extensions/extension_dialog.cc
@@ -132,7 +132,7 @@ ExtensionHost* ExtensionDialog::CreateExtensionHost(const GURL& url,
void ExtensionDialog::InitWindowFullscreen() {
aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
gfx::Rect screen_rect =
- gfx::Screen::GetMonitorNearestWindow(root_window).bounds();
+ gfx::Screen::GetDisplayNearestWindow(root_window).bounds();
// We want to be the fullscreen topmost child of the root window.
window_ = new views::Widget;
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index 8d34e70..45ce385 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -340,7 +340,7 @@ gfx::Rect FullscreenExitBubbleViews::GetPopupRect(
gfx::Size size(view_->GetPreferredSize());
// NOTE: don't use the bounds of the root_view_. On linux changing window
// size is async. Instead we use the size of the screen.
- gfx::Rect screen_bounds = gfx::Screen::GetMonitorNearestWindow(
+ gfx::Rect screen_bounds = gfx::Screen::GetDisplayNearestWindow(
root_view_->GetWidget()->GetNativeView()).bounds();
gfx::Point origin(screen_bounds.x() +
(screen_bounds.width() - size.width()) / 2,
diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc
index 7844537..55b7dc5 100644
--- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc
@@ -81,7 +81,7 @@ void KeyboardOverlayDelegate::Show(WebDialogView* view) {
// Show the widget at the bottom of the work area.
gfx::Size size;
GetDialogSize(&size);
- const gfx::Rect& rect = gfx::Screen::GetMonitorNearestWindow(
+ const gfx::Rect& rect = gfx::Screen::GetDisplayNearestWindow(
widget->GetNativeView()).work_area();
gfx::Rect bounds((rect.width() - size.width()) / 2,
rect.height() - size.height(),
@@ -114,7 +114,7 @@ void KeyboardOverlayDelegate::GetDialogSize(
gfx::Size* size) const {
using std::min;
DCHECK(view_);
- gfx::Rect rect = gfx::Screen::GetMonitorNearestWindow(
+ gfx::Rect rect = gfx::Screen::GetDisplayNearestWindow(
view_->GetWidget()->GetNativeView()).bounds();
const int width = min(kBaseWidth, rect.width() - kHorizontalMargin);
const int height = width * kBaseHeight / kBaseWidth;
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 9d23448..85167cf 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -766,7 +766,7 @@ void StatusBubbleViews::AvoidMouse(const gfx::Point& location) {
// download shelf.
gfx::NativeView widget = base_view_->GetWidget()->GetNativeView();
gfx::Rect monitor_rect =
- gfx::Screen::GetMonitorNearestWindow(widget).work_area();
+ gfx::Screen::GetDisplayNearestWindow(widget).work_area();
const int bubble_bottom_y = top_left.y() + position_.y() + size_.height();
if (bubble_bottom_y + offset > monitor_rect.height() ||
diff --git a/chrome/browser/ui/views/tabs/dock_info_win.cc b/chrome/browser/ui/views/tabs/dock_info_win.cc
index f5fa245..c4f23ef 100644
--- a/chrome/browser/ui/views/tabs/dock_info_win.cc
+++ b/chrome/browser/ui/views/tabs/dock_info_win.cc
@@ -242,7 +242,7 @@ class DockToWindowFinder : public BaseWindowFinder {
const std::set<HWND>& ignore)
: BaseWindowFinder(ignore),
screen_loc_(screen_loc) {
- gfx::Rect work_area = gfx::Screen::GetMonitorNearestPoint(
+ gfx::Rect work_area = gfx::Screen::GetDisplayNearestPoint(
screen_loc).bounds();
if (!work_area.IsEmpty()) {
result_.set_monitor_bounds(work_area);
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index dc91d4d..5b2763e 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -632,7 +632,7 @@ gfx::Point TabDragController::GetWindowCreatePoint(
// If the cursor is outside the monitor area, move it inside. For example,
// dropping a tab onto the task bar on Windows produces this situation.
- gfx::Rect work_area = gfx::Screen::GetMonitorNearestPoint(origin).work_area();
+ gfx::Rect work_area = gfx::Screen::GetDisplayNearestPoint(origin).work_area();
gfx::Point create_point(origin);
if (!work_area.IsEmpty()) {
if (create_point.x() < work_area.x())
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 69e3a2f..4e7a4cf 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -137,7 +137,7 @@ Browser* TabDragControllerTest::CreateAnotherWindowBrowserAndRelayout() {
ResetIDs(browser2->tab_strip_model(), 100);
// Resize the two windows so they're right next to each other.
- gfx::Rect work_area = gfx::Screen::GetMonitorNearestWindow(
+ gfx::Rect work_area = gfx::Screen::GetDisplayNearestWindow(
browser()->window()->GetNativeWindow()).work_area();
gfx::Size half_size =
gfx::Size(work_area.width() / 3 - 10, work_area.height() / 2 - 10);
diff --git a/chrome/browser/ui/window_sizer.cc b/chrome/browser/ui/window_sizer.cc
index 0dffea6..13a1505 100644
--- a/chrome/browser/ui/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer.cc
@@ -22,15 +22,15 @@ const int kMinVisibleWidth = 30;
class DefaultMonitorInfoProvider : public MonitorInfoProvider {
public:
// Overridden from MonitorInfoProvider:
- virtual gfx::Rect GetPrimaryMonitorWorkArea() const OVERRIDE {
- return gfx::Screen::GetPrimaryMonitor().work_area();
+ virtual gfx::Rect GetPrimaryDisplayWorkArea() const OVERRIDE {
+ return gfx::Screen::GetPrimaryDisplay().work_area();
}
- virtual gfx::Rect GetPrimaryMonitorBounds() const OVERRIDE {
- return gfx::Screen::GetPrimaryMonitor().bounds();
+ virtual gfx::Rect GetPrimaryDisplayBounds() const OVERRIDE {
+ return gfx::Screen::GetPrimaryDisplay().bounds();
}
virtual gfx::Rect GetMonitorWorkAreaMatching(
const gfx::Rect& match_rect) const OVERRIDE {
- return gfx::Screen::GetMonitorMatching(match_rect).work_area();
+ return gfx::Screen::GetDisplayMatching(match_rect).work_area();
}
};
@@ -213,7 +213,7 @@ void WindowSizer::GetDefaultWindowBounds(gfx::Rect* default_bounds) const {
DCHECK(default_bounds);
DCHECK(monitor_info_provider_.get());
- gfx::Rect work_area = monitor_info_provider_->GetPrimaryMonitorWorkArea();
+ gfx::Rect work_area = monitor_info_provider_->GetPrimaryDisplayWorkArea();
// The default size is either some reasonably wide width, or if the work
// area is narrower, then the work area width less some aesthetic padding.
@@ -222,7 +222,7 @@ void WindowSizer::GetDefaultWindowBounds(gfx::Rect* default_bounds) const {
// For wider aspect ratio displays at higher resolutions, we might size the
// window narrower to allow two windows to easily be placed side-by-side.
- gfx::Rect screen_size = monitor_info_provider_->GetPrimaryMonitorBounds();
+ gfx::Rect screen_size = monitor_info_provider_->GetPrimaryDisplayBounds();
double width_to_height =
static_cast<double>(screen_size.width()) / screen_size.height();
diff --git a/chrome/browser/ui/window_sizer.h b/chrome/browser/ui/window_sizer.h
index 9a3553c..cdf765b 100644
--- a/chrome/browser/ui/window_sizer.h
+++ b/chrome/browser/ui/window_sizer.h
@@ -19,10 +19,10 @@ class MonitorInfoProvider {
virtual ~MonitorInfoProvider() {}
// Returns the bounds of the work area of the primary monitor.
- virtual gfx::Rect GetPrimaryMonitorWorkArea() const = 0;
+ virtual gfx::Rect GetPrimaryDisplayWorkArea() const = 0;
// Returns the bounds of the primary monitor.
- virtual gfx::Rect GetPrimaryMonitorBounds() const = 0;
+ virtual gfx::Rect GetPrimaryDisplayBounds() const = 0;
// Returns the bounds of the work area of the monitor that most closely
// intersects the provided bounds.
diff --git a/chrome/browser/ui/window_sizer_ash.cc b/chrome/browser/ui/window_sizer_ash.cc
index c941c90..e1eb836 100644
--- a/chrome/browser/ui/window_sizer_ash.cc
+++ b/chrome/browser/ui/window_sizer_ash.cc
@@ -100,7 +100,7 @@ void WindowSizer::GetDefaultWindowBounds(gfx::Rect* default_bounds) const {
DCHECK(default_bounds);
DCHECK(monitor_info_provider_.get());
- gfx::Rect work_area = monitor_info_provider_->GetPrimaryMonitorWorkArea();
+ gfx::Rect work_area = monitor_info_provider_->GetPrimaryDisplayWorkArea();
DCHECK_EQ(kDesktopBorderSize, ash::Shell::GetInstance()->GetGridSize());
diff --git a/chrome/browser/ui/window_sizer_common_unittest.h b/chrome/browser/ui/window_sizer_common_unittest.h
index 38323d1..2345d29 100644
--- a/chrome/browser/ui/window_sizer_common_unittest.h
+++ b/chrome/browser/ui/window_sizer_common_unittest.h
@@ -47,9 +47,9 @@ class TestMonitorInfoProvider : public MonitorInfoProvider {
void AddMonitor(const gfx::Rect& bounds, const gfx::Rect& work_area);
// Overridden from WindowSizer::MonitorInfoProvider:
- virtual gfx::Rect GetPrimaryMonitorWorkArea() const OVERRIDE;
+ virtual gfx::Rect GetPrimaryDisplayWorkArea() const OVERRIDE;
- virtual gfx::Rect GetPrimaryMonitorBounds() const OVERRIDE;
+ virtual gfx::Rect GetPrimaryDisplayBounds() const OVERRIDE;
virtual gfx::Rect GetMonitorWorkAreaMatching(
const gfx::Rect& match_rect) const OVERRIDE;
@@ -74,11 +74,11 @@ void TestMonitorInfoProvider::AddMonitor(const gfx::Rect& bounds,
}
// Overridden from WindowSizer::MonitorInfoProvider:
-gfx::Rect TestMonitorInfoProvider::GetPrimaryMonitorWorkArea() const {
+gfx::Rect TestMonitorInfoProvider::GetPrimaryDisplayWorkArea() const {
return work_areas_[0];
}
-gfx::Rect TestMonitorInfoProvider::GetPrimaryMonitorBounds() const {
+gfx::Rect TestMonitorInfoProvider::GetPrimaryDisplayBounds() const {
return monitor_bounds_[0];
}
diff --git a/chrome/browser/ui/window_sizer_gtk.cc b/chrome/browser/ui/window_sizer_gtk.cc
index 3598361..6c00319 100644
--- a/chrome/browser/ui/window_sizer_gtk.cc
+++ b/chrome/browser/ui/window_sizer_gtk.cc
@@ -20,7 +20,7 @@ const int WindowSizer::kWindowTilePixels = 10;
// static
gfx::Point WindowSizer::GetDefaultPopupOrigin(const gfx::Size& size) {
- gfx::Rect monitor_bounds = gfx::Screen::GetPrimaryMonitor().work_area();
+ gfx::Rect monitor_bounds = gfx::Screen::GetPrimaryDisplay().work_area();
gfx::Point corner(monitor_bounds.x(), monitor_bounds.y());
if (Browser* browser = BrowserList::GetLastActive()) {
GtkWindow* window =