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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2290603002: Enhance chrome.app.window API for shelf integration with pinning support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: LauncherItemController Unit Tests Fix after Rebase Created 4 years, 3 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/chrome_launcher_controller_impl_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index 189fee3d1b12864f9eb142d958e793deede345f4..4b4cdee92e08ddda9790e1c0aa115731be880b26 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -261,8 +261,8 @@ class TestV2AppLauncherItemController : public LauncherItemController {
ChromeLauncherController* controller)
: LauncherItemController(LauncherItemController::TYPE_APP,
app_id,
- controller) {
- }
+ "",
+ controller) {}
~TestV2AppLauncherItemController() override {}
@@ -3210,7 +3210,7 @@ TEST_F(ChromeLauncherControllerImplTest, AppPanels) {
// Test adding an app panel
AppWindowLauncherItemController* app_panel_controller =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, "id", app_id,
+ LauncherItemController::TYPE_APP_PANEL, app_id, "id",
launcher_controller_.get());
ash::ShelfID shelf_id1 = launcher_controller_->CreateAppLauncherItem(
app_panel_controller, app_id, ash::STATUS_RUNNING);
@@ -3234,7 +3234,7 @@ TEST_F(ChromeLauncherControllerImplTest, AppPanels) {
// one had, being added to the left of the existing panel.
AppWindowLauncherItemController* app_panel_controller2 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, "id", app_id,
+ LauncherItemController::TYPE_APP_PANEL, app_id, "id",
launcher_controller_.get());
ash::ShelfID shelf_id2 = launcher_controller_->CreateAppLauncherItem(
@@ -3429,7 +3429,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
AppWindowLauncherItemController* app_panel_controller3 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, "id", app_id3,
+ LauncherItemController::TYPE_APP_PANEL, app_id3, "id",
launcher_controller_.get());
const ash::ShelfID shelfId3 = launcher_controller_->CreateAppLauncherItem(
app_panel_controller3, app_id3, ash::STATUS_RUNNING);
@@ -3440,7 +3440,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
AppWindowLauncherItemController* app_panel_controller2 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, "id", app_id2,
+ LauncherItemController::TYPE_APP_PANEL, app_id2, "id",
launcher_controller_.get());
const ash::ShelfID shelfId2 = launcher_controller_->CreateAppLauncherItem(
app_panel_controller2, app_id2, ash::STATUS_RUNNING);
@@ -3452,7 +3452,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
// Test adding an app panel
AppWindowLauncherItemController* app_panel_controller1 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, "id", app_id1,
+ LauncherItemController::TYPE_APP_PANEL, app_id1, "id",
launcher_controller_.get());
const ash::ShelfID shelfId1 = launcher_controller_->CreateAppLauncherItem(

Powered by Google App Engine
This is Rietveld 408576698