chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc - Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems...

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

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

Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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 b3bdaa122c4c6e8f4070ab5bc81a51422bea8e5d..35e5404c9cc8bb68b6c7c22f2fb87c46a0bc6801 100644

--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

@@ -4,8 +4,8 @@

#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

-#include "ash/launcher/launcher_types.h"

#include "ash/shelf/shelf.h"

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

#include "ash/shelf/shelf_model.h"

#include "ash/test/ash_test_base.h"

#include "base/prefs/pref_service.h"

@@ -50,7 +50,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {

LauncherContextMenu* CreateLauncherContextMenu(

ash::ShelfItemType shelf_item_type) {

- ash::LauncherItem item;

+ ash::ShelfItem item;

item.id = 1; // dummy id

item.type = shelf_item_type;

return new LauncherContextMenu(controller_.get(), &item, CurrentContext());