Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7647)

Unified Diff: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc

Issue 12212207: Support panel titles and Icons for v1 apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comment. 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
Index: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc
index 59e4fefad040a4617dcf96954dba100e22305467..09f5d403e0b160a8de5cb59f28ccf9b1a52bfa70 100644
--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc
@@ -16,7 +16,7 @@
namespace {
std::string GetAppLauncherId(ShellWindow* shell_window) {
- if (shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL)
+ if (shell_window->window_type_is_panel())
return StringPrintf("panel:%d", shell_window->session_id().id());
return shell_window->extension()->id();
}
@@ -75,8 +75,7 @@ void ShellWindowLauncherController::OnShellWindowAdded(
launcher_id = controller->launcher_id();
controller->AddShellWindow(shell_window, status);
} else {
- LauncherItemController::Type type =
- shell_window->window_type() == ShellWindow::WINDOW_TYPE_PANEL
+ LauncherItemController::Type type = shell_window->window_type_is_panel()
? LauncherItemController::TYPE_APP_PANEL
: LauncherItemController::TYPE_APP;
ShellWindowLauncherItemController* controller =

Powered by Google App Engine
This is Rietveld 408576698