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

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

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)
Patch Set: Fix test. Created 3 years, 11 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
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/shelf_window_watcher_item_delegate.h" 5 #include "ash/common/shelf/shelf_window_watcher_item_delegate.h"
6 6
7 #include "ash/common/shelf/shelf_controller.h" 7 #include "ash/common/shelf/shelf_controller.h"
8 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/common/shelf/shelf_model.h"
9 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 base::string16 ShelfWindowWatcherItemDelegate::GetTitle() { 58 base::string16 ShelfWindowWatcherItemDelegate::GetTitle() {
59 return window_->GetTitle(); 59 return window_->GetTitle();
60 } 60 }
61 61
62 ShelfMenuModel* ShelfWindowWatcherItemDelegate::CreateApplicationMenu( 62 ShelfMenuModel* ShelfWindowWatcherItemDelegate::CreateApplicationMenu(
63 int event_flags) { 63 int event_flags) {
64 return nullptr; 64 return nullptr;
65 } 65 }
66 66
67 bool ShelfWindowWatcherItemDelegate::CanPin() const {
68 return GetShelfItemType(id_) != TYPE_APP_PANEL;
69 }
70
71 void ShelfWindowWatcherItemDelegate::Close() { 67 void ShelfWindowWatcherItemDelegate::Close() {
72 window_->CloseWidget(); 68 window_->CloseWidget();
73 } 69 }
74 70
75 } // namespace ash 71 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_window_watcher_item_delegate.h ('k') | ash/common/test/test_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698