ash/shell/window_watcher.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: ash/shell/window_watcher.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: ash/shell/window_watcher.h

diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h

index fcda05a725f5d2c24517402b51c22b5f674defee..2d94b77edf07ecb5a192a0f6271317e03998d230 100644

--- a/ash/shell/window_watcher.h

+++ b/ash/shell/window_watcher.h

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

#include <map>

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

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

#include "base/compiler_specific.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

@@ -31,7 +31,7 @@ class WindowWatcher : public aura::WindowObserver,

WindowWatcher();

virtual ~WindowWatcher();

- aura::Window* GetWindowByID(ash::LauncherID id);

+ aura::Window* GetWindowByID(ash::ShelfID id);

// aura::WindowObserver overrides:

virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;

@@ -45,7 +45,7 @@ class WindowWatcher : public aura::WindowObserver,

private:

class WorkspaceWindowWatcher;

- typedef std::map<ash::LauncherID, aura::Window*> IDToWindow;

+ typedef std::map<ash::ShelfID, aura::Window*> IDToWindow;

// Maps from window to the id we gave it.

IDToWindow id_to_window_;

« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/shell/window_watcher.cc » ('j') | no next file with comments »