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

Side by Side Diff: ash/shelf/app_list_shelf_item_delegate.cc

Issue 282163004: ash: Rename some IDS_AURA entries to IDS_ASH_SHELF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/app_list_button.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 14 matching lines...) Expand all
25 bool AppListShelfItemDelegate::ItemSelected(const ui::Event& event) { 25 bool AppListShelfItemDelegate::ItemSelected(const ui::Event& event) {
26 // Pass NULL here to show the app list in the currently active RootWindow. 26 // Pass NULL here to show the app list in the currently active RootWindow.
27 Shell::GetInstance()->ToggleAppList(NULL); 27 Shell::GetInstance()->ToggleAppList(NULL);
28 return false; 28 return false;
29 } 29 }
30 30
31 base::string16 AppListShelfItemDelegate::GetTitle() { 31 base::string16 AppListShelfItemDelegate::GetTitle() {
32 ShelfModel* model = Shell::GetInstance()->shelf_model(); 32 ShelfModel* model = Shell::GetInstance()->shelf_model();
33 DCHECK(model); 33 DCHECK(model);
34 return model->status() == ShelfModel::STATUS_LOADING ? 34 return model->status() == ShelfModel::STATUS_LOADING ?
35 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : 35 l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE) :
36 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); 36 l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE);
37 } 37 }
38 38
39 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( 39 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu(
40 aura::Window* root_window) { 40 aura::Window* root_window) {
41 return Shell::GetInstance()->delegate()->CreateContextMenu(root_window, 41 return Shell::GetInstance()->delegate()->CreateContextMenu(root_window,
42 NULL, 42 NULL,
43 NULL); 43 NULL);
44 } 44 }
45 45
46 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( 46 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu(
47 int event_flags) { 47 int event_flags) {
48 // AppList does not show an application menu. 48 // AppList does not show an application menu.
49 return NULL; 49 return NULL;
50 } 50 }
51 51
52 bool AppListShelfItemDelegate::IsDraggable() { 52 bool AppListShelfItemDelegate::IsDraggable() {
53 return false; 53 return false;
54 } 54 }
55 55
56 bool AppListShelfItemDelegate::ShouldShowTooltip() { 56 bool AppListShelfItemDelegate::ShouldShowTooltip() {
57 return true; 57 return true;
58 } 58 }
59 59
60 void AppListShelfItemDelegate::Close() { 60 void AppListShelfItemDelegate::Close() {
61 } 61 }
62 62
63 } // namespace ash 63 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/app_list_button.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698