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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/shelf/app_list_shelf_item_delegate.h ('k') | ash/shelf/shelf_alignment_menu.h » ('j') | 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/launcher/launcher_model.h" 7 #include "ash/launcher/launcher_model.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "grit/ash_strings.h" 9 #include "grit/ash_strings.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 18 matching lines...) Expand all
29 29
30 base::string16 AppListShelfItemDelegate::GetTitle() { 30 base::string16 AppListShelfItemDelegate::GetTitle() {
31 LauncherModel* model = Shell::GetInstance()->launcher_model(); 31 LauncherModel* model = Shell::GetInstance()->launcher_model();
32 DCHECK(model); 32 DCHECK(model);
33 return model->status() == LauncherModel::STATUS_LOADING ? 33 return model->status() == LauncherModel::STATUS_LOADING ?
34 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : 34 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) :
35 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); 35 l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
36 } 36 }
37 37
38 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( 38 ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu(
39 aura::RootWindow* root_window) { 39 aura::Window* root_window) {
40 return NULL; 40 return NULL;
41 } 41 }
42 42
43 LauncherMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( 43 LauncherMenuModel* AppListShelfItemDelegate::CreateApplicationMenu(
44 int event_flags) { 44 int event_flags) {
45 // AppList does not show an application menu. 45 // AppList does not show an application menu.
46 return NULL; 46 return NULL;
47 } 47 }
48 48
49 bool AppListShelfItemDelegate::IsDraggable() { 49 bool AppListShelfItemDelegate::IsDraggable() {
50 return false; 50 return false;
51 } 51 }
52 52
53 bool AppListShelfItemDelegate::ShouldShowTooltip() { 53 bool AppListShelfItemDelegate::ShouldShowTooltip() {
54 return true; 54 return true;
55 } 55 }
56 56
57 } // namespace internal 57 } // namespace internal
58 } // namespace ash 58 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/app_list_shelf_item_delegate.h ('k') | ash/shelf/shelf_alignment_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698