| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shelf/app_list_shelf_item_delegate.h" | 5 #include "ash/shelf/app_list_shelf_item_delegate.h" |
| 6 | 6 |
| 7 #include "ash/shelf/shelf_model.h" | 7 #include "ash/shelf/shelf_model.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_delegate.h" |
| 9 #include "grit/ash_strings.h" | 10 #include "grit/ash_strings.h" |
| 10 #include "ui/base/l10n/l10n_util.h" | 11 #include "ui/base/l10n/l10n_util.h" |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 namespace internal { | 14 namespace internal { |
| 14 | 15 |
| 15 AppListShelfItemDelegate::AppListShelfItemDelegate() { | 16 AppListShelfItemDelegate::AppListShelfItemDelegate() { |
| 16 LauncherItem app_list; | 17 LauncherItem app_list; |
| 17 app_list.type = TYPE_APP_LIST; | 18 app_list.type = TYPE_APP_LIST; |
| 18 Shell::GetInstance()->shelf_model()->Add(app_list); | 19 Shell::GetInstance()->shelf_model()->Add(app_list); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 31 base::string16 AppListShelfItemDelegate::GetTitle() { | 32 base::string16 AppListShelfItemDelegate::GetTitle() { |
| 32 ShelfModel* model = Shell::GetInstance()->shelf_model(); | 33 ShelfModel* model = Shell::GetInstance()->shelf_model(); |
| 33 DCHECK(model); | 34 DCHECK(model); |
| 34 return model->status() == ShelfModel::STATUS_LOADING ? | 35 return model->status() == ShelfModel::STATUS_LOADING ? |
| 35 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : | 36 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : |
| 36 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); | 37 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); |
| 37 } | 38 } |
| 38 | 39 |
| 39 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( | 40 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( |
| 40 aura::Window* root_window) { | 41 aura::Window* root_window) { |
| 41 return NULL; | 42 return Shell::GetInstance()->delegate()->CreateContextMenu(root_window); |
| 42 } | 43 } |
| 43 | 44 |
| 44 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( | 45 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( |
| 45 int event_flags) { | 46 int event_flags) { |
| 46 // AppList does not show an application menu. | 47 // AppList does not show an application menu. |
| 47 return NULL; | 48 return NULL; |
| 48 } | 49 } |
| 49 | 50 |
| 50 bool AppListShelfItemDelegate::IsDraggable() { | 51 bool AppListShelfItemDelegate::IsDraggable() { |
| 51 return false; | 52 return false; |
| 52 } | 53 } |
| 53 | 54 |
| 54 bool AppListShelfItemDelegate::ShouldShowTooltip() { | 55 bool AppListShelfItemDelegate::ShouldShowTooltip() { |
| 55 return true; | 56 return true; |
| 56 } | 57 } |
| 57 | 58 |
| 58 } // namespace internal | 59 } // namespace internal |
| 59 } // namespace ash | 60 } // namespace ash |
| OLD | NEW |