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

Unified Diff: ash/common/wm/workspace/workspace_layout_manager_unittest.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge 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 | « ash/common/wm/workspace/workspace_layout_manager.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/common/wm/workspace/workspace_layout_manager_unittest.cc b/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
index 5ca89034ba62c93bdbec6ba04edba0d4d946cd27..0b916c1a2593ae96289e84f32414cc7a0e6bcb51 100644
--- a/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
@@ -24,6 +24,7 @@
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "base/run_loop.h"
@@ -63,10 +64,12 @@ class MaximizeDelegateView : public views::WidgetDelegateView {
class TestShellObserver : public ShellObserver {
public:
TestShellObserver() : call_count_(0), is_fullscreen_(false) {
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
}
- ~TestShellObserver() override { WmShell::Get()->RemoveShellObserver(this); }
+ ~TestShellObserver() override {
+ Shell::GetInstance()->RemoveShellObserver(this);
+ }
void OnFullscreenStateChanged(bool is_fullscreen,
WmWindow* root_window) override {
« no previous file with comments | « ash/common/wm/workspace/workspace_layout_manager.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698