chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc - Issue 12212207: Support panel titles and Icons for v1 apps

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/shell_window_launcher_item_controller.cc

Issue 12212207: Support panel titles and Icons for v1 apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/shell_window_launcher_controller.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | chrome/browser/ui/extensions/shell_window.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

index 588878edd161d06605a97a11d1b0c779a11798ef..e0f10c835ff7e6dc057f5f2f4464376d8581ca89 100644

--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc

@@ -45,8 +45,7 @@ ShellWindowLauncherItemController::~ShellWindowLauncherItemController() {

void ShellWindowLauncherItemController::AddShellWindow(

ShellWindow* shell_window,

ash::LauncherItemStatus status) {

- if (shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL &&

- type() != TYPE_APP_PANEL) {

+ if (shell_window->window_type_panel() && type() != TYPE_APP_PANEL) {

LOG(ERROR) << "ShellWindow of type Panel added to non-panel launcher item";

}

if (status == ash::STATUS_ACTIVE)