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

Unified Diff: ash/display/screen_orientation_controller_chromeos.h

Issue 2895713002: [mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode (Closed)
Patch Set: Address nits, unit_tests target compiles Created 3 years, 7 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: ash/display/screen_orientation_controller_chromeos.h
diff --git a/ash/display/screen_orientation_controller_chromeos.h b/ash/display/screen_orientation_controller_chromeos.h
index bfd802f3aa17a3018c1128b8b2a2bb4c4ed37474..b64d4c1697588f03223d92d299ef73a74a00fe72 100644
--- a/ash/display/screen_orientation_controller_chromeos.h
+++ b/ash/display/screen_orientation_controller_chromeos.h
@@ -19,6 +19,10 @@
#include "ui/display/display.h"
#include "ui/wm/public/activation_change_observer.h"
+namespace aura {
+class Window;
+}
+
namespace ash {
namespace test {
class ScreenOrientationControllerTestApi;
@@ -64,10 +68,10 @@ class ASH_EXPORT ScreenOrientationController
// Allows/unallows a window to lock the screen orientation.
void LockOrientationForWindow(
- WmWindow* requesting_window,
+ aura::Window* requesting_window,
blink::WebScreenOrientationLockType lock_orientation,
LockCompletionBehavior lock_completion_behavior);
- void UnlockOrientationForWindow(WmWindow* window);
+ void UnlockOrientationForWindow(aura::Window* window);
// Unlock all and set the rotation back to the user specified rotation.
void UnlockAll();
@@ -226,7 +230,7 @@ class ASH_EXPORT ScreenOrientationController
// Tracks all windows that have requested a lock, as well as the requested
// orientation.
- std::unordered_map<WmWindow*, LockInfo> lock_info_map_;
+ std::unordered_map<aura::Window*, LockInfo> lock_info_map_;
DISALLOW_COPY_AND_ASSIGN(ScreenOrientationController);
};

Powered by Google App Engine
This is Rietveld 408576698