chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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_per_app.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/chrome_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('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_per_app.h

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

index 2b7830b0c7f3f905bb9355372693e76fde38a87b..0bca6b2468b7aa0a7553fd7db9dd69fb3dbe5725 100644

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

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

@@ -307,6 +307,13 @@ class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver,

private:

friend class ChromeLauncherControllerPerAppTest;

+ // Updates the activation state of the Broswer item.

+ void UpdateBrowserItemStatus();

+ // Checks if there is at least one browser which is not in progress of

+ // shutting down.

+ bool BrowserIsRunning();

typedef std::map<ash::LauncherID, LauncherItemController*>

IDToItemControllerMap;

typedef std::list<content::WebContents*> WebContentsList;