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

Unified Diff: ash/common/shelf/shelf_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
« no previous file with comments | « no previous file | ash/common/shelf/shelf_layout_manager.cc » ('j') | ash/root_window_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_layout_manager.h
diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h
index 7661de4e0aa7ee3d54195f17152552f62666fece..168624371e1499f73fbe8acd150424f4f0d05922 100644
--- a/ash/common/shelf/shelf_layout_manager.h
+++ b/ash/common/shelf/shelf_layout_manager.h
@@ -18,12 +18,17 @@
#include "ash/public/cpp/shelf_types.h"
#include "base/macros.h"
#include "base/observer_list.h"
+#include "base/scoped_observer.h"
#include "base/timer/timer.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/wm/public/activation_change_observer.h"
+namespace keyboard {
+class KeyboardController;
+}
+
namespace ui {
class ImplicitAnimationObserver;
class MouseEvent;
@@ -180,6 +185,10 @@ class ASH_EXPORT ShelfLayoutManager
// available work area from the top of the screen.
void SetChromeVoxPanelHeight(int height);
+ void StartObservingKeyboard(
+ keyboard::KeyboardController* keyboard_controller);
+ void StopObservingKeyboard(keyboard::KeyboardController* keyboard_controller);
+
private:
class UpdateShelfObserver;
friend class PanelLayoutManagerTest;
@@ -358,6 +367,10 @@ class ASH_EXPORT ShelfLayoutManager
// MaybeUpdateShelfBackground() instead.
ShelfBackgroundType shelf_background_type_;
+ ScopedObserver<keyboard::KeyboardController,
+ keyboard::KeyboardControllerObserver>
+ keyboard_observer_;
+
DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
};
« no previous file with comments | « no previous file | ash/common/shelf/shelf_layout_manager.cc » ('j') | ash/root_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698