chrome/browser/ui/ash/chrome_shell_delegate.h - 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/chrome_shell_delegate.h

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/chrome_shell_delegate.h

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h

index 38b3a2f73f2a563f21fe79a67418cb70ef197780..c009dd7ac7a385e4722d387de9fe7789f4aba922 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.h

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h

@@ -7,7 +7,7 @@

#include <string>

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

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

#include "ash/shell_delegate.h"

#include "base/basictypes.h"

#include "base/compiler_specific.h"

@@ -70,7 +70,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,

virtual ui::MenuModel* CreateContextMenu(

aura::Window* root,

ash::ShelfItemDelegate* item_delegate,

- ash::LauncherItem* item) OVERRIDE;

+ ash::ShelfItem* item) OVERRIDE;

virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;

virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE;

virtual base::string16 GetProductName() const OVERRIDE;