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

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

Issue 2262723002: arc: Fix crash on Arc window close. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: patch for M53 Created 4 years, 4 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" 11 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/prefs/incognito_mode_prefs.h" 15 #include "chrome/browser/prefs/incognito_mode_prefs.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/app_list/arc/arc_app_test.h" 17 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
18 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h" 18 #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" 19 #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" 20 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
21 #include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h" 21 #include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h"
22 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h" 22 #include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"
23 #include "chrome/test/base/testing_profile.h" 23 #include "chrome/test/base/testing_profile.h"
24 #include "components/arc/test/fake_app_instance.h" 24 #include "components/arc/test/fake_app_instance.h"
25 #include "components/exo/shell_surface.h"
25 #include "components/prefs/pref_service.h" 26 #include "components/prefs/pref_service.h"
26 #include "ui/aura/window_event_dispatcher.h" 27 #include "ui/aura/window_event_dispatcher.h"
28 #include "ui/views/widget/widget.h"
27 29
28 class LauncherContextMenuTest : public ash::test::AshTestBase { 30 class LauncherContextMenuTest : public ash::test::AshTestBase {
29 protected: 31 protected:
30 static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) { 32 static bool IsItemPresentInMenu(LauncherContextMenu* menu, int command_id) {
31 return menu->GetIndexOfCommandId(command_id) != -1; 33 return menu->GetIndexOfCommandId(command_id) != -1;
32 } 34 }
33 35
34 LauncherContextMenuTest() : profile_(new TestingProfile()) {} 36 LauncherContextMenuTest() : profile_(new TestingProfile()) {}
35 37
36 void SetUp() override { 38 void SetUp() override {
(...skipping 22 matching lines...) Expand all
59 item.id = 1; // dummy id 61 item.id = 1; // dummy id
60 item.type = shelf_item_type; 62 item.type = shelf_item_type;
61 return LauncherContextMenu::Create(controller_.get(), &item, GetWmShelf()); 63 return LauncherContextMenu::Create(controller_.get(), &item, GetWmShelf());
62 } 64 }
63 65
64 LauncherContextMenu* CreateLauncherContextMenuForDesktopShell() { 66 LauncherContextMenu* CreateLauncherContextMenuForDesktopShell() {
65 ash::ShelfItem* item = nullptr; 67 ash::ShelfItem* item = nullptr;
66 return LauncherContextMenu::Create(controller_.get(), item, GetWmShelf()); 68 return LauncherContextMenu::Create(controller_.get(), item, GetWmShelf());
67 } 69 }
68 70
71 // Creates app window and set optional Arc application id.
72 views::Widget* CreateArcWindow(std::string& window_app_id) {
73 views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
74 views::Widget* widget = new views::Widget();
75 widget->Init(params);
76 widget->Show();
77 widget->Activate();
78 exo::ShellSurface::SetApplicationId(widget->GetNativeWindow(),
79 &window_app_id);
80 return widget;
81 }
82
69 ArcAppTest& arc_test() { return arc_test_; } 83 ArcAppTest& arc_test() { return arc_test_; }
70 84
71 Profile* profile() { return profile_.get(); } 85 Profile* profile() { return profile_.get(); }
72 86
73 ChromeLauncherControllerImpl* controller() { return controller_.get(); } 87 ChromeLauncherControllerImpl* controller() { return controller_.get(); }
74 88
75 private: 89 private:
76 std::unique_ptr<TestingProfile> profile_; 90 std::unique_ptr<TestingProfile> profile_;
77 std::unique_ptr<ChromeLauncherControllerImpl> controller_; 91 std::unique_ptr<ChromeLauncherControllerImpl> controller_;
78 ArcAppTest arc_test_; 92 ArcAppTest arc_test_;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 EXPECT_TRUE( 201 EXPECT_TRUE(
188 menu->IsCommandIdEnabled(LauncherContextMenu::MENU_ALIGNMENT_MENU)); 202 menu->IsCommandIdEnabled(LauncherContextMenu::MENU_ALIGNMENT_MENU));
189 // By default, screen is not locked and ChangeWallPaper item is added in 203 // By default, screen is not locked and ChangeWallPaper item is added in
190 // menu. ChangeWallPaper item is not enabled in default mode. 204 // menu. ChangeWallPaper item is not enabled in default mode.
191 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), 205 EXPECT_TRUE(IsItemPresentInMenu(menu.get(),
192 LauncherContextMenu::MENU_CHANGE_WALLPAPER)); 206 LauncherContextMenu::MENU_CHANGE_WALLPAPER));
193 EXPECT_FALSE( 207 EXPECT_FALSE(
194 menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CHANGE_WALLPAPER)); 208 menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CHANGE_WALLPAPER));
195 209
196 // Arc app is running. 210 // Arc app is running.
211 std::string window_app_id1("org.chromium.arc.1");
212 CreateArcWindow(window_app_id1);
197 arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]); 213 arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);
198 menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf)); 214 menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf));
199 215
200 EXPECT_FALSE( 216 EXPECT_FALSE(
201 IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW)); 217 IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
202 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN)); 218 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
203 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN)); 219 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));
204 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE)); 220 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
205 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE)); 221 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
206 } 222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698