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

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

Issue 2484413002: Enhance chrome.app.window API with title property
Patch Set: Created 4 years, 1 month 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 f783e73d6bb3ad4afaa3ff0e24ce2ea565064c84..1e5d45e48c63c70907d6ea77f6b3638276712d86 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
@@ -258,6 +258,7 @@ class TestV2AppLauncherItemController : public LauncherItemController {
: LauncherItemController(LauncherItemController::TYPE_APP,
app_id,
"",
+ "",
controller) {}
~TestV2AppLauncherItemController() override {}
@@ -420,7 +421,7 @@ class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {
DCHECK(!test_controller_);
ash::ShelfID id =
launcher_controller_->CreateAppShortcutLauncherItemWithType(
- ash::launcher::AppLauncherId(app_id), model_->item_count(),
+ ash::launcher::AppLauncherId(app_id), "", model_->item_count(),
ash::TYPE_PLATFORM_APP);
DCHECK(id);
// Change the created launcher controller into a V2 app controller.
@@ -3288,7 +3289,7 @@ TEST_F(ChromeLauncherControllerImplTest, AppPanels) {
// Test adding an app panel
AppWindowLauncherItemController* app_panel_controller =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, app_id, "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);
@@ -3312,7 +3313,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, app_id, "id",
+ LauncherItemController::TYPE_APP_PANEL, app_id, "id", "",
launcher_controller_.get());
ash::ShelfID shelf_id2 = launcher_controller_->CreateAppLauncherItem(
@@ -3507,7 +3508,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
AppWindowLauncherItemController* app_panel_controller3 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, app_id3, "id",
+ 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);
@@ -3518,7 +3519,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
AppWindowLauncherItemController* app_panel_controller2 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, app_id2, "id",
+ 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);
@@ -3530,7 +3531,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
// Test adding an app panel
AppWindowLauncherItemController* app_panel_controller1 =
new ExtensionAppWindowLauncherItemController(
- LauncherItemController::TYPE_APP_PANEL, app_id1, "id",
+ 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