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

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: merge to trunk 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 0f6e9fa829e4fb3b5841fe00d3e9f634047ec59f..23ac68696542a7aab6882404e4e32e2288c3c123 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
@@ -16,6 +16,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 MultiUserNotificationBlockerChromeOS;
@@ -44,11 +45,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);
@@ -78,10 +81,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(
« no previous file with comments | « ash/wm/immersive_fullscreen_controller.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698