| 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 =
|
|
|