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

Unified Diff: ash/common/wm/dock/docked_window_layout_manager.h

Issue 2747543002: ash: Start/stop observing KeyboardController via ShellObserver (Closed)
Patch Set: rebase Created 3 years, 9 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/common/wm/dock/docked_window_layout_manager.h
diff --git a/ash/common/wm/dock/docked_window_layout_manager.h b/ash/common/wm/dock/docked_window_layout_manager.h
index f363890758ddfc0d1f38410cdbc389abd495f13c..43a013c198ed9fb19fe8c2ee508afad7b522cfb4 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.h
+++ b/ash/common/wm/dock/docked_window_layout_manager.h
@@ -16,6 +16,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/observer_list.h"
+#include "base/scoped_observer.h"
#include "base/time/time.h"
#include "ui/aura/window_observer.h"
#include "ui/display/display_observer.h"
@@ -23,6 +24,10 @@
#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/wm/public/activation_change_observer.h"
+namespace keyboard {
+class KeyboardController;
+}
+
namespace ash {
class DockedBackgroundWidget;
class DockedWindowLayoutManagerObserver;
@@ -126,6 +131,10 @@ class ASH_EXPORT DockedWindowLayoutManager
// Updates docked layout when shelf bounds change.
void OnShelfBoundsChanged();
+ void StartObservingKeyboard(
+ keyboard::KeyboardController* keyboard_controller);
+ void StopObservingKeyboard(keyboard::KeyboardController* keyboard_controller);
+
// SnapLayoutManager:
void OnWindowResized() override;
void OnWindowAddedToLayout(WmWindow* child) override;
@@ -315,6 +324,10 @@ class ASH_EXPORT DockedWindowLayoutManager
// Observers of dock bounds changes.
base::ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
+ ScopedObserver<keyboard::KeyboardController,
+ keyboard::KeyboardControllerObserver>
+ keyboard_observer_;
+
DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
};

Powered by Google App Engine
This is Rietveld 408576698