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

Unified Diff: ui/views/cocoa/bridged_native_widget.mm

Issue 1929203004: Rename gfx::Display/Screen to display::Display/Screen in views mac (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
« no previous file with comments | « no previous file | ui/views/event_monitor_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_native_widget.mm
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
index 0ccff9d15a0fd3402ed9c1e613f6552cd7de2f62..6fd25948eacf5b38a799ff65f4d4b84e8224f4b0 100644
--- a/ui/views/cocoa/bridged_native_widget.mm
+++ b/ui/views/cocoa/bridged_native_widget.mm
@@ -18,11 +18,11 @@
#include "ui/base/hit_test.h"
#include "ui/base/ime/input_method.h"
#include "ui/base/ime/input_method_factory.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
#include "ui/gfx/geometry/dip_util.h"
#import "ui/gfx/mac/coordinate_conversion.h"
#import "ui/gfx/mac/nswindow_frame_controls.h"
-#include "ui/gfx/screen.h"
#import "ui/views/cocoa/bridged_content_view.h"
#import "ui/views/cocoa/cocoa_mouse_capture.h"
#include "ui/views/cocoa/tooltip_manager_mac.h"
@@ -107,8 +107,8 @@ const int kResizeAreaCornerSize = 12;
int kWindowPropertiesKey;
float GetDeviceScaleFactorFromView(NSView* view) {
- gfx::Display display =
- gfx::Screen::GetScreen()->GetDisplayNearestWindow(view);
+ display::Display display =
+ display::Screen::GetScreen()->GetDisplayNearestWindow(view);
DCHECK(display.is_valid());
return display.device_scale_factor();
}
« no previous file with comments | « no previous file | ui/views/event_monitor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698