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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_button.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index d910b3720f205198a7653014b41fed38c8874085..6ae0e07c7980cb2d88ba5082a955beb4b92d8b64 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -19,8 +19,8 @@
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/models/menu_model.h"
#include "ui/base/theme_provider.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/animation/button_ink_drop_delegate.h"
#include "ui/views/controls/button/label_button_border.h"
@@ -201,15 +201,15 @@ void ToolbarButton::ShowDropDownMenu(ui::MenuSourceType source_type) {
// Use the left bound of the display on which
// the menu button exists.
gfx::NativeView view = GetWidget()->GetNativeView();
- gfx::Display display =
- gfx::Screen::GetScreen()->GetDisplayNearestWindow(view);
+ display::Display display =
+ display::Screen::GetScreen()->GetDisplayNearestWindow(view);
int left_bound = display.bounds().x();
#else
// The window might be positioned over the edge between two screens. We'll
// want to position the dropdown on the screen the mouse cursor is on.
- gfx::Screen* screen = gfx::Screen::GetScreen();
- gfx::Display display = screen->GetDisplayNearestPoint(
- screen->GetCursorScreenPoint());
+ display::Screen* screen = display::Screen::GetScreen();
+ display::Display display =
+ screen->GetDisplayNearestPoint(screen->GetCursorScreenPoint());
int left_bound = display.bounds().x();
#endif
if (menu_position.x() < left_bound)
« no previous file with comments | « chrome/browser/ui/views/tabs/window_finder_x11.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698