chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc - Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly

Patch Set: Created 4 years, 6 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

OLD	NEW
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"

	8 #include "ash/common/shelf/shelf_model.h"

7 #include "ash/shelf/shelf.h"	9 #include "ash/shelf/shelf.h"

8 #include "ash/shelf/shelf_item_types.h"

9 #include "ash/shelf/shelf_model.h"

10 #include "ash/shell.h"	10 #include "ash/shell.h"

11 #include "ash/test/ash_test_base.h"	11 #include "ash/test/ash_test_base.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "chrome/app/chrome_command_ids.h"	13 #include "chrome/app/chrome_command_ids.h"

14 #include "chrome/browser/prefs/incognito_mode_prefs.h"	14 #include "chrome/browser/prefs/incognito_mode_prefs.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"	16 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"

17 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"	17 #include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"

18 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"	18 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll er.h"

19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	19 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

(...skipping 170 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);	190 arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);

191 menu.reset(new ArcLauncherContextMenu(controller(), &item, shelf));	191 menu.reset(new ArcLauncherContextMenu(controller(), &item, shelf));

192	192

193 EXPECT_FALSE(	193 EXPECT_FALSE(

194 IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));	194 IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));

195 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));	195 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));

196 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));	196 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));

197 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));	197 EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));

198 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));	198 EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));

199 }	199 }

OLD	NEW