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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h

Issue 132013004: Moves transient window observer methods out of WindowObserver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments and update gyp Created 6 years, 11 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/ash/multi_user/multi_user_window_manager_chromeos.h
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
index be4a43ebf5addd9a1a163db59ec1a73ede2468b1..885e83c98d3680b43951aa2a36a37097ff0ef935 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
@@ -15,6 +15,7 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/aura/window_observer.h"
+#include "ui/views/corewm/transient_window_observer.h"
class Browser;
class Profile;
@@ -41,11 +42,13 @@ class AppObserver;
// visibility changes from the owning user. This way the visibility can be
// changed back to its requested state upon showing by us - or when the window
// gets detached from its current owning parent.
-class MultiUserWindowManagerChromeOS : public MultiUserWindowManager,
- public ash::SessionStateObserver,
- public aura::WindowObserver,
- public content::NotificationObserver,
- public ash::wm::WindowStateObserver {
+class MultiUserWindowManagerChromeOS
+ : public MultiUserWindowManager,
+ public ash::SessionStateObserver,
+ public ash::wm::WindowStateObserver,
+ public aura::WindowObserver,
+ public content::NotificationObserver,
+ public views::corewm::TransientWindowObserver {
public:
// Create the manager and use |active_user_id| as the active user.
explicit MultiUserWindowManagerChromeOS(const std::string& active_user_id);
@@ -73,10 +76,12 @@ class MultiUserWindowManagerChromeOS : public MultiUserWindowManager,
bool visible) OVERRIDE;
virtual void OnWindowVisibilityChanged(aura::Window* window,
bool visible) OVERRIDE;
- virtual void OnAddTransientChild(aura::Window* window,
- aura::Window* transient) OVERRIDE;
- virtual void OnRemoveTransientChild(aura::Window* window,
- aura::Window* transient) OVERRIDE;
+
+ // TransientWindowObserver overrides:
+ virtual void OnTransientChildAdded(aura::Window* window,
+ aura::Window* transient) OVERRIDE;
+ virtual void OnTransientChildRemoved(aura::Window* window,
+ aura::Window* transient) OVERRIDE;
// Window .. overrides:
virtual void OnWindowShowTypeChanged(

Powered by Google App Engine
This is Rietveld 408576698