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

Unified Diff: ash/accelerators/accelerator_interactive_uitest_chromeos.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: 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/accelerators/accelerator_interactive_uitest_chromeos.cc
diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
index 69755878e1647c2a25d64a9b1c32993a56993afb..274ca6efb3c01fb2efc29dd7769afe0f503eeea5 100644
--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -62,7 +62,7 @@ class AcceleratorInteractiveUITest : public AshInteractiveUITestBase,
void SetUp() override {
AshInteractiveUITestBase::SetUp();
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
msw 2017/03/08 19:52:23 tangential: wdyt about adding Shell::Get and phasi
sky 2017/03/08 20:26:06 +1 will do it separately.
chromeos::NetworkHandler::Initialize();
}
@@ -70,7 +70,7 @@ class AcceleratorInteractiveUITest : public AshInteractiveUITestBase,
void TearDown() override {
chromeos::NetworkHandler::Shutdown();
- WmShell::Get()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
AshInteractiveUITestBase::TearDown();
}
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | ash/high_contrast/high_contrast_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698