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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index f768df800c37a31f70012e4c392b3aeb7a10ab7c..4c63e73f912ae6ccc12f22570ea8a7de30419100 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -22,8 +22,10 @@
#include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"
#include "chrome/test/base/testing_profile.h"
#include "components/arc/test/fake_app_instance.h"
+#include "components/exo/shell_surface.h"
#include "components/prefs/pref_service.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/views/widget/widget.h"
class LauncherContextMenuTest : public ash::test::AshTestBase {
protected:
@@ -66,6 +68,18 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
return LauncherContextMenu::Create(controller_.get(), item, GetWmShelf());
}
+ // Creates app window and set optional Arc application id.
+ views::Widget* CreateArcWindow(std::string& window_app_id) {
+ views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
+ views::Widget* widget = new views::Widget();
+ widget->Init(params);
+ widget->Show();
+ widget->Activate();
+ exo::ShellSurface::SetApplicationId(widget->GetNativeWindow(),
+ &window_app_id);
+ return widget;
+ }
+
ArcAppTest& arc_test() { return arc_test_; }
Profile* profile() { return profile_.get(); }
@@ -194,6 +208,8 @@ TEST_F(LauncherContextMenuTest, ArcLauncherContextMenuItemCheck) {
menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CHANGE_WALLPAPER));
// Arc app is running.
+ std::string window_app_id1("org.chromium.arc.1");
+ CreateArcWindow(window_app_id1);
arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);
menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf));

Powered by Google App Engine
This is Rietveld 408576698