chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - Issue 12022002: Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new…

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

Issue 12022002: Fixing activation states from the new launcher. Also adding a whole bunch of unit tests for the new… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Forgotten to add file to repository Created 7 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

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

index d54faa3cbd7383e94f0de4c8fb7ea74274e1df3e..dc4338b1a115513b98c8668ca24b9dde667f0ae3 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

@@ -277,6 +277,9 @@ class ChromeLauncherController

friend class BrowserLauncherItemControllerTest;

friend class LauncherPlatformAppBrowserTest;

friend class LauncherAppBrowserTest;

+ // TODO(skuhne): Remove these when the old launcher get removed.

+ friend class LauncherPlatformPerAppAppBrowserTest;

+ friend class LauncherPerAppAppBrowserTest;

// Creates a new app shortcut item and controller on the launcher at |index|.

// Use kInsertItemAtEnd to add a shortcut as the last item.