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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
6 6
7 #include "ash/common/shelf/shelf_item_types.h" 7 #include "ash/common/shelf/shelf_item_types.h"
8 #include "ash/common/wm_root_window_controller.h" 8 #include "ash/common/wm_root_window_controller.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/common/wm_window.h" 10 #include "ash/common/wm_window.h"
11 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/prefs/incognito_mode_prefs.h" 14 #include "chrome/browser/prefs/incognito_mode_prefs.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/app_list/arc/arc_app_test.h" 16 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
18 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h" 17 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
19 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h" 18 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"
20 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" 19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
21 #include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h" 20 #include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h"
22 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h" 21 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"
23 #include "chrome/test/base/testing_profile.h" 22 #include "chrome/test/base/testing_profile.h"
24 #include "components/arc/test/fake_app_instance.h" 23 #include "components/arc/test/fake_app_instance.h"
25 #include "components/prefs/pref_service.h" 24 #include "components/prefs/pref_service.h"
26 #include "ui/aura/window_event_dispatcher.h" 25 #include "ui/aura/window_event_dispatcher.h"
27 26
28 class LauncherContextMenuTest : public ash::test::AshTestBase { 27 class LauncherContextMenuTest : public ash::test::AshTestBase {
29 protected: 28 protected:
30 static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) { 29 static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) {
31 return menu->GetIndexOfCommandId(command_id) != -1; 30 return menu->GetIndexOfCommandId(command_id) != -1;
32 } 31 }
33 32
34 LauncherContextMenuTest() : profile_(new TestingProfile()) {} 33 LauncherContextMenuTest() : profile_(new TestingProfile()) {}
35 34
36 void SetUp() override { 35 void SetUp() override {
37 arc_test_.SetUp(profile_.get()); 36 arc_test_.SetUp(profile_.get());
38 ash::test::AshTestBase::SetUp(); 37 ash::test::AshTestBase::SetUp();
39 controller_.reset(new ChromeLauncherControllerImpl( 38 controller_.reset(new ChromeLauncherControllerImpl(
40 profile(), ash::Shell::GetInstance()->shelf_model())); 39 profile(), ash::WmShell::Get()->shelf_model()));
41 controller_->Init(); 40 controller_->Init();
42 } 41 }
43 42
44 void TearDown() override { 43 void TearDown() override {
45 controller_.reset(nullptr); 44 controller_.reset(nullptr);
46 ash::test::AshTestBase::TearDown(); 45 ash::test::AshTestBase::TearDown();
47 } 46 }
48 47
49 ash::WmShelf* GetWmShelf() { 48 ash::WmShelf* GetWmShelf() {
50 return ash::WmShell::Get() 49 return ash::WmShell::Get()
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]); 196 arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);
198 menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf)); 197 menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf));
199 198
200 EXPECT_FALSE( 199 EXPECT_FALSE(
201 IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW)); 200 IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
202 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN)); 201 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
203 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN)); 202 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));
204 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE)); 203 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
205 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE)); 204 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
206 } 205 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698