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

Unified Diff: ash/wm/overview/window_selector.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/wm/overview/window_grid.cc ('k') | ash/wm/overview/window_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector.h
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h
index 6328b399fe370a997b45ab653dd371d8212d4fe6..6311121934b68f7e023ae03037739704e587ff97 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -19,8 +19,8 @@
#include "base/time/time.h"
#include "ui/aura/window_observer.h"
#include "ui/aura/window_tracker.h"
+#include "ui/display/display_observer.h"
#include "ui/events/event_handler.h"
-#include "ui/gfx/display_observer.h"
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/wm/public/activation_change_observer.h"
@@ -50,11 +50,10 @@ class WindowGrid;
// The WindowSelector shows a grid of all of your windows, allowing to select
// one by clicking or tapping on it.
-class ASH_EXPORT WindowSelector
- : public gfx::DisplayObserver,
- public aura::WindowObserver,
- public aura::client::ActivationChangeObserver,
- public views::TextfieldController {
+class ASH_EXPORT WindowSelector : public display::DisplayObserver,
+ public aura::WindowObserver,
+ public aura::client::ActivationChangeObserver,
+ public views::TextfieldController {
public:
// The distance between the top edge of the screen and the bottom edge of
// the text filtering textfield.
@@ -95,10 +94,10 @@ class ASH_EXPORT WindowSelector
return restoring_minimized_windows_;
}
- // gfx::DisplayObserver:
- void OnDisplayAdded(const gfx::Display& display) override;
- void OnDisplayRemoved(const gfx::Display& display) override;
- void OnDisplayMetricsChanged(const gfx::Display& display,
+ // display::DisplayObserver:
+ void OnDisplayAdded(const display::Display& display) override;
+ void OnDisplayRemoved(const display::Display& display) override;
+ void OnDisplayMetricsChanged(const display::Display& display,
uint32_t metrics) override;
// aura::WindowObserver:
« no previous file with comments | « ash/wm/overview/window_grid.cc ('k') | ash/wm/overview/window_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698