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

Unified Diff: ash/wm/screen_pinning_controller.h

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 6 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/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/screen_pinning_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/screen_pinning_controller.h
diff --git a/ash/wm/screen_pinning_controller.h b/ash/wm/screen_pinning_controller.h
index 191ac0828f0281e5b03aedbc8a4e8ad87b3e93e1..202565a370de719d5c3baaf7c7a9d869acf2817d 100644
--- a/ash/wm/screen_pinning_controller.h
+++ b/ash/wm/screen_pinning_controller.h
@@ -14,14 +14,13 @@
namespace ash {
class WindowTreeHostManager;
-class WmShellCommon;
class WmWindow;
// Handles pinned state.
class ScreenPinningController : public WindowTreeHostManager::Observer {
public:
- ScreenPinningController(WmShellCommon* wm_shell_common,
- WindowTreeHostManager* window_tree_host_manager);
+ explicit ScreenPinningController(
+ WindowTreeHostManager* window_tree_host_manager);
~ScreenPinningController() override;
// Sets a pinned window. It is not allowed to call this when there already
@@ -88,11 +87,6 @@ class ScreenPinningController : public WindowTreeHostManager::Observer {
// Set true only when restacking done by this controller.
bool in_restacking_ = false;
- // For OnPinnedStateChanged event notification.
- // While this controller is alive, it needs to be ensured that the instances
- // refered from the pointers should be alive.
- WmShellCommon* wm_shell_common_;
-
// Keep references to remove this as a observer.
// While this controller is alive, it needs to be ensured that the instances
// refered from the pointers should be alive.
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/screen_pinning_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698