chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h - Issue 12288012: Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in …

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

Issue 12288012: Showing launcher items for windowed v1 apps - pinned or not. Also - don't show windowed v1 apps in … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing build breakage with clang Created 7 years, 10 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/browser_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 586a2dc4adf786d57c06efb6ebcbeae36481b94f..6fcba4d601a0732c5e93b007922a145bb5b29ae6 100644

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

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

@@ -53,6 +53,9 @@ class BrowserLauncherItemController : public LauncherItemController,

const std::string& app_id);

virtual ~BrowserLauncherItemController();

+ // Overriding the app id for V1 apps.

+ virtual const std::string& app_id() const OVERRIDE;

// Sets up this BrowserLauncherItemController.

void Init();

@@ -133,6 +136,10 @@ class BrowserLauncherItemController : public LauncherItemController,

// Browser window we're in.

aura::Window* window_;

+ // If running a windowed V1 app with the new launcher, this (empty) app id

+ // will be returned by app_id().

+ std::string empty_app_id_;

TabStripModel* tab_model_;

// Whether this is associated with an incognito profile.