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

Side by Side Diff: ash/accelerators/accelerator_interactive_uitest_chromeos.cc

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete 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 unified diff | Download patch
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/app_list/app_list_delegate_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/accelerators/accelerator_controller.h" 5 #include "ash/common/accelerators/accelerator_controller.h"
6 6
7 #include "ash/common/shell_observer.h" 7 #include "ash/common/shell_observer.h"
8 #include "ash/common/system/chromeos/network/network_observer.h" 8 #include "ash/common/system/chromeos/network/network_observer.h"
9 #include "ash/common/system/tray/system_tray_delegate.h" 9 #include "ash/common/system/tray/system_tray_delegate.h"
10 #include "ash/common/system/tray/system_tray_notifier.h" 10 #include "ash/common/system/tray/system_tray_notifier.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 EXPECT_FALSE(network_observer.wifi_enabled_status()); 193 EXPECT_FALSE(network_observer.wifi_enabled_status());
194 194
195 WmShell::Get()->system_tray_notifier()->RemoveNetworkObserver( 195 WmShell::Get()->system_tray_notifier()->RemoveNetworkObserver(
196 &network_observer); 196 &network_observer);
197 } 197 }
198 198
199 // Tests the app list accelerator. 199 // Tests the app list accelerator.
200 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) { 200 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
201 mojo::edk::Init(); 201 mojo::edk::Init();
202 app_list::test::TestAppListPresenter test_app_list_presenter; 202 app_list::test::TestAppListPresenter test_app_list_presenter;
203 WmShell::Get()->app_list()->SetAppListPresenter( 203 Shell::Get()->app_list()->SetAppListPresenter(
204 test_app_list_presenter.CreateInterfacePtrAndBind()); 204 test_app_list_presenter.CreateInterfacePtrAndBind());
205 205
206 EXPECT_EQ(0u, test_app_list_presenter.toggle_count()); 206 EXPECT_EQ(0u, test_app_list_presenter.toggle_count());
207 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); 207 SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
208 RunAllPendingInMessageLoop(); 208 RunAllPendingInMessageLoop();
209 EXPECT_EQ(1u, test_app_list_presenter.toggle_count()); 209 EXPECT_EQ(1u, test_app_list_presenter.toggle_count());
210 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); 210 SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
211 RunAllPendingInMessageLoop(); 211 RunAllPendingInMessageLoop();
212 EXPECT_EQ(2u, test_app_list_presenter.toggle_count()); 212 EXPECT_EQ(2u, test_app_list_presenter.toggle_count());
213 } 213 }
214 214
215 } // namespace test 215 } // namespace test
216 } // namespace ash 216 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/app_list/app_list_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698