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

Unified Diff: ash/wm/panels/panel_layout_manager.h

Issue 237963019: Remove remaining window states where window is shown with opacity 0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments. Created 6 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_overview.cc ('k') | ash/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_layout_manager.h
diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
index f0c093d48c2bb83377090c890b4f44060da7bf0f..fc42af271aa3ca4e09b72ae5b56ab17c50f7365e 100644
--- a/ash/wm/panels/panel_layout_manager.h
+++ b/ash/wm/panels/panel_layout_manager.h
@@ -18,6 +18,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/aura/layout_manager.h"
+#include "ui/aura/window_observer.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/wm/public/activation_change_observer.h"
@@ -53,11 +54,12 @@ class ASH_EXPORT PanelLayoutManager
: public aura::LayoutManager,
public ShelfIconObserver,
public ShellObserver,
+ public aura::WindowObserver,
+ public wm::WindowStateObserver,
public aura::client::ActivationChangeObserver,
public keyboard::KeyboardControllerObserver,
public DisplayController::Observer,
- public ShelfLayoutManagerObserver,
- public wm::WindowStateObserver {
+ public ShelfLayoutManagerObserver {
public:
explicit PanelLayoutManager(aura::Window* panel_container);
virtual ~PanelLayoutManager();
@@ -92,6 +94,11 @@ class ASH_EXPORT PanelLayoutManager
// Overridden from ShellObserver
virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE;
+ // Overridden from aura::WindowObserver
+ virtual void OnWindowPropertyChanged(aura::Window* window,
+ const void* key,
+ intptr_t old) OVERRIDE;
+
// Overridden from ash::wm::WindowStateObserver
virtual void OnPostWindowStateTypeChange(
wm::WindowState* window_state,
@@ -132,8 +139,8 @@ class ASH_EXPORT PanelLayoutManager
PanelCalloutWidget* callout_widget;
// True on new and restored panel windows until the panel has been
- // positioned. The first time Relayout is called the panel will slide into
- // position and this will be set to false.
+ // positioned. The first time Relayout is called the panel will be shown,
+ // and slide into position and this will be set to false.
bool slide_in;
};
« no previous file with comments | « ash/wm/overview/window_overview.cc ('k') | ash/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698