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

Unified Diff: ash/utility/partial_screenshot_controller.h

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (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 | « ash/touch/touchscreen_util.cc ('k') | ash/utility/partial_screenshot_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/utility/partial_screenshot_controller.h
diff --git a/ash/utility/partial_screenshot_controller.h b/ash/utility/partial_screenshot_controller.h
index bfb8d4fc8cb778da12abcd370048667dd03651c1..6f2ca36d65880409279debed738da74b4beb856e 100644
--- a/ash/utility/partial_screenshot_controller.h
+++ b/ash/utility/partial_screenshot_controller.h
@@ -13,8 +13,8 @@
#include "ash/ash_export.h"
#include "ash/shell_observer.h"
#include "base/macros.h"
+#include "ui/display/display_observer.h"
#include "ui/events/event_handler.h"
-#include "ui/gfx/display_observer.h"
#include "ui/gfx/geometry/point.h"
namespace aura {
@@ -34,7 +34,7 @@ class ScreenshotDelegate;
// This class does not use aura::Window / views::Widget intentionally to avoid
// the conflicts of window manager features like mouse captures or window focus.
class ASH_EXPORT PartialScreenshotController : public ui::EventHandler,
- public gfx::DisplayObserver {
+ public display::DisplayObserver {
public:
PartialScreenshotController();
~PartialScreenshotController() override;
@@ -61,10 +61,10 @@ class ASH_EXPORT PartialScreenshotController : public ui::EventHandler,
void OnMouseEvent(ui::MouseEvent* event) override;
void OnTouchEvent(ui::TouchEvent* event) override;
- // gfx::DisplayObserver:
- void OnDisplayAdded(const gfx::Display& new_display) override;
- void OnDisplayRemoved(const gfx::Display& old_display) override;
- void OnDisplayMetricsChanged(const gfx::Display& display,
+ // display::DisplayObserver:
+ void OnDisplayAdded(const display::Display& new_display) override;
+ void OnDisplayRemoved(const display::Display& old_display) override;
+ void OnDisplayMetricsChanged(const display::Display& display,
uint32_t changed_metrics) override;
// The data to build the screenshot region.
« no previous file with comments | « ash/touch/touchscreen_util.cc ('k') | ash/utility/partial_screenshot_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698