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

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

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 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
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/common/shelf/app_list_shelf_item_delegate.h" 5 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
6 6
7 #include "ash/common/shelf/shelf_model.h" 7 #include "ash/common/shelf/shelf_model.h"
8 #include "ash/common/wm_shell.h" 8 #include "ash/common/wm_shell.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "grit/ash_strings.h" 10 #include "grit/ash_strings.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 int title_id; 45 int title_id;
46 title_id = model->status() == ShelfModel::STATUS_LOADING 46 title_id = model->status() == ShelfModel::STATUS_LOADING
47 ? IDS_ASH_SHELF_APP_LIST_LAUNCHER_SYNCING_TITLE 47 ? IDS_ASH_SHELF_APP_LIST_LAUNCHER_SYNCING_TITLE
48 : IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE; 48 : IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE;
49 return l10n_util::GetStringUTF16(title_id); 49 return l10n_util::GetStringUTF16(title_id);
50 } 50 }
51 51
52 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu( 52 ShelfMenuModel* AppListShelfItemDelegate::CreateApplicationMenu(
53 int event_flags) { 53 int event_flags) {
54 // AppList does not show an application menu. 54 // AppList does not show an application menu.
55 return NULL; 55 return nullptr;
56 } 56 }
57 57
58 bool AppListShelfItemDelegate::IsDraggable() { 58 bool AppListShelfItemDelegate::IsDraggable() {
59 return false; 59 return false;
60 } 60 }
61 61
62 bool AppListShelfItemDelegate::CanPin() const { 62 bool AppListShelfItemDelegate::CanPin() const {
63 return true; 63 return true;
64 } 64 }
65 65
66 bool AppListShelfItemDelegate::ShouldShowTooltip() { 66 bool AppListShelfItemDelegate::ShouldShowTooltip() {
67 return true; 67 return true;
68 } 68 }
69 69
70 bool AppListShelfItemDelegate::IsOpen() const {
71 return WmShell::Get()->GetAppListTargetVisibility();
72 }
73
70 void AppListShelfItemDelegate::Close() {} 74 void AppListShelfItemDelegate::Close() {}
71 75
72 } // namespace ash 76 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698