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 "ash/shell_delegate.h" |
10 #include "grit/ash_strings.h" | 10 #include "grit/ash_strings.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 base::string16 AppListShelfItemDelegate::GetTitle() { | 32 base::string16 AppListShelfItemDelegate::GetTitle() { |
33 ShelfModel* model = Shell::GetInstance()->shelf_model(); | 33 ShelfModel* model = Shell::GetInstance()->shelf_model(); |
34 DCHECK(model); | 34 DCHECK(model); |
35 return model->status() == ShelfModel::STATUS_LOADING ? | 35 return model->status() == ShelfModel::STATUS_LOADING ? |
36 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : | 36 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : |
37 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); | 37 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); |
38 } | 38 } |
39 | 39 |
40 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( | 40 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( |
41 aura::Window* root_window) { | 41 aura::Window* root_window) { |
42 return Shell::GetInstance()->delegate()->CreateContextMenu(root_window); | 42 return Shell::GetInstance()->delegate()->CreateContextMenu(root_window, |
| 43 NULL, |
| 44 NULL); |
43 } | 45 } |
44 | 46 |
45 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( | 47 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( |
46 int event_flags) { | 48 int event_flags) { |
47 // AppList does not show an application menu. | 49 // AppList does not show an application menu. |
48 return NULL; | 50 return NULL; |
49 } | 51 } |
50 | 52 |
51 bool AppListShelfItemDelegate::IsDraggable() { | 53 bool AppListShelfItemDelegate::IsDraggable() { |
52 return false; | 54 return false; |
53 } | 55 } |
54 | 56 |
55 bool AppListShelfItemDelegate::ShouldShowTooltip() { | 57 bool AppListShelfItemDelegate::ShouldShowTooltip() { |
56 return true; | 58 return true; |
57 } | 59 } |
58 | 60 |
| 61 void AppListShelfItemDelegate::Close() { |
| 62 } |
| 63 |
59 } // namespace internal | 64 } // namespace internal |
60 } // namespace ash | 65 } // namespace ash |
OLD | NEW |