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

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

Issue 12288012: Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 7 years, 10 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/browser_launcher_item_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
index 2842a16465f0612f694cb1e3dc2316d55db2859f..5e145b1d47dffde63ab4acc46d15342c4a5b0db7 100644
--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
@@ -174,7 +174,8 @@ class BrowserLauncherItemControllerTest
&window,
&tab_strip,
test->launcher_delegate_.get(),
- app_id) {
+ app_id,
+ std::string()) {
window.Init(ui::LAYER_NOT_DRAWN);
launcher_test->root_window()->AddChild(&window);
launcher_test->activation_client_->ActivateWindow(&window);
@@ -281,6 +282,7 @@ TEST_F(BrowserLauncherItemControllerTest, TabbedSetup) {
BrowserLauncherItemController updater(
LauncherItemController::TYPE_TABBED,
&window, &tab_strip, launcher_delegate_.get(),
+ std::string(),
std::string());
updater.Init();
@@ -308,6 +310,7 @@ TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
BrowserLauncherItemController updater(
LauncherItemController::TYPE_APP_PANEL,
&window, &tab_strip, launcher_delegate_.get(),
+ std::string(),
std::string());
updater.Init();
ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
@@ -328,6 +331,7 @@ TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
BrowserLauncherItemController updater(
LauncherItemController::TYPE_EXTENSION_PANEL,
&window, &tab_strip, launcher_delegate_.get(),
+ std::string(),
std::string());
updater.Init();
ASSERT_EQ(initial_size + 1, launcher_model_->items().size());

Powered by Google App Engine
This is Rietveld 408576698